summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-02-10 06:18:49 -0800
committerLinux Build Service Account <lnxbuild@localhost>2019-02-10 06:18:49 -0800
commit035b1a6caf2568da3a9b2e97394f8ba79e0014bb (patch)
tree6f9c99015eb9c1981b1e2617d0c6e4e6ef5bdd33
parentfccbad206a983b489c5969389796dbcdb13ff664 (diff)
parentbaec5e4b5cdc68b2bde85d81f937ac7cf3b09a13 (diff)
Merge baec5e4b5cdc68b2bde85d81f937ac7cf3b09a13 on remote branch
Change-Id: I66a2d565ebe929718d589e8aff3c9ae63bc4501e
-rw-r--r--ipacm/src/IPACM_ConntrackListener.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/ipacm/src/IPACM_ConntrackListener.cpp b/ipacm/src/IPACM_ConntrackListener.cpp
index 29a70b9..d6289e3 100644
--- a/ipacm/src/IPACM_ConntrackListener.cpp
+++ b/ipacm/src/IPACM_ConntrackListener.cpp
@@ -345,10 +345,13 @@ void IPACM_ConntrackListener::HandleNeighIpAddrDelEvt(
void IPACM_ConntrackListener::TriggerWANUp(void *in_param)
{
ipacm_event_iface_up *wanup_data = (ipacm_event_iface_up *)in_param;
+ uint8_t mux_id;
IPACMDBG_H("Recevied below information during wanup,\n");
- IPACMDBG_H("if_name:%s, ipv4_address:0x%x\n",
- wanup_data->ifname, wanup_data->ipv4_addr);
+ IPACMDBG_H("if_name:%s, ipv4_address:0x%x mux_id:%d, xlat_mux_id:%d\n",
+ wanup_data->ifname, wanup_data->ipv4_addr,
+ wanup_data->mux_id,
+ wanup_data->xlat_mux_id);
if(wanup_data->ipv4_addr == 0)
{
@@ -373,7 +376,11 @@ void IPACM_ConntrackListener::TriggerWANUp(void *in_param)
if(nat_inst != NULL)
{
- nat_inst->AddTable(wanup_data->ipv4_addr, wanup_data->mux_id);
+ if (wanup_data->mux_id == 0)
+ mux_id = wanup_data->xlat_mux_id;
+ else
+ mux_id = wanup_data->mux_id;
+ nat_inst->AddTable(wanup_data->ipv4_addr, mux_id);
}
IPACMDBG("creating nat threads\n");