2005-02-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* ospf_packet.c: (ospf_read) Fix bug: must check for state ISM_Down,
	  not for event ISM_InterfaceDown.  And improve the message by
	  adding the interface flags.
	* if.h: Declare if_flag_dump.

	[backport candidate]

diff --git a/lib/ChangeLog b/lib/ChangeLog
index dcf37767f9afb7cee8bce0265573ae57b152fe55..a69abc59fe2f06995b875932d95a988cde47eb85 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+       * if.h: Declare if_flag_dump.
+
 2005-01-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * daemon.c: (daemon) Replace perror with zlog_err.

diff --git a/lib/if.h b/lib/if.h
index 492a63c9056a24ff5b4487aa6784509b540ab05f..f5efda6e2cc7847c0e4a256dddbb5c7d77e7eac2 100644 (file)
--- a/lib/if.h
+++ b/lib/if.h
@@ -227,6 +227,7 @@ void if_add_hook (int, int (*)(struct interface *));
 void if_init ();
 void if_dump_all ();
 char *ifindex2ifname (unsigned int);
+extern const char *if_flag_dump(unsigned long);
 
 /* Connected address functions. */
 struct connected *connected_new ();

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index deefce54734d0e1f5f000c2717c9f33e69783266..2f58678136c75b37caa4cf15cc84e9ac4d1f1878 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+       * ospf_packet.c: (ospf_read) Fix bug: must check for state ISM_Down,
+         not for event ISM_InterfaceDown.  And improve the message by
+         adding the interface flags.
+
 2005-01-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * ospf_network.c: (ospf_sock_init) Save errno before calling

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 45dabc54f4bd5864662c0ab2a99aa6c3829856ed..67fbedd2e23640dc2d6f3c12b5a216074893495c 100644 (file)
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -2430,11 +2430,11 @@ ospf_read (struct thread *thread)
       stream_free (ibuf);
       return 0;
     }
-  else if (oi->state == ISM_InterfaceDown)
+  else if (oi->state == ISM_Down)
     {
       zlog_warn ("Ignoring packet from [%s] received on interface that is "
-                "down [%s]",
-                 inet_ntoa (iph->ip_src), ifp->name); 
+                "down [%s]; interface flags are %s",
+                 inet_ntoa (iph->ip_src), ifp->name, if_flag_dump(ifp->flags));
       stream_free (ibuf);
       return 0;
     }