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]
This commit is contained in:
ajs 2005-02-02 18:38:48 +00:00
parent dd4c593fb8
commit 847947f20b
4 changed files with 14 additions and 3 deletions

View File

@ -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.

View File

@ -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 ();

View File

@ -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

View File

@ -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;
}