proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 13:27:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: Add tableid the route entry was sent to

Browse Source 
Add for the southbound pass back the route entries tableid
used for installation.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-02-09 19:27:52 -05:00
parent 8d056acc82
commit 28610f7e44
7 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eigrpd/eigrp_zebra.c
View File

@ -99,8 +99,9 @@ static int eigrp_zebra_notify_owner(int command, struct zclient *zclient,
{ {
struct prefix p; struct prefix p;
enum zapi_route_notify_owner note; enum zapi_route_notify_owner note;
uint32_t table;
if (!zapi_route_notify_decode(zclient->ibuf, &p, &note)) if (!zapi_route_notify_decode(zclient->ibuf, &p, &table, &note))
return -1; return -1;
return 0; return 0;

2
lib/zclient.c
View File

@ -1210,6 +1210,7 @@ stream_failure:
} }
bool zapi_route_notify_decode(struct stream *s, struct prefix *p, bool zapi_route_notify_decode(struct stream *s, struct prefix *p,
uint32_t *tableid,
enum zapi_route_notify_owner *note) enum zapi_route_notify_owner *note)
{ {
STREAM_GET(note, s, sizeof(*note)); STREAM_GET(note, s, sizeof(*note));
@ -1218,6 +1219,7 @@ bool zapi_route_notify_decode(struct stream *s, struct prefix *p,
STREAM_GETC(s, p->prefixlen); STREAM_GETC(s, p->prefixlen);
STREAM_GET(&p->u.prefix, s, STREAM_GET(&p->u.prefix, s,
PSIZE(p->prefixlen)); PSIZE(p->prefixlen));
STREAM_GETL(s, *tableid);
return true; return true;

1
lib/zclient.h
View File

@ -513,6 +513,7 @@ extern int zclient_send_rnh(struct zclient *zclient, int command,
extern int zapi_route_encode(u_char, struct stream *, struct zapi_route *); extern int zapi_route_encode(u_char, struct stream *, struct zapi_route *);
extern int zapi_route_decode(struct stream *, struct zapi_route *); extern int zapi_route_decode(struct stream *, struct zapi_route *);
bool zapi_route_notify_decode(struct stream *s, struct prefix *p, bool zapi_route_notify_decode(struct stream *s, struct prefix *p,
uint32_t *tableid,
enum zapi_route_notify_owner *note); enum zapi_route_notify_owner *note);
extern struct nexthop *nexthop_from_zapi_nexthop(struct zapi_nexthop *znh); extern struct nexthop *nexthop_from_zapi_nexthop(struct zapi_nexthop *znh);
extern bool zapi_nexthop_update_decode(struct stream *s, extern bool zapi_nexthop_update_decode(struct stream *s,

3
sharpd/sharp_zebra.c
View File

@ -136,8 +136,9 @@ static int notify_owner(int command, struct zclient *zclient,
{ {
struct prefix p; struct prefix p;
enum zapi_route_notify_owner note; enum zapi_route_notify_owner note;
uint32_t table;
if (!zapi_route_notify_decode(zclient->ibuf, &p, &note)) if (!zapi_route_notify_decode(zclient->ibuf, &p, &table, &note))
return -1; return -1;
installed_routes++; installed_routes++;

10
zebra/zebra_rib.c
View File

@ -1033,8 +1033,7 @@ void kernel_route_rib_pass_fail(struct route_node *rn, struct prefix *p,
else else
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB); UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
} }
zsend_route_notify_owner(re->type, re->instance, re->vrf_id, zsend_route_notify_owner(re, p, ZAPI_ROUTE_INSTALLED);
p, ZAPI_ROUTE_INSTALLED);
break; break;
case SOUTHBOUND_INSTALL_FAILURE: case SOUTHBOUND_INSTALL_FAILURE:
/* /*
@ -1044,8 +1043,7 @@ void kernel_route_rib_pass_fail(struct route_node *rn, struct prefix *p,
*/ */
dest->selected_fib = re; dest->selected_fib = re;
zsend_route_notify_owner(re->type, re->instance, re->vrf_id, zsend_route_notify_owner(re, p, ZAPI_ROUTE_FAIL_INSTALL);
p, ZAPI_ROUTE_FAIL_INSTALL);
zlog_warn("%u:%s: Route install failed", re->vrf_id, zlog_warn("%u:%s: Route install failed", re->vrf_id,
prefix2str(p, buf, sizeof(buf))); prefix2str(p, buf, sizeof(buf)));
break; break;
@ -1113,9 +1111,7 @@ void rib_install_kernel(struct route_node *rn, struct route_entry *re,
* know that they've lost * know that they've lost
*/ */
if (old && old != re) if (old && old != re)
zsend_route_notify_owner(old->type, old->instance, zsend_route_notify_owner(old, p, ZAPI_ROUTE_BETTER_ADMIN_WON);
old->vrf_id, p,
ZAPI_ROUTE_BETTER_ADMIN_WON);
/* /*
* Make sure we update the FPM any time we send new information to * Make sure we update the FPM any time we send new information to

15
zebra/zserv.c
View File

@ -978,21 +978,22 @@ static int zsend_ipv4_nexthop_lookup_mrib(struct zserv *client,
return zebra_server_send_message(client); return zebra_server_send_message(client);
} }
int zsend_route_notify_owner(u_char proto, u_short instance, int zsend_route_notify_owner(struct route_entry *re, struct prefix *p,
vrf_id_t vrf_id, struct prefix *p,
enum zapi_route_notify_owner note) enum zapi_route_notify_owner note)
{ {
struct zserv *client; struct zserv *client;
struct stream *s; struct stream *s;
uint8_t blen; uint8_t blen;
client = zebra_find_client(proto, instance); client = zebra_find_client(re->type, re->instance);
if (!client || !client->notify_owner) { if (!client || !client->notify_owner) {
if (IS_ZEBRA_DEBUG_PACKET) { if (IS_ZEBRA_DEBUG_PACKET) {
char buff[PREFIX_STRLEN]; char buff[PREFIX_STRLEN];
zlog_debug("Not Notifying Owner: %u about prefix %s", zlog_debug(
proto, prefix2str(p, buff, sizeof(buff))); "Not Notifying Owner: %u about prefix %s(%u)",
re->type, prefix2str(p, buff, sizeof(buff)),
re->table);
} }
return 0; return 0;
} }
@ -1000,7 +1001,7 @@ int zsend_route_notify_owner(u_char proto, u_short instance,
s = client->obuf; s = client->obuf;
stream_reset(s); stream_reset(s);
zclient_create_header(s, ZEBRA_ROUTE_NOTIFY_OWNER, vrf_id); zclient_create_header(s, ZEBRA_ROUTE_NOTIFY_OWNER, re->vrf_id);
stream_put(s, &note, sizeof(note)); stream_put(s, &note, sizeof(note));
@ -1010,6 +1011,8 @@ int zsend_route_notify_owner(u_char proto, u_short instance,
stream_putc(s, p->prefixlen); stream_putc(s, p->prefixlen);
stream_put(s, &p->u.prefix, blen); stream_put(s, &p->u.prefix, blen);
stream_putl(s, re->table);
stream_putw_at(s, 0, stream_get_endp(s)); stream_putw_at(s, 0, stream_get_endp(s));
return zebra_server_send_message(client); return zebra_server_send_message(client);

3
zebra/zserv.h
View File

@ -175,8 +175,7 @@ extern int zsend_interface_vrf_update(struct zserv *, struct interface *,
extern int zsend_interface_link_params(struct zserv *, struct interface *); extern int zsend_interface_link_params(struct zserv *, struct interface *);
extern int zsend_pw_update(struct zserv *, struct zebra_pw *); extern int zsend_pw_update(struct zserv *, struct zebra_pw *);
extern int zsend_route_notify_owner(u_char proto, u_short instance, extern int zsend_route_notify_owner(struct route_entry *re, struct prefix *p,
vrf_id_t vrf_id, struct prefix *p,
enum zapi_route_notify_owner note); enum zapi_route_notify_owner note);
extern void zserv_nexthop_num_warn(const char *, const struct prefix *, extern void zserv_nexthop_num_warn(const char *, const struct prefix *,