diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-06-22 19:35:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-22 19:35:45 +0200 |
| commit | a12bb225a6681b7e7eb0aac105cbc8b745675131 (patch) | |
| tree | adb8d7935dcb1da93d6cf4082f903e412e292640 /zebra/rtadv.c | |
| parent | Merge pull request #4294 from adharkar/frr-master-fpm_rmac (diff) | |
| parent | *: change interface structure, from vrf_id to vrf (diff) | |
| download | frr-a12bb225a6681b7e7eb0aac105cbc8b745675131.tar.xz frr-a12bb225a6681b7e7eb0aac105cbc8b745675131.zip | |
Merge pull request #3775 from pguibert6WIND/ospf_missing_interface_handling_2
Ospf missing interface handling 2
Diffstat (limited to 'zebra/rtadv.c')
| -rw-r--r-- | zebra/rtadv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 5841c44b0..33d0022a9 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -534,7 +534,7 @@ static int rtadv_timer(struct thread *thread) static void rtadv_process_solicit(struct interface *ifp) { - struct zebra_vrf *zvrf = vrf_info_lookup(ifp->vrf_id); + struct zebra_vrf *zvrf = zvrf_info_lookup(ifp->vrf); assert(zvrf); rtadv_send_packet(rtadv_get_socket(zvrf), ifp); @@ -884,7 +884,7 @@ static void ipv6_nd_suppress_ra_set(struct interface *ifp, struct zebra_vrf *zvrf; zif = ifp->info; - zvrf = vrf_info_lookup(ifp->vrf_id); + zvrf = zvrf_info_lookup(ifp->vrf); if (status == RA_SUPPRESS) { /* RA is currently enabled */ @@ -957,11 +957,11 @@ static void zebra_interface_radv_set(ZAPI_HANDLER_ARGS, int enable) zebra_route_string(client->proto)); return; } - if (ifp->vrf_id != zvrf_id(zvrf)) { + if (ifp->vrf != zvrf->vrf) { zlog_debug( "%u: IF %u RA %s client %s - VRF mismatch, IF VRF %u", zvrf_id(zvrf), ifindex, enable ? "enable" : "disable", - zebra_route_string(client->proto), ifp->vrf_id); + zebra_route_string(client->proto), vrf_to_id(ifp->vrf)); return; } @@ -1058,7 +1058,7 @@ DEFUN (ipv6_nd_ra_interval_msec, struct zebra_if *zif = ifp->info; struct zebra_vrf *zvrf; - zvrf = vrf_info_lookup(ifp->vrf_id); + zvrf = zvrf_info_lookup(ifp->vrf); interval = strtoul(argv[idx_number]->arg, NULL, 10); if ((zif->rtadv.AdvDefaultLifetime != -1 @@ -1096,7 +1096,7 @@ DEFUN (ipv6_nd_ra_interval, struct zebra_if *zif = ifp->info; struct zebra_vrf *zvrf; - zvrf = vrf_info_lookup(ifp->vrf_id); + zvrf = zvrf_info_lookup(ifp->vrf); interval = strtoul(argv[idx_number]->arg, NULL, 10); if ((zif->rtadv.AdvDefaultLifetime != -1 @@ -1135,7 +1135,7 @@ DEFUN (no_ipv6_nd_ra_interval, struct zebra_if *zif = ifp->info; struct zebra_vrf *zvrf = NULL; - zvrf = vrf_info_lookup(ifp->vrf_id); + zvrf = zvrf_info_lookup(ifp->vrf); if (zif->rtadv.MaxRtrAdvInterval % 1000) zvrf->rtadv.adv_msec_if_count--; |