Merge "IPACM: fix the ipv6 rmnet-tethering FTP issue"
diff --git a/ipacm/inc/IPACM_Xml.h b/ipacm/inc/IPACM_Xml.h
index 06be0a9..f645ae1 100644
--- a/ipacm/inc/IPACM_Xml.h
+++ b/ipacm/inc/IPACM_Xml.h
@@ -40,10 +40,6 @@
#ifndef IPACM_XML_H
#define IPACM_XML_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include <linux/msm_ipa.h>
#include "IPACM_Defs.h"
#include <stdio.h>
@@ -53,6 +49,10 @@
#include <stdint.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define IPACM_ASSERT(a) \
if (!(a)) { \
diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 64ee3ec..c52a8a4 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -3,7 +3,6 @@
ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH)))
-ifneq ($(TARGET_USES_AOSP),true)
LOCAL_PATH := $(call my-dir)
@@ -18,7 +17,6 @@
LOCAL_C_INCLUDES += external/icu4c/common
endif
LOCAL_C_INCLUDES += external/dhcpcd
-LOCAL_C_INCLUDES += bionic/libstdc++/include
LOCAL_C_INCLUDES += external/libxml2/include
LOCAL_C_INCLUDES += external/libnetfilter_conntrack/include
LOCAL_C_INCLUDES += external/libnfnetlink/include
@@ -63,7 +61,6 @@
LOCAL_SHARED_LIBRARIES += libxml2
LOCAL_SHARED_LIBRARIES += libnfnetlink
LOCAL_SHARED_LIBRARIES += libnetfilter_conntrack
-LOCAL_SHARED_LIBRARIES += libicuuc
LOCAL_SHARED_LIBRARIES += libdhcpcd
include $(BUILD_EXECUTABLE)
@@ -90,7 +87,6 @@
LOCAL_MODULE_OWNER := ipacm
include $(BUILD_PREBUILT)
-endif # not (TARGET_USES_AOSP)
endif # $(TARGET_ARCH)
endif
endif
\ No newline at end of file
diff --git a/ipacm/src/IPACM_Config.cpp b/ipacm/src/IPACM_Config.cpp
index 69e2b41..24890ed 100644
--- a/ipacm/src/IPACM_Config.cpp
+++ b/ipacm/src/IPACM_Config.cpp
@@ -238,6 +238,7 @@
pNatIfaces = NULL;
IPACMDBG_H("RESET IPACM_Config::pNatIfaces \n");
}
+ ipa_nat_iface_entries = 0;
pNatIfaces = (NatIfaces *)calloc(ipa_num_ipa_interfaces, sizeof(NatIfaces));
if (pNatIfaces == NULL)
{
@@ -423,6 +424,19 @@
int IPACM_Config::AddNatIfaces(char *dev_name)
{
+ int i;
+ /* Check if this iface already in NAT-iface*/
+ for(i = 0; i < ipa_nat_iface_entries; i++)
+ {
+ if(strncmp(dev_name,
+ pNatIfaces[i].iface_name,
+ sizeof(pNatIfaces[i].iface_name)) == 0)
+ {
+ IPACMDBG("Interface (%s) is add to nat iface already\n", dev_name);
+ return 0;
+ }
+ }
+
IPACMDBG_H("Add iface %s to NAT-ifaces, origin it has %d nat ifaces\n",
dev_name, ipa_nat_iface_entries);
ipa_nat_iface_entries++;
diff --git a/ipacm/src/IPACM_Conntrack_NATApp.cpp b/ipacm/src/IPACM_Conntrack_NATApp.cpp
index 4e7338e..348faa9 100644
--- a/ipacm/src/IPACM_Conntrack_NATApp.cpp
+++ b/ipacm/src/IPACM_Conntrack_NATApp.cpp
@@ -684,6 +684,13 @@
IPACMDBG("Private Port: %d\t Target Port: %d\t", new_entry->private_port, new_entry->target_port);
IPACMDBG("protocolcol: %d\n", new_entry->protocol);
+ if(isAlgPort(new_entry->protocol, new_entry->private_port) ||
+ isAlgPort(new_entry->protocol, new_entry->target_port))
+ {
+ IPACMDBG("connection using ALG Port. Dont insert into nat cache\n");
+ return;
+ }
+
if(ChkForDup(new_entry))
{
return;
diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index 2e5b51a..6f5f2ad 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -347,6 +347,12 @@
is_mode_switch = true; // need post internal usb-link up event
return;
}
+ /* Add Natting iface to IPACM_Config if there is Rx/Tx property */
+ if (rx_prop != NULL || tx_prop != NULL)
+ {
+ IPACMDBG_H(" Has rx/tx properties registered for iface %s, add for NATTING \n", dev_name);
+ IPACM_Iface::ipacmcfg->AddNatIfaces(dev_name);
+ }
}
break;
diff --git a/ipacm/src/IPACM_Neighbor.cpp b/ipacm/src/IPACM_Neighbor.cpp
index 93bec04..270ed7b 100644
--- a/ipacm/src/IPACM_Neighbor.cpp
+++ b/ipacm/src/IPACM_Neighbor.cpp
@@ -161,7 +161,7 @@
{
if (data->ipv4_addr != 0) /* not 0.0.0.0 */
{
- IPACMDBG(" Got Neighbor event with ipv4 address \n");
+ IPACMDBG("Got Neighbor event with ipv4 address \n");
/* check if iface is bridge interface*/
if (strcmp(IPACM_Iface::ipacmcfg->ipa_virtual_iface_name, IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].iface_name) == 0)
{
@@ -222,7 +222,7 @@
evt_data.event,
IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].iface_name);
break;
- };
+ }
}
}
else
@@ -231,36 +231,36 @@
if (event == IPA_NEW_NEIGH_EVENT)
{
evt_data.event = IPA_NEIGH_CLIENT_IP_ADDR_ADD_EVENT;
- /* Also save to cache for ipv4 */
- /*searh if seen this client or not*/
- for (i = 0; i < num_neighbor_client_temp; i++)
- {
- /* find the client */
- if (memcmp(neighbor_client[i].mac_addr, data->mac_addr, sizeof(neighbor_client[i].mac_addr)) == 0)
+ /* Also save to cache for ipv4 */
+ /*searh if seen this client or not*/
+ for (i = 0; i < num_neighbor_client_temp; i++)
{
- /* update the network interface client associated */
- neighbor_client[i].iface_index = data->if_index;
- neighbor_client[i].ipa_if_num = ipa_interface_index;
- neighbor_client[i].v4_addr = data->ipv4_addr; // cache client's previous ipv4 address
- IPACMDBG_H("update cache %d-entry, with %s iface, ipv4 address: 0x%x\n",
- i,
- IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].iface_name,
- data->ipv4_addr);
- break;
+ /* find the client */
+ if (memcmp(neighbor_client[i].mac_addr, data->mac_addr, sizeof(neighbor_client[i].mac_addr)) == 0)
+ {
+ /* update the network interface client associated */
+ neighbor_client[i].iface_index = data->if_index;
+ neighbor_client[i].ipa_if_num = ipa_interface_index;
+ neighbor_client[i].v4_addr = data->ipv4_addr; // cache client's previous ipv4 address
+ IPACMDBG_H("update cache %d-entry, with %s iface, ipv4 address: 0x%x\n",
+ i,
+ IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].iface_name,
+ data->ipv4_addr);
+ break;
+ }
}
- }
- /* not find client */
- if (i == num_neighbor_client_temp)
- {
- if (num_neighbor_client_temp < IPA_MAX_NUM_NEIGHBOR_CLIENTS)
+ /* not find client */
+ if (i == num_neighbor_client_temp)
{
- memcpy(neighbor_client[num_neighbor_client_temp].mac_addr,
- data->mac_addr,
- sizeof(data->mac_addr));
- neighbor_client[num_neighbor_client_temp].iface_index = data->if_index;
- /* cache the network interface client associated */
- neighbor_client[num_neighbor_client_temp].ipa_if_num = ipa_interface_index;
- neighbor_client[num_neighbor_client_temp].v4_addr = data->ipv4_addr;
+ if (num_neighbor_client_temp < IPA_MAX_NUM_NEIGHBOR_CLIENTS)
+ {
+ memcpy(neighbor_client[num_neighbor_client_temp].mac_addr,
+ data->mac_addr,
+ sizeof(data->mac_addr));
+ neighbor_client[num_neighbor_client_temp].iface_index = data->if_index;
+ /* cache the network interface client associated */
+ neighbor_client[num_neighbor_client_temp].ipa_if_num = ipa_interface_index;
+ neighbor_client[num_neighbor_client_temp].v4_addr = data->ipv4_addr;
num_neighbor_client++;
IPACMDBG_H("Cache client MAC %02x:%02x:%02x:%02x:%02x:%02x\n, total client: %d\n",
neighbor_client[num_neighbor_client_temp].mac_addr[0],
@@ -270,10 +270,10 @@
neighbor_client[num_neighbor_client_temp].mac_addr[4],
neighbor_client[num_neighbor_client_temp].mac_addr[5],
num_neighbor_client);
- return;
- }
- else
- {
+ }
+ else
+ {
+
IPACMERR("error: neighbor client oversize! recycle %d-st entry ! \n", circular_index);
memcpy(neighbor_client[circular_index].mac_addr,
data->mac_addr,
@@ -292,10 +292,9 @@
num_neighbor_client,
circular_index);
circular_index++;
- return;
+ }
}
}
- }
else
{
evt_data.event = IPA_NEIGH_CLIENT_IP_ADDR_DEL_EVENT;
@@ -346,9 +345,8 @@
evt_data.evt_data = (void *)data_all;
IPACM_EvtDispatcher::PostEvt(&evt_data);
IPACMDBG_H("Posted event %d with %s for ipv4\n",
- evt_data.event,
- IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].iface_name);
-
+ evt_data.event,
+ IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].iface_name);
}
}
}
@@ -445,10 +443,9 @@
if (neighbor_client[i].v4_addr != 0) /* not 0.0.0.0 */
{
-// evt_data.event = IPA_NEIGH_CLIENT_IP_ADDR_ADD_EVENT;
/* construct IPA_NEIGH_CLIENT_IP_ADDR_ADD_EVENT command and insert to command-queue */
if (event == IPA_NEW_NEIGH_EVENT)
- evt_data.event = IPA_NEIGH_CLIENT_IP_ADDR_ADD_EVENT;
+ evt_data.event = IPA_NEIGH_CLIENT_IP_ADDR_ADD_EVENT;
else
evt_data.event = IPA_NEIGH_CLIENT_IP_ADDR_DEL_EVENT;
data_all = (ipacm_event_data_all *)malloc(sizeof(ipacm_event_data_all));
diff --git a/ipacm/src/IPACM_Wlan.cpp b/ipacm/src/IPACM_Wlan.cpp
index 0deda4f..f51c0c3 100644
--- a/ipacm/src/IPACM_Wlan.cpp
+++ b/ipacm/src/IPACM_Wlan.cpp
@@ -823,6 +823,13 @@
IPACM_Iface::ipacmcfg->iface_table[ipa_if_num].iface_name,
(IPACM_Iface::ipacmcfg->iface_table[ipa_if_num].wlan_mode == 0) ? "full" : "internet",
(is_guest_ap == true) ? "internet" : "full");
+ /* Add Natting iface to IPACM_Config if there is Rx/Tx property */
+ if (rx_prop != NULL || tx_prop != NULL)
+ {
+ IPACMDBG_H(" Has rx/tx properties registered for iface %s, add for NATTING \n", dev_name);
+ IPACM_Iface::ipacmcfg->AddNatIfaces(dev_name);
+ }
+
if (is_guest_ap == true && (IPACM_Iface::ipacmcfg->iface_table[ipa_if_num].wlan_mode == FULL))
{
is_guest_ap = false;
diff --git a/ipacm/src/IPACM_cfg.xml b/ipacm/src/IPACM_cfg.xml
index b4a236e..d16d2ed 100644
--- a/ipacm/src/IPACM_cfg.xml
+++ b/ipacm/src/IPACM_cfg.xml
@@ -140,6 +140,11 @@
<Description>NETBIOS_NS</Description>
</ALG>
<ALG>
+ <Protocol>UDP</Protocol>
+ <Port>138</Port>
+ <Description>NETBIOS_NS</Description>
+ </ALG>
+ <ALG>
<Protocol>TCP</Protocol>
<Port>6566</Port>
<Description>SANE</Description>