summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul>2004-06-06 09:41:00 +0000
committerpaul <paul>2004-06-06 09:41:00 +0000
commit553ff11329835054314f6c9ce61da7d3e2477b19 (patch)
tree11140105b2b1a6c70fd58601d7b6f9f609385152
parent8ba85bc0716e9823b12c48167781f81c7565977a (diff)
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.
-rw-r--r--ospfd/ChangeLog5
-rw-r--r--ospfd/ospf_dump.c2
-rw-r--r--ospfd/ospf_flood.c2
-rw-r--r--ospfd/ospf_lsa.c2
4 files changed, 8 insertions, 3 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 5c4a6702..7048b5e8 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
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index ccee1d6b..9ea67558 100644
--- 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 71910dd7..d077a7d1 100644
--- 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 b7550b13..d4cb5fde 100644
--- 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))
{