Renamed EAF_INLINE to EAF_TEMP to make the name reflect the real meaning.

diff --git a/filter/config.Y b/filter/config.Y
index e99d5b714ac046e14eeaa5d102b8067fa12df668..0859ead1485bc03beba370f31a802a13390f4f91 100644 (file)
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -419,7 +419,7 @@ cmd:
    }
  | UNSET '(' rtadot dynamic_attr ')' ';' {
      $$ = $4;
-     $$->aux = EAF_TYPE_UNDEF | EAF_INLINE;
+     $$->aux = EAF_TYPE_UNDEF | EAF_TEMP;
      $$->code = P('e','S');
      $$->a1.p = NULL;
    }

diff --git a/filter/filter.c b/filter/filter.c
index 7e5266401cdc92999416d2bbd7b1946138c32cff..f0e9cd8a510d9fcfe1ee48363d6881cea5d6c942 100644 (file)
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -361,7 +361,7 @@ interpret(struct f_inst *what)
        break;
       }
 
-      if (what->aux & EAF_INLINE) {
+      if (!(what->aux & EAF_TEMP)) {
        *f_rte = rte_do_cow(*f_rte);
        l->next = (*f_rte)->attrs->eattrs;
        (*f_rte)->attrs->eattrs = l;

diff --git a/nest/route.h b/nest/route.h
index 375ea9bf746ce6407eabf71fc05d4d8643221a04..aa21596e87e274682429fc23b3f53e6a327ed412 100644 (file)
--- a/nest/route.h
+++ b/nest/route.h
@@ -300,7 +300,7 @@ typedef struct eattr {
 #define EAF_TYPE_UNDEF 0x0f            /* `force undefined' entry */
 #define EAF_EMBEDDED 0x01              /* Data stored in eattr.u.data (part of type spec) */
 #define EAF_VAR_LENGTH 0x02            /* Attribute length is variable */
-#define EAF_INLINE 0x80                        /* Copy of an attribute inlined in rte (temporary ea_lists only) */
+#define EAF_TEMP 0x80                  /* A temporary attribute (the one stored in the tmp attr list) */
 
 struct adata {
   unsigned int length;

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 43bf5fe947b7227cb6a173e98990b95b62c42c93..75cdf39b19e05fc7253fd78d094b3c6949928007 100644 (file)
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -253,8 +253,8 @@ ea_dump(ea_list *e)
        {
          eattr *a = &e->attrs[i];
          debug(" %02x:%02x.%02x", EA_PROTO(a->id), EA_ID(a->id), a->flags);
-         if (a->type & EAF_INLINE)
-           debug("*");
+         if (a->type & EAF_TEMP)
+           debug("T");
          debug("=%c", "?iO?I?P???S?????" [a->type & EAF_TYPE_MASK]);
          if (a->type & EAF_EMBEDDED)
            debug(":%08x", a->u.data);

diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index 99b0f9a4a79c06e45a003ba8e53c56a1d0051535..6e9a72a9ce389901ae1262a42e242d29aa443197 100644 (file)
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -98,8 +98,8 @@ rip_iface_list:
  | rip_iface_list ',' rip_iface
  ;
 
-CF_ADDTO(dynamic_attr, RIP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_INLINE, EA_RIP_METRIC); })
-CF_ADDTO(dynamic_attr, RIP_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_INLINE, EA_RIP_TAG); })
+CF_ADDTO(dynamic_attr, RIP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, EA_RIP_METRIC); })
+CF_ADDTO(dynamic_attr, RIP_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, EA_RIP_TAG); })
 
 CF_CODE
 

diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 2808e059d457b6f4aad38d89108ee9a65d4af38d..1f356738dd470d6ee029bbe9e75b0d9e156c3ca6 100644 (file)
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -642,11 +642,11 @@ rip_gen_attrs(struct proto *p, struct linpool *pool, int metric, u16 tag)
   l->count = 2;
   l->attrs[0].id = EA_RIP_TAG;
   l->attrs[0].flags = 0;
-  l->attrs[0].type = EAF_TYPE_INT | EAF_INLINE;
+  l->attrs[0].type = EAF_TYPE_INT | EAF_TEMP;
   l->attrs[0].u.data = tag;
   l->attrs[1].id = EA_RIP_METRIC;
   l->attrs[1].flags = 0;
-  l->attrs[1].type = EAF_TYPE_INT | EAF_INLINE;
+  l->attrs[1].type = EAF_TYPE_INT | EAF_TEMP;
   l->attrs[1].u.data = metric;
   return l;
 }