summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-12-03 18:25:14 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2009-12-03 18:25:14 +0100
commit69fbf9a25190e0149dcc31e830e952c586fe2024 (patch)
treeb681ef1f421727f0b69af45a8313f998afdf0493
parente4a810b0ce3d7904e87a210c44c36eda7cba7a3e (diff)
downloadbird-69fbf9a25190e0149dcc31e830e952c586fe2024.tar
bird-69fbf9a25190e0149dcc31e830e952c586fe2024.zip
Minor fix in LSA update.
-rw-r--r--proto/ospf/lsack.c4
-rw-r--r--proto/ospf/lsupd.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/proto/ospf/lsack.c b/proto/ospf/lsack.c
index 857f0c1..ba9a918 100644
--- a/proto/ospf/lsack.c
+++ b/proto/ospf/lsack.c
@@ -76,9 +76,9 @@ ospf_lsack_send(struct ospf_neighbor *n, int queue)
{
no = (struct lsah_n *) HEAD(n->ackl[queue]);
memcpy(h + i, &no->lsa, sizeof(struct ospf_lsa_header));
- i++;
- DBG("Iter %u ID: %R, RT: %R, Type: %u\n", i, ntohl((h + i)->id),
+ DBG("Iter %u ID: %R, RT: %R, Type: %04x\n", i, ntohl((h + i)->id),
ntohl((h + i)->rt), (h + i)->type);
+ i++;
rem_node(NODE no);
mb_free(no);
if ((i * sizeof(struct ospf_lsa_header) +
diff --git a/proto/ospf/lsupd.c b/proto/ospf/lsupd.c
index b1f6f46..75c6702 100644
--- a/proto/ospf/lsupd.c
+++ b/proto/ospf/lsupd.c
@@ -449,8 +449,9 @@ ospf_lsupd_receive(struct ospf_packet *ps_i, struct ospf_iface *ifa,
struct ospf_lsa_header *lsa = (void *) (((u8 *) ps) + offset);
unsigned int lsalen = ntohs(lsa->length);
-
- if (((offset + lsalen) > size) || ((lsalen % 4) != 0) ||
+ offset += lsalen;
+
+ if ((offset > size) || ((lsalen % 4) != 0) ||
(lsalen <= sizeof(struct ospf_lsa_header)))
{
log(L_WARN "Received LSA from %I with bad length", n->ip);