Commit 07c67f2e authored by Maria Matejka's avatar Maria Matejka
Browse files

Nest: Added const to ea_show just to declare that this shouldn't really change anything

parent 14d6f6d7

nest/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct protocol { 
  void (*cleanup)(struct proto *);		/* Called after shutdown when protocol became hungry/down */

  void (*get_status)(struct proto *, byte *buf); /* Get instance status (for `show protocols' command) */

  void (*get_route_info)(struct rte *, byte *buf, struct ea_list *attrs); /* Get route information (for `show route' command) */

  int (*get_attr)(struct eattr *, byte *buf, int buflen);	/* ASCIIfy dynamic attribute (returns GA_*) */

  int (*get_attr)(const struct eattr *, byte *buf, int buflen);	/* ASCIIfy dynamic attribute (returns GA_*) */

  void (*show_proto_info)(struct proto *);	/* Show protocol info (for `show protocols all' command) */

  void (*copy_config)(struct proto_config *, struct proto_config *);	/* Copy config from given protocol instance */

};

nest/route.h

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ void ea_merge(ea_list *from, ea_list *to); /* Merge sub-lists to allocated buffe 
int ea_same(ea_list *x, ea_list *y);	/* Test whether two ea_lists are identical */

uint ea_hash(ea_list *e);	/* Calculate 16-bit hash value */

ea_list *ea_append(ea_list *to, ea_list *what);

void ea_format_bitfield(struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max);

void ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max);



static inline eattr *

ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, uintptr_t val)

nest/rt-attr.c

+3 −3
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ ea_free(ea_list *o) 
}



static int

get_generic_attr(eattr *a, byte **buf, int buflen UNUSED)

get_generic_attr(const eattr *a, byte **buf, int buflen UNUSED)

{

  if (a->id == EA_GEN_IGP_METRIC)

    {
@@ -753,7 +753,7 @@ get_generic_attr(eattr *a, byte **buf, int buflen UNUSED) 
}



void

ea_format_bitfield(struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max)

ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max)

{

  byte *bound = buf + bufsize - 32;

  u32 data = a->u.data;
@@ -849,7 +849,7 @@ ea_show_lc_set(struct cli *c, struct adata *ad, byte *pos, byte *buf, byte *end) 
 * get_attr() hook, it's consulted first.

 */

void

ea_show(struct cli *c, eattr *e)

ea_show(struct cli *c, const eattr *e)

{

  struct protocol *p;

  int status = GA_UNKNOWN;

proto/babel/babel.c

+1 −1
Original line number Diff line number Diff line
@@ -1835,7 +1835,7 @@ babel_get_route_info(rte *rte, byte *buf, ea_list *attrs UNUSED) 
}



static int

babel_get_attr(eattr *a, byte *buf, int buflen UNUSED)

babel_get_attr(const eattr *a, byte *buf, int buflen UNUSED)

{

  switch (a->id)

  {

proto/bgp/attrs.c

+7 −7
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct bgp_attr_desc { 
  void (*export)(struct bgp_export_state *s, eattr *a);

  int  (*encode)(struct bgp_write_state *s, eattr *a, byte *buf, uint size);

  void (*decode)(struct bgp_parse_state *s, uint code, uint flags, byte *data, uint len, ea_list **to);

  void (*format)(eattr *ea, byte *buf, uint size);

  void (*format)(const eattr *ea, byte *buf, uint size);

};



static const struct bgp_attr_desc bgp_attr_table[];
@@ -233,7 +233,7 @@ bgp_decode_origin(struct bgp_parse_state *s, uint code UNUSED, uint flags, byte 
}



static void

bgp_format_origin(eattr *a, byte *buf, uint size UNUSED)

bgp_format_origin(const eattr *a, byte *buf, uint size UNUSED)

{

  static const char *bgp_origin_names[] = { "IGP", "EGP", "Incomplete" };
@@ -327,7 +327,7 @@ bgp_decode_next_hop(struct bgp_parse_state *s, uint code UNUSED, uint flags UNUS 


/* TODO: This function should use AF-specific hook */

static void

bgp_format_next_hop(eattr *a, byte *buf, uint size UNUSED)

bgp_format_next_hop(const eattr *a, byte *buf, uint size UNUSED)

{

  ip_addr *nh = (void *) a->u.ptr->data;

  uint len = a->u.ptr->length;
@@ -418,7 +418,7 @@ bgp_decode_aggregator(struct bgp_parse_state *s, uint code UNUSED, uint flags, b 
}



static void

bgp_format_aggregator(eattr *a, byte *buf, uint size UNUSED)

bgp_format_aggregator(const eattr *a, byte *buf, uint size UNUSED)

{

  byte *data = a->u.ptr->data;
@@ -493,7 +493,7 @@ bgp_decode_cluster_list(struct bgp_parse_state *s, uint code UNUSED, uint flags, 
}



static void

bgp_format_cluster_list(eattr *a, byte *buf, uint size)

bgp_format_cluster_list(const eattr *a, byte *buf, uint size)

{

  /* Truncates cluster lists larger than buflen, probably not a problem */

  int_set_format(a->u.ptr, 0, -1, buf, size);
@@ -676,7 +676,7 @@ bgp_decode_mpls_label_stack(struct bgp_parse_state *s, uint code UNUSED, uint fl 
}



static void

bgp_format_mpls_label_stack(eattr *a, byte *buf, uint size)

bgp_format_mpls_label_stack(const eattr *a, byte *buf, uint size)

{

  u32 *labels = (u32 *) a->u.ptr->data;

  uint lnum = a->u.ptr->length / 4;
@@ -1984,7 +1984,7 @@ bgp_process_as4_attrs(ea_list **attrs, struct linpool *pool) 
}



int

bgp_get_attr(eattr *a, byte *buf, int buflen)

bgp_get_attr(const eattr *a, byte *buf, int buflen)

{

  uint i = EA_ID(a->id);

  const struct bgp_attr_desc *d;

CRA Git | Maintained and supported by SUSTech CRA and CCSE