diff options
| author | Christian Franke <chris@opensourcerouting.org> | 2018-07-17 21:14:54 +0200 |
|---|---|---|
| committer | Christian Franke <chris@opensourcerouting.org> | 2018-07-19 16:11:07 +0200 |
| commit | d4670f515b7f62bfd8f9bdd750540245aab542c0 (patch) | |
| tree | 5dd8bf81cf8ba0bc81eea0c3754965be7c2013d1 /isisd/isis_circuit.c | |
| parent | Merge pull request #2608 from pacovn/PVS-Studio_dead_code_1 (diff) | |
| download | frr-d4670f515b7f62bfd8f9bdd750540245aab542c0.tar.xz frr-d4670f515b7f62bfd8f9bdd750540245aab542c0.zip | |
isisd: don't crash when isis_sock_init fails
When isis_sock_init fails in isis_circuit_up, isis_circuit_down would
be called to cancel timers which were scheduled. However
isis_circuit_down would immediately return, since the state had not been
changed to 'UP' yet.
Fix this by having isis_circuit_down always cancel all the timers.
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to '')
| -rw-r--r-- | isisd/isis_circuit.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index f8df33d3e..d51f31ff3 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -638,7 +638,7 @@ int isis_circuit_up(struct isis_circuit *circuit) thread_add_timer(master, isis_run_dr_l2, circuit, 2 * circuit->hello_interval[1], &circuit->u.bc.t_run_dr[1]); - } else { + } else if (circuit->circ_type == CIRCUIT_T_P2P) { /* initializing the hello send threads * for a ptp IF */ @@ -682,9 +682,6 @@ int isis_circuit_up(struct isis_circuit *circuit) void isis_circuit_down(struct isis_circuit *circuit) { - if (circuit->state != C_STATE_UP) - return; - /* Clear the flags for all the lsps of the circuit. */ isis_circuit_update_all_srmflags(circuit, 0); @@ -756,10 +753,12 @@ void isis_circuit_down(struct isis_circuit *circuit) } /* send one gratuitous hello to spead up convergence */ - if (circuit->is_type & IS_LEVEL_1) - send_hello(circuit, IS_LEVEL_1); - if (circuit->is_type & IS_LEVEL_2) - send_hello(circuit, IS_LEVEL_2); + if (circuit->state == C_STATE_UP) { + if (circuit->is_type & IS_LEVEL_1) + send_hello(circuit, IS_LEVEL_1); + if (circuit->is_type & IS_LEVEL_2) + send_hello(circuit, IS_LEVEL_2); + } circuit->upadjcount[0] = 0; circuit->upadjcount[1] = 0; |