bgpd, lib: More `const`ification of various code

More second order effects of cleaning up rn usage
in bgp.  Sprinkle the fairy const's all over the place.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c
index 6941e1f9b53fc73b1779f0cc73c82229ffef0155..7239ddef93686db0d65884aec9c5ec08a4d3bb24 100644 (file)
--- a/bgpd/bgp_attr_evpn.c
+++ b/bgpd/bgp_attr_evpn.c
@@ -186,7 +186,7 @@ uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr, uint8_t *sticky)
         * one.
         */
        for (i = 0; i < ecom->size; i++) {
-               uint8_t *pnt;
+               const uint8_t *pnt;
                uint8_t type, sub_type;
                uint32_t seq_num;
 

diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c
index 5c461dbe77681b82638b7dd83a98c2cc47664748..fc0c987ba2e0358026a87af7dbc21c31f5f96e18 100644 (file)
--- a/bgpd/bgp_clist.c
+++ b/bgpd/bgp_clist.c
@@ -549,7 +549,7 @@ static char *lcommunity_str_get(struct lcommunity *lcom, int i)
        uint32_t localdata1;
        uint32_t localdata2;
        char *str;
-       uint8_t *ptr;
+       const uint8_t *ptr;
        char *pnt;
 
        ptr = lcom->val + (i * LCOMMUNITY_SIZE);

diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index 21bfe3f1264c00a57dea00a6584a38f5447a5b66..fc66494742255549377eade7ef5d0a3cc3e10aa5 100644 (file)
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -555,7 +555,7 @@ struct ecommunity *ecommunity_str2com(const char *str, int type,
        return ecom;
 }
 
-static int ecommunity_rt_soo_str(char *buf, size_t bufsz, uint8_t *pnt,
+static int ecommunity_rt_soo_str(char *buf, size_t bufsz, const uint8_t *pnt,
                                 int type, int sub_type, int format)
 {
        int len = 0;

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 4f9d2a7b53d6d9bdc3401c2af12f498194ca0558..70bd7b21931e340f74ebff779c98237b3aa61ffd 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -59,7 +59,7 @@ struct vni_walk_ctx {
 static void display_vrf_import_rt(struct vty *vty, struct vrf_irt_node *irt,
                                  json_object *json)
 {
-       uint8_t *pnt;
+       const uint8_t *pnt;
        uint8_t type, sub_type;
        struct ecommunity_as eas;
        struct ecommunity_ip eip;
@@ -167,7 +167,7 @@ static void show_vrf_import_rt_entry(struct hash_bucket *bucket, void *args[])
 static void display_import_rt(struct vty *vty, struct irt_node *irt,
                              json_object *json)
 {
-       uint8_t *pnt;
+       const uint8_t *pnt;
        uint8_t type, sub_type;
        struct ecommunity_as eas;
        struct ecommunity_ip eip;

diff --git a/bgpd/bgp_lcommunity.c b/bgpd/bgp_lcommunity.c
index 324505418c244353f3d0d372b3336e9547ec5272..c21056f305743d4972ddb4420369a96e3ddc0127 100644 (file)
--- a/bgpd/bgp_lcommunity.c
+++ b/bgpd/bgp_lcommunity.c
@@ -178,7 +178,7 @@ static void set_lcommunity_string(struct lcommunity *lcom, bool make_json)
        int i;
        int len;
        char *str_buf;
-       uint8_t *pnt;
+       const uint8_t *pnt;
        uint32_t global, local1, local2;
        json_object *json_lcommunity_list = NULL;
        json_object *json_string = NULL;

diff --git a/bgpd/bgp_rd.c b/bgpd/bgp_rd.c
index be950dfa51659a593c626d48e0e02f53b41011b5..ea97583495e884dfb03173ac1c13e02adf7af611 100644 (file)
--- a/bgpd/bgp_rd.c
+++ b/bgpd/bgp_rd.c
@@ -37,7 +37,7 @@
 #include "bgpd/rfapi/rfapi_backend.h"
 #endif
 
-uint16_t decode_rd_type(uint8_t *pnt)
+uint16_t decode_rd_type(const uint8_t *pnt)
 {
        uint16_t v;
 
@@ -60,7 +60,7 @@ void encode_rd_type(uint16_t v, uint8_t *pnt)
 }
 
 /* type == RD_TYPE_AS */
-void decode_rd_as(uint8_t *pnt, struct rd_as *rd_as)
+void decode_rd_as(const uint8_t *pnt, struct rd_as *rd_as)
 {
        rd_as->as = (uint16_t)*pnt++ << 8;
        rd_as->as |= (uint16_t)*pnt++;
@@ -68,7 +68,7 @@ void decode_rd_as(uint8_t *pnt, struct rd_as *rd_as)
 }
 
 /* type == RD_TYPE_AS4 */
-void decode_rd_as4(uint8_t *pnt, struct rd_as *rd_as)
+void decode_rd_as4(const uint8_t *pnt, struct rd_as *rd_as)
 {
        pnt = ptr_get_be32(pnt, &rd_as->as);
        rd_as->val = ((uint16_t)*pnt++ << 8);

diff --git a/bgpd/bgp_rd.h b/bgpd/bgp_rd.h
index c5ea34103ffa6fecb64971ab8e53df6ddcac9ef1..da8c553b4ba06bb9a8a8d12076da37925e549907 100644 (file)
--- a/bgpd/bgp_rd.h
+++ b/bgpd/bgp_rd.h
@@ -54,11 +54,11 @@ struct rd_vnc_eth {
 };
 #endif
 
-extern uint16_t decode_rd_type(uint8_t *pnt);
+extern uint16_t decode_rd_type(const uint8_t *pnt);
 extern void encode_rd_type(uint16_t, uint8_t *);
 
-extern void decode_rd_as(uint8_t *pnt, struct rd_as *rd_as);
-extern void decode_rd_as4(uint8_t *pnt, struct rd_as *rd_as);
+extern void decode_rd_as(const uint8_t *pnt, struct rd_as *rd_as);
+extern void decode_rd_as4(const uint8_t *pnt, struct rd_as *rd_as);
 extern void decode_rd_ip(uint8_t *pnt, struct rd_ip *rd_ip);
 #if ENABLE_BGP_VNC
 extern void decode_rd_vnc_eth(uint8_t *pnt, struct rd_vnc_eth *rd_vnc_eth);

diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c
index 2f274015fc64b9e5d41ab9d4ce589188a4d9b9e5..5cb4fd5a1086318ba17d7ffaccc416f8e4c398ca 100644 (file)
--- a/bgpd/rfapi/rfapi_import.c
+++ b/bgpd/rfapi/rfapi_import.c
@@ -1040,7 +1040,7 @@ int rfapiEcommunityGetEthernetTag(struct ecommunity *ecom, uint16_t *tag_id)
                for (i = 0; i < ecom->size; ++i) {
                        as_t as = 0;
                        int encode = 0;
-                       uint8_t *p = ecom->val + (i * ECOMMUNITY_SIZE);
+                       const uint8_t *p = ecom->val + (i * ECOMMUNITY_SIZE);
 
                        /* High-order octet of type. */
                        encode = *p++;

diff --git a/lib/stream.h b/lib/stream.h
index 36c65afa3c7026ecd45f9c96a52c2ce2948ce3cf..425f0c5eddbed85c7cfd215e18c036b7fd748e55 100644 (file)
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -354,9 +354,10 @@ extern void stream_fifo_free(struct stream_fifo *fifo);
  * bit), for 64-bit values (you need to cast them anyway), and neither for
  * encoding (because it's downcasted.)
  */
-static inline uint8_t *ptr_get_be32(uint8_t *ptr, uint32_t *out)
+static inline const uint8_t *ptr_get_be32(const uint8_t *ptr, uint32_t *out)
 {
        uint32_t tmp;
+
        memcpy(&tmp, ptr, sizeof(tmp));
        *out = ntohl(tmp);
        return ptr + 4;