diff options
Diffstat (limited to 'ripd/rip_interface.c')
| -rw-r--r-- | ripd/rip_interface.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 7c35781eef..c601ab4047 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -172,8 +172,8 @@ static void rip_request_interface_send(struct interface *ifp, uint8_t version) continue; if (IS_RIP_DEBUG_EVENT) - zlog_debug("SEND request to %s", - inet_ntoa(to.sin_addr)); + zlog_debug("SEND request to %pI4", + &to.sin_addr); rip_request_send(&to, ifp, version, connected); } @@ -468,10 +468,7 @@ static void rip_interface_clean(struct rip_interface *ri) ri->enable_interface = 0; ri->running = 0; - if (ri->t_wakeup) { - thread_cancel(ri->t_wakeup); - ri->t_wakeup = NULL; - } + thread_cancel(&ri->t_wakeup); } void rip_interfaces_clean(struct rip *rip) @@ -1174,9 +1171,7 @@ int rip_show_network_config(struct vty *vty, struct rip *rip) for (node = route_top(rip->enable_network); node; node = route_next(node)) if (node->info) - vty_out(vty, " %s/%u\n", - inet_ntoa(node->p.u.prefix4), - node->p.prefixlen); + vty_out(vty, " %pFX\n", &node->p); /* Interface name RIP enable statement. */ for (i = 0; i < vector_active(rip->enable_interface); i++) @@ -1186,7 +1181,7 @@ int rip_show_network_config(struct vty *vty, struct rip *rip) /* RIP neighbors listing. */ for (node = route_top(rip->neighbor); node; node = route_next(node)) if (node->info) - vty_out(vty, " %s\n", inet_ntoa(node->p.u.prefix4)); + vty_out(vty, " %pI4\n", &node->p.u.prefix4); return 0; } |