diff options
Diffstat (limited to 'isisd/isis_adjacency.c')
| -rw-r--r-- | isisd/isis_adjacency.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c index 9013c7c19b..e1cdfc30ea 100644 --- a/isisd/isis_adjacency.c +++ b/isisd/isis_adjacency.c @@ -215,21 +215,24 @@ void isis_adj_process_threeway(struct isis_adjacency *adj, } } + if (adj->threeway_state != next_tw_state) { + send_hello_sched(adj->circuit, 0, TRIGGERED_IIH_DELAY); + } + adj->threeway_state = next_tw_state; } void isis_adj_state_change(struct isis_adjacency *adj, enum isis_adj_state new_state, const char *reason) { - int old_state; - int level; - struct isis_circuit *circuit; + enum isis_adj_state old_state = adj->adj_state; + struct isis_circuit *circuit = adj->circuit; bool del; - old_state = adj->adj_state; adj->adj_state = new_state; - - circuit = adj->circuit; + if (new_state != old_state) { + send_hello_sched(circuit, adj->level, TRIGGERED_IIH_DELAY); + } if (isis->debugs & DEBUG_ADJ_PACKETS) { zlog_debug("ISIS-Adj (%s): Adjacency state change %d->%d: %s", @@ -255,9 +258,14 @@ void isis_adj_state_change(struct isis_adjacency *adj, reason ? reason : "unspecified"); } +#ifndef FABRICD + /* send northbound notification */ + isis_notif_adj_state_change(adj, new_state, reason); +#endif /* ifndef FABRICD */ + if (circuit->circ_type == CIRCUIT_T_BROADCAST) { del = false; - for (level = IS_LEVEL_1; level <= IS_LEVEL_2; level++) { + for (int level = IS_LEVEL_1; level <= IS_LEVEL_2; level++) { if ((adj->level & level) == 0) continue; if (new_state == ISIS_ADJ_UP) { @@ -298,16 +306,13 @@ void isis_adj_state_change(struct isis_adjacency *adj, } else if (circuit->circ_type == CIRCUIT_T_P2P) { del = false; - for (level = IS_LEVEL_1; level <= IS_LEVEL_2; level++) { + for (int level = IS_LEVEL_1; level <= IS_LEVEL_2; level++) { if ((adj->level & level) == 0) continue; if (new_state == ISIS_ADJ_UP) { circuit->upadjcount[level - 1]++; hook_call(isis_adj_state_change_hook, adj); - if (adj->sys_type == ISIS_SYSTYPE_UNKNOWN) - send_hello(circuit, level); - /* update counter & timers for debugging * purposes */ adj->last_flap = time(NULL); @@ -337,8 +342,6 @@ void isis_adj_state_change(struct isis_adjacency *adj, if (del) isis_delete_adj(adj); } - - return; } |