Merge pull request #5625 from qlyoung/fix-zapi-ipset-name-nullterm

[mirror_frr.git] / isisd / isis_pdu.c

diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index 46b013ddd0c78bcd382121ce88d668642d1129a8..cc22aa5ffd8650d7da1b9b99d0afd436c940f470 100644 (file)
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -58,6 +58,7 @@
 #include "isisd/fabricd.h"
 #include "isisd/isis_tx_queue.h"
 #include "isisd/isis_pdu_counter.h"
+#include "isisd/isis_nb.h"
 
 static int ack_lsp(struct isis_lsp_hdr *hdr, struct isis_circuit *circuit,
                   int level)
@@ -187,7 +188,7 @@ static int process_p2p_hello(struct iih_info *iih)
                adj->sys_type = ISIS_SYSTYPE_UNKNOWN;
        }
 
-       if (tw_adj && adj->threeway_state == ISIS_THREEWAY_DOWN)
+       if (tw_adj)
                adj->ext_circuit_id = tw_adj->local_circuit_id;
 
        /* 8.2.6 Monitoring point-to-point adjacencies */
@@ -1053,6 +1054,8 @@ dontcheckadj:
                                                   circuit->rcv_stream,
                                                   circuit->area, level,
                                                   lsp_confusion);
+                                       if (lsp_confusion)
+                                               isis_free_tlvs(tlvs);
                                        tlvs = NULL;
                                        /* ii */
                                        lsp_flood_or_update(lsp, NULL,