Merge pull request #11577 from opensourcerouting/fix/memory_leak_bgp_gr_notification

bgpd: Free ->raw_data from Hard Notification message after we use it

diff --git a/babeld/message.c b/babeld/message.c
index c2ea2a268394631728ac0e8e80b4957b0395de0a..7d45d91bf7a50f73171fc8fea8061e1890585739 100644 (file)
--- a/babeld/message.c
+++ b/babeld/message.c
@@ -636,7 +636,7 @@ parse_packet(const unsigned char *from, struct interface *ifp,
                                                    len - parsed_len, channels);
            }
 
-           if (ignore_update)
+           if (!ignore_update)
                    update_route(router_id, prefix, plen, seqno, metric,
                                 interval, neigh, nh, channels,
                                 channels_len(channels));

diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c
index 76a7c4b122dd3718e874e07c2cefda93b6dc3c59..c30017fc12fc3509ce7cc42220a3bbcd23b9eb1a 100644 (file)
--- a/pimd/pim_cmd_common.c
+++ b/pimd/pim_cmd_common.c
@@ -4738,10 +4738,10 @@ void pim_show_interface_traffic(struct pim_instance *pim, struct vty *vty,
                                            pim_ifp->pim_ifstat_join_recv);
                        json_object_int_add(json_row, "joinTx",
                                            pim_ifp->pim_ifstat_join_send);
-                       json_object_int_add(json_row, "pruneTx",
-                                           pim_ifp->pim_ifstat_prune_send);
                        json_object_int_add(json_row, "pruneRx",
                                            pim_ifp->pim_ifstat_prune_recv);
+                       json_object_int_add(json_row, "pruneTx",
+                                           pim_ifp->pim_ifstat_prune_send);
                        json_object_int_add(json_row, "registerRx",
                                            pim_ifp->pim_ifstat_reg_recv);
                        json_object_int_add(json_row, "registerTx",

diff --git a/pimd/pim_str.h b/pimd/pim_str.h
index be8b6a9f4f94178bcc2b82d92e53a7801d405079..4a19ea7b35bf825efefc78b390ef687bbf012f1e 100644 (file)
--- a/pimd/pim_str.h
+++ b/pimd/pim_str.h
@@ -27,8 +27,6 @@
 #include "prefix.h"
 #include "pim_addr.h"
 
-#include "pim_addr.h"
-
 /*
  * Longest possible length of a (S,G) string is 36 bytes
  * 123.123.123.123 = 16 * 2