diff options
| author | ajs <ajs> | 2005-02-02 18:38:48 +0000 |
|---|---|---|
| committer | ajs <ajs> | 2005-02-02 18:38:48 +0000 |
| commit | 847947f20b152f0b64057a7115e118b44d238b5c (patch) | |
| tree | 68f726878177a594e258ce5312b7937951d3b421 | |
| parent | dd4c593fb88b7c6cf5f27aa8a8286644743ed58a (diff) | |
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]
| -rw-r--r-- | lib/ChangeLog | 4 | ||||
| -rw-r--r-- | lib/if.h | 1 | ||||
| -rw-r--r-- | ospfd/ChangeLog | 6 | ||||
| -rw-r--r-- | ospfd/ospf_packet.c | 6 |
4 files changed, 14 insertions, 3 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index dcf37767..a69abc59 100644 --- 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. @@ -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 deefce54..2f586781 100644 --- 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 45dabc54..67fbedd2 100644 --- 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; } |