zebra: Fix label manager memory leak (#5680)

[mirror_frr.git] / isisd / isis_tx_queue.c

diff --git a/isisd/isis_tx_queue.c b/isisd/isis_tx_queue.c
index 46d1595f0632f7cf9ed642d0c56a43288f29688c..507fd489bc621fb3e50bd9f73f1d39e665bf1c46 100644 (file)
--- a/isisd/isis_tx_queue.c
+++ b/isisd/isis_tx_queue.c
@@ -27,7 +27,6 @@
 #include "isisd/isisd.h"
 #include "isisd/isis_memory.h"
 #include "isisd/isis_flags.h"
-#include "dict.h"
 #include "isisd/isis_circuit.h"
 #include "isisd/isis_lsp.h"
 #include "isisd/isis_misc.h"
@@ -46,13 +45,14 @@ struct isis_tx_queue {
 struct isis_tx_queue_entry {
        struct isis_lsp *lsp;
        enum isis_tx_type type;
+       bool is_retry;
        struct thread *retry;
        struct isis_tx_queue *queue;
 };
 
-static unsigned tx_queue_hash_key(void *p)
+static unsigned tx_queue_hash_key(const void *p)
 {
-       struct isis_tx_queue_entry *e = p;
+       const struct isis_tx_queue_entry *e = p;
 
        uint32_t id_key = jhash(e->lsp->hdr.lsp_id,
                                ISIS_SYS_ID_LEN + 2, 0x55aa5a5a);
@@ -124,6 +124,11 @@ static int tx_queue_send_event(struct thread *thread)
        e->retry = NULL;
        thread_add_timer(master, tx_queue_send_event, e, 5, &e->retry);
 
+       if (e->is_retry)
+               queue->circuit->area->lsp_rxmt_count++;
+       else
+               e->is_retry = true;
+
        queue->send_event(queue->circuit, e->lsp, e->type);
        /* Don't access e here anymore, send_event might have destroyed it */
 
@@ -164,6 +169,8 @@ void _isis_tx_queue_add(struct isis_tx_queue *queue,
        if (e->retry)
                thread_cancel(e->retry);
        thread_add_event(master, tx_queue_send_event, e, 0, &e->retry);
+
+       e->is_retry = false;
 }
 
 void _isis_tx_queue_del(struct isis_tx_queue *queue, struct isis_lsp *lsp,