#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) \
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,
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
}
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) {