2004-06-06 Paul Jakma <paul@dishone.st>

        * ospf_dump.c,ospf_lsa.c: Fix typos of merge of previous.
          ospf_flood.c: (ospf_process_self_originated_lsa) fix zlog format.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 5c4a670258361fcb3fb17ec68f591e79227f79be..7048b5e83c9df8549f8d48d9c841485f18ba507b 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-06 Paul Jakma <paul@dishone.st>
+
+       * ospf_dump.c,ospf_lsa.c: Fix typos of merge of previous.
+         ospf_flood.c: (ospf_process_self_originated_lsa) fix zlog format
+
 2004-05-31 Sagun Shakya <sagun.shakya@sun.com>
 
        * ospf_dump.c: (ospf_lsa_header_dump) LOOKUP can return null if

diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index ccee1d6ba20f0ec09ebd2beaf381dece96f8df94..9ea675587ab19ec782c4a305c3c9566c8dc3263b 100644 (file)
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -332,7 +332,7 @@ ospf_lsa_header_dump (struct lsa_header *lsah)
   zlog_info ("    Options %d (%s)", lsah->options,
             ospf_options_dump (lsah->options));
   zlog_info ("    LS type %d (%s)", lsah->type,
-             (lsah->type ? lsah->type : "unknown type"));
+             (lsah->type ? lsah_type : "unknown type"));
   zlog_info ("    Link State ID %s", inet_ntoa (lsah->id));
   zlog_info ("    Advertising Router %s", inet_ntoa (lsah->adv_router));
   zlog_info ("    LS sequence number 0x%lx", (u_long)ntohl (lsah->ls_seqnum));

diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index 71910dd75c399cff85a0cc9d17b785d364c72971..d077a7d115d9caee5de38979bf2cab2c03cdd8a2 100644 (file)
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -119,7 +119,7 @@ ospf_process_self_originated_lsa (struct ospf *ospf,
   listnode node;
   
   if (IS_DEBUG_OSPF_EVENT)
-    zlog_info ("LSA[Type%d:%s]: Process self-originated LSA seq 0x%lx",
+    zlog_info ("LSA[Type%d:%s]: Process self-originated LSA seq 0x%x",
               new->data->type, inet_ntoa (new->data->id), 
               ntohl(new->data->ls_seqnum));
 

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index b7550b13f0711d482b5a42e8c1f92ab0d523d5eb..d4cb5fde3620af1cf08602697796b014528eea62 100644 (file)
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2652,7 +2652,7 @@ ospf_lsa_install (struct ospf *ospf, struct ospf_interface *oi,
       can be originated. "
    */
 
-  if (ntohl(lsa->data->ls_seqnum) - 1 ==  htonl(OSPF_MAX_SEQUENCE_NUMBER)
+  if (ntohl(lsa->data->ls_seqnum) - 1 ==  htonl(OSPF_MAX_SEQUENCE_NUMBER))
     {
       if (ospf_lsa_is_self_originated(ospf, lsa))
         {