zebra: Convert socket interface to use `union sockunion`

[mirror_frr.git] / nhrpd / nhrp_interface.c

diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c
index fba045daeb5c8ca1ae02cc1222755c0666391b27..ccca100db57940b038501c5a08b44cccd3958e20 100644 (file)
--- a/nhrpd/nhrp_interface.c
+++ b/nhrpd/nhrp_interface.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <net/if_arp.h>
 #include "zebra.h"
 #include "linklist.h"
@@ -25,8 +29,6 @@ static int nhrp_if_new_hook(struct interface *ifp)
        afi_t afi;
 
        nifp = XCALLOC(MTYPE_NHRP_IF, sizeof(struct nhrp_interface));
-       if (!nifp)
-               return 0;
 
        ifp->info = nifp;
        nifp->ifp = ifp;
@@ -134,7 +136,7 @@ static void nhrp_interface_update_nbma(struct interface *ifp)
                debugf(NHRP_DEBUG_IF, "%s: GRE: %x %x %x", ifp->name,
                       nifp->grekey, nifp->linkidx, saddr.s_addr);
                if (saddr.s_addr)
-                       sockunion_set(&nbma, AF_INET, (u_char *)&saddr.s_addr,
+                       sockunion_set(&nbma, AF_INET, (uint8_t *)&saddr.s_addr,
                                      sizeof(saddr.s_addr));
                else if (!nbmaifp && nifp->linkidx != IFINDEX_INTERNAL)
                        nbmaifp =