commit 553ff11329835054314f6c9ce61da7d3e2477b19
author paul <paul> Sun Jun 06 09:41:00 2004 +0000
committer paul <paul> Sun Jun 06 09:41:00 2004 +0000
tree 11140105b2b1a6c70fd58601d7b6f9f609385152
parent 8ba85bc0716e9823b12c48167781f81c7565977a

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.

ospfd/ChangeLog

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 5c4a670..7048b5e 100644
--- 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

ospfd/ospf_dump.c

diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index ccee1d6..9ea6755 100644
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -332,7 +332,7 @@
   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));

ospfd/ospf_flood.c

diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index 71910dd..d077a7d 100644
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -119,7 +119,7 @@
   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));
 

ospfd/ospf_lsa.c

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index b7550b1..d4cb5fd 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2652,7 +2652,7 @@
       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))
         {