diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:18:46 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:18:46 +0200 |
| commit | 65254128e105903b6b470c6b4bb4729f56cf81bc (patch) | |
| tree | 8f0e61f94053f49428531f0d8cd6e8d1abfcdb2a /proto/babel | |
| parent | 1a92ee9d4df265018c0344064019f53bc3afce3a (diff) | |
| parent | 702c04fbef222e802ca4dfac645dc75ede522db6 (diff) | |
Merge commit '702c04fbef222e802ca4dfac645dc75ede522db6' 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, 3 insertions, 5 deletions
diff --git a/proto/babel/babel.c b/proto/babel/babel.c index 6cc6b794..d3eef506 100644 --- a/proto/babel/babel.c +++ b/proto/babel/babel.c @@ -645,11 +645,12 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e) { struct { ea_list l; - eattr a[4]; + eattr a[5]; } eattrs = { .l.count = ARRAY_SIZE(eattrs.a), .a = { EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, c->preference), + EA_LITERAL_STORE_ADATA(&ea_gen_from, 0, &r->neigh->addr, sizeof(r->neigh->addr)), EA_LITERAL_EMBEDDED(&ea_babel_metric, 0, r->metric), EA_LITERAL_STORE_ADATA(&ea_babel_router_id, 0, &r->router_id, sizeof(r->router_id)), EA_LITERAL_EMBEDDED(&ea_babel_seqno, 0, r->seqno), @@ -658,9 +659,7 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e) rta a0 = { .source = RTS_BABEL, - .scope = SCOPE_UNIVERSE, .dest = RTD_UNICAST, - .from = r->neigh->addr, .nh.gw = r->next_hop, .nh.iface = r->neigh->ifa->iface, .eattrs = &eattrs.l, @@ -687,7 +686,6 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e) /* Unreachable */ rta a0 = { .source = RTS_BABEL, - .scope = SCOPE_UNIVERSE, .dest = RTD_UNREACHABLE, }; diff --git a/proto/babel/config.Y b/proto/babel/config.Y index 82419b20..a4350eed 100644 --- a/proto/babel/config.Y +++ b/proto/babel/config.Y @@ -24,7 +24,7 @@ CF_DECLS CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT, TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK, - NEXT, HOP, IPV4, IPV6, BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS, + NEXT, HOP, IPV4, IPV6, SHOW, INTERFACES, NEIGHBORS, ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE) CF_GRAMMAR |