diff options
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/ospf/ospf.c | 2 | ||||
| -rw-r--r-- | proto/ospf/topology.c | 17 | ||||
| -rw-r--r-- | proto/ospf/topology.h | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index 37f58f1..1912305 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -81,7 +81,7 @@ ospf_dump(struct proto *p) WALK_LIST(NODE oa,po->area_list) { OSPF_TRACE(D_EVENTS, "LSA graph dump for area \"%I\" start:", oa->areaid); - ospf_top_dump(oa->gr); + ospf_top_dump(oa->gr,p); OSPF_TRACE(D_EVENTS, "LSA graph dump for area \"%I\" finished", oa->areaid); } neigh_dump_all(); diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index 4c5e8c3..607583a 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -174,11 +174,12 @@ originate_rt_lsa(struct ospf_area *oa) { struct ospf_lsa_header lsa; struct proto_ospf *po=oa->po; + struct proto *p=&po->proto; u32 rtid=po->proto.cf->global->router_id; struct top_hash_entry *en; void *body; - debug("%s: Originating RT_lsa for area \"%I\".\n",po->proto.name,oa->areaid); + OSPF_TRACE(D_EVENTS, "Originating RT_lsa for area \"%I\".",oa->areaid); lsa.age=0; lsa.id=rtid; @@ -236,9 +237,10 @@ originate_net_lsa(struct ospf_iface *ifa, struct proto_ospf *po) struct ospf_lsa_header lsa; u32 rtid=po->proto.cf->global->router_id; struct top_hash_entry *en; + struct proto *p=&po->proto; void *body; - debug("%s: Originating Net lsa for iface \"%s\".\n", po->proto.name, + OSPF_TRACE(D_EVENTS, "Originating Net lsa for iface \"%s\".", ifa->iface->name); if((ifa->state!=OSPF_IS_DR)||(ifa->fadj==0)) @@ -272,8 +274,6 @@ originate_net_lsa(struct ospf_iface *ifa, struct proto_ospf *po) body=originate_net_lsa_body(ifa, &lsa.length, po); lsasum_calculate(&lsa,body,po); ifa->nlsa=lsa_install_new(&lsa, body, ifa->oa, &po->proto); - debug("NetLsa: Id: %I, Sum: %u Sn: 0x%x\n",ifa->nlsa->lsa.id, - ifa->nlsa->lsa.checksum, ifa->nlsa->lsa.sn); flood_lsa(NULL,NULL,&ifa->nlsa->lsa,po,NULL,ifa->oa,1); } @@ -329,7 +329,7 @@ originate_ext_lsa(net *n, rte *e, struct proto_ospf *po, struct ea_list *attrs) struct ospf_lsa_ext *ext1,*ext2; int i; - debug("%s: Originating Ext lsa for %I/%d.\n", po->proto.name, n->n.prefix, + OSPF_TRACE(D_EVENTS, "Originating Ext lsa for %I/%d.", n->n.prefix, n->n.pxlen); lsa.age=0; @@ -548,17 +548,18 @@ ospf_hash_delete(struct top_graph *f, struct top_hash_entry *e) } void -ospf_top_dump(struct top_graph *f) +ospf_top_dump(struct top_graph *f, struct proto *p) { unsigned int i; - debug("Hash entries: %d\n", f->hash_entries); + OSPF_TRACE(D_EVENTS, "Hash entries: %d", f->hash_entries); for(i=0; i<f->hash_size; i++) { struct top_hash_entry *e = f->hash_table[i]; while (e) { - debug("\t%1x %8I %8I %4u 0x%08x\n", e->lsa.type, e->lsa.id, + OSPF_TRACE(D_EVENTS, "\t%1x %8I %8I %4u 0x%08x", + e->lsa.type, e->lsa.id, e->lsa.rt, e->lsa.age, e->lsa.sn); e = e->next; } diff --git a/proto/ospf/topology.h b/proto/ospf/topology.h index 786e976..de04cae 100644 --- a/proto/ospf/topology.h +++ b/proto/ospf/topology.h @@ -39,7 +39,7 @@ struct top_graph { struct top_graph *ospf_top_new(struct proto_ospf *); void ospf_top_free(struct top_graph *); -void ospf_top_dump(struct top_graph *); +void ospf_top_dump(struct top_graph *, struct proto *); struct top_hash_entry *ospf_hash_find_header(struct top_graph *f, struct ospf_lsa_header *h); struct top_hash_entry *ospf_hash_get_header(struct top_graph *f, struct ospf_lsa_header *h); struct top_hash_entry *ospf_hash_find(struct top_graph *, u32 lsa, u32 rtr, u32 type); |