From 3aab39f589c352e30e9db92346b579dd561482b3 Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Thu, 23 Jul 2009 16:51:28 +0200 Subject: Use %R in OSPF when appropriate. --- proto/ospf/neighbor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'proto/ospf/neighbor.c') 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); -- cgit v1.2.3