diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-07-23 16:51:28 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-07-23 16:51:28 +0200 |
| commit | 3aab39f589c352e30e9db92346b579dd561482b3 (patch) | |
| tree | d8d6338aaae7d64fc67e704aeed95006afd59396 /proto/ospf/lsreq.c | |
| parent | 2f6483cd312ffd7ef055099ce801fb8f437d9abe (diff) | |
| download | bird-3aab39f589c352e30e9db92346b579dd561482b3.tar bird-3aab39f589c352e30e9db92346b579dd561482b3.zip | |
Use %R in OSPF when appropriate.
Diffstat (limited to 'proto/ospf/lsreq.c')
| -rw-r--r-- | proto/ospf/lsreq.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/proto/ospf/lsreq.c b/proto/ospf/lsreq.c index 45062f9..5eeb06f 100644 --- a/proto/ospf/lsreq.c +++ b/proto/ospf/lsreq.c @@ -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; |