2005-11-03 Paul Jakma <paul.jakma@sun.com>

	* ospf_apiserver.c: (apiserver_sync_callback) stray semi-colon
	* ospf_packet.c: include checksum.h, remove the in_cksum extern
	* prototypes.
	* ospf_te.h: Add braces, quell warning.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index fc0d599390298b5db1c6fcd56249b67c2c529112..aef712150b61a1945ed732003d0da7895526fdb7 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-03 Paul Jakma <paul.jakma@sun.com>
+
+       * ospf_apiserver.c: (apiserver_sync_callback) stray semi-colon
+       * ospf_packet.c: include checksum.h, remove the in_cksum extern
+       * prototypes.
+       * ospf_te.h: Add braces, quell warning.
+         
 2005-10-29 Paul Jakma <paul.jakma@sun.com>
 
        * (general) RFC3137 stub-router support

diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 577419da8e9becb6525b145d6ac5bbc1a9373834..2ee4d3e1697c25e80ca57a00257369a02b805657 100644 (file)
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -1301,7 +1301,7 @@ apiserver_sync_callback (struct ospf_lsa *lsa, void *p_arg, int int_arg)
       struct in_addr area_id = { .s_addr = 0L };
 
       /* Default interface for non Opaque9 LSAs */
-      struct in_addr ifaddr = { .s_addr = 0L };;
+      struct in_addr ifaddr = { .s_addr = 0L };
       
       if (lsa->area)
        {

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 8b818d7230ac41ef1cc2c29403f3ab56b2e0ac78..d41fff57bd7baf03ab9ad1ccc1fe1700e69b0a32 100644 (file)
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -32,6 +32,7 @@
 #include "stream.h"
 #include "log.h"
 #include "sockopt.h"
+#include "checksum.h"
 #include "md5.h"
 
 #include "ospfd/ospfd.h"
@@ -59,8 +60,6 @@ const char *ospf_packet_type_str[] =
   "Link State Acknowledgment",
 };
 
-extern int in_cksum (void *ptr, int nbytes);
-
 /* OSPF authentication checking function */
 static int
 ospf_auth_type (struct ospf_interface *oi)
@@ -2193,7 +2192,6 @@ ospf_check_sum (struct ospf_header *ospfh)
 {
   u_int32_t ret;
   u_int16_t sum;
-  int in_cksum (void *ptr, int nbytes);
 
   /* clear auth_data for checksum. */
   memset (ospfh->u.auth_data, 0, OSPF_AUTH_SIMPLE_SIZE);

diff --git a/ospfd/ospf_te.h b/ospfd/ospf_te.h
index 8a7a98c7707a9415719c0721cb90f166d011b63d..e8511cdfbf83bd2b329e7ce4ce08f39e923323e5 100644 (file)
--- a/ospfd/ospf_te.h
+++ b/ospfd/ospf_te.h
@@ -73,10 +73,10 @@ struct te_tlv_header
 };
 
 #define TLV_HDR_SIZE \
-       sizeof (struct te_tlv_header)
+       (sizeof (struct te_tlv_header))
 
 #define TLV_BODY_SIZE(tlvh) \
-       ROUNDUP (ntohs ((tlvh)->length), sizeof (u_int32_t))
+       (ROUNDUP (ntohs ((tlvh)->length), sizeof (u_int32_t)))
 
 #define TLV_SIZE(tlvh) \
        (TLV_HDR_SIZE + TLV_BODY_SIZE(tlvh))