diff --git a/nest/iface.c b/nest/iface.c index 41cb05bb..591733a1 100644 --- a/nest/iface.c +++ b/nest/iface.c @@ -95,7 +95,7 @@ neigh_find(struct proto *p, ip_addr *a, unsigned flags) void neigh_dump(neighbor *n) { - debug("%p %08x ", n, _I(n->addr)); + debug("%p %I ", n, n->addr); if (n->iface) debug("%s ", n->iface->name); else @@ -129,7 +129,7 @@ neigh_if_up(struct iface *i) n->iface = i; n->sibling = i->neigh; i->neigh = n; - DBG("Waking up sticky neighbor %08x\n", _I(n->addr)); + DBG("Waking up sticky neighbor %I\n", n->addr); if (n->proto->neigh_notify) n->proto->neigh_notify(n); } @@ -143,7 +143,7 @@ neigh_if_down(struct iface *i) for(m=i->neigh; n = m;) { m = n->sibling; - DBG("Flushing neighbor %08x on %s\n", _I(n->addr), n->iface->name); + DBG("Flushing neighbor %I on %s\n", n->addr, n->iface->name); n->iface = NULL; if (n->proto->neigh_notify) n->proto->neigh_notify(n); @@ -185,7 +185,7 @@ if_dump(struct iface *i) if (i->flags & IF_IGNORE) debug(" IGN"); debug(" MTU=%d\n", i->mtu); - debug("\t%08x, net %08x/%-2d bc %08x -> %08x\n", _I(i->ip), _I(i->prefix), i->pxlen, _I(i->brd), _I(i->opposite)); + debug("\t%I, net %I/%-2d bc %I -> %I\n", i->ip, i->prefix, i->pxlen, i->brd, i->opposite); } void diff --git a/nest/rt-attr.c b/nest/rt-attr.c index d6a57235..fa92d665 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -144,9 +144,9 @@ rta_dump(rta *a) debug(" EXT"); if (a->flags & RTF_TAGGED) debug(" TAG"); - debug(" <-%08x", _I(a->from)); + debug(" <-%I", a->from); if (a->dest == RTD_ROUTER) - debug(" ->%08x", _I(a->gw)); + debug(" ->%I", a->gw); if (a->dest == RTD_DEVICE || a->dest == RTD_ROUTER) debug(" [%s]", a->iface->name); } diff --git a/nest/rt-table.c b/nest/rt-table.c index 249cbbf6..a45b58da 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -185,7 +185,7 @@ void rte_dump(net *n, rte *e) { if (n) - debug("%08x/%2d ", _I(n->n.prefix), n->n.pxlen); + debug("%1I/%2d ", n->n.prefix, n->n.pxlen); debug("PF=%02x pref=%d lm=%d ", e->pflags, e->pref, e->lastmod); rta_dump(e->attrs); if (e->flags & REF_CHOSEN)