Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Martin Mares 2000-03-04 22:30:44 +00:00
parent b9626ec6ea
commit 9f4929e749
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
filter/config.Y
View file

@ -419,7 +419,7 @@ cmd:
} }
| UNSET '(' rtadot dynamic_attr ')' ';' { | UNSET '(' rtadot dynamic_attr ')' ';' {
$$ = $4; $$ = $4;
$$->aux = EAF_TYPE_UNDEF | EAF_INLINE; $$->aux = EAF_TYPE_UNDEF | EAF_TEMP;
$$->code = P('e','S'); $$->code = P('e','S');
$$->a1.p = NULL; $$->a1.p = NULL;
} }

2
filter/filter.c
View file

@ -361,7 +361,7 @@ interpret(struct f_inst *what)
break; break;
} }
if (what->aux & EAF_INLINE) { if (!(what->aux & EAF_TEMP)) {
*f_rte = rte_do_cow(*f_rte); *f_rte = rte_do_cow(*f_rte);
l->next = (*f_rte)->attrs->eattrs; l->next = (*f_rte)->attrs->eattrs;
(*f_rte)->attrs->eattrs = l; (*f_rte)->attrs->eattrs = l;

2
nest/route.h
View file

@ -300,7 +300,7 @@ typedef struct eattr {
#define EAF_TYPE_UNDEF 0x0f /* `force undefined' entry */ #define EAF_TYPE_UNDEF 0x0f /* `force undefined' entry */
#define EAF_EMBEDDED 0x01 /* Data stored in eattr.u.data (part of type spec) */ #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_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 { struct adata {
unsigned int length; unsigned int length;

4
nest/rt-attr.c
View file

@ -253,8 +253,8 @@ ea_dump(ea_list *e)
{ {
eattr *a = &e->attrs[i]; eattr *a = &e->attrs[i];
debug(" %02x:%02x.%02x", EA_PROTO(a->id), EA_ID(a->id), a->flags); debug(" %02x:%02x.%02x", EA_PROTO(a->id), EA_ID(a->id), a->flags);
if (a->type & EAF_INLINE) if (a->type & EAF_TEMP)
debug("*"); debug("T");
debug("=%c", "?iO?I?P???S?????" [a->type & EAF_TYPE_MASK]); debug("=%c", "?iO?I?P???S?????" [a->type & EAF_TYPE_MASK]);
if (a->type & EAF_EMBEDDED) if (a->type & EAF_EMBEDDED)
debug(":%08x", a->u.data); debug(":%08x", a->u.data);

4
proto/rip/config.Y
View file

@ -98,8 +98,8 @@ rip_iface_list:
| rip_iface_list ',' rip_iface | 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_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_INLINE, EA_RIP_TAG); }) CF_ADDTO(dynamic_attr, RIP_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, EA_RIP_TAG); })
CF_CODE CF_CODE

4
proto/rip/rip.c
View file

@ -642,11 +642,11 @@ rip_gen_attrs(struct proto *p, struct linpool *pool, int metric, u16 tag)
l->count = 2; l->count = 2;
l->attrs[0].id = EA_RIP_TAG; l->attrs[0].id = EA_RIP_TAG;
l->attrs[0].flags = 0; 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[0].u.data = tag;
l->attrs[1].id = EA_RIP_METRIC; l->attrs[1].id = EA_RIP_METRIC;
l->attrs[1].flags = 0; 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; l->attrs[1].u.data = metric;
return l; return l;
} }