diff options
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/rt_socket.c | 2 | ||||
| -rw-r--r-- | zebra/rtadv.c | 4 | ||||
| -rw-r--r-- | zebra/zserv.c | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index d603c60d..5b2a5e71 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -71,7 +71,7 @@ int kernel_rtm_ipv4 (int cmd, struct prefix *p, struct rib *rib, int family) { - struct sockaddr_in *mask; + struct sockaddr_in *mask = NULL; struct sockaddr_in sin_dest, sin_mask, sin_gate; struct nexthop *nexthop; int nexthop_num = 0; diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 61abd95d..c98b11cf 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -41,6 +41,10 @@ extern struct zebra_privs_t zserv_privs; #if defined (HAVE_IPV6) && defined (RTADV) +#ifdef OPEN_BSD +#include <netinet/icmp6.h> +#endif + /* If RFC2133 definition is used. */ #ifndef IPV6_JOIN_GROUP #define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP diff --git a/zebra/zserv.c b/zebra/zserv.c index 0f30a559..833b369d 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -862,6 +862,9 @@ zsend_ipv6_nexthop_lookup (struct zserv *client, struct in6_addr *addr) case ZEBRA_NEXTHOP_IFNAME: stream_putl (s, nexthop->ifindex); break; + default: + /* do nothing */ + break; } num++; } @@ -921,6 +924,9 @@ zsend_ipv4_nexthop_lookup (struct zserv *client, struct in_addr addr) case ZEBRA_NEXTHOP_IFNAME: stream_putl (s, nexthop->ifindex); break; + default: + /* do nothing */ + break; } num++; } @@ -979,6 +985,9 @@ zsend_ipv4_import_lookup (struct zserv *client, struct prefix_ipv4 *p) case ZEBRA_NEXTHOP_IFNAME: stream_putl (s, nexthop->ifindex); break; + default: + /* do nothing */ + break; } num++; } |