eigrp: Fix Compile issues

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
index df4ed1069f84c3d3087cd752f07cd359fac0024e..0071c2c6a7546f4be079574bedbff0a027c3e7a6 100644 (file)
--- a/eigrpd/eigrp_hello.c
+++ b/eigrpd/eigrp_hello.c
@@ -94,8 +94,8 @@ eigrp_hello_timer (struct thread *thread)
   ei->t_hello = NULL;
 
   if (IS_DEBUG_EIGRP(0, TIMERS))
-    zlog (NULL, LOG_DEBUG, "Start Hello Timer (%s) Expire [%u]",
-         IF_NAME(ei), EIGRP_IF_PARAM(ei, v_hello));
+    zlog_debug ("Start Hello Timer (%s) Expire [%u]",
+                IF_NAME(ei), EIGRP_IF_PARAM(ei, v_hello));
 
   /* Sending hello packet. */
   eigrp_hello_send(ei, EIGRP_HELLO_NORMAL, NULL);

diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index 9a0a9897f0345a9ebec76f2b13cfe60120fd7c64..75be2eff3d90ac407b227b6086b839e15cb3cb06 100644 (file)
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -519,13 +519,16 @@ eigrp_read (struct thread *thread)
   /* Note that sockopt_iphdrincl_swab_systoh was called in eigrp_recv_packet. */
   if (ifp == NULL)
     {
+      struct connected *c;
       /* Handle cases where the platform does not support retrieving the ifindex,
         and also platforms (such as Solaris 8) that claim to support ifindex
         retrieval but do not. */
-      ifp = if_lookup_address((void *)&iph->ip_src, VRF_DEFAULT);
+      c = if_lookup_address((void *)&iph->ip_src, VRF_DEFAULT);
 
-      if (ifp == NULL)
+      if (c == NULL)
        return 0;
+
+      ifp = c->ifp;
     }
 
   /* associate packet with eigrp interface */
@@ -706,9 +709,8 @@ eigrp_read (struct thread *thread)
       eigrp_update_receive(eigrp, iph, eigrph, ibuf, ei, length);
       break;
     default:
-      zlog(NULL, LOG_WARNING,
-           "interface %s: EIGRP packet header type %d unsupported",
-           IF_NAME(ei), opcode);
+      zlog_warn("interface %s: EIGRP packet header type %d unsupported",
+               IF_NAME(ei), opcode);
       break;
     }