From: Christian Franke Date: Mon, 5 Nov 2018 19:07:11 +0000 (+0100) Subject: isisd: Add level&circuit thread argument to circuit X-Git-Tag: frr-7.0.1~142^2~7 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7da4aa3c7a8a4e4726bf06d08e2fd67175244211;p=mirror_frr.git isisd: Add level&circuit thread argument to circuit Signed-off-by: Christian Franke --- diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 74488a1fc..4c095c26d 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -89,6 +89,8 @@ struct isis_circuit *isis_circuit_new() circuit->priority[i] = DEFAULT_PRIORITY; circuit->metric[i] = DEFAULT_CIRCUIT_METRIC; circuit->te_metric[i] = DEFAULT_CIRCUIT_METRIC; + circuit->level_arg[i].level = i + 1; + circuit->level_arg[i].circuit = circuit; } circuit->mtc = mpls_te_circuit_new(); diff --git a/isisd/isis_circuit.h b/isisd/isis_circuit.h index e83424a4a..7d7b25b92 100644 --- a/isisd/isis_circuit.h +++ b/isisd/isis_circuit.h @@ -67,6 +67,11 @@ struct isis_p2p_info { struct bfd_info; +struct isis_circuit_arg { + int level; + struct isis_circuit *circuit; +}; + struct isis_circuit { int state; uint8_t circuit_id; /* l1/l2 bcast CircuitID */ @@ -83,6 +88,7 @@ struct isis_circuit { struct thread *t_send_psnp[2]; struct thread *t_send_lsp; struct isis_tx_queue *tx_queue; + struct isis_circuit_arg level_arg[2]; /* used as argument for threads */ /* there is no real point in two streams, just for programming kicker */ int (*rx)(struct isis_circuit *circuit, uint8_t *ssnpa);