]> git.proxmox.com Git - mirror_frr.git/commitdiff
isisd: Add level&circuit thread argument to circuit
authorChristian Franke <chris@opensourcerouting.org>
Mon, 5 Nov 2018 19:07:11 +0000 (20:07 +0100)
committerChristian Franke <chris@opensourcerouting.org>
Tue, 4 Dec 2018 11:49:25 +0000 (12:49 +0100)
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
isisd/isis_circuit.c
isisd/isis_circuit.h

index 74488a1fcd8ee033bbe7c4a5e2673e3085d3936a..4c095c26d1d3315b167b8d2fb35b4e3b9da69e66 100644 (file)
@@ -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();
index e83424a4addfd668f5f00d7ac30c2ad8dea98248..7d7b25b92fd863b5456b7ed07b290c692a72f885 100644 (file)
@@ -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);