Renamed attr->attrs to attr->eattrs.

diff --git a/nest/route.h b/nest/route.h
index c11d771b47e929dbd43c8e70ac503f155ef99236..0451e25458e5807a32ae5ede23c383e1282eb3a4 100644 (file)
--- a/nest/route.h
+++ b/nest/route.h
@@ -208,7 +208,7 @@ typedef struct rta {
   ip_addr gw;                          /* Next hop */
   ip_addr from;                                /* Advertising router */
   struct iface *iface;                 /* Outgoing interface */
-  struct ea_list *attrs;               /* Extended Attribute chain */
+  struct ea_list *eattrs;              /* Extended Attribute chain */
 } rta;
 
 #define RTS_DUMMY 0                    /* Dummy route to be removed soon */
@@ -305,7 +305,7 @@ void rta__free(rta *r);
 static inline void rta_free(rta *r) { if (r && !--r->uc) rta__free(r); }
 void rta_dump(rta *);
 void rta_dump_all(void);
-static inline eattr * rta_find(rta *a, unsigned ea) { return ea_find(a->attrs, ea); }
+static inline eattr * rta_find(rta *a, unsigned ea) { return ea_find(a->eattrs, ea); }
 
 /*
  *     Default protocol preferences

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 2a369cedd6cc7732ec0ed38594297f3dc70ae999..ca6cb1019a5e3ba3121d13c072ddd9b6f25f5423 100644 (file)
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -275,7 +275,7 @@ rta_same(rta *x, rta *y)
          ipa_equal(x->gw, y->gw) &&
          ipa_equal(x->from, y->from) &&
          x->iface == y->iface &&
-         ea_same(x->attrs, y->attrs));
+         ea_same(x->eattrs, y->eattrs));
 }
 
 static rta *
@@ -285,7 +285,7 @@ rta_copy(rta *o)
 
   memcpy(r, o, sizeof(rta));
   r->uc = 1;
-  r->attrs = ea_list_copy(o->attrs);
+  r->eattrs = ea_list_copy(o->eattrs);
   return r;
 }
 
@@ -295,15 +295,15 @@ rta_lookup(rta *o)
   rta *r;
 
   ASSERT(!(o->aflags & RTAF_CACHED));
-  if (o->attrs)
+  if (o->eattrs)
     {
-      if (o->attrs->next)      /* Multiple ea_list's, need to merge them */
+      if (o->eattrs->next)     /* Multiple ea_list's, need to merge them */
        {
-         ea_list *ml = alloca(ea_scan(o->attrs));
-         ea_merge(o->attrs, ml);
-         o->attrs = ml;
+         ea_list *ml = alloca(ea_scan(o->eattrs));
+         ea_merge(o->eattrs, ml);
+         o->eattrs = ml;
        }
-      ea_sort(o->attrs);
+      ea_sort(o->eattrs);
     }
 
   for(r=first_rta; r; r=r->next)
@@ -347,10 +347,10 @@ rta_dump(rta *a)
     debug(" ->%I", a->gw);
   if (a->dest == RTD_DEVICE || a->dest == RTD_ROUTER)
     debug(" [%s]", a->iface ? a->iface->name : "???" );
-  if (a->attrs)
+  if (a->eattrs)
     {
       debug(" EA: ");
-      ea_dump(a->attrs);
+      ea_dump(a->eattrs);
     }
 }
 

diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index c07b5de616d0daf43065c4eb0dc4abac49fc4707..2253a113f16a42c774c45904fe8b868a8f032ef6 100644 (file)
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -54,7 +54,7 @@ dev_ifa_notify(struct proto *p, unsigned c, struct ifa *ad)
       A.cast = RTC_UNICAST;
       A.dest = RTD_DEVICE;
       A.iface = ad->iface;
-      A.attrs = NULL;
+      A.eattrs = NULL;
       a = rta_lookup(&A);
       if (ad->flags & IF_UNNUMBERED)
        n = net_get(p->table, ad->opposite, ad->pxlen);

diff --git a/sysdep/linux/krt-scan.c b/sysdep/linux/krt-scan.c
index 85b7af23894ddbab462e95040006d8c9f3aff7d2..3f3def1a1ef3202b80beb9cb7e2b7cb9f1e4acb6 100644 (file)
--- a/sysdep/linux/krt-scan.c
+++ b/sysdep/linux/krt-scan.c
@@ -95,7 +95,7 @@ krt_parse_entry(byte *ent, struct krt_proto *p)
   a.flags = a.aflags = 0;
   a.from = IPA_NONE;
   a.iface = NULL;
-  a.attrs = NULL;
+  a.eattrs = NULL;
 
   if (flags & RTF_GATEWAY)
     {

diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c
index 23e51688284ebf38f8123f862001ac09567d86f6..bf619701c75827bce0a7f78c5e1ef01b74a1f743 100644 (file)
--- a/sysdep/linux/netlink/netlink.c
+++ b/sysdep/linux/netlink/netlink.c
@@ -642,7 +642,7 @@ nl_parse_route(struct nlmsghdr *h, int scan)
   ra.from = IPA_NONE;
   ra.gw = IPA_NONE;
   ra.iface = NULL;
-  ra.attrs = NULL;
+  ra.eattrs = NULL;
 
   switch (i->rtm_type)
     {