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

Merge pull request #3271 from donaldsharp/nh_encode_better

Browse Source 
lib, zebra: Encode nexthop vrf in nht updates
This commit is contained in:
Renato Westphal 2018-11-03 15:15:25 -03:00 committed by GitHub
commit fb52f65126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/zclient.c
View File

@ -1217,6 +1217,7 @@ bool zapi_nexthop_update_decode(struct stream *s, struct zapi_route *nhr)
STREAM_GETC(s, nhr->nexthop_num); STREAM_GETC(s, nhr->nexthop_num);
for (i = 0; i < nhr->nexthop_num; i++) { for (i = 0; i < nhr->nexthop_num; i++) {
STREAM_GETL(s, nhr->nexthops[i].vrf_id);
STREAM_GETC(s, nhr->nexthops[i].type); STREAM_GETC(s, nhr->nexthops[i].type);
switch (nhr->nexthops[i].type) { switch (nhr->nexthops[i].type) {
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4:

7
pimd/pim_zlookup.c
View File

@ -202,10 +202,12 @@ static int zclient_read_nexthop(struct pim_instance *pim,
} }
for (i = 0; i < nexthop_num; ++i) { for (i = 0; i < nexthop_num; ++i) {
vrf_id_t nexthop_vrf_id;
enum nexthop_types_t nexthop_type; enum nexthop_types_t nexthop_type;
struct pim_neighbor *nbr; struct pim_neighbor *nbr;
struct prefix p; struct prefix p;
nexthop_vrf_id = stream_getl(s);
nexthop_type = stream_getc(s); nexthop_type = stream_getc(s);
if (num_ifindex >= tab_size) { if (num_ifindex >= tab_size) {
char addr_str[INET_ADDRSTRLEN]; char addr_str[INET_ADDRSTRLEN];
@ -219,6 +221,7 @@ static int zclient_read_nexthop(struct pim_instance *pim,
} }
nexthop_tab[num_ifindex].protocol_distance = distance; nexthop_tab[num_ifindex].protocol_distance = distance;
nexthop_tab[num_ifindex].route_metric = metric; nexthop_tab[num_ifindex].route_metric = metric;
nexthop_tab[num_ifindex].vrf_id = nexthop_vrf_id;
switch (nexthop_type) { switch (nexthop_type) {
case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFINDEX:
nexthop_tab[num_ifindex].ifindex = stream_getl(s); nexthop_tab[num_ifindex].ifindex = stream_getl(s);
@ -265,12 +268,12 @@ static int zclient_read_nexthop(struct pim_instance *pim,
if_lookup_by_index( if_lookup_by_index(
nexthop_tab[num_ifindex] nexthop_tab[num_ifindex]
.ifindex, .ifindex,
vrf_id), nexthop_vrf_id),
&p); &p);
else else
nbr = pim_neighbor_find_if(if_lookup_by_index( nbr = pim_neighbor_find_if(if_lookup_by_index(
nexthop_tab[num_ifindex].ifindex, nexthop_tab[num_ifindex].ifindex,
vrf_id)); nexthop_vrf_id));
if (nbr) { if (nbr) {
nexthop_tab[num_ifindex].nexthop_addr.family = nexthop_tab[num_ifindex].nexthop_addr.family =
AF_INET; AF_INET;

1
pimd/pim_zlookup.h
View File

@ -27,6 +27,7 @@
#define PIM_NEXTHOP_LOOKUP_MAX (3) /* max. recursive route lookup */ #define PIM_NEXTHOP_LOOKUP_MAX (3) /* max. recursive route lookup */
struct pim_zlookup_nexthop { struct pim_zlookup_nexthop {
vrf_id_t vrf_id;
struct prefix nexthop_addr; struct prefix nexthop_addr;
ifindex_t ifindex; ifindex_t ifindex;
uint32_t route_metric; uint32_t route_metric;

1
zebra/zapi_msg.c
View File

@ -118,6 +118,7 @@ static void zserv_encode_vrf(struct stream *s, struct zebra_vrf *zvrf)
static int zserv_encode_nexthop(struct stream *s, struct nexthop *nexthop) static int zserv_encode_nexthop(struct stream *s, struct nexthop *nexthop)
{ {
stream_putl(s, nexthop->vrf_id);
stream_putc(s, nexthop->type); stream_putc(s, nexthop->type);
switch (nexthop->type) { switch (nexthop->type) {
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4:

1
zebra/zebra_rnh.c
View File

@ -913,6 +913,7 @@ static int send_client(struct rnh *rnh, struct zserv *client, rnh_type_t type,
stream_putc(s, 0); stream_putc(s, 0);
for (nh = re->ng.nexthop; nh; nh = nh->next) for (nh = re->ng.nexthop; nh; nh = nh->next)
if (rnh_nexthop_valid(nh)) { if (rnh_nexthop_valid(nh)) {
stream_putl(s, nh->vrf_id);
stream_putc(s, nh->type); stream_putc(s, nh->type);
switch (nh->type) { switch (nh->type) {
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4: