summaryrefslogtreecommitdiffstats
path: root/proto/ospf/neighbor.c
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-07-23 16:51:28 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2009-07-23 16:51:28 +0200
commit3aab39f589c352e30e9db92346b579dd561482b3 (patch)
treed8d6338aaae7d64fc67e704aeed95006afd59396 /proto/ospf/neighbor.c
parent2f6483cd312ffd7ef055099ce801fb8f437d9abe (diff)
downloadbird-3aab39f589c352e30e9db92346b579dd561482b3.tar
bird-3aab39f589c352e30e9db92346b579dd561482b3.zip
Use %R in OSPF when appropriate.
Diffstat (limited to 'proto/ospf/neighbor.c')
-rw-r--r--proto/ospf/neighbor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index cb43140..bb681c2 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -506,7 +506,7 @@ bdr_election(struct ospf_iface *ifa)
ifa->bdrip = nbdr->ip;
}
- DBG("DR=%I, BDR=%I\n", ipa_from_u32(ifa->drid), ipa_from_u32(ifa->bdrid));
+ DBG("DR=%R, BDR=%R\n", ifa->drid, ifa->bdrid);
if (myid == ifa->drid)
ospf_iface_chstate(ifa, OSPF_IS_DR);
@@ -624,7 +624,7 @@ ospf_sh_neigh_info(struct ospf_neighbor *n)
if ((n->ifa->type == OSPF_IT_PTP) || (n->ifa->type == OSPF_IT_VLINK))
pos = "ptp ";
- cli_msg(-1013, "%-1I\t%3u\t%s/%s\t%-5s\t%-1I\t%-10s", ipa_from_u32(n->rid), n->priority,
+ cli_msg(-1013, "%-1R\t%3u\t%s/%s\t%-5s\t%-1I\t%-10s", n->rid, n->priority,
ospf_ns[n->state], pos, etime, n->ip,
(ifa->type == OSPF_IT_VLINK ? "vlink" : ifa->iface->name));
}
@@ -672,8 +672,8 @@ rxmt_timer_hook(timer * timer)
llsh->lsh.id = en->lsa.id;
llsh->lsh.rt = en->lsa.rt;
llsh->lsh.type = en->lsa.type;
- DBG("Working on ID: %I, RT: %I, Type: %u\n",
- ipa_from_u32(en->lsa.id), ipa_from_u32(en->lsa.rt), en->lsa.type);
+ DBG("Working on ID: %R, RT: %R, Type: %u\n",
+ en->lsa.id, en->lsa.rt, en->lsa.type);
add_tail(&uplist, NODE llsh);
}
ospf_lsupd_send_list(n, &uplist);