diff options
Diffstat (limited to 'isisd/isis_adjacency.c')
| -rw-r--r-- | isisd/isis_adjacency.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c index 5bfbb2cf7e..71d4758163 100644 --- a/isisd/isis_adjacency.c +++ b/isisd/isis_adjacency.c @@ -147,7 +147,7 @@ void isis_delete_adj(void *arg) if (!adj) return; - THREAD_TIMER_OFF(adj->t_expire); + thread_cancel(&adj->t_expire); if (adj->adj_state != ISIS_ADJ_DOWN) adj->adj_state = ISIS_ADJ_DOWN; @@ -393,7 +393,7 @@ void isis_adj_print(struct isis_adjacency *adj) if (adj->ipv4_address_count) { zlog_debug("IPv4 Address(es):"); for (unsigned int i = 0; i < adj->ipv4_address_count; i++) - zlog_debug("%s", inet_ntoa(adj->ipv4_addresses[i])); + zlog_debug("%pI4", &adj->ipv4_addresses[i]); } if (adj->ipv6_address_count) { @@ -562,8 +562,8 @@ void isis_adj_print_vty(struct isis_adjacency *adj, struct vty *vty, vty_out(vty, " IPv4 Address(es):\n"); for (unsigned int i = 0; i < adj->ipv4_address_count; i++) - vty_out(vty, " %s\n", - inet_ntoa(adj->ipv4_addresses[i])); + vty_out(vty, " %pI4\n", + &adj->ipv4_addresses[i]); } if (adj->ipv6_address_count) { vty_out(vty, " IPv6 Address(es):\n"); |
