diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-11-05 12:48:52 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-11-05 12:48:52 +0100 |
| commit | fe9f1a6dedda6bab23cbb605d1cd5db6cd3e2468 (patch) | |
| tree | d6ea417b7ed16c90b29634fe075e51508dec87d9 /proto/ospf/packet.c | |
| parent | 8eb8e546dc8cc647fcfa4a3a17dfa8ab36b00958 (diff) | |
Initial commit on integrated BIRD
New data types net_addr and variants (in lib/net.h) describing
network addresses (prefix/pxlen). Modifications of FIB structures
to handle these data types and changing everything to use these
data types instead of prefix/pxlen pairs where possible.
The commit is WiP, some protocols are not yet updated (BGP, Kernel),
and the code contains some temporary scaffolding.
Comments are welcome.
Diffstat (limited to 'proto/ospf/packet.c')
| -rw-r--r-- | proto/ospf/packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/proto/ospf/packet.c b/proto/ospf/packet.c index 5af9e875..606127f2 100644 --- a/proto/ospf/packet.c +++ b/proto/ospf/packet.c @@ -22,7 +22,7 @@ ospf_pkt_fill_hdr(struct ospf_iface *ifa, void *buf, u8 h_type) pkt->version = ospf_get_version(p); pkt->type = h_type; - pkt->length = htons(ospf_pkt_maxsize(ifa)); + pkt->length = htons(ospf_pkt_maxsize(p, ifa)); pkt->routerid = htonl(p->router_id); pkt->areaid = htonl(ifa->oa->areaid); pkt->checksum = 0; @@ -31,9 +31,9 @@ ospf_pkt_fill_hdr(struct ospf_iface *ifa, void *buf, u8 h_type) } uint -ospf_pkt_maxsize(struct ospf_iface *ifa) +ospf_pkt_maxsize(struct ospf_proto *p, struct ospf_iface *ifa) { - uint headers = SIZE_OF_IP_HEADER; + uint headers = ospf_is_v2(p) ? IP4_HEADER_LENGTH : IP6_HEADER_LENGTH; /* Relevant just for OSPFv2 */ if (ifa->autype == OSPF_AUTH_CRYPT) |