diff options
author | hasso <hasso> | 2004-08-15 07:52:07 +0200 |
---|---|---|
committer | hasso <hasso> | 2004-08-15 07:52:07 +0200 |
commit | 6452df092bf6b694ea62a0423ac242f10ab997f9 (patch) | |
tree | 087490eb5e58209ca207f28b626c4a4a84ad4c9c /ospf6d/ospf6_lsdb.c | |
parent | Include padding in control message length. (diff) | |
download | frr-6452df092bf6b694ea62a0423ac242f10ab997f9.tar.xz frr-6452df092bf6b694ea62a0423ac242f10ab997f9.zip |
SVN revisions 916-920 from Zebra. ABR support is almost done.
Diffstat (limited to 'ospf6d/ospf6_lsdb.c')
-rw-r--r-- | ospf6d/ospf6_lsdb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ospf6d/ospf6_lsdb.c b/ospf6d/ospf6_lsdb.c index 5c132caae..9b37406d5 100644 --- a/ospf6d/ospf6_lsdb.c +++ b/ospf6d/ospf6_lsdb.c @@ -34,7 +34,7 @@ #include "ospf6d.h" struct ospf6_lsdb * -ospf6_lsdb_create () +ospf6_lsdb_create (void *data) { struct ospf6_lsdb *lsdb; @@ -46,6 +46,7 @@ ospf6_lsdb_create () } memset (lsdb, 0, sizeof (struct ospf6_lsdb)); + lsdb->data = data; lsdb->table = route_table_init (); return lsdb; } @@ -228,6 +229,7 @@ ospf6_lsdb_remove (struct ospf6_lsa *lsa, struct ospf6_lsdb *lsdb) ospf6_lsa_unlock (lsa); route_unlock_node (node); + ospf6_lsdb_count_assert (lsdb); } @@ -475,7 +477,7 @@ ospf6_new_ls_id (u_int16_t type, u_int32_t adv_router, if (ntohl (lsa->header->id) < id) continue; if (ntohl (lsa->header->id) > id) - return ((u_int32_t) htonl (id)); + break; id++; } |