0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 02:01:55 +00:00
This commit is contained in:
Ondrej Filip 2000-06-06 02:50:49 +00:00
parent bd37f45c10
commit 064b1d8932
3 changed files with 9 additions and 8 deletions

View File

@ -266,8 +266,8 @@ wait_timer_hook(timer *timer)
ifa=(struct ospf_iface *)timer->data; ifa=(struct ospf_iface *)timer->data;
p=(struct proto *)(ifa->proto); p=(struct proto *)(ifa->proto);
debug("%s: Wait timer fired on interface %s.\n", OSPF_TRACE(D_EVENTS, "Wait timer fired on interface %s.",
p->name, ifa->iface->name); ifa->iface->name);
ospf_int_sm(ifa, ISM_WAITF); ospf_int_sm(ifa, ISM_WAITF);
} }

View File

@ -11,7 +11,8 @@
void void
flush_lsa(struct top_hash_entry *en, struct ospf_area *oa) 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); en->lsa.type, en->lsa.id, en->lsa.rt, en->lsa.age);
s_rem_node(SNODE en); s_rem_node(SNODE en);
ospf_hash_delete(oa->gr,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)) 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", OSPF_TRACE(D_EVENTS, "Refreshing my LSA: Type: %u, Id: %I, Rt: %I",
p->name,en->lsa.type, en->lsa.id, en->lsa.rt); en->lsa.type, en->lsa.id, en->lsa.rt);
en->lsa.sn++; en->lsa.sn++;
en->lsa.age=0; en->lsa.age=0;
lsasum_calculate(&en->lsa,en->lsa_body,po); lsasum_calculate(&en->lsa,en->lsa_body,po);

View File

@ -55,7 +55,7 @@ ospf_lsreq_tx(struct ospf_neighbor *n)
op->length=htons(length); op->length=htons(length);
ospf_pkt_finalize(n->ifa, op); ospf_pkt_finalize(n->ifa, op);
sk_send_to(n->ifa->ip_sk,length, n->ip, OSPF_PROTO); 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 void
@ -120,13 +120,13 @@ ospf_lsreq_rx(struct ospf_lsreq_packet *ps, struct proto *p,
if((n=find_neigh(ifa, nrid))==NULL) 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); nrid);
return ; return ;
} }
if(n->state<NEIGHBOR_EXCHANGE) 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); ospf_neigh_sm(n, INM_HELLOREC);
length=ntohs(ps->ospf_packet.length); length=ntohs(ps->ospf_packet.length);