summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-05-14 20:03:09 +0200
committerMartin Mares <mj@ucw.cz>1999-05-14 20:03:09 +0200
commitb23c5e0ff4e9071b2568bf2f7d437bc13273d17d (patch)
tree2e6ff94f799923b0c8cd70ebedd431368f67b059
parent11ce4490fac7d0446802738f5fb8fd68c36bd30b (diff)
downloadbird-b23c5e0ff4e9071b2568bf2f7d437bc13273d17d.tar
bird-b23c5e0ff4e9071b2568bf2f7d437bc13273d17d.zip
Added ip_skip_header() and modified OSPF to use it.
-rw-r--r--TODO2
-rw-r--r--lib/ipv4.c15
-rw-r--r--lib/ipv4.h3
-rw-r--r--proto/ospf/ospf.c7
4 files changed, 23 insertions, 4 deletions
diff --git a/TODO b/TODO
index 0746c48..28f94cc 100644
--- a/TODO
+++ b/TODO
@@ -30,6 +30,8 @@ Core
- socket: Use IP_RECVERR for BGP TCP sockets?
+- lib: use better checksum function
+
Cleanup
~~~~~~~
- right usage of DBG vs. debug
diff --git a/lib/ipv4.c b/lib/ipv4.c
index 186b36a..943e2c8 100644
--- a/lib/ipv4.c
+++ b/lib/ipv4.c
@@ -94,3 +94,18 @@ ip_pton(char *a, ip_addr *o)
*o = ipa_from_u32(ia);
return 1;
}
+
+byte *
+ipv4_skip_header(byte *pkt, int *len)
+{
+ int l = *len;
+ int q;
+
+ if (l < 20 || (*pkt & 0xf0) != 0x40)
+ return NULL;
+ q = (*pkt & 0x0f) * 4;
+ if (q < l)
+ return NULL;
+ *len -= q;
+ return pkt + q;
+}
diff --git a/lib/ipv4.h b/lib/ipv4.h
index a672036..87e0874 100644
--- a/lib/ipv4.h
+++ b/lib/ipv4.h
@@ -58,8 +58,11 @@ typedef u32 ip_addr;
#define ipa_to_u32(x) _I(x)
#define ipa_compare(x,y) ipv4_compare(_I(x),_I(y))
+#define ip_skip_header(x, y) ipv4_skip_header(x, y)
+
int ipv4_classify(u32);
u32 ipv4_class_mask(u32);
+byte *ipv4_skip_header(byte *, int *);
static inline unsigned ipv4_hash(u32 a)
{
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index ef65064..954df8e 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -80,16 +80,15 @@ ospf_rx_hook(sock *sk, int size)
DBG(sk->iface->name);
DBG(".\n");
- ps=(struct ospf_packet *)(sk->rbuf+5*4);
-
- if(size<=(20+sizeof(struct ospf_packet)))
+ ps = (struct ospf_packet *) ipv4_skip_header(sk->rbuf, &size);
+ if(!ps || size < sizeof(struct ospf_packet))
{
log("%s: Bad packet received: too short", p->name);
log("%s: Discarding",p->name);
return(1);
}
- if((ntohs(ps->length))!=(size-20))
+ if(ntohs(ps->length) != size)
{
log("%s: Bad packet received: size fields does not match", p->name);
log("%s: Discarding",p->name);