Be more verbose.

diff --git a/proto/ospf/hello.c b/proto/ospf/hello.c
index eb506f4be597a32e11e1f0b64afc18ca744268a6..b2594ecb33292974b25871f6d773ebb6f451e765 100644 (file)
--- a/proto/ospf/hello.c
+++ b/proto/ospf/hello.c
@@ -58,6 +58,8 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p,
 
   nrid=ntohl(((struct ospf_packet *)ps)->routerid);
 
+  debug("%s: Received hello from %I via %s\n",p->name,faddr,ifa->iface->name);
+
   if((unsigned)ipa_mklen(ipa_ntoh(ps->netmask))!=ifa->iface->addr->pxlen)
   {
     log("%s%s%I%s%Ibad netmask %I.\n", p->name, beg, nrid, rec,
@@ -67,25 +69,26 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p,
   
   if(ntohs(ps->helloint)!=ifa->helloint)
   {
-    log("%s%s%I%shello interval mismatch.\n", p->name, beg, nrid, rec);
+    log("%s%s%I%shello interval mismatch.\n", p->name, beg, faddr, rec);
     return;
   }
 
   if(ntohl(ps->deadint)!=ifa->helloint*ifa->deadc)
   {
-    log("%s%s%I%sdead interval mismatch.\n", p->name, beg, nrid, rec);
+    log("%s%s%I%sdead interval mismatch.\n", p->name, beg, faddr, rec);
     return;
   }
 
   if(ps->options!=ifa->options)
   {
-    log("%s%s%I%soptions mismatch.\n", p->name, beg, nrid, rec);
+    log("%s%s%I%soptions mismatch.\n", p->name, beg, faddr, rec);
     return;
   }
 
   if((n=find_neigh(ifa, nrid))==NULL)
   {
-    debug("%s: New neighbor found: %I.\n", p->name,nrid);
+    debug("%s: New neighbor found: %I on %s.\n", p->name,faddr,
+      ifa->iface->name);
     n=mb_allocz(p->pool, sizeof(struct ospf_neighbor));
     add_tail(&ifa->neigh_list, NODE n);
     n->rid=nrid;
@@ -128,7 +131,7 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p,
   {
     if(ntohl(*(pnrid+i))==p->cf->global->router_id)
     {
-      DBG("%s: Twoway received from %I\n", p->name, nrid);
+      DBG("%s: Twoway received from %I\n", p->name, faddr);
       ospf_neigh_sm(n, INM_2WAYREC);
       twoway=1;
       break;
@@ -223,6 +226,8 @@ hello_timer_hook(timer *timer)
     /* And finally send it :-) */
     sk_send(ifa->hello_sk,length);
   }
+
+  debug("%s: Hello sent via %s\n",p->name,ifa->iface->name);
 }
 
 void