summaryrefslogtreecommitdiffstats
path: root/proto
diff options
context:
space:
mode:
Diffstat (limited to 'proto')
-rw-r--r--proto/ospf/hello.c4
-rw-r--r--proto/ospf/lsalib.c7
-rw-r--r--proto/ospf/lsreq.c6
3 files changed, 9 insertions, 8 deletions
diff --git a/proto/ospf/hello.c b/proto/ospf/hello.c
index 8117afe..ef9bf59 100644
--- a/proto/ospf/hello.c
+++ b/proto/ospf/hello.c
@@ -266,8 +266,8 @@ wait_timer_hook(timer *timer)
ifa=(struct ospf_iface *)timer->data;
p=(struct proto *)(ifa->proto);
- debug("%s: Wait timer fired on interface %s.\n",
- p->name, ifa->iface->name);
+ OSPF_TRACE(D_EVENTS, "Wait timer fired on interface %s.",
+ ifa->iface->name);
ospf_int_sm(ifa, ISM_WAITF);
}
diff --git a/proto/ospf/lsalib.c b/proto/ospf/lsalib.c
index 0741c79..46b6d09 100644
--- a/proto/ospf/lsalib.c
+++ b/proto/ospf/lsalib.c
@@ -11,7 +11,8 @@
void
flush_lsa(struct top_hash_entry *en, struct ospf_area *oa)
{
- debug("Going to remove node: Type: %u, Id: %I, Rt: %I, Age: %u\n",
+ struct proto *p=&oa->po->proto;
+ OSPF_TRACE(D_EVENTS, "Going to remove node Type: %u, Id: %I, Rt: %I, Age: %u",
en->lsa.type, en->lsa.id, en->lsa.rt, en->lsa.age);
s_rem_node(SNODE en);
ospf_hash_delete(oa->gr,en);
@@ -35,8 +36,8 @@ ospf_age(struct ospf_area *oa)
}
if((en->lsa.rt==p->cf->global->router_id)&&(en->lsa.age>=LSREFRESHTIME))
{
- debug("%s: Refreshing my LSA: Type: %u, Id: %I, Rt: %I\n",
- p->name,en->lsa.type, en->lsa.id, en->lsa.rt);
+ OSPF_TRACE(D_EVENTS, "Refreshing my LSA: Type: %u, Id: %I, Rt: %I",
+ en->lsa.type, en->lsa.id, en->lsa.rt);
en->lsa.sn++;
en->lsa.age=0;
lsasum_calculate(&en->lsa,en->lsa_body,po);
diff --git a/proto/ospf/lsreq.c b/proto/ospf/lsreq.c
index 504ab58..4951c84 100644
--- a/proto/ospf/lsreq.c
+++ b/proto/ospf/lsreq.c
@@ -55,7 +55,7 @@ ospf_lsreq_tx(struct ospf_neighbor *n)
op->length=htons(length);
ospf_pkt_finalize(n->ifa, op);
sk_send_to(n->ifa->ip_sk,length, n->ip, OSPF_PROTO);
- debug("%s: LS request sent to: %I\n", p->name, n->rid);
+ OSPF_TRACE(D_PACKETS, "LS request sent to: %I", n->rid);
}
void
@@ -120,13 +120,13 @@ ospf_lsreq_rx(struct ospf_lsreq_packet *ps, struct proto *p,
if((n=find_neigh(ifa, nrid))==NULL)
{
- debug("%s: Received lsreq from unknown neighbor! (%I)\n", p->name,
+ OSPF_TRACE(D_PACKETS, "Received lsreq from unknown neighbor! (%I)",
nrid);
return ;
}
if(n->state<NEIGHBOR_EXCHANGE) return;
- debug("%s: Received LS req from neighbor: %I\n",p->name, n->ip);
+ OSPF_TRACE(D_EVENTS, "Received LS req from neighbor: %I", n->ip);
ospf_neigh_sm(n, INM_HELLOREC);
length=ntohs(ps->ospf_packet.length);