diff options
| author | paul <paul> | 2003-02-13 22:04:01 +0000 |
|---|---|---|
| committer | paul <paul> | 2003-02-13 22:04:01 +0000 |
| commit | 17b78d38e438bb25d27aa00554ad948a792850aa (patch) | |
| tree | 7c0691d8d0164f57266690a9982ba750c346927f | |
| parent | 619efcb3d51edf5d144293d08cbc3777655310e4 (diff) | |
Fix debug statement in ospf_packet.c and merge error in ospf_lsa.c
| -rw-r--r-- | ospfd/ospf_lsa.c | 2 | ||||
| -rw-r--r-- | ospfd/ospf_packet.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 0a48babc..9c8cd81d 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -2620,8 +2620,6 @@ ospf_lsa_maxage_walker_remover (struct ospf_lsa *lsa, void *p_arg, int int_arg) case OSPF_OPAQUE_LINK_LSA: case OSPF_OPAQUE_AREA_LSA: case OSPF_OPAQUE_AS_LSA: - case OSPF_OPAQUE_LINK_LSA: - case OSPF_OPAQUE_AREA_LSA: /* * As a general rule, whenever network topology has changed * (due to an LSA removal in this case), routing recalculation diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 0b9e60f3..d8456842 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -2217,7 +2217,7 @@ ospf_read (struct thread *thread) top->t_read = thread_add_read (master, ospf_read, top, top->fd); /* IP Header dump. */ - if (ospf_debug_packet & OSPF_DEBUG_RECV) + if (IS_DEBUG_OSPF_PACKET(0, RECV)) ospf_ip_header_dump (ibuf); /* Self-originated packet should be discarded silently. */ |