diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-30 15:43:13 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 15:43:13 +0200 |
| commit | 54344f15f8a6a6f5f0388097a1825a9c08c17482 (patch) | |
| tree | 85af19e3330719d3486efdf8a12fc5f9549b72ac /proto/babel | |
| parent | 3752654852f4962465154257348000d6de1c2dae (diff) | |
| parent | 0d0f6554a5c233bf2bf830ae319191c4b1808d49 (diff) | |
Merge commit '0d0f6554a5c233bf2bf830ae319191c4b1808d49' into haugesund
Diffstat (limited to 'proto/babel')
| -rw-r--r-- | proto/babel/babel.c | 6 | ||||
| -rw-r--r-- | proto/babel/config.Y | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/proto/babel/babel.c b/proto/babel/babel.c index db54e4f1..6df80922 100644 --- a/proto/babel/babel.c +++ b/proto/babel/babel.c @@ -654,7 +654,7 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e) *a0.eattrs = (ea_list) { .count = 3 }; a0.eattrs->attrs[0] = (eattr) { .id = EA_BABEL_METRIC, - .type = EAF_TYPE_INT, + .type = T_INT, .u.data = r->metric, }; @@ -663,13 +663,13 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e) memcpy(ad->data, &(r->router_id), sizeof(u64)); a0.eattrs->attrs[1] = (eattr) { .id = EA_BABEL_ROUTER_ID, - .type = EAF_TYPE_OPAQUE, + .type = T_OPAQUE, .u.ptr = ad, }; a0.eattrs->attrs[2] = (eattr) { .id = EA_BABEL_SEQNO, - .type = EAF_TYPE_INT, + .type = T_INT, .u.data = r->seqno, }; diff --git a/proto/babel/config.Y b/proto/babel/config.Y index 05210fa4..fa745993 100644 --- a/proto/babel/config.Y +++ b/proto/babel/config.Y @@ -163,7 +163,7 @@ babel_iface_opt_list: babel_iface: babel_iface_start iface_patt_list_nopx babel_iface_opt_list babel_iface_finish; -dynamic_attr: BABEL_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_BABEL_METRIC); } ; +dynamic_attr: BABEL_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_BABEL_METRIC); } ; CF_CLI_HELP(SHOW BABEL, ..., [[Show information about Babel protocol]]); |