mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Use %R in OSPF when appropriate.

Browse Source
This commit is contained in:
Ondrej Zajicek
2009-07-23 16:51:28 +02:00
parent 2f6483cd31
commit 3aab39f589
10 changed files with 98 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
proto/ospf/lsreq.c
View File

@@ -22,9 +22,8 @@ static void ospf_dump_lsreq(struct proto *p, struct ospf_lsreq_packet *pkt)
sizeof(struct ospf_lsreq_header);
for (i = 0; i < j; i++)
log(L_TRACE "%s: LSR Id: %I, Rt: %I, Type: %u",
p->name, ipa_from_u32(htonl(plsr[i].id)),
ipa_from_u32(htonl(plsr[i].rt)), plsr[i].type);
log(L_TRACE "%s: LSR Id: %R, Rt: %R, Type: %u",
p->name, htonl(plsr[i].id), htonl(plsr[i].rt), plsr[i].type);
}
void
@@ -64,8 +63,8 @@ ospf_lsreq_send(struct ospf_neighbor *n)
lsh->type = en->lsa.type;
lsh->rt = htonl(en->lsa.rt);
lsh->id = htonl(en->lsa.id);
DBG("Requesting %uth LSA: Type: %u, ID: %I, RT: %I, SN: 0x%x, Age %u\n",
i, en->lsa.type, ipa_from_u32(en->lsa.id), ipa_from_u32(en->lsa.rt), en->lsa.sn, en->lsa.age);
DBG("Requesting %uth LSA: Type: %u, ID: %R, RT: %R, SN: 0x%x, Age %u\n",
i, en->lsa.type, en->lsa.id, en->lsa.rt, en->lsa.sn, en->lsa.age);
lsh++;
if (sn == STAIL(n->lsrql))
break;
@@ -115,7 +114,7 @@ ospf_lsreq_receive(struct ospf_lsreq_packet *ps,
{
u32 hid = ntohl(lsh->id);
u32 hrt = ntohl(lsh->rt);
DBG("Processing requested LSA: Type: %u, ID: %I, RT: %I\n", lsh->type, ipa_from_u32(hid), ipa_from_u32(hrt));
DBG("Processing requested LSA: Type: %u, ID: %R, RT: %R\n", lsh->type, hid, hrt);
llsh = sl_alloc(upslab);
llsh->lsh.id = hid;
llsh->lsh.rt = hrt;
@@ -125,8 +124,8 @@ ospf_lsreq_receive(struct ospf_lsreq_packet *ps,
llsh->lsh.type) == NULL)
{
log(L_WARN
"Received bad LS req from: %I looking: Type: %u, ID: %I, RT: %I",
n->ip, lsh->type, ipa_from_u32(hid), ipa_from_u32(hrt));
"Received bad LS req from: %I looking: Type: %u, ID: %R, RT: %R",
n->ip, lsh->type, hid, hrt);
ospf_neigh_sm(n, INM_BADLSREQ);
rfree(upslab);
return;