isisd: implement the 'if-state-change' notification

[mirror_frr.git] / pimd / pim_hello.c

diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c
index 2592514f38f50c5a71e66262900aa893e123a9eb..e482d321a41b6fef736f0eeeb5843665132f5b9b 100644 (file)
--- a/pimd/pim_hello.c
+++ b/pimd/pim_hello.c
@@ -127,7 +127,7 @@ static void tlv_trace_list(const char *label, const char *tlv_name,
 
 #define FREE_ADDR_LIST                                                         \
        if (hello_option_addr_list) {                                          \
-               list_delete(hello_option_addr_list);                           \
+               list_delete(&hello_option_addr_list);                          \
        }
 
 #define FREE_ADDR_LIST_THEN_RETURN(code)                                       \
@@ -395,7 +395,8 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
                                        ifp->name);
                        }
 
-                       pim_upstream_rpf_genid_changed(neigh->source_addr);
+                       pim_upstream_rpf_genid_changed(pim_ifp->pim,
+                                                      neigh->source_addr);
 
                        pim_neighbor_delete(ifp, neigh, "GenID mismatch");
                        neigh = pim_neighbor_add(ifp, src_addr, hello_options,
@@ -445,6 +446,8 @@ int pim_hello_build_tlv(struct interface *ifp, uint8_t *tlv_buf,
        uint8_t *curr = tlv_buf;
        uint8_t *pastend = tlv_buf + tlv_buf_size;
        uint8_t *tmp;
+       struct pim_interface *pim_ifp = ifp->info;
+       struct pim_instance *pim = pim_ifp->pim;
 
        /*
         * Append options
@@ -516,7 +519,7 @@ int pim_hello_build_tlv(struct interface *ifp, uint8_t *tlv_buf,
                        }
                        return -4;
                }
-               if (pimg->send_v6_secondary) {
+               if (pim->send_v6_secondary) {
                        curr = pim_tlv_append_addrlist_ucast(
                                curr, pastend, ifp->connected, AF_INET6);
                        if (!curr) {