proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 09:22:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
paul 2005-11-03 09:08:29 +00:00
parent 34204aac42
commit 484315fd27
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ospfd/ChangeLog
View File

@ -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> 2005-10-29 Paul Jakma <paul.jakma@sun.com>
* (general) RFC3137 stub-router support * (general) RFC3137 stub-router support

2
ospfd/ospf_apiserver.c
View File

@ -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 }; struct in_addr area_id = { .s_addr = 0L };
/* Default interface for non Opaque9 LSAs */ /* Default interface for non Opaque9 LSAs */
struct in_addr ifaddr = { .s_addr = 0L };; struct in_addr ifaddr = { .s_addr = 0L };
if (lsa->area) if (lsa->area)
{ {

4
ospfd/ospf_packet.c
View File

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

4
ospfd/ospf_te.h
View File

@ -73,10 +73,10 @@ struct te_tlv_header
}; };
#define TLV_HDR_SIZE \ #define TLV_HDR_SIZE \
sizeof (struct te_tlv_header) (sizeof (struct te_tlv_header))
#define TLV_BODY_SIZE(tlvh) \ #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) \ #define TLV_SIZE(tlvh) \
(TLV_HDR_SIZE + TLV_BODY_SIZE(tlvh)) (TLV_HDR_SIZE + TLV_BODY_SIZE(tlvh))