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/iface.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'proto/ospf/iface.c') diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 2239bef9..ea38461d 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -112,8 +112,8 @@ ospf_iface_chstate(struct ospf_iface *ifa, u8 state) if (ifa->type == OSPF_IT_VLINK) { OSPF_TRACE(D_EVENTS, - "Changing state of virtual link %I from \"%s\" into \"%s\".", - ipa_from_u32(ifa->vid), ospf_is[oldstate], ospf_is[state]); + "Changing state of virtual link %R from \"%s\" into \"%s\".", + ifa->vid, ospf_is[oldstate], ospf_is[state]); if (state == OSPF_IS_PTP) { ifa->ip_sk = ospf_open_ip_socket(ifa); @@ -586,8 +586,8 @@ ospf_iface_info(struct ospf_iface *ifa) strict = ""; if (ifa->type == OSPF_IT_VLINK) { - cli_msg(-1015, "Virtual link to %I:", ipa_from_u32(ifa->vid)); - cli_msg(-1015, "\tTransit area: %I (%u)", ipa_from_u32(ifa->voa->areaid), + cli_msg(-1015, "Virtual link to %R:", ifa->vid); + cli_msg(-1015, "\tTransit area: %R (%u)", ifa->voa->areaid, ifa->voa->areaid); } else @@ -595,7 +595,7 @@ ospf_iface_info(struct ospf_iface *ifa) cli_msg(-1015, "Interface \"%s\":", (ifa->iface ? ifa->iface->name : "(none)")); cli_msg(-1015, "\tType: %s %s", ospf_it[ifa->type], strict); - cli_msg(-1015, "\tArea: %I (%u)", ipa_from_u32(ifa->oa->areaid), ifa->oa->areaid); + cli_msg(-1015, "\tArea: %R (%u)", ifa->oa->areaid, ifa->oa->areaid); } cli_msg(-1015, "\tState: %s %s", ospf_is[ifa->state], ifa->stub ? "(stub)" : ""); @@ -612,9 +612,9 @@ ospf_iface_info(struct ospf_iface *ifa) cli_msg(-1015, "\tRetransmit timer: %u", ifa->rxmtint); if ((ifa->type == OSPF_IT_BCAST) || (ifa->type == OSPF_IT_NBMA)) { - cli_msg(-1015, "\tDesigned router (ID): %I", ipa_from_u32(ifa->drid)); + cli_msg(-1015, "\tDesigned router (ID): %R", ifa->drid); cli_msg(-1015, "\tDesigned router (IP): %I", ifa->drip); - cli_msg(-1015, "\tBackup designed router (ID): %I", ipa_from_u32(ifa->bdrid)); + cli_msg(-1015, "\tBackup designed router (ID): %R", ifa->bdrid); cli_msg(-1015, "\tBackup designed router (IP): %I", ifa->bdrip); } } -- cgit v1.2.3