diff options
| -rw-r--r-- | bgpd/rfapi/bgp_rfapi_cfg.c | 2 | ||||
| -rw-r--r-- | tools/etc/iproute2/rt_protos.d/frr.conf | 4 | ||||
| -rw-r--r-- | zebra/interface.c | 2 | ||||
| -rw-r--r-- | zebra/misc_null.c | 2 | ||||
| -rw-r--r-- | zebra/rt_netlink.c | 13 | ||||
| -rw-r--r-- | zebra/rt_netlink.h | 3 | ||||
| -rw-r--r-- | zebra/zserv.c | 4 |
7 files changed, 27 insertions, 3 deletions
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index 6002046bcd..2caaa5ce38 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -3385,7 +3385,7 @@ DEFUN (vnc_vrf_policy_nexthop, "Specify next hop to use for VRF advertised prefixes\n" "IPv4 prefix\n" "IPv6 prefix\n" - "Use configured router-id (default)") + "Use configured router-id (default)\n") { VTY_DECLVAR_CONTEXT_SUB(rfapi_nve_group_cfg, rfg); struct prefix p; diff --git a/tools/etc/iproute2/rt_protos.d/frr.conf b/tools/etc/iproute2/rt_protos.d/frr.conf index 3f55b11268..2d3b884e7e 100644 --- a/tools/etc/iproute2/rt_protos.d/frr.conf +++ b/tools/etc/iproute2/rt_protos.d/frr.conf @@ -5,4 +5,6 @@ 188 ospf 189 rip 190 ripng -191 static +191 nhrp +192 eigrp +193 ldp diff --git a/zebra/interface.c b/zebra/interface.c index c60cb8dcbc..9393305f06 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -849,6 +849,7 @@ if_up (struct interface *ifp) if_nbr_ipv6ll_to_ipv4ll_neigh_add_all (ifp); +#if defined (HAVE_RTADV) /* Enable fast tx of RA if enabled && RA interval is not in msecs */ if (zif->rtadv.AdvSendAdvertisements && (zif->rtadv.MaxRtrAdvInterval >= 1000)) @@ -856,6 +857,7 @@ if_up (struct interface *ifp) zif->rtadv.inFastRexmit = 1; zif->rtadv.NumFastReXmitsRemain = RTADV_NUM_FAST_REXMITS; } +#endif /* Install connected routes to the kernel. */ if_install_connected (ifp); diff --git a/zebra/misc_null.c b/zebra/misc_null.c index b125becdc9..f58eb628b0 100644 --- a/zebra/misc_null.c +++ b/zebra/misc_null.c @@ -25,7 +25,9 @@ #include "zebra/irdp.h" #include "zebra/interface.h" +#if defined (HAVE_RTADV) void rtadv_config_write (struct vty *vty, struct interface *ifp) { return; } +#endif void irdp_config_write (struct vty *vty, struct interface *ifp) { return; } #ifdef HAVE_PROC_NET_DEV void ifstat_update_proc (void) { return; } diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 88cdfbcae1..9bad7991a5 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -121,7 +121,9 @@ static inline int is_selfroute(int proto) { if ((proto == RTPROT_BGP) || (proto == RTPROT_OSPF) || (proto == RTPROT_STATIC) || (proto == RTPROT_ZEBRA) || - (proto == RTPROT_ISIS) || (proto == RTPROT_RIPNG)) { + (proto == RTPROT_ISIS) || (proto == RTPROT_RIPNG) || + (proto == RTPROT_NHRP) || (proto == RTPROT_EIGRP) || + (proto == RTPROT_LDP)) { return 1; } @@ -150,6 +152,15 @@ static inline int get_rt_proto(int proto) case ZEBRA_ROUTE_RIPNG: proto = RTPROT_RIPNG; break; + case ZEBRA_ROUTE_NHRP: + proto = RTPROT_NHRP; + break; + case ZEBRA_ROUTE_EIGRP: + proto = RTPROT_EIGRP; + break; + case ZEBRA_ROUTE_LDP: + proto = RTPROT_LDP; + break; default: proto = RTPROT_ZEBRA; break; diff --git a/zebra/rt_netlink.h b/zebra/rt_netlink.h index 4ec5f18535..6f9487542c 100644 --- a/zebra/rt_netlink.h +++ b/zebra/rt_netlink.h @@ -33,6 +33,9 @@ #define RTPROT_OSPF 188 #define RTPROT_RIP 189 #define RTPROT_RIPNG 190 +#define RTPROT_NHRP 191 +#define RTPROT_EIGRP 192 +#define RTPROT_LDP 193 void rt_netlink_init (void); diff --git a/zebra/zserv.c b/zebra/zserv.c index ea4c769fa5..9d05a3b9df 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -2396,10 +2396,14 @@ zebra_client_read (struct thread *thread) zebra_ptm_bfd_client_register(client, sock, length); break; case ZEBRA_INTERFACE_ENABLE_RADV: +#if defined (HAVE_RTADV) zebra_interface_radv_set (client, sock, length, zvrf, 1); +#endif break; case ZEBRA_INTERFACE_DISABLE_RADV: +#if defined (HAVE_RTADV) zebra_interface_radv_set (client, sock, length, zvrf, 0); +#endif break; case ZEBRA_MPLS_LABELS_ADD: case ZEBRA_MPLS_LABELS_DELETE: |