diff options
Diffstat (limited to 'ipacm/src/IPACM_ConntrackClient.cpp')
| -rw-r--r-- | ipacm/src/IPACM_ConntrackClient.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/ipacm/src/IPACM_ConntrackClient.cpp b/ipacm/src/IPACM_ConntrackClient.cpp index d8f7f73..3eab6fa 100644 --- a/ipacm/src/IPACM_ConntrackClient.cpp +++ b/ipacm/src/IPACM_ConntrackClient.cpp @@ -174,6 +174,12 @@ int IPACM_ConntrackClient::IPA_Conntrack_Filters_Ignore_Bridge_Addrs uint32_t ipv4_addr; struct ifreq ifr; + /* retrieve bridge interface ipv4 address */ + memset(&ifr, 0, sizeof(struct ifreq)); + ifr.ifr_addr.sa_family = AF_INET; + (void)strlcpy(ifr.ifr_name, IPACM_Iface::ipacmcfg->ipa_virtual_iface_name, sizeof(ifr.ifr_name)); + IPACMDBG("bridge interface name (%s)\n", ifr.ifr_name); + if(strlen(IPACM_Iface::ipacmcfg->ipa_virtual_iface_name) >= sizeof(ifr.ifr_name)) { IPACMERR("interface name overflows: len %zu\n", @@ -182,12 +188,6 @@ int IPACM_ConntrackClient::IPA_Conntrack_Filters_Ignore_Bridge_Addrs return -1; } - /* retrieve bridge interface ipv4 address */ - memset(&ifr, 0, sizeof(struct ifreq)); - ifr.ifr_addr.sa_family = AF_INET; - (void)strlcpy(ifr.ifr_name, IPACM_Iface::ipacmcfg->ipa_virtual_iface_name, sizeof(ifr.ifr_name)); - IPACMDBG("bridge interface name (%s)\n", ifr.ifr_name); - ret = ioctl(fd, SIOCGIFADDR, &ifr); if (ret < 0) { @@ -217,7 +217,7 @@ int IPACM_ConntrackClient::IPA_Conntrack_Filters_Ignore_Bridge_Addrs nfct_filter_add_attr(filter, NFCT_FILTER_SRC_IPV4, &filter_ipv4); - return 0; + return 0; } int IPACM_ConntrackClient::IPA_Conntrack_Filters_Ignore_Local_Iface @@ -387,7 +387,6 @@ int IPACM_ConntrackClient::IPA_Conntrack_UDP_Filter_Init(void) void* IPACM_ConntrackClient::UDPConnTimeoutUpdate(void *ptr) { - NatApp *nat_inst = NULL; ptr = NULL; #ifdef IPACM_DEBUG @@ -469,7 +468,7 @@ void* IPACM_ConntrackClient::TCPRegisterWithConnTrack(void *) } /* Register callback with netfilter handler */ - IPACMDBG_H("tcp handle:%p, fd:%d\n", pClient->tcp_hdl, nfct_fd(pClient->tcp_hdl)); + IPACMDBG_H("tcp handle:%pK, fd:%d\n", pClient->tcp_hdl, nfct_fd(pClient->tcp_hdl)); #ifndef CT_OPT nfct_callback_register(pClient->tcp_hdl, (nf_conntrack_msg_type) (NFCT_T_UPDATE | NFCT_T_DESTROY | NFCT_T_NEW), @@ -560,7 +559,7 @@ void* IPACM_ConntrackClient::UDPRegisterWithConnTrack(void *) } /* Register callback with netfilter handler */ - IPACMDBG_H("udp handle:%p, fd:%d\n", pClient->udp_hdl, nfct_fd(pClient->udp_hdl)); + IPACMDBG_H("udp handle:%pK, fd:%d\n", pClient->udp_hdl, nfct_fd(pClient->udp_hdl)); nfct_callback_register(pClient->udp_hdl, (nf_conntrack_msg_type)(NFCT_T_NEW | NFCT_T_DESTROY), IPAConntrackEventCB, @@ -687,7 +686,7 @@ void IPACM_ConntrackClient::UpdateUDPFilters(void *param, bool isWan) if(ret == -1) { PERROR("unable to attach the filter to udp handle\n"); - IPACMERR("udp handle:%p, fd:%d Error: %d\n",pClient->udp_hdl, nfct_fd(pClient->udp_hdl), ret); + IPACMERR("udp handle:%pK, fd:%d Error: %d\n",pClient->udp_hdl, nfct_fd(pClient->udp_hdl), ret); return; } } @@ -732,7 +731,7 @@ void IPACM_ConntrackClient::UpdateTCPFilters(void *param, bool isWan) if(ret == -1) { PERROR("unable to attach the filter to tcp handle\n"); - IPACMERR("tcp handle:%p, fd:%d Error: %d\n",pClient->tcp_hdl, nfct_fd(pClient->tcp_hdl), ret); + IPACMERR("tcp handle:%pK, fd:%d Error: %d\n",pClient->tcp_hdl, nfct_fd(pClient->tcp_hdl), ret); return; } } |