summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Filip <feela@network.cz>2000-02-25 15:26:54 +0100
committerOndrej Filip <feela@network.cz>2000-02-25 15:26:54 +0100
commitb786df7035f43bb5eb4f7bca980e3bf684e527b7 (patch)
tree990b3733af3e963f05f682bfb491c5bb0036e16a
parent2d496d2028e1283384f1c9d243f96eb59c42297e (diff)
downloadbird-b786df7035f43bb5eb4f7bca980e3bf684e527b7.tar
bird-b786df7035f43bb5eb4f7bca980e3bf684e527b7.zip
Memory allocation in ospf_area changed.
-rw-r--r--proto/ospf/ospf.c1
-rw-r--r--proto/ospf/ospf.h1
-rw-r--r--proto/ospf/topology.c3
3 files changed, 2 insertions, 3 deletions
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 1cf6175..8eae39e 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -25,7 +25,6 @@ ospf_start(struct proto *p)
po->areano=0; /* Waiting for interfaces comming up */
po->firstarea=NULL;
- po->areaslab=sl_new(p->pool, sizeof(struct ospf_area));
return PS_UP;
}
diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h
index 05e79e7..647deba 100644
--- a/proto/ospf/ospf.h
+++ b/proto/ospf/ospf.h
@@ -220,7 +220,6 @@ struct proto_ospf {
list iface_list; /* Interfaces we really use */
int areano; /* Number of area I belong to */
struct ospf_area *firstarea;
- slab *areaslab;
};
static int ospf_start(struct proto *p);
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 60dbd4f..7de749d 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -46,10 +46,11 @@ addifa_rtlsa(struct ospf_iface *ifa)
{
po->areano++;
oa=po->firstarea;
- po->firstarea=sl_alloc(po->areaslab);
+ po->firstarea=mb_alloc(po->proto.pool, sizeof(struct ospf_area));
po->firstarea->next=oa;
po->firstarea->areaid=ifa->area;
po->firstarea->gr=ospf_top_new(po);
+ DBG("%s: New OSPF area \"%d\" added.\n", po->proto.name, ifa->area);
}
/* FIXME Go on, change router lsa, bits and so on... */