ipacm: add support for mhi-prime
Add the support for pcie modem.
Change-Id: Ic97beb5ab228c40b211babd8681093c5bafebfb0
diff --git a/ipacm/inc/IPACM_ConntrackListener.h b/ipacm/inc/IPACM_ConntrackListener.h
index d965cf7..24a2c72 100644
--- a/ipacm/inc/IPACM_ConntrackListener.h
+++ b/ipacm/inc/IPACM_ConntrackListener.h
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -103,7 +103,7 @@
public:
char wan_ifname[IPA_IFACE_NAME_LEN];
uint32_t wan_ipaddr;
- bool isStaMode;
+ ipacm_wan_iface_type backhaul_mode;
IPACM_ConntrackListener();
void event_callback(ipa_cm_event_id, void *data);
inline bool isWanUp()
diff --git a/ipacm/inc/IPACM_Conntrack_NATApp.h b/ipacm/inc/IPACM_Conntrack_NATApp.h
index c3749e1..b362907 100644
--- a/ipacm/inc/IPACM_Conntrack_NATApp.h
+++ b/ipacm/inc/IPACM_Conntrack_NATApp.h
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -65,6 +65,8 @@
bool enabled;
uint32_t rule_hdl;
+ /* used for pcie-modem */
+ uint32_t rule_id;
}nat_table_entry;
#define CHK_TBL_HDL() if(nat_table_hdl == 0){ return -1; }
@@ -80,6 +82,8 @@
uint32_t pub_ip_addr;
uint32_t pub_ip_addr_pre;
uint32_t nat_table_hdl;
+ /* used for pcie-modem */
+ uint8_t pub_mux_id;
int curCnt, max_entries;
@@ -94,7 +98,10 @@
struct nf_conntrack *ct;
struct nfct_handle *ct_hdl;
+ int m_fd_ipa;
+
NatApp();
+ ~NatApp();
int Init();
void UpdateCTUdpTs(nat_table_entry *, uint32_t);
@@ -114,6 +121,9 @@
int AddEntry(const nat_table_entry *);
int DeleteEntry(const nat_table_entry *);
+ int AddConnection(const nat_table_entry *);
+ int DelConnection(const uint32_t);
+
void UpdateUDPTimeStamp();
int UpdatePwrSaveIf(uint32_t);
diff --git a/ipacm/inc/IPACM_Defs.h b/ipacm/inc/IPACM_Defs.h
index d2186b6..6157d1f 100644
--- a/ipacm/inc/IPACM_Defs.h
+++ b/ipacm/inc/IPACM_Defs.h
@@ -352,31 +352,34 @@
struct ipa_wlan_hdr_attrib_val attribs[0];
} ipacm_event_data_wlan_ex;
+typedef enum
+{
+ Q6_WAN = 0,
+ WLAN_WAN,
+ ECM_WAN,
+ Q6_MHI_WAN
+} ipacm_wan_iface_type;
+
typedef struct _ipacm_event_iface_up
{
+ ipacm_wan_iface_type backhaul_type;
char ifname[IPA_IFACE_NAME_LEN];
uint32_t ipv4_addr;
uint32_t addr_mask;
uint32_t ipv6_prefix[2];
- bool is_sta;
uint8_t xlat_mux_id;
uint8_t mux_id;
}ipacm_event_iface_up;
typedef struct _ipacm_event_iface_up_tether
{
+ ipacm_wan_iface_type backhaul_type;
uint32_t if_index_tether;
uint32_t ipv6_prefix[2];
bool is_sta;
uint8_t xlat_mux_id;
}ipacm_event_iface_up_tehter;
-typedef enum
-{
- Q6_WAN = 0,
- WLAN_WAN,
- ECM_WAN
-} ipacm_wan_iface_type;
typedef struct _ipacm_ifacemgr_data
{
diff --git a/ipacm/inc/IPACM_Filtering.h b/ipacm/inc/IPACM_Filtering.h
index 9bb8247..d216a00 100644
--- a/ipacm/inc/IPACM_Filtering.h
+++ b/ipacm/inc/IPACM_Filtering.h
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -47,6 +47,8 @@
#include <IPACM_Defs.h>
#include <linux/rmnet_ipa_fd_ioctl.h>
+#define IPA_PCIE_MODEM_RULE_ID_START 69
+
class IPACM_Filtering
{
public:
@@ -63,6 +65,8 @@
uint8_t num_rules);
bool AddWanDLFilteringRule(struct ipa_ioc_add_flt_rule const *rule_table_v4, struct ipa_ioc_add_flt_rule const * rule_table_v6, uint8_t mux_id);
+ bool AddOffloadFilteringRule(struct ipa_ioc_add_flt_rule *flt_rule_tbl, uint8_t mux_id);
+ bool DelOffloadFilteringRule(struct ipa_ioc_del_flt_rule const *flt_rule_tbl);
bool SendFilteringRuleIndex(struct ipa_fltr_installed_notif_req_msg_v01* table);
bool ModifyFilteringRule(struct ipa_ioc_mdfy_flt_rule* ruleTable);
ipa_filter_action_enum_v01 GetQmiFilterAction(ipa_flt_action action);
@@ -70,6 +74,8 @@
private:
static const char *DEVICE_NAME;
int fd; /* File descriptor of the IPA device node /dev/ipa */
+ int total_num_offload_rules;
+ int pcie_modem_rule_id;
};
#endif //IPACM_FILTERING_H
diff --git a/ipacm/inc/IPACM_Iface.h b/ipacm/inc/IPACM_Iface.h
index a562613..df192c9 100644
--- a/ipacm/inc/IPACM_Iface.h
+++ b/ipacm/inc/IPACM_Iface.h
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -139,6 +139,8 @@
static IPACM_Filtering m_filtering;
static IPACM_Header m_header;
+ void change_to_network_order(ipa_ip_type iptype, ipa_rule_attrib* attrib);
+
/* software routing enable */
virtual int handle_software_routing_enable(void);
@@ -146,6 +148,8 @@
virtual int handle_software_routing_disable(void);
void delete_iface(void);
+ bool is_global_ipv6_addr(uint32_t* ipv6_addr);
+
private:
static const char *DEVICE_NAME;
diff --git a/ipacm/inc/IPACM_Lan.h b/ipacm/inc/IPACM_Lan.h
index 700dfbc..83b2211 100644
--- a/ipacm/inc/IPACM_Lan.h
+++ b/ipacm/inc/IPACM_Lan.h
@@ -49,6 +49,7 @@
#include "IPACM_Filtering.h"
#include "IPACM_Config.h"
#include "IPACM_Conntrack_NATApp.h"
+#include "IPACM_Wan.h"
#define IPA_WAN_DEFAULT_FILTER_RULE_HANDLES 1
#define IPA_PRIV_SUBNET_FILTER_RULE_HANDLES 3
@@ -94,6 +95,8 @@
int ipv6_set;
bool ipv4_header_set;
bool ipv6_header_set;
+ /* used for pcie-modem */
+ uint32_t v6_rt_rule_id[IPV6_NUM_ADDR];
eth_client_rt_hdl eth_rt_hdl[0]; /* depends on number of tx properties */
}ipa_eth_client;
@@ -121,10 +124,10 @@
virtual int handle_wan_up_ex(ipacm_ext_prop* ext_prop, ipa_ip_type iptype, uint8_t xlat_mux_id);
/* delete filter rule for wan_down event*/
- virtual int handle_wan_down(bool is_sta_mode);
+ virtual int handle_wan_down(ipacm_wan_iface_type backhaul_mode);
/* delete filter rule for wan_down event*/
- virtual int handle_wan_down_v6(bool is_sta_mode);
+ virtual int handle_wan_down_v6(ipacm_wan_iface_type backhaul_mode);
/* configure private subnet filter rules*/
virtual int handle_private_subnet(ipa_ip_type iptype);
@@ -393,6 +396,18 @@
{
for(num_v6 =0;num_v6 < get_client_memptr(eth_client, clt_indx)->route_rule_set_v6;num_v6++)
{
+ /* send client-v6 delete to pcie modem only with global ipv6 with tx_index = 0 one time*/
+ if(is_global_ipv6_addr(get_client_memptr(eth_client, clt_indx)->v6_addr[num_v6]) && (IPACM_Wan::backhaul_mode == Q6_MHI_WAN) && (tx_index == 0)
+ && (get_client_memptr(eth_client, clt_indx)->v6_rt_rule_id[num_v6] > 0))
+ {
+ IPACMDBG_H("Delete client index %d ipv6 RT-rules for %d-st ipv6 for rule-id:%d\n", clt_indx,num_v6,
+ get_client_memptr(eth_client, clt_indx)->v6_rt_rule_id[num_v6]);
+ if (del_connection(clt_indx, num_v6))
+ {
+ IPACMERR("PCIE filter rule deletion failed! (%d-client) %d v6-entry\n",clt_indx, num_v6);
+ }
+ }
+
IPACMDBG_H("Delete client index %d ipv6 RT-rules for %d-st ipv6 for tx:%d\n", clt_indx,num_v6,tx_index);
rt_hdl = get_client_memptr(eth_client, clt_indx)->eth_rt_hdl[tx_index].eth_rt_rule_hdl_v6[num_v6];
if(m_routing.DeleteRoutingHdl(rt_hdl, IPA_IP_v6) == false)
@@ -445,6 +460,10 @@
/*handle reset usb-client rt-rules */
int handle_lan_client_reset_rt(ipa_ip_type iptype);
+
+ /* for pcie modem */
+ virtual int add_connection(int client_index, int v6_num);
+ virtual int del_connection(int client_index, int v6_num);
};
#endif /* IPACM_LAN_H */
diff --git a/ipacm/inc/IPACM_Wan.h b/ipacm/inc/IPACM_Wan.h
index be28fe0..b9456c1 100644
--- a/ipacm/inc/IPACM_Wan.h
+++ b/ipacm/inc/IPACM_Wan.h
@@ -243,7 +243,7 @@
static int num_v6_flt_rule;
ipacm_wan_iface_type m_is_sta_mode;
- static bool backhaul_is_sta_mode;
+ static ipacm_wan_iface_type backhaul_mode;
static bool is_ext_prop_set;
static uint32_t backhaul_ipv6_prefix[2];
@@ -512,6 +512,9 @@
/* handle new_address event */
int handle_addr_evt(ipacm_event_data_addr *data);
+ /* handle new_address event for q6_mhi */
+ int handle_addr_evt_mhi_q6(ipacm_event_data_addr *data);
+
/* wan default route/filter rule configuration */
int handle_route_add_evt(ipa_ip_type iptype);
@@ -568,10 +571,6 @@
int install_wan_filtering_rule(bool is_sw_routing);
- void change_to_network_order(ipa_ip_type iptype, ipa_rule_attrib* attrib);
-
- bool is_global_ipv6_addr(uint32_t* ipv6_addr);
-
void handle_wlan_SCC_MCC_switch(bool, ipa_ip_type);
void handle_wan_client_SCC_MCC_switch(bool, ipa_ip_type);
diff --git a/ipacm/inc/IPACM_Wlan.h b/ipacm/inc/IPACM_Wlan.h
index f3c6d65..f7508db 100644
--- a/ipacm/inc/IPACM_Wlan.h
+++ b/ipacm/inc/IPACM_Wlan.h
@@ -54,6 +54,7 @@
uint32_t wifi_rt_rule_hdl_v4;
uint32_t wifi_rt_rule_hdl_v6[IPV6_NUM_ADDR];
uint32_t wifi_rt_rule_hdl_v6_wan[IPV6_NUM_ADDR];
+
}wlan_client_rt_hdl;
typedef struct _ipa_wlan_client
@@ -72,6 +73,8 @@
bool ipv6_header_set;
bool power_save_set;
enum ipa_client_type wigig_ipa_client;
+ /* used for pcie-modem */
+ uint32_t v6_rt_rule_id[IPV6_NUM_ADDR];
wlan_client_rt_hdl wifi_rt_hdl[0]; /* depends on number of tx properties */
}ipa_wlan_client;
@@ -185,6 +188,18 @@
{
for(num_v6 =0;num_v6 < get_client_memptr(wlan_client, clt_indx)->route_rule_set_v6;num_v6++)
{
+ /* send client-v6 delete to pcie modem only with global ipv6 with tx_index = 0 one time*/
+ if(is_global_ipv6_addr(get_client_memptr(wlan_client, clt_indx)->v6_addr[num_v6]) && (IPACM_Wan::backhaul_mode == Q6_MHI_WAN) && (tx_index == 0)
+ && (get_client_memptr(wlan_client, clt_indx)->v6_rt_rule_id[num_v6] > 0))
+ {
+ IPACMDBG_H("Delete client index %d ipv6 RT-rules for %d-st ipv6 for rule-id:%d\n", clt_indx,num_v6,
+ get_client_memptr(wlan_client, clt_indx)->v6_rt_rule_id[num_v6]);
+ if (del_connection(clt_indx, num_v6))
+ {
+ IPACMERR("PCIE filter rule deletion failed! (%d-client) %d v6-entry\n",clt_indx, num_v6);
+ }
+ }
+
IPACMDBG_H("Delete client index %d ipv6 Qos rules for %d-st ipv6 for tx:%d\n", clt_indx,num_v6,tx_index);
rt_hdl = get_client_memptr(wlan_client, clt_indx)->wifi_rt_hdl[tx_index].wifi_rt_rule_hdl_v6[num_v6];
if(m_routing.DeleteRoutingHdl(rt_hdl, IPA_IP_v6) == false)
@@ -237,6 +252,11 @@
void handle_SCC_MCC_switch(ipa_ip_type);
+ /* for pcie modem */
+ int add_connection(int client_index, int v6_num);
+
+ int del_connection(int client_index, int v6_num);
+
#ifdef FEATURE_IPACM_RESTART
/*query wlan-clients */
int ipa_query_wlan_client();
diff --git a/ipacm/src/IPACM_ConntrackListener.cpp b/ipacm/src/IPACM_ConntrackListener.cpp
index d6289e3..e006393 100644
--- a/ipacm/src/IPACM_ConntrackListener.cpp
+++ b/ipacm/src/IPACM_ConntrackListener.cpp
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -230,7 +230,7 @@
bool NatIface = false;
int cnt, ret;
- if (isStaMode)
+ if (backhaul_mode != Q6_WAN)
{
IPACMDBG("In STA mode, don't add dummy rules for non nat ifaces\n");
return;
@@ -368,8 +368,8 @@
}
WanUp = true;
- isStaMode = wanup_data->is_sta;
- IPACMDBG("isStaMode: %d\n", isStaMode);
+ backhaul_mode = wanup_data->backhaul_type;
+ IPACMDBG("backhaul_mode: %d\n", backhaul_mode);
wan_ipaddr = wanup_data->ipv4_addr;
memcpy(wan_ifname, wanup_data->ifname, sizeof(wan_ifname));
@@ -730,7 +730,7 @@
}
}
- if (!isStaMode)
+ if (backhaul_mode == Q6_WAN)
{
/* check whether non nat iface or not, on Non Nat iface
add dummy rule by copying public ip to private ip */
@@ -999,7 +999,7 @@
/* Check whether target is in STA client list or not
if not ignore the connection */
- if(!isStaMode || (StaClntCnt == 0))
+ if((backhaul_mode == Q6_WAN) || (StaClntCnt == 0))
{
return;
}
@@ -1114,7 +1114,7 @@
}
else
{
- if (isStaMode)
+ if (backhaul_mode != Q6_WAN)
{
IPACMDBG("In STA mode, ignore connections destinated to STA interface\n");
goto IGNORE;
diff --git a/ipacm/src/IPACM_Conntrack_NATApp.cpp b/ipacm/src/IPACM_Conntrack_NATApp.cpp
index 4004597..9828036 100644
--- a/ipacm/src/IPACM_Conntrack_NATApp.cpp
+++ b/ipacm/src/IPACM_Conntrack_NATApp.cpp
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -28,6 +28,7 @@
*/
#include "IPACM_Conntrack_NATApp.h"
#include "IPACM_ConntrackClient.h"
+#include "IPACM_ConntrackListener.h"
#ifdef FEATURE_IPACM_HAL
#include "IPACM_OffloadManager.h"
#endif
@@ -47,6 +48,7 @@
nat_table_hdl = 0;
pub_ip_addr = 0;
+ pub_mux_id = 0;
curCnt = 0;
@@ -57,6 +59,18 @@
ct_hdl = NULL;
memset(temp, 0, sizeof(temp));
+ m_fd_ipa = open(IPA_DEVICE_NAME, O_RDWR);
+ if(m_fd_ipa < 0)
+ {
+ IPACMERR("Failed to open %s\n",IPA_DEVICE_NAME);
+ }
+}
+
+NatApp::~NatApp()
+{
+ if (m_fd_ipa) {
+ close(m_fd_ipa);
+ }
}
int NatApp::Init(void)
@@ -205,6 +219,22 @@
continue;
}
cache[cnt].enabled = true;
+ /* send connections info to pcie modem only with DL direction */
+ if ((CtList->backhaul_mode == Q6_MHI_WAN) && (cache[cnt].dst_nat == true || cache[cnt].protocol == IPPROTO_TCP))
+ {
+ ret = AddConnection(&cache[cnt]);
+ if(ret > 0)
+ {
+ /* save the rule id for deletion */
+ cache[cnt].rule_id = ret;
+ IPACMDBG_H("rule-id(%d)\n", cache[cnt].rule_id);
+ }
+ else
+ {
+ IPACMERR("unable to add Connection to pcie modem: error:%d\n", ret);
+ cache[cnt].rule_id = 0;
+ }
+ }
IPACMDBG("On wan-iface reset added below rule successfully\n");
iptodot("Private IP", nat_rule.private_ip);
@@ -217,24 +247,21 @@
}
pub_ip_addr = pub_ip;
+ pub_mux_id = mux_id;
+ IPACMDBG(" Set pub_mux_id: %d\t", pub_mux_id);
return 0;
}
void NatApp::Reset()
{
- int cnt = 0;
-
nat_table_hdl = 0;
pub_ip_addr = 0;
- /* NAT tbl deleted, reset enabled bit */
- for(cnt = 0; cnt < max_entries; cnt++)
- {
- cache[cnt].enabled = false;
- }
+ pub_mux_id = 0;
}
int NatApp::DeleteTable(uint32_t pub_ip)
{
+ int cnt = 0;
int ret;
IPACMDBG_H("%s() %d\n", __FUNCTION__, __LINE__);
@@ -247,6 +274,27 @@
return -1;
}
+ /* NAT tbl deleted, reset enabled bit */
+ for(cnt = 0; cnt < max_entries; cnt++)
+ {
+ cache[cnt].enabled = false;
+ /* send connections del info to pcie modem first */
+ if ((CtList->backhaul_mode == Q6_MHI_WAN) && (cache[cnt].dst_nat == true || cache[cnt].protocol == IPPROTO_TCP) && (cache[cnt].rule_id > 0))
+
+ {
+ ret = DelConnection(cache[cnt].rule_id);
+ if(ret)
+ {
+ IPACMERR("unable to del Connection to pcie modem: %d\n", ret);
+ }
+ else
+ {
+ /* save the rule id for deletion */
+ cache[cnt].rule_id = 0;
+ }
+ }
+ }
+
ret = ipa_nat_del_ipv4_tbl(nat_table_hdl);
if(ret)
{
@@ -286,6 +334,7 @@
int NatApp::DeleteEntry(const nat_table_entry *rule)
{
int cnt = 0;
+ int ret = 0;
IPACMDBG("%s() %d\n", __FUNCTION__, __LINE__);
log_nat(rule->protocol,rule->private_ip,rule->target_ip,rule->private_port,\
@@ -303,6 +352,21 @@
if(cache[cnt].enabled == true)
{
+ /* send connections del info to pcie modem first */
+ if ((CtList->backhaul_mode == Q6_MHI_WAN) && (cache[cnt].dst_nat == true || cache[cnt].protocol == IPPROTO_TCP) && (cache[cnt].rule_id > 0))
+ {
+ ret = DelConnection(cache[cnt].rule_id);
+ if(ret)
+ {
+ IPACMERR("unable to del Connection to pcie modem: %d\n", ret);
+ }
+ else
+ {
+ /* save the rule id for deletion */
+ cache[cnt].rule_id = 0;
+ }
+ }
+
if(ipa_nat_del_ipv4_rule(nat_table_hdl, cache[cnt].rule_hdl) < 0)
{
IPACMERR("%s() %d deletion failed\n", __FUNCTION__, __LINE__);
@@ -329,6 +393,7 @@
{
int cnt = 0;
ipa_nat_ipv4_rule nat_rule;
+ int ret = 0;
IPACMDBG("%s() %d\n", __FUNCTION__, __LINE__);
@@ -398,8 +463,23 @@
}
cache[cnt].enabled = true;
+ /* send connections info to pcie modem only with DL direction */
+ if ((CtList->backhaul_mode == Q6_MHI_WAN) && (rule->dst_nat == true || rule->protocol == IPPROTO_TCP))
+ {
+ ret = AddConnection(rule);
+ if(ret > 0)
+ {
+ /* save the rule id for deletion */
+ cache[cnt].rule_id = ret;
+ IPACMDBG_H("rule-id(%d)\n", cache[cnt].rule_id);
+ }
+ else
+ {
+ IPACMERR("unable to add Connection to pcie modem: error:%d\n", ret);
+ cache[cnt].rule_id = 0;
+ }
+ }
}
-
cache[cnt].private_ip = rule->private_ip;
cache[cnt].target_ip = rule->target_ip;
cache[cnt].target_port = rule->target_port;
@@ -430,6 +510,137 @@
return 0;
}
+/* Add new entry to the nat table on new connection, return rule-id */
+int NatApp::AddConnection(const nat_table_entry *rule)
+{
+ int len, res = IPACM_SUCCESS;
+ ipa_ioc_add_flt_rule *pFilteringTable = NULL;
+
+ /* contruct filter rules to pcie modem */
+ struct ipa_flt_rule_add flt_rule_entry;
+ ipa_ioc_generate_flt_eq flt_eq;
+
+ IPACMDBG("\n");
+ len = sizeof(struct ipa_ioc_add_flt_rule) + sizeof(struct ipa_flt_rule_add);
+ pFilteringTable = (struct ipa_ioc_add_flt_rule*)malloc(len);
+ if (pFilteringTable == NULL)
+ {
+ IPACMERR("Error Locate ipa_flt_rule_add memory...\n");
+ return IPACM_FAILURE;
+ }
+ memset(pFilteringTable, 0, len);
+
+
+ pFilteringTable->commit = 1;
+ pFilteringTable->global = false;
+ pFilteringTable->ip = IPA_IP_v4;
+ pFilteringTable->num_rules = (uint8_t)1;
+
+ /* Configuring Software-Routing Filtering Rule */
+ memset(&flt_rule_entry, 0, sizeof(struct ipa_flt_rule_add));
+ flt_rule_entry.at_rear = true;
+ flt_rule_entry.flt_rule_hdl = -1;
+ flt_rule_entry.status = -1;
+
+ flt_rule_entry.rule.retain_hdr = 1;
+ flt_rule_entry.rule.to_uc = 0;
+ flt_rule_entry.rule.eq_attrib_type = 1;
+ flt_rule_entry.rule.action = IPA_PASS_TO_ROUTING;
+#ifdef FEATURE_IPA_V3
+ flt_rule_entry.rule.hashable = true;
+#endif
+ flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_SRC_PORT;
+ flt_rule_entry.rule.attrib.src_port = rule->target_port;
+ flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_DST_PORT;
+ flt_rule_entry.rule.attrib.dst_port = rule->public_port;
+ flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_PROTOCOL;
+ flt_rule_entry.rule.attrib.u.v4.protocol = rule->protocol;
+ flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_DST_ADDR;
+ flt_rule_entry.rule.attrib.u.v4.dst_addr_mask = 0xFFFFFFFF;
+ flt_rule_entry.rule.attrib.u.v4.dst_addr = rule->public_ip;
+ flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_SRC_ADDR;
+ flt_rule_entry.rule.attrib.u.v4.src_addr_mask = 0xFFFFFFFF;
+ flt_rule_entry.rule.attrib.u.v4.src_addr = rule->target_ip;
+ IPACMDBG_H("src(0x%x) port(%d)->dst(0x%x) port(%d), protocol(%d) pub_mux_id (%d)\n",
+ rule->target_ip, rule->target_port, rule->public_ip, rule->public_port,
+ rule->protocol, pub_mux_id);
+
+ memset(&flt_eq, 0, sizeof(flt_eq));
+ memcpy(&flt_eq.attrib, &flt_rule_entry.rule.attrib, sizeof(flt_eq.attrib));
+ flt_eq.ip = IPA_IP_v4;
+ if(0 != ioctl(m_fd_ipa, IPA_IOC_GENERATE_FLT_EQ, &flt_eq))
+ {
+ IPACMERR("Failed to get eq_attrib\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ memcpy(&flt_rule_entry.rule.eq_attrib,
+ &flt_eq.eq_attrib,
+ sizeof(flt_rule_entry.rule.eq_attrib));
+ memcpy(&(pFilteringTable->rules[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_add));
+
+ if(false == IPACM_Iface::m_filtering.AddOffloadFilteringRule(pFilteringTable, pub_mux_id))
+ {
+ IPACMERR("Failed to install WAN DL filtering table.\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
+ /* get rule-id */
+ res = pFilteringTable->rules[0].flt_rule_hdl;
+
+fail:
+ if(pFilteringTable != NULL)
+ {
+ free(pFilteringTable);
+ }
+ return res;
+}
+
+int NatApp::DelConnection(const uint32_t rule_id)
+{
+ int len, res = IPACM_SUCCESS;
+ ipa_ioc_del_flt_rule *pFilteringTable = NULL;
+
+
+ struct ipa_flt_rule_del flt_rule_entry;
+
+ IPACMDBG("\n");
+ len = sizeof(struct ipa_ioc_del_flt_rule) + sizeof(struct ipa_flt_rule_del);
+ pFilteringTable = (struct ipa_ioc_del_flt_rule*)malloc(len);
+ if (pFilteringTable == NULL)
+ {
+ IPACMERR("Error Locate ipa_ioc_del_flt_rule memory...\n");
+ return IPACM_FAILURE;
+ }
+ memset(pFilteringTable, 0, len);
+
+
+ pFilteringTable->commit = 1;
+ pFilteringTable->ip = IPA_IP_v4;
+ pFilteringTable->num_hdls = (uint8_t)1;
+
+ /* Configuring Software-Routing Filtering Rule */
+ memset(&flt_rule_entry, 0, sizeof(struct ipa_flt_rule_del));
+ flt_rule_entry.hdl = rule_id;
+
+ memcpy(&(pFilteringTable->hdl[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_del));
+
+ if(false == IPACM_Iface::m_filtering.DelOffloadFilteringRule(pFilteringTable))
+ {
+ IPACMERR("Failed to install WAN DL filtering table.\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
+fail:
+ if(pFilteringTable != NULL)
+ {
+ free(pFilteringTable);
+ }
+ return res;
+}
+
void NatApp::UpdateCTUdpTs(nat_table_entry *rule, uint32_t new_ts)
{
#ifdef FEATURE_IPACM_HAL
@@ -629,7 +840,7 @@
int NatApp::UpdatePwrSaveIf(uint32_t client_lan_ip)
{
- int cnt;
+ int cnt, ret;
IPACMDBG_H("Received IP address: 0x%x\n", client_lan_ip);
if(client_lan_ip == INVALID_IP_ADDR)
@@ -662,6 +873,21 @@
if(cache[cnt].private_ip == client_lan_ip &&
cache[cnt].enabled == true)
{
+ /* send connections del info to pcie modem first */
+ if ((CtList->backhaul_mode == Q6_MHI_WAN) && (cache[cnt].dst_nat == true || cache[cnt].protocol == IPPROTO_TCP) && (cache[cnt].rule_id > 0))
+ {
+ ret = DelConnection(cache[cnt].rule_id);
+ if(ret)
+ {
+ IPACMERR("unable to del Connection to pcie modem: %d\n", ret);
+ }
+ else
+ {
+ /* save the rule id for deletion */
+ cache[cnt].rule_id = 0;
+ }
+ }
+
if(ipa_nat_del_ipv4_rule(nat_table_hdl, cache[cnt].rule_hdl) < 0)
{
IPACMERR("unable to delete the rule\n");
@@ -678,7 +904,7 @@
int NatApp::ResetPwrSaveIf(uint32_t client_lan_ip)
{
- int cnt;
+ int cnt, ret;
ipa_nat_ipv4_rule nat_rule;
IPACMDBG_H("Received ip address: 0x%x\n", client_lan_ip);
@@ -721,6 +947,22 @@
continue;
}
cache[cnt].enabled = true;
+ /* send connections info to pcie modem only with DL direction */
+ if ((CtList->backhaul_mode == Q6_MHI_WAN) && (cache[cnt].dst_nat == true || cache[cnt].protocol == IPPROTO_TCP))
+ {
+ ret = AddConnection(&cache[cnt]);
+ if(ret > 0)
+ {
+ /* save the rule id for deletion */
+ cache[cnt].rule_id = ret;
+ IPACMDBG_H("rule-id(%d)\n", cache[cnt].rule_id);
+ }
+ else
+ {
+ IPACMERR("unable to add Connection to pcie modem: error:%d\n", ret);
+ cache[cnt].rule_id = 0;
+ }
+ }
IPACMDBG("On power reset added below rule successfully\n");
iptodot("Private IP", nat_rule.private_ip);
@@ -866,7 +1108,7 @@
int NatApp::DelEntriesOnClntDiscon(uint32_t ip_addr)
{
- int cnt, tmp = 0;
+ int cnt, tmp = 0, ret;
IPACMDBG_H("Received IP address: 0x%x\n", ip_addr);
if(ip_addr == INVALID_IP_ADDR)
@@ -891,6 +1133,21 @@
{
if(cache[cnt].enabled == true)
{
+ /* send connections del info to pcie modem first */
+ if ((CtList->backhaul_mode == Q6_MHI_WAN) && (cache[cnt].dst_nat == true || cache[cnt].protocol == IPPROTO_TCP) && (cache[cnt].rule_id > 0))
+ {
+ ret = DelConnection(cache[cnt].rule_id);
+ if(ret)
+ {
+ IPACMERR("unable to del Connection to pcie modem: %d\n", ret);
+ }
+ else
+ {
+ /* save the rule id for deletion */
+ cache[cnt].rule_id = 0;
+ }
+ }
+
if(ipa_nat_del_ipv4_rule(nat_table_hdl, cache[cnt].rule_hdl) < 0)
{
IPACMERR("unable to delete the rule\n");
@@ -913,7 +1170,7 @@
int NatApp::DelEntriesOnSTAClntDiscon(uint32_t ip_addr)
{
- int cnt, tmp = curCnt;
+ int cnt, tmp = curCnt, ret;
IPACMDBG_H("Received IP address: 0x%x\n", ip_addr);
if(ip_addr == INVALID_IP_ADDR)
@@ -929,6 +1186,21 @@
{
if(cache[cnt].enabled == true)
{
+ /* send connections del info to pcie modem first */
+ if ((CtList->backhaul_mode == Q6_MHI_WAN) && (cache[cnt].dst_nat == true || cache[cnt].protocol == IPPROTO_TCP) && (cache[cnt].rule_id > 0))
+ {
+ ret = DelConnection(cache[cnt].rule_id);
+ if(ret)
+ {
+ IPACMERR("unable to del Connection to pcie modem: %d\n", ret);
+ }
+ else
+ {
+ /* save the rule id for deletion */
+ cache[cnt].rule_id = 0;
+ }
+ }
+
if(ipa_nat_del_ipv4_rule(nat_table_hdl, cache[cnt].rule_hdl) < 0)
{
IPACMERR("unable to delete the rule\n");
diff --git a/ipacm/src/IPACM_Filtering.cpp b/ipacm/src/IPACM_Filtering.cpp
index 3545d81..623bad4 100644
--- a/ipacm/src/IPACM_Filtering.cpp
+++ b/ipacm/src/IPACM_Filtering.cpp
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -57,6 +57,8 @@
{
IPACMERR("Failed opening %s.\n", DEVICE_NAME);
}
+ total_num_offload_rules = 0;
+ pcie_modem_rule_id = 0;
}
IPACM_Filtering::~IPACM_Filtering()
@@ -461,6 +463,195 @@
return true;
}
+bool IPACM_Filtering::AddOffloadFilteringRule(struct ipa_ioc_add_flt_rule *flt_rule_tbl, uint8_t mux_id)
+{
+#ifdef WAN_IOCTL_ADD_OFFLOAD_CONNECTION
+ int ret = 0, cnt, pos = 0;
+ ipa_add_offload_connection_req_msg_v01 qmi_add_msg;
+ int fd_wwan_ioctl = open(WWAN_QMI_IOCTL_DEVICE_NAME, O_RDWR);
+ if(fd_wwan_ioctl < 0)
+ {
+ IPACMERR("Failed to open %s.\n",WWAN_QMI_IOCTL_DEVICE_NAME);
+ return false;
+ }
+
+ if(flt_rule_tbl == NULL)
+ {
+ IPACMERR("Invalid add_offload_req\n");
+ close(fd_wwan_ioctl);
+ return false;
+ }
+ /* check Max offload connections */
+ if (total_num_offload_rules + flt_rule_tbl->num_rules > QMI_IPA_MAX_FILTERS_V01)
+ {
+ IPACMERR("(%d) add_offload req with curent(%d), exceed max (%d).\n",
+ flt_rule_tbl->num_rules, total_num_offload_rules,
+ QMI_IPA_MAX_FILTERS_V01);
+ close(fd_wwan_ioctl);
+ return false;
+ }
+ else
+ {
+ memset(&qmi_add_msg, 0, sizeof(qmi_add_msg));
+
+ if (flt_rule_tbl->num_rules > 0)
+ {
+ qmi_add_msg.filter_spec_ex2_list_valid = true;
+ }
+ else
+ {
+ IPACMDBG_H("Get %d offload-req\n", flt_rule_tbl->num_rules);
+ close(fd_wwan_ioctl);
+ return true;
+ }
+ qmi_add_msg.filter_spec_ex2_list_len = flt_rule_tbl->num_rules;
+
+ IPACMDBG_H("passing %d offload req to modem.\n", flt_rule_tbl->num_rules);
+
+ if(flt_rule_tbl != NULL)
+ {
+ for(cnt = flt_rule_tbl->num_rules - 1; cnt >= 0; cnt--)
+ {
+ if (pos < QMI_IPA_MAX_FILTERS_V01)
+ {
+ if (flt_rule_tbl->ip == IPA_IP_v4)
+ {
+ qmi_add_msg.filter_spec_ex2_list[pos].ip_type = QMI_IPA_IP_TYPE_V4_V01;
+ } else if (flt_rule_tbl->ip == IPA_IP_v6) {
+ qmi_add_msg.filter_spec_ex2_list[pos].ip_type = QMI_IPA_IP_TYPE_V6_V01;
+ } else {
+ IPACMDBG_H("invalid ip-type %d\n", flt_rule_tbl->ip);
+ close(fd_wwan_ioctl);
+ return true;
+ }
+
+ qmi_add_msg.filter_spec_ex2_list[pos].filter_action = GetQmiFilterAction(flt_rule_tbl->rules[cnt].rule.action);
+ qmi_add_msg.filter_spec_ex2_list[pos].is_mux_id_valid = 1;
+ qmi_add_msg.filter_spec_ex2_list[pos].mux_id = mux_id;
+ /* assign the rule-id */
+ flt_rule_tbl->rules[cnt].flt_rule_hdl = IPA_PCIE_MODEM_RULE_ID_START + pcie_modem_rule_id;
+ qmi_add_msg.filter_spec_ex2_list[pos].rule_id = flt_rule_tbl->rules[cnt].flt_rule_hdl;
+ qmi_add_msg.filter_spec_ex2_list[pos].is_rule_hashable = flt_rule_tbl->rules[cnt].rule.hashable;
+ memcpy(&qmi_add_msg.filter_spec_ex2_list[pos].filter_rule,
+ &flt_rule_tbl->rules[cnt].rule.eq_attrib,
+ sizeof(struct ipa_filter_rule_type_v01));
+ IPACMDBG_H("mux-id %d, hashable %d\n", qmi_add_msg.filter_spec_ex2_list[pos].mux_id, qmi_add_msg.filter_spec_ex2_list[pos].is_rule_hashable);
+ pos++;
+ pcie_modem_rule_id = (pcie_modem_rule_id + 1)%100;
+ }
+ else
+ {
+ IPACMERR(" QMI only support max %d rules, current (%d)\n ",QMI_IPA_MAX_FILTERS_V01, pos);
+ }
+ }
+ }
+
+ ret = ioctl(fd_wwan_ioctl, WAN_IOC_ADD_OFFLOAD_CONNECTION, &qmi_add_msg);
+ if (ret != 0)
+ {
+ IPACMERR("Failed sending WAN_IOC_ADD_OFFLOAD_CONNECTION with ret %d\n ", ret);
+ close(fd_wwan_ioctl);
+ return false;
+ }
+ }
+ /* update total_num_offload_rules */
+ total_num_offload_rules += flt_rule_tbl->num_rules;
+ IPACMDBG_H("total_num_offload_rules %d \n", total_num_offload_rules);
+ close(fd_wwan_ioctl);
+ return true;
+#else
+ if(flt_rule_tbl != NULL)
+ {
+ IPACMERR("Not support (%d) AddOffloadFilteringRule with mux-id (%d)\n", flt_rule_tbl->num_rules, mux_id);
+ }
+ return false;
+#endif
+}
+
+bool IPACM_Filtering::DelOffloadFilteringRule(struct ipa_ioc_del_flt_rule const *flt_rule_tbl)
+{
+#ifdef WAN_IOCTL_ADD_OFFLOAD_CONNECTION
+ bool result = true;
+ int ret = 0, cnt, pos = 0;
+ ipa_remove_offload_connection_req_msg_v01 qmi_del_msg;
+ int fd_wwan_ioctl = open(WWAN_QMI_IOCTL_DEVICE_NAME, O_RDWR);
+
+ if(fd_wwan_ioctl < 0)
+ {
+ IPACMERR("Failed to open %s.\n",WWAN_QMI_IOCTL_DEVICE_NAME);
+ return false;
+ }
+
+ if(flt_rule_tbl == NULL)
+ {
+ IPACMERR("Invalid add_offload_req\n");
+ result = false;
+ goto fail;
+ }
+
+ /* check # of offload connections */
+ if (flt_rule_tbl->num_hdls > total_num_offload_rules) {
+ IPACMERR("(%d) del_offload req , exceed curent(%d)\n",
+ flt_rule_tbl->num_hdls, total_num_offload_rules);
+ result = false;
+ goto fail;
+ }
+ else
+ {
+ memset(&qmi_del_msg, 0, sizeof(qmi_del_msg));
+
+ if (flt_rule_tbl->num_hdls > 0)
+ {
+ qmi_del_msg.filter_handle_list_valid = true;
+ }
+ else
+ {
+ IPACMERR("Get %d offload-req\n", flt_rule_tbl->num_hdls);
+ goto fail;
+ }
+ qmi_del_msg.filter_handle_list_len = flt_rule_tbl->num_hdls;
+
+ IPACMDBG_H("passing %d offload req to modem.\n", flt_rule_tbl->num_hdls);
+
+ if(flt_rule_tbl != NULL)
+ {
+ for(cnt = flt_rule_tbl->num_hdls - 1; cnt >= 0; cnt--)
+ {
+ if (pos < QMI_IPA_MAX_FILTERS_V01)
+ {
+ /* passing rule-id to wan-driver */
+ qmi_del_msg.filter_handle_list[pos].filter_spec_identifier = flt_rule_tbl->hdl[cnt].hdl;
+ pos++;
+ }
+ else
+ {
+ IPACMERR(" QMI only support max %d rules, current (%d)\n ",QMI_IPA_MAX_FILTERS_V01, pos);
+ result = false;
+ goto fail;
+ }
+ }
+ }
+
+ ret = ioctl(fd_wwan_ioctl, WAN_IOC_RMV_OFFLOAD_CONNECTION, &qmi_del_msg);
+ if (ret != 0)
+ {
+ IPACMERR("Failed deleting Filtering rule %pK with ret %d\n ", &qmi_del_msg, ret);
+ result = false;
+ goto fail;
+ }
+ }
+fail:
+ close(fd_wwan_ioctl);
+ return result;
+#else
+ if(flt_rule_tbl != NULL)
+ {
+ IPACMERR("Not support (%d) DelOffloadFilteringRule\n", flt_rule_tbl->num_hdls);
+ }
+ return false;
+#endif
+}
+
bool IPACM_Filtering::SendFilteringRuleIndex(struct ipa_fltr_installed_notif_req_msg_v01* table)
{
int ret = 0;
diff --git a/ipacm/src/IPACM_Iface.cpp b/ipacm/src/IPACM_Iface.cpp
index 512846f..55e19ba 100644
--- a/ipacm/src/IPACM_Iface.cpp
+++ b/ipacm/src/IPACM_Iface.cpp
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -139,6 +139,12 @@
memcpy(&flt_rule_entry.rule.attrib,
&rx_prop->rx[0].attrib,
sizeof(flt_rule_entry.rule.attrib));
+ /* disble meta-data filtering skylar */
+ if (IPACM_Wan::backhaul_mode == Q6_MHI_WAN)
+ {
+ flt_rule_entry.rule.attrib.attrib_mask &= ~((uint32_t)IPA_FLT_META_DATA);
+ IPACMDBG_H("disable meta-data filtering 0x%x\n", flt_rule_entry.rule.attrib.attrib_mask);
+ }
memcpy(&(m_pFilteringTable->rules[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_add));
@@ -1045,6 +1051,58 @@
return;
}
+void IPACM_Iface::change_to_network_order(ipa_ip_type iptype, ipa_rule_attrib* attrib)
+{
+ if(attrib == NULL)
+ {
+ IPACMERR("Attribute pointer is NULL.\n");
+ return;
+ }
+
+ if(iptype == IPA_IP_v6)
+ {
+ int i;
+ for(i=0; i<4; i++)
+ {
+ attrib->u.v6.src_addr[i] = htonl(attrib->u.v6.src_addr[i]);
+ attrib->u.v6.src_addr_mask[i] = htonl(attrib->u.v6.src_addr_mask[i]);
+ attrib->u.v6.dst_addr[i] = htonl(attrib->u.v6.dst_addr[i]);
+ attrib->u.v6.dst_addr_mask[i] = htonl(attrib->u.v6.dst_addr_mask[i]);
+ }
+ }
+ else
+ {
+ IPACMDBG_H("IP type is not IPv6, do nothing: %d\n", iptype);
+ }
+
+ return;
+}
+
+bool IPACM_Iface::is_global_ipv6_addr(uint32_t* ipv6_addr)
+{
+ uint32_t ipv6_link_local_prefix, ipv6_link_local_prefix_mask;
+ ipv6_link_local_prefix = 0xFE800000;
+ ipv6_link_local_prefix_mask = 0xFFC00000;
+
+ if(ipv6_addr == NULL)
+ {
+ IPACMERR("IPv6 address is empty.\n");
+ return false;
+ }
+ IPACMDBG_H("Get ipv6 address with first word 0x%08x.\n", ipv6_addr[0]);
+
+ if((ipv6_addr[0] & ipv6_link_local_prefix_mask) == (ipv6_link_local_prefix & ipv6_link_local_prefix_mask))
+ {
+ IPACMDBG_H("This IPv6 address is link local.\n");
+ return false;
+ }
+ else
+ {
+ IPACMDBG_H("This IPv6 address is not link local.\n");
+ return true;
+ }
+}
+
void IPACM_Iface::delete_iface(void)
{
IPACMDBG_H("netdev (%s):ipa_index (%d) instance close \n",
diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index ad3e5ff..356cac8 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -184,9 +184,9 @@
handle_tethering_client(false, IPACM_CLIENT_MAX);
#else
handle_tethering_client(false, IPACM_CLIENT_USB);
-#endif
+#endif // FEATURE_IPACM_HAL end
}
-#endif
+#endif // FEATURE_IPA_ANDROID end
memset(is_downstream_set, 0, sizeof(is_downstream_set));
memset(is_upstream_set, 0, sizeof(is_upstream_set));
@@ -195,9 +195,9 @@
#ifdef FEATURE_IPACM_HAL
/* check if Upstream was set before as WIFI with RNDIS case */
- if(ipa_if_cate == LAN_IF && IPACM_Wan::backhaul_is_sta_mode == true) /* LTE */
+ if(ipa_if_cate == LAN_IF && IPACM_Wan::backhaul_mode == WLAN_WAN) /* LTE */
{
- IPACMDBG_H(" Skip the Upstream falg set on LAN instance (%d) with WIFI backhaul (%d)\n", ipa_if_cate, IPACM_Wan::backhaul_is_sta_mode ); /* RNDIS+WIFI not support on msm*/
+ IPACMDBG_H(" Skip the Upstream flag set on LAN instance (%d) with WIFI backhaul (%d)\n", ipa_if_cate, IPACM_Wan::backhaul_mode ); /* RNDIS+WIFI not support on msm*/
return;
}
@@ -213,7 +213,7 @@
IPACMDBG_H("Upstream was set previously for ipv6, change is_upstream_set flag\n");
is_upstream_set[IPA_IP_v6] = true;
}
-#endif
+#endif // FEATURE_IPACM_HAL end
return;
}
@@ -399,7 +399,7 @@
handle_private_subnet_android(data->iptype);
#else
handle_private_subnet(data->iptype);
-#endif
+#endif // FEATURE_IPA_ANDROID end
}
else
{
@@ -419,14 +419,14 @@
handle_private_subnet_android(data->iptype);
#else
handle_private_subnet(data->iptype);
-#endif
+#endif // FEATURE_IPA_ANDROID end
#ifndef FEATURE_IPACM_HAL
if (IPACM_Wan::isWanUP(ipa_if_num))
{
if(data->iptype == IPA_IP_v4 || data->iptype == IPA_IP_MAX)
{
- if(IPACM_Wan::backhaul_is_sta_mode == false)
+ if(IPACM_Wan::backhaul_mode == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v4);
handle_wan_up_ex(ext_prop, IPA_IP_v4,
@@ -448,7 +448,7 @@
{
memcpy(ipv6_prefix, IPACM_Wan::backhaul_ipv6_prefix, sizeof(ipv6_prefix));
install_ipv6_prefix_flt_rule(IPACM_Wan::backhaul_ipv6_prefix);
- if(IPACM_Wan::backhaul_is_sta_mode == false)
+ if(IPACM_Wan::backhaul_mode == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v6);
handle_wan_up_ex(ext_prop, IPA_IP_v6, 0);
@@ -474,7 +474,7 @@
IPACMDBG_H("Upstream was set previously for ipv6, change is_upstream_set flag\n");
is_upstream_set[IPA_IP_v6] = true;
}
-#endif
+#endif //FEATURE_IPACM_HAL end
/* Post event to NAT */
if (data->iptype == IPA_IP_v4)
{
@@ -528,7 +528,7 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s xlat_mux_id: %d\n", data_wan_tether->is_sta,
+ IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s, xlat %d\n", data_wan_tether->backhaul_type,
data_wan_tether->if_index_tether,
IPACM_Iface::ipacmcfg->iface_table[data_wan_tether->if_index_tether].iface_name,
data_wan_tether->xlat_mux_id);
@@ -539,7 +539,7 @@
return;
}
#else /* not offload rndis on WIFI mode on MSM targets */
- if (data_wan_tether->is_sta)
+ if (data_wan_tether->backhaul_type == WLAN_WAN)
{
IPACMERR("Not support RNDIS offload on WIFI mode, dun install UL filter rules for WIFI mode\n");
@@ -577,7 +577,7 @@
} /* end of for loop */
return;
}
-#endif
+#endif // FEATURE_IPACM_HAL end
if (ip_type == IPA_IP_v4 || ip_type == IPA_IP_MAX)
{
#ifdef FEATURE_IPACM_HAL
@@ -588,7 +588,7 @@
if (is_downstream_set[IPA_IP_v4] == true)
{
IPACMDBG_H("Downstream was set before, adding UL rules.\n");
- if (data_wan_tether->is_sta == false)
+ if (data_wan_tether->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v4);
handle_wan_up_ex(ext_prop, IPA_IP_v4,
@@ -599,14 +599,14 @@
}
}
#else
- if (data_wan_tether->is_sta == false)
+ if (data_wan_tether->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v4);
handle_wan_up_ex(ext_prop, IPA_IP_v4, data_wan_tether->xlat_mux_id);
} else {
handle_wan_up(IPA_IP_v4);
}
-#endif
+#endif // FEATURE_IPACM_HAL end
}
break;
@@ -619,7 +619,7 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->is_sta,
+ IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->backhaul_type,
data_wan_tether->if_index_tether,
IPACM_Iface::ipacmcfg->iface_table[data_wan_tether->if_index_tether].iface_name);
#ifndef FEATURE_IPACM_HAL
@@ -628,7 +628,7 @@
IPACMERR("IPA_HANDLE_WAN_UP_V6_TETHER tether_if(%d), not valid (%d) ignore\n", data_wan_tether->if_index_tether, ipa_if_num);
return;
}
-#endif
+#endif // FEATURE_IPACM_HAL end
if (ip_type == IPA_IP_v6 || ip_type == IPA_IP_MAX)
{
#ifdef FEATURE_IPACM_HAL
@@ -642,7 +642,7 @@
IPACMDBG_H("Downstream was set before, adding UL rules.\n");
memcpy(ipv6_prefix, data_wan_tether->ipv6_prefix, sizeof(ipv6_prefix));
install_ipv6_prefix_flt_rule(data_wan_tether->ipv6_prefix);
- if (data_wan_tether->is_sta == false)
+ if (data_wan_tether->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v6);
handle_wan_up_ex(ext_prop, IPA_IP_v6, 0);
@@ -654,14 +654,14 @@
}
}
#else
- if (data_wan_tether->is_sta == false)
+ if (data_wan_tether->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v6);
handle_wan_up_ex(ext_prop, IPA_IP_v6, 0);
} else {
handle_wan_up(IPA_IP_v6);
}
-#endif
+#endif // FEATURE_IPACM_HAL end
}
break;
@@ -673,7 +673,7 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->is_sta,
+ IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->backhaul_type,
data_wan_tether->if_index_tether,
IPACM_Iface::ipacmcfg->iface_table[data_wan_tether->if_index_tether].iface_name);
#ifndef FEATURE_IPACM_HAL
@@ -682,7 +682,7 @@
IPACMERR("IPA_HANDLE_WAN_DOWN_TETHER tether_if(%d), not valid (%d) ignore\n", data_wan_tether->if_index_tether, ipa_if_num);
return;
}
-#endif
+#endif // FEATURE_IPACM_HAL end
if (ip_type == IPA_IP_v4 || ip_type == IPA_IP_MAX)
{
#ifdef FEATURE_IPACM_HAL
@@ -693,12 +693,12 @@
if(is_downstream_set[IPA_IP_v4] == true)
{
IPACMDBG_H("Downstream was set before, deleting UL rules.\n");
- handle_wan_down(data_wan_tether->is_sta);
+ handle_wan_down(data_wan_tether->backhaul_type);
}
}
#else
- handle_wan_down(data_wan_tether->is_sta);
-#endif
+ handle_wan_down(data_wan_tether->backhaul_type);
+#endif // FEATURE_IPACM_HAL end
}
break;
@@ -710,7 +710,7 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->is_sta,
+ IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->backhaul_type,
data_wan_tether->if_index_tether,
IPACM_Iface::ipacmcfg->iface_table[data_wan_tether->if_index_tether].iface_name);
#ifndef FEATURE_IPACM_HAL
@@ -719,7 +719,7 @@
IPACMERR("IPA_HANDLE_WAN_DOWN_V6_TETHER tether_if(%d), not valid (%d) ignore\n", data_wan_tether->if_index_tether, ipa_if_num);
return;
}
-#endif
+#endif // FEATURE_IPACM_HAL end
if (ip_type == IPA_IP_v6 || ip_type == IPA_IP_MAX)
{
#ifdef FEATURE_IPACM_HAL
@@ -732,14 +732,14 @@
IPACMDBG_H("Downstream was set before, deleting UL rules.\n");
/* reset usb-client ipv6 rt-rules */
handle_lan_client_reset_rt(IPA_IP_v6);
- handle_wan_down_v6(data_wan_tether->is_sta);
+ handle_wan_down_v6(data_wan_tether->backhaul_type);
}
}
#else
/* reset usb-client ipv6 rt-rules */
handle_lan_client_reset_rt(IPA_IP_v6);
- handle_wan_down_v6(data_wan_tether->is_sta);
-#endif
+ handle_wan_down_v6(data_wan_tether->backhaul_type);
+#endif // FEATURE_IPACM_HAL end
}
break;
@@ -786,7 +786,7 @@
install_ipv6_prefix_flt_rule(ipv6_prefix);
}
- if (IPACM_Wan::backhaul_is_sta_mode == false) /* LTE */
+ if (IPACM_Wan::backhaul_mode == Q6_WAN) /* LTE */
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(data->prefix.iptype);
if (data->prefix.iptype == IPA_IP_v4)
@@ -827,10 +827,10 @@
IPACMDBG_H("Upstream was set before, deleting UL rules.\n");
if (data->prefix.iptype == IPA_IP_v4)
{
- handle_wan_down(IPACM_Wan::backhaul_is_sta_mode); /* LTE STA */
+ handle_wan_down(IPACM_Wan::backhaul_mode); /* LTE STA */
} else {
handle_lan_client_reset_rt(IPA_IP_v6);
- handle_wan_down_v6(IPACM_Wan::backhaul_is_sta_mode); /* LTE STA */
+ handle_wan_down_v6(IPACM_Wan::backhaul_mode); /* LTE STA */
}
}
}
@@ -838,7 +838,7 @@
break;
}
-#else
+#else // above Andorid
case IPA_HANDLE_WAN_UP:
IPACMDBG_H("Received IPA_HANDLE_WAN_UP event\n");
@@ -848,10 +848,10 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->is_sta);
+ IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->backhaul_type);
if (ip_type == IPA_IP_v4 || ip_type == IPA_IP_MAX)
{
- if (data_wan->is_sta == false)
+ if (data_wan->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v4);
handle_wan_up_ex(ext_prop, IPA_IP_v4, data_wan->xlat_mux_id);
@@ -872,12 +872,12 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->is_sta);
+ IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->backhaul_type);
if (ip_type == IPA_IP_v6 || ip_type == IPA_IP_MAX)
{
memcpy(ipv6_prefix, data_wan->ipv6_prefix, sizeof(ipv6_prefix));
install_ipv6_prefix_flt_rule(data_wan->ipv6_prefix);
- if (data_wan->is_sta == false)
+ if (data_wan->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v6);
handle_wan_up_ex(ext_prop, IPA_IP_v6, 0);
@@ -897,10 +897,10 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->is_sta);
+ IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->backhaul_type);
if (ip_type == IPA_IP_v4 || ip_type == IPA_IP_MAX)
{
- handle_wan_down(data_wan->is_sta);
+ handle_wan_down(data_wan->backhaul_type);
}
break;
@@ -917,13 +917,13 @@
/* reset usb-client ipv6 rt-rules */
handle_lan_client_reset_rt(IPA_IP_v6);
- IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->is_sta);
+ IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->backhaul_type);
if (ip_type == IPA_IP_v6 || ip_type == IPA_IP_MAX)
{
- handle_wan_down_v6(data_wan->is_sta);
+ handle_wan_down_v6(data_wan->backhaul_type);
}
break;
-#endif
+#endif // FEATURE_IPA_ANDROID end
case IPA_NEIGH_CLIENT_IP_ADDR_ADD_EVENT:
{
@@ -934,9 +934,9 @@
/* if RNDIS under WIFI mode in MSM, dun add RT rule*/
#ifdef FEATURE_IPACM_HAL
- if(IPACM_Wan::backhaul_is_sta_mode == true) /* WIFI */
+ if(IPACM_Wan::backhaul_mode == WLAN_WAN) /* WIFI */
{
- IPACMDBG_H(" dun construct header and RT-rules for RNDIS-PC in WIFI mode on MSM targets (STA %d) \n", IPACM_Wan::backhaul_is_sta_mode);
+ IPACMDBG_H(" dun construct header and RT-rules for RNDIS-PC in WIFI mode on MSM targets (STA %d) \n", IPACM_Wan::backhaul_mode);
return;
}
#endif
@@ -1101,7 +1101,7 @@
IPACMDBG_H("Received IPA_TETHERING_STATS_UPDATE_EVENT event.\n");
if (IPACM_Wan::isWanUP(ipa_if_num) || IPACM_Wan::isWanUP_V6(ipa_if_num))
{
- if(IPACM_Wan::backhaul_is_sta_mode == false) /* LTE */
+ if(IPACM_Wan::backhaul_mode == Q6_WAN) /* LTE */
{
ipa_get_data_stats_resp_msg_v01 *data = (ipa_get_data_stats_resp_msg_v01 *)param;
IPACMDBG("Received IPA_TETHERING_STATS_UPDATE_STATS ipa_stats_type: %d\n",data->ipa_stats_type);
@@ -1208,7 +1208,7 @@
}
/* delete filter rule for wan_down event for IPv4*/
-int IPACM_Lan::handle_wan_down(bool is_sta_mode)
+int IPACM_Lan::handle_wan_down(ipacm_wan_iface_type backhaul_mode)
{
ipa_fltr_installed_notif_req_msg_v01 flt_index;
int fd;
@@ -1228,7 +1228,7 @@
}
#endif
- if(is_sta_mode == false && modem_ul_v4_set == true)
+ if(backhaul_mode == Q6_WAN && modem_ul_v4_set == true)
{
if (num_wan_ul_fl_rule_v4 > MAX_WAN_UL_FILTER_RULES)
{
@@ -1766,14 +1766,14 @@
/* only offload UL traffic of certain clients */
#ifdef FEATURE_IPACM_HAL
flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_SRC_ADDR;
- flt_rule_entry.rule.attrib.u.v6.src_addr_mask[0] = ntohl(prefix[IPA_IP_v6].v6Mask[0]);
- flt_rule_entry.rule.attrib.u.v6.src_addr_mask[1] = ntohl(prefix[IPA_IP_v6].v6Mask[1]);
- flt_rule_entry.rule.attrib.u.v6.src_addr_mask[2] = ntohl(prefix[IPA_IP_v6].v6Mask[2]);
- flt_rule_entry.rule.attrib.u.v6.src_addr_mask[3] = ntohl(prefix[IPA_IP_v6].v6Mask[3]);
- flt_rule_entry.rule.attrib.u.v6.src_addr[0] = ntohl(prefix[IPA_IP_v6].v6Addr[0]);
- flt_rule_entry.rule.attrib.u.v6.src_addr[1] = ntohl(prefix[IPA_IP_v6].v6Addr[1]);
- flt_rule_entry.rule.attrib.u.v6.src_addr[2] = ntohl(prefix[IPA_IP_v6].v6Addr[2]);
- flt_rule_entry.rule.attrib.u.v6.src_addr[3] = ntohl(prefix[IPA_IP_v6].v6Addr[3]);
+ flt_rule_entry.rule.attrib.u.v6.src_addr_mask[0] = prefix[IPA_IP_v6].v6Mask[0];
+ flt_rule_entry.rule.attrib.u.v6.src_addr_mask[1] = prefix[IPA_IP_v6].v6Mask[1];
+ flt_rule_entry.rule.attrib.u.v6.src_addr_mask[2] = prefix[IPA_IP_v6].v6Mask[2];
+ flt_rule_entry.rule.attrib.u.v6.src_addr_mask[3] = prefix[IPA_IP_v6].v6Mask[3];
+ flt_rule_entry.rule.attrib.u.v6.src_addr[0] = prefix[IPA_IP_v6].v6Addr[0];
+ flt_rule_entry.rule.attrib.u.v6.src_addr[1] = prefix[IPA_IP_v6].v6Addr[1];
+ flt_rule_entry.rule.attrib.u.v6.src_addr[2] = prefix[IPA_IP_v6].v6Addr[2];
+ flt_rule_entry.rule.attrib.u.v6.src_addr[3] = prefix[IPA_IP_v6].v6Addr[3];
#endif
memcpy(&(m_pFilteringTable->rules[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_add));
@@ -2424,6 +2424,15 @@
get_client_memptr(eth_client, eth_index)->eth_rt_hdl[tx_index].eth_rt_rule_hdl_v6_wan[v6_num] = rt_rule->rules[0].rt_rule_hdl;
IPACMDBG_H("tx:%d, rt rule hdl=%x ip-type: %d\n", tx_index,
get_client_memptr(eth_client, eth_index)->eth_rt_hdl[tx_index].eth_rt_rule_hdl_v6_wan[v6_num], iptype);
+
+ /* send client-v6 info to pcie modem only with global ipv6 with tx_index = 0 one time*/
+ if(is_global_ipv6_addr(get_client_memptr(eth_client, eth_index)->v6_addr[v6_num]) && (IPACM_Wan::backhaul_mode == Q6_MHI_WAN))
+ {
+ if (add_connection(eth_index, v6_num))
+ {
+ IPACMERR("PCIE filter rule addition failed! (%d-client) %d v6-entry\n",eth_index, v6_num);
+ }
+ }
}
}
@@ -2951,8 +2960,8 @@
/* delete wan filter rule */
if (IPACM_Wan::isWanUP(ipa_if_num) && rx_prop != NULL)
{
- IPACMDBG_H("LAN IF goes down, backhaul type %d\n", IPACM_Wan::backhaul_is_sta_mode);
- handle_wan_down(IPACM_Wan::backhaul_is_sta_mode);
+ IPACMDBG_H("LAN IF goes down, backhaul type %d\n", IPACM_Wan::backhaul_mode);
+ handle_wan_down(IPACM_Wan::backhaul_mode);
#ifdef FEATURE_IPA_ANDROID
#ifndef FEATURE_IPACM_HAL
/* Clean-up tethered-iface list */
@@ -2963,8 +2972,8 @@
if (IPACM_Wan::isWanUP_V6(ipa_if_num) && rx_prop != NULL)
{
- IPACMDBG_H("LAN IF goes down, backhaul type %d\n", IPACM_Wan::backhaul_is_sta_mode);
- handle_wan_down_v6(IPACM_Wan::backhaul_is_sta_mode);
+ IPACMDBG_H("LAN IF goes down, backhaul type %d\n", IPACM_Wan::backhaul_mode);
+ handle_wan_down_v6(IPACM_Wan::backhaul_mode);
#ifdef FEATURE_IPA_ANDROID
/* Clean-up tethered-iface list */
IPACM_Wan::delete_tether_iface(IPA_IP_v6, ipa_if_num);
@@ -3555,7 +3564,7 @@
return ret;
}
-int IPACM_Lan::handle_wan_down_v6(bool is_sta_mode)
+int IPACM_Lan::handle_wan_down_v6(ipacm_wan_iface_type backhaul_mode)
{
ipa_fltr_installed_notif_req_msg_v01 flt_index;
int fd;
@@ -3571,7 +3580,7 @@
memset(ipv6_prefix, 0, sizeof(ipv6_prefix));
- if(is_sta_mode == false && modem_ul_v6_set == true)
+ if(backhaul_mode == Q6_WAN && modem_ul_v6_set == true)
{
if (num_wan_ul_fl_rule_v6 > MAX_WAN_UL_FILTER_RULES)
{
@@ -6032,3 +6041,147 @@
free(m_pFilteringTable);
return IPACM_SUCCESS;
}
+
+int IPACM_Lan::add_connection(int client_index, int v6_num)
+{
+ int len, res = IPACM_SUCCESS;
+ uint8_t mux_id;
+ ipa_ioc_add_flt_rule *pFilteringTable = NULL;
+ int fd;
+
+ mux_id = IPACM_Iface::ipacmcfg->GetQmapId();
+ /* contruct filter rules to pcie modem */
+ struct ipa_flt_rule_add flt_rule_entry;
+ ipa_ioc_generate_flt_eq flt_eq;
+
+ IPACMDBG("\n");
+ len = sizeof(struct ipa_ioc_add_flt_rule) + sizeof(struct ipa_flt_rule_add);
+ pFilteringTable = (struct ipa_ioc_add_flt_rule*)malloc(len);
+ if (pFilteringTable == NULL)
+ {
+ IPACMERR("Error Locate ipa_flt_rule_add memory...\n");
+ return IPACM_FAILURE;
+ }
+ memset(pFilteringTable, 0, len);
+
+
+ pFilteringTable->commit = 1;
+ pFilteringTable->global = false;
+ pFilteringTable->ip = IPA_IP_v6;
+ pFilteringTable->num_rules = (uint8_t)1;
+
+ /* Configuring Filtering Rule */
+ memset(&flt_rule_entry, 0, sizeof(struct ipa_flt_rule_add));
+ flt_rule_entry.at_rear = true;
+ flt_rule_entry.flt_rule_hdl = -1;
+ flt_rule_entry.status = -1;
+
+ flt_rule_entry.rule.retain_hdr = 1;
+ flt_rule_entry.rule.to_uc = 0;
+ flt_rule_entry.rule.eq_attrib_type = 1;
+ flt_rule_entry.rule.action = IPA_PASS_TO_ROUTING;
+#ifdef FEATURE_IPA_V3
+ flt_rule_entry.rule.hashable = true;
+#endif
+ flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_DST_ADDR;
+ flt_rule_entry.rule.attrib.u.v6.dst_addr[0] = get_client_memptr(eth_client, client_index)->v6_addr[v6_num][0];
+ flt_rule_entry.rule.attrib.u.v6.dst_addr[1] = get_client_memptr(eth_client, client_index)->v6_addr[v6_num][1];
+ flt_rule_entry.rule.attrib.u.v6.dst_addr[2] = get_client_memptr(eth_client, client_index)->v6_addr[v6_num][2];
+ flt_rule_entry.rule.attrib.u.v6.dst_addr[3] = get_client_memptr(eth_client, client_index)->v6_addr[v6_num][3];
+ flt_rule_entry.rule.attrib.u.v6.dst_addr_mask[0] = 0xFFFFFFFF;
+ flt_rule_entry.rule.attrib.u.v6.dst_addr_mask[1] = 0xFFFFFFFF;
+ flt_rule_entry.rule.attrib.u.v6.dst_addr_mask[2] = 0xFFFFFFFF;
+ flt_rule_entry.rule.attrib.u.v6.dst_addr_mask[3] = 0xFFFFFFFF;
+
+ IPACMDBG_H("ipv6 address got: 0x%x:%x:%x:%x\n", get_client_memptr(eth_client, client_index)->v6_addr[v6_num][0],
+ get_client_memptr(eth_client, client_index)->v6_addr[v6_num][1],
+ get_client_memptr(eth_client, client_index)->v6_addr[v6_num][2],
+ get_client_memptr(eth_client, client_index)->v6_addr[v6_num][3]);
+
+ /* change to network order for modem */
+ change_to_network_order(IPA_IP_v6, &flt_rule_entry.rule.attrib);
+
+ memset(&flt_eq, 0, sizeof(flt_eq));
+ memcpy(&flt_eq.attrib, &flt_rule_entry.rule.attrib, sizeof(flt_eq.attrib));
+ flt_eq.ip = IPA_IP_v6;
+
+ fd = open(IPA_DEVICE_NAME, O_RDWR);
+ if (fd < 0)
+ {
+ IPACMERR("Failed opening %s.\n", IPA_DEVICE_NAME);
+ free(pFilteringTable);
+ return IPACM_FAILURE;
+ }
+
+ if(0 != ioctl(fd, IPA_IOC_GENERATE_FLT_EQ, &flt_eq))
+ {
+ IPACMERR("Failed to get eq_attrib\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ memcpy(&flt_rule_entry.rule.eq_attrib,
+ &flt_eq.eq_attrib,
+ sizeof(flt_rule_entry.rule.eq_attrib));
+ memcpy(&(pFilteringTable->rules[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_add));
+
+ if(false == m_filtering.AddOffloadFilteringRule(pFilteringTable, mux_id))
+ {
+ IPACMERR("Failed to install WAN DL filtering table.\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
+ get_client_memptr(eth_client, client_index)->v6_rt_rule_id[v6_num] = pFilteringTable->rules[0].flt_rule_hdl;
+
+fail:
+ close(fd);
+ if(pFilteringTable != NULL)
+ {
+ free(pFilteringTable);
+ }
+ return res;
+}
+
+int IPACM_Lan::del_connection(int client_index, int v6_num)
+{
+ int len, res = IPACM_SUCCESS;
+ ipa_ioc_del_flt_rule *pFilteringTable = NULL;
+
+ struct ipa_flt_rule_del flt_rule_entry;
+
+ IPACMDBG("\n");
+ len = sizeof(struct ipa_ioc_del_flt_rule) + sizeof(struct ipa_flt_rule_del);
+ pFilteringTable = (struct ipa_ioc_del_flt_rule*)malloc(len);
+ if (pFilteringTable == NULL)
+ {
+ IPACMERR("Error Locate ipa_ioc_del_flt_rule memory...\n");
+ return IPACM_FAILURE;
+ }
+ memset(pFilteringTable, 0, len);
+
+
+ pFilteringTable->commit = 1;
+ pFilteringTable->ip = IPA_IP_v6;
+ pFilteringTable->num_hdls = (uint8_t)1;
+
+ /* Configuring Software-Routing Filtering Rule */
+ memset(&flt_rule_entry, 0, sizeof(struct ipa_flt_rule_del));
+ flt_rule_entry.hdl = get_client_memptr(eth_client, client_index)->v6_rt_rule_id[v6_num];
+
+ memcpy(&(pFilteringTable->hdl[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_del));
+
+ if(false == m_filtering.DelOffloadFilteringRule(pFilteringTable))
+ {
+ IPACMERR("Failed to install WAN DL filtering table.\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ get_client_memptr(eth_client, client_index)->v6_rt_rule_id[v6_num] = 0;
+
+fail:
+ if(pFilteringTable != NULL)
+ {
+ free(pFilteringTable);
+ }
+ return res;
+}
diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index edd546d..103e1b8 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013, 2018 The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -69,7 +69,7 @@
char IPACM_Wan::wan_up_dev_name[IF_NAME_LEN];
-bool IPACM_Wan::backhaul_is_sta_mode = false;
+ipacm_wan_iface_type IPACM_Wan::backhaul_mode = Q6_WAN;
bool IPACM_Wan::is_ext_prop_set = false;
int IPACM_Wan::num_ipv4_modem_pdn = 0;
@@ -108,7 +108,6 @@
wan_route_rule_v6_hdl_a5 = (uint32_t *)calloc(iface_query->num_tx_props, sizeof(uint32_t));
IPACMDBG_H("IPACM->IPACM_Wan(%d) constructor: Tx:%d\n", ipa_if_num, iface_query->num_tx_props);
}
- m_is_sta_mode = is_sta_mode;
wan_v4_addr_set = false;
wan_v4_addr_gw_set = false;
@@ -153,14 +152,26 @@
}
- if(m_is_sta_mode == Q6_WAN)
+ if(is_sta_mode == Q6_WAN)
{
- IPACMDBG_H("The new WAN interface is modem.\n");
- is_default_gateway = false;
query_ext_prop();
+
+ if ((iface_query->num_ext_props == 1) && (ext_prop->ext[0].ip = IPA_IP_MAX))
+ {
+ /* only has one ext properties with IP_MAX type, will be the mhi-modem */
+ IPACMDBG_H("One extended property for iface %s, replace %d to Q6_MHI_WAN\n", dev_name, is_sta_mode);
+ m_is_sta_mode = Q6_MHI_WAN;
+ }
+ else
+ {
+ IPACMDBG_H("The new WAN interface is modem.\n");
+ m_is_sta_mode = is_sta_mode;
+ is_default_gateway = false;
+ }
}
else
{
+ m_is_sta_mode = is_sta_mode;
IPACMDBG_H("The new WAN interface is WLAN STA.\n");
}
@@ -336,6 +347,11 @@
IPACMDBG_H("Now the number of modem ipv6 pdn is %d.\n", num_ipv6_modem_pdn);
init_fl_rule_ex(data->iptype);
}
+ else if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ IPACMDBG_H(" Has rx/tx properties registered for iface %s, add for NATTING for ip-family %d \n", dev_name, IPA_IP_v6);
+ IPACM_Iface::ipacmcfg->AddNatIfaces(dev_name, IPA_IP_v6);
+ }
else
{
init_fl_rule(data->iptype);
@@ -499,6 +515,11 @@
IPACMDBG_H("Now the number of modem ipv4 pdn is %d.\n", num_ipv4_modem_pdn);
init_fl_rule_ex(data->iptype);
}
+ else if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ IPACMDBG_H(" Has rx/tx properties registered for iface %s, add for NATTING for ip-family %d \n", dev_name, IPA_IP_v4);
+ IPACM_Iface::ipacmcfg->AddNatIfaces(dev_name, IPA_IP_v4);
+ }
else
{
init_fl_rule(data->iptype);
@@ -527,11 +548,231 @@
IPACMDBG_H("number of default route rules %d\n", num_dft_rt_v6);
fail:
- free(rt_rule);
-
+ if (rt_rule != NULL)
+ {
+ free(rt_rule);
+ }
return res;
}
+/* handle new_address event */
+int IPACM_Wan::handle_addr_evt_mhi_q6(ipacm_event_data_addr *data)
+{
+ uint32_t num_ipv6_addr;
+ int res = IPACM_SUCCESS;
+ struct ipa_ioc_add_rt_rule *rt_rule = NULL;
+ struct ipa_rt_rule_add *rt_rule_entry;
+ struct ipa_ioc_get_hdr hdr;
+ const int NUM_RULES = 1;
+
+#ifdef FEATURE_IPACM_HAL
+ IPACM_OffloadManager* OffloadMng;
+#endif
+
+ memset(&hdr, 0, sizeof(hdr));
+ if(tx_prop == NULL || rx_prop == NULL)
+ {
+ IPACMDBG_H("Either tx or rx property is NULL, return.\n");
+ return IPACM_SUCCESS;
+ }
+ /* Update the IP Type. */
+ config_ip_type(data->iptype);
+
+ if (data->iptype == IPA_IP_v6)
+ {
+ for(num_ipv6_addr=0;num_ipv6_addr<num_dft_rt_v6;num_ipv6_addr++)
+ {
+ if((ipv6_addr[num_ipv6_addr][0] == data->ipv6_addr[0]) &&
+ (ipv6_addr[num_ipv6_addr][1] == data->ipv6_addr[1]) &&
+ (ipv6_addr[num_ipv6_addr][2] == data->ipv6_addr[2]) &&
+ (ipv6_addr[num_ipv6_addr][3] == data->ipv6_addr[3]))
+ {
+ IPACMDBG_H("find matched ipv6 address, index:%d \n", num_ipv6_addr);
+ return IPACM_SUCCESS;
+ break;
+ }
+ }
+
+ ipv6_addr[num_dft_rt_v6][0] = data->ipv6_addr[0];
+ ipv6_addr[num_dft_rt_v6][1] = data->ipv6_addr[1];
+ ipv6_addr[num_dft_rt_v6][2] = data->ipv6_addr[2];
+ ipv6_addr[num_dft_rt_v6][3] = data->ipv6_addr[3];
+
+ /* store ipv6 prefix if the ipv6 address is not link local */
+ if(is_global_ipv6_addr(data->ipv6_addr))
+ {
+ memcpy(ipv6_prefix, data->ipv6_addr, sizeof(ipv6_prefix));
+ }
+ num_dft_rt_v6++;
+ if (num_dft_rt_v6 == 1)
+ {
+ /* 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 for ip-family %d \n", dev_name, IPA_IP_v6);
+ IPACM_Iface::ipacmcfg->AddNatIfaces(dev_name, IPA_IP_v6);
+ }
+ /* skylar setup v6-wan-tbl */
+ rt_rule = (struct ipa_ioc_add_rt_rule *)
+ calloc(1, sizeof(struct ipa_ioc_add_rt_rule) +
+ NUM_RULES * sizeof(struct ipa_rt_rule_add));
+ if (!rt_rule)
+ {
+ IPACMERR("Error Locate ipa_ioc_add_rt_rule memory...\n");
+ return IPACM_FAILURE;
+ }
+
+ rt_rule->commit = 1;
+ rt_rule->num_rules = NUM_RULES;
+ rt_rule->ip = data->iptype;
+ strlcpy(rt_rule->rt_tbl_name, IPACM_Iface::ipacmcfg->rt_tbl_wan_v6.name, sizeof(rt_rule->rt_tbl_name));
+ rt_rule_entry = &rt_rule->rules[0];
+ strlcpy(hdr.name, tx_prop->tx[0].hdr_name, sizeof(hdr.name));
+ hdr.name[IPA_RESOURCE_NAME_MAX-1] = '\0';
+ if(m_header.GetHeaderHandle(&hdr) == false)
+ {
+ IPACMERR("Failed to get QMAP header.\n");
+ free(rt_rule);
+ return IPACM_FAILURE;
+ }
+ rt_rule_entry->rule.hdr_hdl = hdr.hdl;
+ rt_rule_entry->rule.dst = IPA_CLIENT_APPS_LAN_CONS;
+ rt_rule_entry->at_rear = false;
+ rt_rule_entry->rule.attrib.attrib_mask = IPA_FLT_DST_ADDR;
+ /* still need setup v4 default routing rule to A5*/
+ rt_rule_entry->rule.attrib.attrib_mask = IPA_FLT_DST_ADDR;
+ rt_rule_entry->rule.attrib.u.v6.dst_addr[0] = data->ipv6_addr[0];
+ rt_rule_entry->rule.attrib.u.v6.dst_addr[1] = data->ipv6_addr[1];
+ rt_rule_entry->rule.attrib.u.v6.dst_addr[2] = data->ipv6_addr[2];
+ rt_rule_entry->rule.attrib.u.v6.dst_addr[3] = data->ipv6_addr[3];
+ rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[0] = 0xFFFFFFFF;
+ rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[1] = 0xFFFFFFFF;
+ rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[2] = 0xFFFFFFFF;
+ rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[3] = 0xFFFFFFFF;
+ ipv6_addr[0][0] = data->ipv6_addr[0];
+ ipv6_addr[0][1] = data->ipv6_addr[1];
+ ipv6_addr[0][2] = data->ipv6_addr[2];
+ ipv6_addr[0][3] = data->ipv6_addr[3];
+#ifdef FEATURE_IPA_V3
+ rt_rule_entry->rule.hashable = false;
+#endif
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ free(rt_rule);
+ return IPACM_FAILURE;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ free(rt_rule);
+ return rt_rule_entry->status;
+ }
+ dft_rt_rule_hdl[1] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv6 wan iface rt-rule hdll=0x%x\n", dft_rt_rule_hdl[1]);
+ }
+ }
+ else
+ {
+ if(wan_v4_addr_set)
+ {
+ /* check iface ipv4 same or not */
+ if(data->ipv4_addr == wan_v4_addr)
+ {
+ IPACMDBG_H("Already setup device (%s) ipv4 and it didn't change(0x%x)\n", dev_name, data->ipv4_addr);
+ return IPACM_SUCCESS;
+ }
+ else
+ {
+ IPACMDBG_H(" device (%s) ipv4 addr is changed\n", dev_name);
+ /* Delete default v4 RT rule */
+ IPACMDBG_H("Delete default v4 routing rules\n");
+ if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[0], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing old RT rule deletion failed!\n");
+ return IPACM_FAILURE;
+ }
+ }
+ }
+ /* only do one time */
+ if(!wan_v4_addr_set)
+ {
+ /* 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 for ip-family %d \n", dev_name, IPA_IP_v4);
+ IPACM_Iface::ipacmcfg->AddNatIfaces(dev_name, IPA_IP_v4);
+ }
+
+ rt_rule = (struct ipa_ioc_add_rt_rule *)
+ calloc(1, sizeof(struct ipa_ioc_add_rt_rule) +
+ NUM_RULES * sizeof(struct ipa_rt_rule_add));
+
+ if (!rt_rule)
+ {
+ IPACMERR("Error Locate ipa_ioc_add_rt_rule memory...\n");
+ return IPACM_FAILURE;
+ }
+
+ rt_rule->commit = 1;
+ rt_rule->num_rules = NUM_RULES;
+ rt_rule->ip = data->iptype;
+ rt_rule_entry = &rt_rule->rules[0];
+ strlcpy(hdr.name, tx_prop->tx[0].hdr_name, sizeof(hdr.name));
+ hdr.name[IPA_RESOURCE_NAME_MAX-1] = '\0';
+ if(m_header.GetHeaderHandle(&hdr) == false)
+ {
+ IPACMERR("Failed to get QMAP header.\n");
+ free(rt_rule);
+ return IPACM_FAILURE;
+ }
+ rt_rule_entry->rule.hdr_hdl = hdr.hdl;
+ rt_rule_entry->rule.dst = IPA_CLIENT_APPS_LAN_CONS;
+ rt_rule_entry->at_rear = false;
+ rt_rule_entry->rule.attrib.attrib_mask = IPA_FLT_DST_ADDR;
+ /* still need setup v4 default routing rule to A5*/
+ strlcpy(rt_rule->rt_tbl_name, IPACM_Iface::ipacmcfg->rt_tbl_lan_v4.name, sizeof(rt_rule->rt_tbl_name));
+ rt_rule_entry->rule.attrib.u.v4.dst_addr = data->ipv4_addr;
+ rt_rule_entry->rule.attrib.u.v4.dst_addr_mask = 0xFFFFFFFF;
+#ifdef FEATURE_IPA_V3
+ rt_rule_entry->rule.hashable = false;
+#endif
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ free(rt_rule);
+ return IPACM_FAILURE;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ free(rt_rule);
+ return rt_rule_entry->status;
+ }
+ dft_rt_rule_hdl[0] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv4 wan iface rt-rule hdll=0x%x\n", dft_rt_rule_hdl[0]);
+ }
+
+ wan_v4_addr = data->ipv4_addr;
+ wan_v4_addr_set = true;
+ IPACMDBG_H("Receved wan ipv4-addr:0x%x\n",wan_v4_addr);
+ free(rt_rule);
+ }
+
+#ifdef FEATURE_IPACM_HAL
+ /* check if having pending set_upstream cache*/
+ OffloadMng = IPACM_OffloadManager::GetInstance();
+ if (OffloadMng == NULL) {
+ IPACMERR("failed to get IPACM_OffloadManager instance !\n");
+ } else {
+ IPACMDBG_H(" check iface %s if having set_upstream cache events\n", dev_name);
+ OffloadMng->search_framwork_cache(dev_name);
+ }
+#endif
+ IPACMDBG_H("number of default route rules %d\n", num_dft_rt_v6);
+
+ return res;
+}
void IPACM_Wan::event_callback(ipa_cm_event_id event, void *param)
{
int ipa_interface_index;
@@ -681,7 +922,7 @@
delete this;
return;
}
- else if (m_is_sta_mode == ECM_WAN)
+ else if ((m_is_sta_mode == ECM_WAN) || (m_is_sta_mode == Q6_MHI_WAN))
{
IPACMDBG_H("Received IPA_LINK_DOWN_EVENT(wan_mode:%d)\n", m_is_sta_mode);
/* delete previous instance */
@@ -716,8 +957,16 @@
if( (data->iptype == IPA_IP_v4)
|| ((data->iptype==IPA_IP_v6) && (num_dft_rt_v6!=MAX_DEFAULT_v6_ROUTE_RULES)))
{
- IPACMDBG_H("Got IPA_ADDR_ADD_EVENT ip-family:%d, v6 num %d: \n",data->iptype,num_dft_rt_v6);
- handle_addr_evt(data);
+ if (m_is_sta_mode == Q6_MHI_WAN)
+ {
+ IPACMDBG_H("Got handle_addr_evt_mhi_q6 ip-family:%d, v6 num %d: \n",data->iptype,num_dft_rt_v6);
+ handle_addr_evt_mhi_q6(data);
+ }
+ else
+ {
+ IPACMDBG_H("Got handle_addr_evt ip-family:%d, v6 num %d: \n",data->iptype,num_dft_rt_v6);
+ handle_addr_evt(data);
+ }
/* checking if SW-RT_enable */
if (IPACM_Iface::ipacmcfg->ipa_sw_rt_enable == true &&
m_is_sta_mode != Q6_WAN)
@@ -764,7 +1013,7 @@
#endif
if (active_v4 == false)
{
- handle_route_add_evt(data->iptype); //sky
+ handle_route_add_evt(data->iptype);
}
}
#ifdef FEATURE_IPA_ANDROID
@@ -825,6 +1074,11 @@
install_wan_filtering_rule(false);
handle_route_del_evt_ex(IPA_IP_v4);
}
+ else if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ /* only need cleanup rt-rule*/
+ handle_route_del_evt(IPA_IP_v4);
+ }
else
{
del_dft_firewall_rules(IPA_IP_v4);
@@ -841,6 +1095,11 @@
install_wan_filtering_rule(false);
handle_route_del_evt_ex(IPA_IP_v6);
}
+ else if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ /* only need cleanup rt-rule*/
+ handle_route_del_evt(IPA_IP_v6);
+ }
else
{
del_dft_firewall_rules(IPA_IP_v6);
@@ -890,6 +1149,11 @@
install_wan_filtering_rule(false);
handle_route_del_evt_ex(IPA_IP_v4);
}
+ else if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ /* only need cleanup rt-rule*/
+ handle_route_del_evt(IPA_IP_v4);
+ }
else
{
del_dft_firewall_rules(IPA_IP_v4);
@@ -919,6 +1183,12 @@
install_wan_filtering_rule(false);
handle_route_del_evt_ex(IPA_IP_v6);
}
+ else if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ /* only need cleanup rt-rule*/
+ handle_route_del_evt(IPA_IP_v6);
+ }
+
else
{
del_dft_firewall_rules(IPA_IP_v6);
@@ -1229,7 +1499,7 @@
break;
case IPA_WLAN_SWITCH_TO_SCC:
- if(IPACM_Wan::backhaul_is_sta_mode == true)
+ if(IPACM_Wan::backhaul_mode == WLAN_WAN)
{
IPACMDBG_H("Received IPA_WLAN_SWITCH_TO_SCC\n");
if(ip_type == IPA_IP_MAX)
@@ -1248,7 +1518,7 @@
break;
case IPA_WLAN_SWITCH_TO_MCC:
- if(IPACM_Wan::backhaul_is_sta_mode == true)
+ if(IPACM_Wan::backhaul_mode == WLAN_WAN)
{
IPACMDBG_H("Received IPA_WLAN_SWITCH_TO_MCC\n");
if(ip_type == IPA_IP_MAX)
@@ -1267,7 +1537,7 @@
break;
#ifdef FEATURE_IPACM_HAL
/* WA for WLAN to clean up NAT instance during SSR */
- case IPA_SSR_NOTICE: //sky
+ case IPA_SSR_NOTICE:
case IPA_WLAN_FWR_SSR_BEFORE_SHUTDOWN_NOTICE:
IPACMDBG_H("Received IPA_SSR_NOTICE event.\n");
if(m_is_sta_mode == WLAN_WAN)
@@ -1323,25 +1593,9 @@
}
IPACMDBG_H("backhaul_is_wan_bridge ?: %d \n", IPACM_Wan::backhaul_is_wan_bridge);
- if (m_is_sta_mode !=Q6_WAN)
+ if (m_is_sta_mode ==Q6_WAN)
{
- IPACM_Wan::backhaul_is_sta_mode = true;
- if((iptype==IPA_IP_v4) && (header_set_v4 != true))
- {
- header_partial_default_wan_v4 = true;
- IPACMDBG_H("STA ipv4-header haven't constructed \n");
- return IPACM_SUCCESS;
- }
- else if((iptype==IPA_IP_v6) && (header_set_v6 != true))
- {
- header_partial_default_wan_v6 = true;
- IPACMDBG_H("STA ipv6-header haven't constructed \n");
- return IPACM_SUCCESS;
- }
- }
- else
- {
- IPACM_Wan::backhaul_is_sta_mode = false;
+ IPACM_Wan::backhaul_mode = m_is_sta_mode;
IPACMDBG_H("reset backhaul to LTE \n");
if (iface_query != NULL && iface_query->num_ext_props > 0)
@@ -1363,53 +1617,38 @@
return IPACM_FAILURE;
}
}
-#if 0
- for (cnt=0; cnt<tx_prop->num_tx_props; cnt++)
+ else if (m_is_sta_mode == Q6_MHI_WAN)
{
- if(tx_prop->tx[cnt].ip==iptype)
- break;
+ if (iface_query != NULL && iface_query->num_ext_props > 0)
+ {
+ /* treat Q6_MHI_WAN as STA mode also */
+ IPACMDBG_H("Q6-MHI ipv4/v6-header already constructed \n");
+ IPACM_Wan::backhaul_mode = m_is_sta_mode;
+ IPACMDBG_H("Setting up QMAP ID %d.\n", ext_prop->ext[0].mux_id);
+ IPACM_Iface::ipacmcfg->SetQmapId(ext_prop->ext[0].mux_id);
+ }
+ else
+ {
+ IPACMERR("iface_query is empty.\n");
+ return IPACM_FAILURE;
+ }
}
-
- if(tx_prop->tx[cnt].hdr_name != NULL)
+ else
{
- memset(&sCopyHeader, 0, sizeof(sCopyHeader));
- memcpy(sCopyHeader.name,
- tx_prop->tx[cnt].hdr_name,
- sizeof(sCopyHeader.name));
-
- IPACMDBG_H("header name: %s\n", sCopyHeader.name);
- if (m_header.CopyHeader(&sCopyHeader) == false)
- {
- IPACMERR("ioctl copy header failed");
- return IPACM_FAILURE;
- }
- IPACMDBG_H("header length: %d, paritial: %d\n", sCopyHeader.hdr_len, sCopyHeader.is_partial);
- if(sCopyHeader.is_partial)
- {
- IPACMDBG_H("Not setup default WAN routing rules cuz the header is not complete\n");
- if(iptype==IPA_IP_v4)
- {
- header_partial_default_wan_v4 = true;
- }
- else
- {
- header_partial_default_wan_v6 = true;
- }
+ IPACM_Wan::backhaul_mode = m_is_sta_mode;
+ if((iptype==IPA_IP_v4) && (header_set_v4 != true))
+ {
+ header_partial_default_wan_v4 = true;
+ IPACMDBG_H("STA ipv4-header haven't constructed \n");
return IPACM_SUCCESS;
- }
- else
- {
- if(iptype==IPA_IP_v4)
- {
- header_partial_default_wan_v4 = false;
- }
- else
- {
- header_partial_default_wan_v6 = false;
- }
- }
- }
-#endif
+ }
+ else if((iptype==IPA_IP_v6) && (header_set_v6 != true))
+ {
+ header_partial_default_wan_v6 = true;
+ IPACMDBG_H("STA ipv6-header haven't constructed \n");
+ return IPACM_SUCCESS;
+ }
+ }
rt_rule = (struct ipa_ioc_add_rt_rule *)
calloc(1, sizeof(struct ipa_ioc_add_rt_rule) +
@@ -1454,15 +1693,33 @@
rt_rule_entry->rule.hdr_hdl = hdr_hdl_sta_v6;
}
- if(IPACM_Iface::ipacmcfg->isMCC_Mode == true)
+ /* replace the hdr handle for q6_PCIE*/
+ if(m_is_sta_mode == Q6_MHI_WAN)
{
- IPACMDBG_H("In MCC mode, use alt dst pipe: %d\n",
- tx_prop->tx[tx_index].alt_dst_pipe);
- rt_rule_entry->rule.dst = tx_prop->tx[tx_index].alt_dst_pipe;
+ memset(&hdr, 0, sizeof(hdr));
+ strlcpy(hdr.name, tx_prop->tx[tx_index].hdr_name, sizeof(hdr.name));
+ hdr.name[IPA_RESOURCE_NAME_MAX-1] = '\0';
+ if(m_header.GetHeaderHandle(&hdr) == false)
+ {
+ IPACMERR("Failed to get QMAP header.\n");
+ free(rt_rule);
+ return IPACM_FAILURE;
+ }
+ rt_rule_entry->rule.hdr_hdl = hdr.hdl;
+ rt_rule_entry->rule.dst = tx_prop->tx[tx_index].dst_pipe;
}
else
{
- rt_rule_entry->rule.dst = tx_prop->tx[tx_index].dst_pipe;
+ if(IPACM_Iface::ipacmcfg->isMCC_Mode == true)
+ {
+ IPACMDBG_H("In MCC mode, use alt dst pipe: %d\n",
+ tx_prop->tx[tx_index].alt_dst_pipe);
+ rt_rule_entry->rule.dst = tx_prop->tx[tx_index].alt_dst_pipe;
+ }
+ else
+ {
+ rt_rule_entry->rule.dst = tx_prop->tx[tx_index].dst_pipe;
+ }
}
memcpy(&rt_rule_entry->rule.attrib,
&tx_prop->tx[tx_index].attrib,
@@ -1519,7 +1776,7 @@
/* add a catch-all rule in wan dl routing table */
- if (iptype == IPA_IP_v6)
+ if (iptype == IPA_IP_v6 && m_is_sta_mode != Q6_MHI_WAN)
{
strlcpy(rt_rule->rt_tbl_name, IPACM_Iface::ipacmcfg->rt_tbl_wan_v6.name, sizeof(rt_rule->rt_tbl_name));
memset(rt_rule_entry, 0, sizeof(struct ipa_rt_rule_add));
@@ -1532,6 +1789,7 @@
if(m_header.GetHeaderHandle(&hdr) == false)
{
IPACMERR("Failed to get QMAP header.\n");
+ free(rt_rule);
return IPACM_FAILURE;
}
rt_rule_entry->rule.hdr_hdl = hdr.hdl;
@@ -1583,6 +1841,7 @@
}
memset(wanup_data, 0, sizeof(ipacm_event_iface_up));
+ /* handling filter rule construction */
if (iptype == IPA_IP_v4)
{
IPACM_Wan::wan_up = true;
@@ -1603,17 +1862,10 @@
memcpy(wanup_data->ifname, dev_name, sizeof(wanup_data->ifname));
wanup_data->ipv4_addr = wan_v4_addr;
- if (m_is_sta_mode!=Q6_WAN)
- {
- wanup_data->is_sta = true;
- }
- else
- {
- wanup_data->is_sta = false;
- }
+ wanup_data->backhaul_type = m_is_sta_mode;
IPACMDBG_H("Posting IPA_HANDLE_WAN_UP with below information:\n");
IPACMDBG_H("if_name:%s, ipv4_address:0x%x, is sta mode:%d\n",
- wanup_data->ifname, wanup_data->ipv4_addr, wanup_data->is_sta);
+ wanup_data->ifname, wanup_data->ipv4_addr, wanup_data->backhaul_type);
memset(&evt_data, 0, sizeof(evt_data));
/* set backhaul type as xlat */
@@ -1628,15 +1880,15 @@
IPACMDBG_H("xlat_enabled: %d xlat_mux_id: %d \n",
IPACM_Wan::is_xlat, xlat_mux_id);
}
- else
+ else /*temp put xlat = 0 for Q6_MHI_WAN*/
{
IPACM_Wan::xlat_mux_id = 0;
wanup_data->xlat_mux_id = 0;
- if(m_is_sta_mode == Q6_WAN)
+ if(m_is_sta_mode != WLAN_WAN) //both q6_wan/q6_mhi_wan
wanup_data->mux_id = ext_prop->ext[0].mux_id;
else
wanup_data->mux_id = 0;
- IPACMDBG_H("No xlat configuration\n");
+ IPACMDBG_H("No xlat configuration mux-id %d %d\n", ext_prop->ext[0].mux_id, wanup_data->mux_id);
}
evt_data.event = IPA_HANDLE_WAN_UP;
evt_data.evt_data = (void *)wanup_data;
@@ -1668,17 +1920,10 @@
}
memcpy(wanup_data->ifname, dev_name, sizeof(wanup_data->ifname));
- if (m_is_sta_mode!=Q6_WAN)
- {
- wanup_data->is_sta = true;
- }
- else
- {
- wanup_data->is_sta = false;
- }
+ wanup_data->backhaul_type = m_is_sta_mode;
memcpy(wanup_data->ipv6_prefix, ipv6_prefix, sizeof(wanup_data->ipv6_prefix));
IPACMDBG_H("Posting IPA_HANDLE_WAN_UP_V6 with below information:\n");
- IPACMDBG_H("if_name:%s, is sta mode: %d\n", wanup_data->ifname, wanup_data->is_sta);
+ IPACMDBG_H("if_name:%s, is sta mode: %d\n", wanup_data->ifname, wanup_data->backhaul_type);
IPACMDBG_H("ipv6 prefix: 0x%08x%08x.\n", ipv6_prefix[0], ipv6_prefix[1]);
memset(&evt_data, 0, sizeof(evt_data));
evt_data.event = IPA_HANDLE_WAN_UP_V6;
@@ -1689,20 +1934,22 @@
post_wan_up_tether_evt(IPA_IP_v6, 0);
#endif
}
- if(IPACM_Iface::ipacmcfg->GetIPAVer() >= IPA_HW_None && IPACM_Iface::ipacmcfg->GetIPAVer() < IPA_HW_v4_0)
- {
+
+ if(IPACM_Iface::ipacmcfg->GetIPAVer() >= IPA_HW_None && IPACM_Iface::ipacmcfg->GetIPAVer() < IPA_HW_v4_0)
+ {
/* Add corresponding ipa_rm_resource_name of TX-endpoint up before IPV6 RT-rule set */
IPACMDBG_H("dev %s add producer dependency\n", dev_name);
IPACMDBG_H("depend Got pipe %d rm index : %d \n", tx_prop->tx[0].dst_pipe, IPACM_Iface::ipacmcfg->ipa_client_rm_map_tbl[tx_prop->tx[0].dst_pipe]);
IPACM_Iface::ipacmcfg->AddRmDepend(IPACM_Iface::ipacmcfg->ipa_client_rm_map_tbl[tx_prop->tx[0].dst_pipe],false);
#ifdef WAN_IOC_NOTIFY_WAN_STATE
- } else {
- if (m_is_sta_mode == Q6_WAN && ipa_pm_q6_check == 0)
+ } else {
+ if ((m_is_sta_mode == Q6_WAN && ipa_pm_q6_check == 0 ) || (m_is_sta_mode == Q6_MHI_WAN))
{
fd_wwan_ioctl = open(WWAN_QMI_IOCTL_DEVICE_NAME, O_RDWR);
if(fd_wwan_ioctl < 0)
{
IPACMERR("Failed to open %s.\n",WWAN_QMI_IOCTL_DEVICE_NAME);
+ free(rt_rule);
return false;
}
IPACMDBG_H("send WAN_IOC_NOTIFY_WAN_STATE up to IPA_PM\n");
@@ -1715,10 +1962,9 @@
}
ipa_pm_q6_check++;
IPACMDBG_H("update ipa_pm_q6_check to %d\n", ipa_pm_q6_check);
-
- }
+ }
#else
-}
+ }
#endif
if(rt_rule != NULL)
{
@@ -1743,14 +1989,7 @@
memset(wanup_data, 0, sizeof(ipacm_event_iface_up_tehter));
wanup_data->if_index_tether = ipa_if_num_tether;
- if (m_is_sta_mode!=Q6_WAN)
- {
- wanup_data->is_sta = true;
- }
- else
- {
- wanup_data->is_sta = false;
- }
+ wanup_data->backhaul_type = m_is_sta_mode;
/* xlat mux-id*/
if(is_xlat && (m_is_sta_mode == Q6_WAN))
wanup_data->xlat_mux_id = ext_prop->ext[0].mux_id;
@@ -1758,7 +1997,8 @@
wanup_data->xlat_mux_id = 0;
IPACMDBG_H("Posting IPA_HANDLE_WAN_UP_TETHER with below information:\n");
IPACMDBG_H("tether_if_name:%s, is sta mode:%d xlat_mux_id: %d\n",
- IPACM_Iface::ipacmcfg->iface_table[ipa_if_num_tether].iface_name, wanup_data->is_sta, wanup_data->xlat_mux_id);
+ IPACM_Iface::ipacmcfg->iface_table[ipa_if_num_tether].iface_name, wanup_data->backhaul_type, wanup_data->xlat_mux_id);
+
memset(&evt_data, 0, sizeof(evt_data));
if (iptype == IPA_IP_v4)
@@ -1810,17 +2050,10 @@
memset(wandown_data, 0, sizeof(ipacm_event_iface_up_tehter));
wandown_data->if_index_tether = ipa_if_num_tether;
- if (m_is_sta_mode!=Q6_WAN)
- {
- wandown_data->is_sta = true;
- }
- else
- {
- wandown_data->is_sta = false;
- }
+ wandown_data->backhaul_type = m_is_sta_mode;
IPACMDBG_H("Posting IPA_HANDLE_WAN_DOWN_TETHER with below information:\n");
IPACMDBG_H("tether_if_name:%s, is sta mode:%d\n",
- IPACM_Iface::ipacmcfg->iface_table[ipa_if_num_tether].iface_name, wandown_data->is_sta);
+ IPACM_Iface::ipacmcfg->iface_table[ipa_if_num_tether].iface_name, wandown_data->backhaul_type);
memset(&evt_data, 0, sizeof(evt_data));
if (iptype == IPA_IP_v4)
@@ -2017,29 +2250,35 @@
memset(&firewall_config, 0, sizeof(firewall_config));
strlcpy(firewall_config.firewall_config_file, "/etc/mobileap_firewall.xml", sizeof(firewall_config.firewall_config_file));
- IPACMDBG_H("Firewall XML file is %s \n", firewall_config.firewall_config_file);
- if (IPACM_SUCCESS == IPACM_read_firewall_xml(firewall_config.firewall_config_file, &firewall_config))
+ if(m_is_sta_mode != Q6_MHI_WAN)
{
- IPACMDBG_H("QCMAP Firewall XML read OK \n");
- /* find the number of v4/v6 firewall rules */
- for (i = 0; i < firewall_config.num_extd_firewall_entries; i++)
+ IPACMDBG_H("Firewall XML file is %s \n", firewall_config.firewall_config_file);
+ if (IPACM_SUCCESS == IPACM_read_firewall_xml(firewall_config.firewall_config_file, &firewall_config))
{
- if (firewall_config.extd_firewall_entries[i].ip_vsn == 4)
+ IPACMDBG_H("QCMAP Firewall XML read OK \n");
+ /* find the number of v4/v6 firewall rules */
+ for (i = 0; i < firewall_config.num_extd_firewall_entries; i++)
{
- rule_v4++;
+ if (firewall_config.extd_firewall_entries[i].ip_vsn == 4)
+ {
+ rule_v4++;
+ }
+ else
+ {
+ rule_v6++;
+ }
}
- else
- {
- rule_v6++;
- }
+ IPACMDBG_H("firewall rule v4:%d v6:%d total:%d\n", rule_v4, rule_v6, firewall_config.num_extd_firewall_entries);
}
- IPACMDBG_H("firewall rule v4:%d v6:%d total:%d\n", rule_v4, rule_v6, firewall_config.num_extd_firewall_entries);
+ else
+ {
+ IPACMERR("QCMAP Firewall XML read failed, no that file, use default configuration \n");
+ }
}
else
{
- IPACMERR("QCMAP Firewall XML read failed, no that file, use default configuration \n");
+ IPACMDBG_H("in Q6_MHI_WAN mode, skip firewall, use default configuration \n");
}
-
/* construct ipa_ioc_add_flt_rule with N firewall rules */
ipa_ioc_add_flt_rule *m_pFilteringTable = NULL;
len = sizeof(struct ipa_ioc_add_flt_rule) + 1 * sizeof(struct ipa_flt_rule_add);
@@ -2157,6 +2396,13 @@
flt_rule_entry.rule.attrib.u.v4.dst_addr_mask = 0x00000000;
flt_rule_entry.rule.attrib.u.v4.dst_addr = 0x00000000;
+ /* disble meta-data filtering */
+ if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ flt_rule_entry.rule.attrib.attrib_mask &= ~((uint32_t)IPA_FLT_META_DATA);
+ IPACMDBG_H("disable meta-data filtering 0x%x\n", flt_rule_entry.rule.attrib.attrib_mask);
+ }
+
memcpy(&(m_pFilteringTable->rules[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_add));
if (false == m_filtering.AddFilteringRule(m_pFilteringTable))
@@ -2399,40 +2645,44 @@
m_pFilteringTable->ip = IPA_IP_v6;
m_pFilteringTable->num_rules = (uint8_t)1;
- /* Construct ICMP rule */
- memset(&flt_rule_entry, 0, sizeof(struct ipa_flt_rule_add));
- flt_rule_entry.at_rear = true;
- flt_rule_entry.flt_rule_hdl = -1;
- flt_rule_entry.status = -1;
- flt_rule_entry.rule.retain_hdr = 1;
- flt_rule_entry.rule.eq_attrib_type = 0;
- flt_rule_entry.rule.action = IPA_PASS_TO_EXCEPTION;
+ if(m_is_sta_mode != Q6_MHI_WAN)
+ {
+ /* Construct ICMP rule */
+ memset(&flt_rule_entry, 0, sizeof(struct ipa_flt_rule_add));
+ flt_rule_entry.at_rear = true;
+ flt_rule_entry.flt_rule_hdl = -1;
+ flt_rule_entry.status = -1;
+ flt_rule_entry.rule.retain_hdr = 1;
+ flt_rule_entry.rule.eq_attrib_type = 0;
+ flt_rule_entry.rule.action = IPA_PASS_TO_EXCEPTION;
#ifdef FEATURE_IPA_V3
flt_rule_entry.rule.hashable = true;
#endif
- memcpy(&flt_rule_entry.rule.attrib,
- &rx_prop->rx[0].attrib,
- sizeof(struct ipa_rule_attrib));
- flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_NEXT_HDR;
- flt_rule_entry.rule.attrib.u.v6.next_hdr = (uint8_t)IPACM_FIREWALL_IPPROTO_ICMP6;
- memcpy(&(m_pFilteringTable->rules[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_add));
-
- if (false == m_filtering.AddFilteringRule(m_pFilteringTable))
- {
- IPACMERR("Error Adding Filtering rules, aborting...\n");
- free(m_pFilteringTable);
- return IPACM_FAILURE;
+ memcpy(&flt_rule_entry.rule.attrib,
+ &rx_prop->rx[0].attrib,
+ sizeof(struct ipa_rule_attrib));
+ flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_NEXT_HDR;
+ flt_rule_entry.rule.attrib.u.v6.next_hdr = (uint8_t)IPACM_FIREWALL_IPPROTO_ICMP6;
+ memcpy(&(m_pFilteringTable->rules[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_add));
+ if (false == m_filtering.AddFilteringRule(m_pFilteringTable))
+ {
+ IPACMERR("Error Adding Filtering rules, aborting...\n");
+ free(m_pFilteringTable);
+ return IPACM_FAILURE;
+ }
+ else
+ {
+ IPACM_Iface::ipacmcfg->increaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, 1);
+ IPACMDBG_H("flt rule hdl0=0x%x, status=0x%x\n", m_pFilteringTable->rules[0].flt_rule_hdl, m_pFilteringTable->rules[0].status);
+ }
+ /* copy filter hdls */
+ dft_wan_fl_hdl[2] = m_pFilteringTable->rules[0].flt_rule_hdl;
+ /* End of construct ICMP rule */
}
else
{
- IPACM_Iface::ipacmcfg->increaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, 1);
- IPACMDBG_H("flt rule hdl0=0x%x, status=0x%x\n", m_pFilteringTable->rules[0].flt_rule_hdl, m_pFilteringTable->rules[0].status);
+ IPACMDBG_H("in Q6_MHI_WAN mode, skip ICMPv6 flt rule \n");
}
- /* copy filter hdls */
- dft_wan_fl_hdl[2] = m_pFilteringTable->rules[0].flt_rule_hdl;
-
- /* End of construct ICMP rule */
-
/* v6 default route */
memset(&flt_rule_entry, 0, sizeof(struct ipa_flt_rule_add));
if (false == m_routing.GetRoutingTable(&IPACM_Iface::ipacmcfg->rt_tbl_wan_v6)) //rt_tbl_wan_v6 rt_tbl_v6
@@ -2447,25 +2697,24 @@
flt_rule_entry.rule.rt_tbl_hdl = IPACM_Iface::ipacmcfg->rt_tbl_wan_v6.hdl;
/* firewall disable, all traffic are allowed */
- if(firewall_config.firewall_enable == true)
+ if(firewall_config.firewall_enable == true)
{
- flt_rule_entry.at_rear = true;
-
- /* default action for v6 is PASS_TO_ROUTE unless user set to exception*/
- if(firewall_config.rule_action_accept == true)
- {
- flt_rule_entry.rule.action = IPA_PASS_TO_EXCEPTION;
- }
- else
- {
+ flt_rule_entry.at_rear = true;
+ /* default action for v6 is PASS_TO_ROUTE unless user set to exception*/
+ if(firewall_config.rule_action_accept == true)
+ {
+ flt_rule_entry.rule.action = IPA_PASS_TO_EXCEPTION;
+ }
+ else
+ {
flt_rule_entry.rule.action = IPA_PASS_TO_ROUTING;
- }
- }
+ }
+ }
else
{
flt_rule_entry.at_rear = true;
flt_rule_entry.rule.action = IPA_PASS_TO_ROUTING;
- }
+ }
#ifdef FEATURE_IPA_V3
flt_rule_entry.rule.hashable = true;
#endif
@@ -2481,6 +2730,12 @@
flt_rule_entry.rule.attrib.u.v6.dst_addr[1] = 0x00000000;
flt_rule_entry.rule.attrib.u.v6.dst_addr[2] = 0x00000000;
flt_rule_entry.rule.attrib.u.v6.dst_addr[3] = 0X00000000;
+ /* disble meta-data filtering */
+ if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ flt_rule_entry.rule.attrib.attrib_mask &= ~((uint32_t)IPA_FLT_META_DATA);
+ IPACMDBG_H("disable meta-data filtering 0x%x\n", flt_rule_entry.rule.attrib.attrib_mask);
+ }
memcpy(&(m_pFilteringTable->rules[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_add));
@@ -3995,7 +4250,7 @@
if (num_firewall_v4 != 0)
{
if (m_filtering.DeleteFilteringHdls(firewall_hdl_v4,
- IPA_IP_v4, num_firewall_v4) == false)
+ IPA_IP_v4, num_firewall_v4) == false)
{
IPACMERR("Error Deleting Filtering rules, aborting...\n");
return IPACM_FAILURE;
@@ -4008,7 +4263,7 @@
}
if (m_filtering.DeleteFilteringHdls(dft_wan_fl_hdl,
- IPA_IP_v4, 1) == false)
+ IPA_IP_v4, 1) == false)
{
IPACMERR("Error Deleting Filtering rules, aborting...\n");
return IPACM_FAILURE;
@@ -4029,7 +4284,7 @@
if (num_firewall_v6 != 0)
{
if (m_filtering.DeleteFilteringHdls(firewall_hdl_v6,
- IPA_IP_v6, num_firewall_v6) == false)
+ IPA_IP_v6, num_firewall_v6) == false)
{
IPACMERR("Error Deleting Filtering rules, aborting...\n");
return IPACM_FAILURE;
@@ -4042,20 +4297,27 @@
}
if (m_filtering.DeleteFilteringHdls(&dft_wan_fl_hdl[1],
- IPA_IP_v6, 1) == false)
+ IPA_IP_v6, 1) == false)
{
IPACMERR("Error Deleting Filtering rules, aborting...\n");
return IPACM_FAILURE;
}
- IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, 1);
- if (m_filtering.DeleteFilteringHdls(&dft_wan_fl_hdl[2],
- IPA_IP_v6, 1) == false)
- {
- IPACMERR("Error Deleting Filtering rules, aborting...\n");
- return IPACM_FAILURE;
- }
- IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, 1);
+ if(m_is_sta_mode != Q6_MHI_WAN)
+ {
+ IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, 1);
+ if (m_filtering.DeleteFilteringHdls(&dft_wan_fl_hdl[2],
+ IPA_IP_v6, 1) == false)
+ {
+ IPACMERR("Error Deleting Filtering rules, aborting...\n");
+ return IPACM_FAILURE;
+ }
+ IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, 1);
+ }
+ else
+ {
+ IPACMDBG_H("in Q6_MHI_WAN mode, skip ICMPv6 flt rule deletion\n");
+ }
if (is_ipv6_frag_firewall_flt_rule_installed &&
check_dft_firewall_rules_attr_mask(&firewall_config))
{
@@ -4069,7 +4331,6 @@
}
num_firewall_v6 = 0;
}
-
return IPACM_SUCCESS;
}
@@ -4078,6 +4339,11 @@
{
uint32_t tx_index;
ipacm_cmd_q_data evt_data;
+#ifdef WAN_IOC_NOTIFY_WAN_STATE
+ struct wan_ioctl_notify_wan_state wan_state;
+ int fd_wwan_ioctl;
+ memset(&wan_state, 0, sizeof(wan_state));
+#endif
IPACMDBG_H("got handle_route_del_evt for STA-mode with ip-family:%d \n", iptype);
@@ -4100,6 +4366,31 @@
IPACMDBG_H("depend Got pipe %d rm index : %d \n", tx_prop->tx[0].dst_pipe, IPACM_Iface::ipacmcfg->ipa_client_rm_map_tbl[tx_prop->tx[0].dst_pipe]);
IPACM_Iface::ipacmcfg->DelRmDepend(IPACM_Iface::ipacmcfg->ipa_client_rm_map_tbl[tx_prop->tx[0].dst_pipe]);
}
+ else
+ {
+ /* change wan_state for Q6_MHI */
+ IPACMDBG_H("ipa_pm_q6_check to %d\n", ipa_pm_q6_check);
+ if(ipa_pm_q6_check == 1 && m_is_sta_mode == Q6_MHI_WAN)
+ {
+ fd_wwan_ioctl = open(WWAN_QMI_IOCTL_DEVICE_NAME, O_RDWR);
+ if(fd_wwan_ioctl < 0)
+ {
+ IPACMERR("Failed to open %s.\n",WWAN_QMI_IOCTL_DEVICE_NAME);
+ return false;
+ }
+ IPACMDBG_H("send WAN_IOC_NOTIFY_WAN_STATE down to IPA_PM\n");
+ if(ioctl(fd_wwan_ioctl, WAN_IOC_NOTIFY_WAN_STATE, &wan_state))
+ {
+ IPACMERR("Failed to send WAN_IOC_NOTIFY_WAN_STATE as up %d\n ", wan_state.up);
+ }
+ close(fd_wwan_ioctl);
+ }
+ if (ipa_pm_q6_check > 0)
+ ipa_pm_q6_check--;
+ else
+ IPACMERR(" ipa_pm_q6_check becomes negative !!!\n");
+ }
+
for (tx_index = 0; tx_index < iface_query->num_tx_props; tx_index++)
{
if(iptype != tx_prop->tx[tx_index].ip)
@@ -4132,7 +4423,7 @@
}
/* Delete the default wan route*/
- if (iptype == IPA_IP_v6)
+ if (iptype == IPA_IP_v6 && m_is_sta_mode != Q6_MHI_WAN)
{
IPACMDBG_H("ip-type %d: default v6 wan RT-rule deleted\n",iptype);
if (m_routing.DeleteRoutingHdl(wan_route_rule_v6_hdl_a5[0], IPA_IP_v6) == false)
@@ -4153,14 +4444,7 @@
if (iptype == IPA_IP_v4)
{
wandown_data->ipv4_addr = wan_v4_addr;
- if (m_is_sta_mode!=Q6_WAN)
- {
- wandown_data->is_sta = true;
- }
- else
- {
- wandown_data->is_sta = false;
- }
+ wandown_data->backhaul_type = m_is_sta_mode;
evt_data.event = IPA_HANDLE_WAN_DOWN;
evt_data.evt_data = (void *)wandown_data;
/* Insert IPA_HANDLE_WAN_DOWN to command queue */
@@ -4185,14 +4469,8 @@
}
else
{
- if (m_is_sta_mode!=Q6_WAN)
- {
- wandown_data->is_sta = true;
- }
- else
- {
- wandown_data->is_sta = false;
- }
+
+ wandown_data->backhaul_type = m_is_sta_mode;
memcpy(wandown_data->ipv6_prefix, ipv6_prefix, sizeof(wandown_data->ipv6_prefix));
evt_data.event = IPA_HANDLE_WAN_DOWN_V6;
evt_data.evt_data = (void *)wandown_data;
@@ -4298,14 +4576,7 @@
if (iptype == IPA_IP_v4)
{
wandown_data->ipv4_addr = wan_v4_addr;
- if (m_is_sta_mode!=Q6_WAN)
- {
- wandown_data->is_sta = true;
- }
- else
- {
- wandown_data->is_sta = false;
- }
+ wandown_data->backhaul_type = m_is_sta_mode;
evt_data.event = IPA_HANDLE_WAN_DOWN;
evt_data.evt_data = (void *)wandown_data;
/* Insert IPA_HANDLE_WAN_DOWN to command queue */
@@ -4326,14 +4597,8 @@
}
else
{
- if (m_is_sta_mode!=Q6_WAN)
- {
- wandown_data->is_sta = true;
- }
- else
- {
- wandown_data->is_sta = false;
- }
+
+ wandown_data->backhaul_type = m_is_sta_mode;
memcpy(wandown_data->ipv6_prefix, ipv6_prefix, sizeof(wandown_data->ipv6_prefix));
evt_data.event = IPA_HANDLE_WAN_DOWN_V6;
evt_data.evt_data = (void *)wandown_data;
@@ -4526,6 +4791,18 @@
handle_route_del_evt(IPA_IP_v4);
IPACMDBG_H("Delete default v4 routing rules\n");
+ if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ /* Delete default v4 RT rule */
+ IPACMDBG_H("Delete default v4 routing rules\n");
+ if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[0], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing v6-lan-RT rule deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ }
+
#ifdef FEATURE_IPA_ANDROID
/* posting wan_down_tether for lan clients */
#ifdef FEATURE_IPACM_HAL
@@ -4555,6 +4832,19 @@
}
handle_route_del_evt(IPA_IP_v6);
IPACMDBG_H("Delete default v6 routing rules\n");
+
+ if(m_is_sta_mode == Q6_MHI_WAN)
+ {
+ /* Delete default v6 RT rule */
+ IPACMDBG_H("Delete default v6 routing rules\n");
+ if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[1], IPA_IP_v6) == false)
+ {
+ IPACMERR("Routing v6-wan-RT rule deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ }
+
#ifdef FEATURE_IPA_ANDROID
/* posting wan_down_tether for lan clients */
#ifdef FEATURE_IPACM_HAL
@@ -4576,26 +4866,13 @@
#endif
}
- /* Delete default v4 RT rule */
- if (ip_type != IPA_IP_v6)
+ if(m_is_sta_mode != Q6_MHI_WAN)
{
- IPACMDBG_H("Delete default v4 routing rules\n");
- if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[0], IPA_IP_v4) == false)
+ /* Delete default v4 RT rule */
+ if (ip_type != IPA_IP_v6)
{
- IPACMERR("Routing rule deletion failed!\n");
- res = IPACM_FAILURE;
- goto fail;
- }
- }
-
- /* delete default v6 RT rule */
- if (ip_type != IPA_IP_v4)
- {
- IPACMDBG_H("Delete default v6 routing rules\n");
- /* May have multiple ipv6 iface-routing rules*/
- for (i = 0; i < 2*num_dft_rt_v6; i++)
- {
- if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES+i], IPA_IP_v6) == false)
+ IPACMDBG_H("Delete default v4 routing rules\n");
+ if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[0], IPA_IP_v4) == false)
{
IPACMERR("Routing rule deletion failed!\n");
res = IPACM_FAILURE;
@@ -4603,130 +4880,136 @@
}
}
- IPACMDBG_H("finished delete default v6 RT rules\n ");
- }
-
-
- /* clean wan-client header, routing rules */
- IPACMDBG_H("left %d wan clients need to be deleted \n ", num_wan_client);
- for (i = 0; i < num_wan_client; i++)
- {
- /* Del NAT rules before ipv4 RT rules are delete */
- if(get_client_memptr(wan_client, i)->ipv4_set == true)
+ /* delete default v6 RT rule */
+ if (ip_type != IPA_IP_v4)
+ {
+ IPACMDBG_H("Delete default v6 routing rules\n");
+ /* May have multiple ipv6 iface-routing rules*/
+ for (i = 0; i < 2*num_dft_rt_v6; i++)
{
- IPACMDBG_H("Clean Nat Rules for ipv4:0x%x\n", get_client_memptr(wan_client, i)->v4_addr);
- CtList->HandleSTAClientDelEvt(get_client_memptr(wan_client, i)->v4_addr);
- }
-
- if (delete_wan_rtrules(i, IPA_IP_v4))
- {
- IPACMERR("unbale to delete wan-client v4 route rules for index %d\n", i);
- res = IPACM_FAILURE;
- goto fail;
- }
-
- if (delete_wan_rtrules(i, IPA_IP_v6))
- {
- IPACMERR("unbale to delete ecm-client v6 route rules for index %d\n", i);
- res = IPACM_FAILURE;
- goto fail;
- }
-
- IPACMDBG_H("Delete %d client header\n", num_wan_client);
-
-
- if(get_client_memptr(wan_client, i)->ipv4_header_set == true)
- {
- if (m_header.DeleteHeaderHdl(get_client_memptr(wan_client, i)->hdr_hdl_v4)
- == false)
+ if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES+i], IPA_IP_v6) == false)
{
+ IPACMERR("Routing rule deletion failed!\n");
res = IPACM_FAILURE;
goto fail;
}
}
+ IPACMDBG_H("finished delete default v6 RT rules\n ");
+ }
+ /* clean wan-client header, routing rules */
+ IPACMDBG_H("left %d wan clients need to be deleted \n ", num_wan_client);
+ for (i = 0; i < num_wan_client; i++)
+ {
+ /* Del NAT rules before ipv4 RT rules are delete */
+ if(get_client_memptr(wan_client, i)->ipv4_set == true)
+ {
+ IPACMDBG_H("Clean Nat Rules for ipv4:0x%x\n", get_client_memptr(wan_client, i)->v4_addr);
+ CtList->HandleSTAClientDelEvt(get_client_memptr(wan_client, i)->v4_addr);
+ }
- if(get_client_memptr(wan_client, i)->ipv6_header_set == true)
+ if (delete_wan_rtrules(i, IPA_IP_v4))
+ {
+ IPACMERR("unbale to delete wan-client v4 route rules for index %d\n", i);
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
+ if (delete_wan_rtrules(i, IPA_IP_v6))
+ {
+ IPACMERR("unbale to delete ecm-client v6 route rules for index %d\n", i);
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
+ IPACMDBG_H("Delete %d client header\n", num_wan_client);
+ if(get_client_memptr(wan_client, i)->ipv4_header_set == true)
+ {
+ if (m_header.DeleteHeaderHdl(get_client_memptr(wan_client, i)->hdr_hdl_v4)
+ == false)
+ {
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ }
+ if(get_client_memptr(wan_client, i)->ipv6_header_set == true)
+ {
+ if (m_header.DeleteHeaderHdl(get_client_memptr(wan_client, i)->hdr_hdl_v6)
+ == false)
+ {
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ }
+ } /* end of for loop */
+ /* free the edm clients cache */
+ IPACMDBG_H("Free wan clients cache\n");
+
+ /* check software routing fl rule hdl */
+ if (softwarerouting_act == true)
+ {
+ handle_software_routing_disable();
+ }
+ /* free dft ipv4 filter rule handlers if any */
+ if (ip_type != IPA_IP_v6 && rx_prop != NULL)
+ {
+ if (dft_v4fl_rule_hdl[0] != 0)
{
- if (m_header.DeleteHeaderHdl(get_client_memptr(wan_client, i)->hdr_hdl_v6)
- == false)
+ if (m_filtering.DeleteFilteringHdls(dft_v4fl_rule_hdl,
+ IPA_IP_v4,
+ IPV4_DEFAULT_FILTERTING_RULES) == false)
+ {
+ IPACMERR("Error Delete Filtering rules, aborting...\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v4, IPV4_DEFAULT_FILTERTING_RULES);
+ IPACMDBG_H("finished delete default v4 filtering rules\n ");
+ }
+ }
+ /* free dft ipv6 filter rule handlers if any */
+ if (ip_type != IPA_IP_v4 && rx_prop != NULL)
+ {
+ if (dft_v6fl_rule_hdl[0] != 0)
{
+ if (m_filtering.DeleteFilteringHdls(dft_v6fl_rule_hdl,
+ IPA_IP_v6,
+ IPV6_DEFAULT_FILTERTING_RULES) == false)
+ {
+ IPACMERR("ErrorDeleting Filtering rule, aborting...\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, IPV6_DEFAULT_FILTERTING_RULES);
+ }
+ if(num_ipv6_dest_flt_rule > 0 && num_ipv6_dest_flt_rule <= MAX_DEFAULT_v6_ROUTE_RULES)
+ {
+ if(m_filtering.DeleteFilteringHdls(ipv6_dest_flt_rule_hdl, IPA_IP_v6, num_ipv6_dest_flt_rule) == false)
+ {
+ IPACMERR("Failed to delete ipv6 dest flt rules.\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, num_ipv6_dest_flt_rule);
+ }
+ IPACMDBG_H("finished delete default v6 filtering rules\n ");
+ }
+ if(hdr_proc_hdl_dummy_v6)
+ {
+ if(m_header.DeleteHeaderProcCtx(hdr_proc_hdl_dummy_v6) == false)
+ {
+ IPACMERR("Failed to delete hdr_proc_hdl_dummy_v6\n");
res = IPACM_FAILURE;
goto fail;
}
- }
- } /* end of for loop */
-
- /* free the edm clients cache */
- IPACMDBG_H("Free wan clients cache\n");
-
- /* check software routing fl rule hdl */
- if (softwarerouting_act == true)
- {
- handle_software_routing_disable();
- }
-
- /* free dft ipv4 filter rule handlers if any */
- if (ip_type != IPA_IP_v6 && rx_prop != NULL)
- {
- if (dft_v4fl_rule_hdl[0] != 0)
+ }
+ if(hdr_hdl_dummy_v6)
{
- if (m_filtering.DeleteFilteringHdls(dft_v4fl_rule_hdl,
- IPA_IP_v4,
- IPV4_DEFAULT_FILTERTING_RULES) == false)
+ if (m_header.DeleteHeaderHdl(hdr_hdl_dummy_v6) == false)
{
- IPACMERR("Error Delete Filtering rules, aborting...\n");
+ IPACMERR("Failed to delete hdr_hdl_dummy_v6\n");
res = IPACM_FAILURE;
goto fail;
}
- IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v4, IPV4_DEFAULT_FILTERTING_RULES);
- IPACMDBG_H("finished delete default v4 filtering rules\n ");
- }
- }
-
- /* free dft ipv6 filter rule handlers if any */
- if (ip_type != IPA_IP_v4 && rx_prop != NULL)
- {
- if (dft_v6fl_rule_hdl[0] != 0)
- {
- if (m_filtering.DeleteFilteringHdls(dft_v6fl_rule_hdl,
- IPA_IP_v6,
- IPV6_DEFAULT_FILTERTING_RULES) == false)
- {
- IPACMERR("ErrorDeleting Filtering rule, aborting...\n");
- res = IPACM_FAILURE;
- goto fail;
- }
- IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, IPV6_DEFAULT_FILTERTING_RULES);
- }
-
- if(num_ipv6_dest_flt_rule > 0 && num_ipv6_dest_flt_rule <= MAX_DEFAULT_v6_ROUTE_RULES)
- {
- if(m_filtering.DeleteFilteringHdls(ipv6_dest_flt_rule_hdl, IPA_IP_v6, num_ipv6_dest_flt_rule) == false)
- {
- IPACMERR("Failed to delete ipv6 dest flt rules.\n");
- res = IPACM_FAILURE;
- goto fail;
- }
- IPACM_Iface::ipacmcfg->decreaseFltRuleCount(rx_prop->rx[0].src_pipe, IPA_IP_v6, num_ipv6_dest_flt_rule);
- }
- IPACMDBG_H("finished delete default v6 filtering rules\n ");
- }
- if(hdr_proc_hdl_dummy_v6)
- {
- if(m_header.DeleteHeaderProcCtx(hdr_proc_hdl_dummy_v6) == false)
- {
- IPACMERR("Failed to delete hdr_proc_hdl_dummy_v6\n");
- res = IPACM_FAILURE;
- goto fail;
- }
- }
- if(hdr_hdl_dummy_v6)
- {
- if (m_header.DeleteHeaderHdl(hdr_hdl_dummy_v6) == false)
- {
- IPACMERR("Failed to delete hdr_hdl_dummy_v6\n");
- res = IPACM_FAILURE;
- goto fail;
}
}
fail:
@@ -5320,57 +5603,6 @@
return res;
}
-void IPACM_Wan::change_to_network_order(ipa_ip_type iptype, ipa_rule_attrib* attrib)
-{
- if(attrib == NULL)
- {
- IPACMERR("Attribute pointer is NULL.\n");
- return;
- }
-
- if(iptype == IPA_IP_v6)
- {
- int i;
- for(i=0; i<4; i++)
- {
- attrib->u.v6.src_addr[i] = htonl(attrib->u.v6.src_addr[i]);
- attrib->u.v6.src_addr_mask[i] = htonl(attrib->u.v6.src_addr_mask[i]);
- attrib->u.v6.dst_addr[i] = htonl(attrib->u.v6.dst_addr[i]);
- attrib->u.v6.dst_addr_mask[i] = htonl(attrib->u.v6.dst_addr_mask[i]);
- }
- }
- else
- {
- IPACMDBG_H("IP type is not IPv6, do nothing: %d\n", iptype);
- }
-
- return;
-}
-
-bool IPACM_Wan::is_global_ipv6_addr(uint32_t* ipv6_addr)
-{
- if(ipv6_addr == NULL)
- {
- IPACMERR("IPv6 address is empty.\n");
- return false;
- }
- IPACMDBG_H("Get ipv6 address with first word 0x%08x.\n", ipv6_addr[0]);
-
- uint32_t ipv6_link_local_prefix, ipv6_link_local_prefix_mask;
- ipv6_link_local_prefix = 0xFE800000;
- ipv6_link_local_prefix_mask = 0xFFC00000;
- if((ipv6_addr[0] & ipv6_link_local_prefix_mask) == (ipv6_link_local_prefix & ipv6_link_local_prefix_mask))
- {
- IPACMDBG_H("This IPv6 address is link local.\n");
- return false;
- }
- else
- {
- IPACMDBG_H("This IPv6 address is not link local.\n");
- return true;
- }
-}
-
/* handle STA WAN-client */
/* handle WAN client initial, construct full headers (tx property) */
int IPACM_Wan::handle_wan_hdr_init(uint8_t *mac_addr)
diff --git a/ipacm/src/IPACM_Wlan.cpp b/ipacm/src/IPACM_Wlan.cpp
index 25b25fd..af74be4 100644
--- a/ipacm/src/IPACM_Wlan.cpp
+++ b/ipacm/src/IPACM_Wlan.cpp
@@ -295,7 +295,7 @@
{
if(data->iptype == IPA_IP_v4 || data->iptype == IPA_IP_MAX)
{
- if(IPACM_Wan::backhaul_is_sta_mode == false)
+ if(IPACM_Wan::backhaul_mode == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v4);
IPACM_Lan::handle_wan_up_ex(ext_prop, IPA_IP_v4,
@@ -318,7 +318,7 @@
memcpy(ipv6_prefix, IPACM_Wan::backhaul_ipv6_prefix, sizeof(ipv6_prefix));
install_ipv6_prefix_flt_rule(IPACM_Wan::backhaul_ipv6_prefix);
- if(IPACM_Wan::backhaul_is_sta_mode == false)
+ if(IPACM_Wan::backhaul_mode == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v6);
IPACM_Lan::handle_wan_up_ex(ext_prop, IPA_IP_v6, 0);
@@ -366,7 +366,7 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s xlat_mux_id: %d\n", data_wan_tether->is_sta,
+ IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s xlat_mux_id: %d\n", data_wan_tether->backhaul_type,
data_wan_tether->if_index_tether,
IPACM_Iface::ipacmcfg->iface_table[data_wan_tether->if_index_tether].iface_name,
data_wan_tether->xlat_mux_id);
@@ -387,7 +387,7 @@
if(is_downstream_set[IPA_IP_v4] == true)
{
IPACMDBG_H("Downstream was set before, adding UL rules.\n");
- if(data_wan_tether->is_sta == false)
+ if(data_wan_tether->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v4);
handle_wan_up_ex(ext_prop, IPA_IP_v4,
@@ -398,7 +398,7 @@
}
}
#else
- if(data_wan_tether->is_sta == false)
+ if(data_wan_tether->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v4);
handle_wan_up_ex(ext_prop, IPA_IP_v4, 0);
@@ -418,7 +418,7 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->is_sta,
+ IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->backhaul_type,
data_wan_tether->if_index_tether,
IPACM_Iface::ipacmcfg->iface_table[data_wan_tether->if_index_tether].iface_name);
#ifndef FEATURE_IPACM_HAL
@@ -441,7 +441,7 @@
IPACMDBG_H("Downstream was set before, adding UL rules.\n");
memcpy(ipv6_prefix, data_wan_tether->ipv6_prefix, sizeof(ipv6_prefix));
install_ipv6_prefix_flt_rule(data_wan_tether->ipv6_prefix);
- if(data_wan_tether->is_sta == false)
+ if(data_wan_tether->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v6);
handle_wan_up_ex(ext_prop, IPA_IP_v6, 0);
@@ -453,7 +453,7 @@
}
}
#else
- if(data_wan_tether->is_sta == false)
+ if(data_wan_tether->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v6);
handle_wan_up_ex(ext_prop, IPA_IP_v6, 0);
@@ -479,7 +479,7 @@
IPACMERR("No rx prop.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->is_sta,
+ IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->backhaul_type,
data_wan_tether->if_index_tether,
IPACM_Iface::ipacmcfg->iface_table[data_wan_tether->if_index_tether].iface_name);
#ifndef FEATURE_IPACM_HAL
@@ -499,11 +499,11 @@
if(is_downstream_set[IPA_IP_v4] == true)
{
IPACMDBG_H("Downstream was set before, deleting UL rules.\n");
- handle_wan_down(data_wan_tether->is_sta);
+ handle_wan_down(data_wan_tether->backhaul_type);
}
}
#else
- handle_wan_down(data_wan_tether->is_sta);
+ handle_wan_down(data_wan_tether->backhaul_type);
#endif
}
break;
@@ -521,7 +521,7 @@
IPACMERR("No rx prop.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->is_sta,
+ IPACMDBG_H("Backhaul is sta mode?%d, if_index_tether:%d tether_if_name:%s\n", data_wan_tether->backhaul_type,
data_wan_tether->if_index_tether,
IPACM_Iface::ipacmcfg->iface_table[data_wan_tether->if_index_tether].iface_name);
#ifndef FEATURE_IPACM_HAL
@@ -543,13 +543,13 @@
IPACMDBG_H("Downstream was set before, deleting UL rules.\n");
/* reset usb-client ipv6 rt-rules */
handle_wlan_client_reset_rt(IPA_IP_v6);
- handle_wan_down_v6(data_wan_tether->is_sta);
+ handle_wan_down_v6(data_wan_tether->backhaul_type);
}
}
#else
/* reset usb-client ipv6 rt-rules */
handle_wlan_client_reset_rt(IPA_IP_v6);
- handle_wan_down_v6(data_wan_tether->is_sta);
+ handle_wan_down_v6(data_wan_tether->backhaul_type);
#endif
}
break;
@@ -597,7 +597,7 @@
install_ipv6_prefix_flt_rule(ipv6_prefix);
}
- if (IPACM_Wan::backhaul_is_sta_mode == false) /* LTE */
+ if (IPACM_Wan::backhaul_mode == Q6_WAN) /* LTE */
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(data->prefix.iptype);
if (data->prefix.iptype == IPA_IP_v4)
@@ -635,10 +635,10 @@
IPACMDBG_H("Upstream was set before, deleting UL rules.\n");
if (data->prefix.iptype == IPA_IP_v4)
{
- handle_wan_down(IPACM_Wan::backhaul_is_sta_mode); /* LTE STA */
+ handle_wan_down(IPACM_Wan::backhaul_mode); /* LTE STA */
} else {
handle_wlan_client_reset_rt(IPA_IP_v6);
- handle_wan_down_v6(IPACM_Wan::backhaul_is_sta_mode); /* LTE STA */
+ handle_wan_down_v6(IPACM_Wan::backhaul_mode); /* LTE STA */
}
}
}
@@ -655,10 +655,10 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->is_sta);
+ IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->backhaul_type);
if(ip_type == IPA_IP_v4 || ip_type == IPA_IP_MAX)
{
- if(data_wan->is_sta == false)
+ if(data_wan->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v4);
IPACM_Lan::handle_wan_up_ex(ext_prop, IPA_IP_v4, data_wan->xlat_mux_id);
@@ -679,13 +679,13 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->is_sta);
+ IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->backhaul_type);
if(ip_type == IPA_IP_v6 || ip_type == IPA_IP_MAX)
{
memcpy(ipv6_prefix, data_wan->ipv6_prefix, sizeof(ipv6_prefix));
install_ipv6_prefix_flt_rule(data_wan->ipv6_prefix);
- if(data_wan->is_sta == false)
+ if(data_wan->backhaul_type == Q6_WAN)
{
ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v6);
IPACM_Lan::handle_wan_up_ex(ext_prop, IPA_IP_v6, 0);
@@ -705,12 +705,12 @@
IPACMERR("No event data is found.\n");
return;
}
- IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->is_sta);
+ IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->backhaul_type);
if (rx_prop != NULL)
{
if(ip_type == IPA_IP_v4 || ip_type == IPA_IP_MAX)
{
- handle_wan_down(data_wan->is_sta);
+ handle_wan_down(data_wan->backhaul_type);
}
}
break;
@@ -727,12 +727,12 @@
IPACMDBG_H("Received IPA_WAN_V6_DOWN in WLAN-instance and need clean up client IPv6 address \n");
/* reset wifi-client ipv6 rt-rules */
handle_wlan_client_reset_rt(IPA_IP_v6);
- IPACMDBG_H("Backhaul is sta mode ? %d\n", data_wan->is_sta);
+ IPACMDBG_H("Backhaul is sta mode ? %d\n", data_wan->backhaul_type);
if (rx_prop != NULL)
{
if(ip_type == IPA_IP_v6 || ip_type == IPA_IP_MAX)
{
- handle_wan_down_v6(data_wan->is_sta);
+ handle_wan_down_v6(data_wan->backhaul_type);
}
}
break;
@@ -954,7 +954,7 @@
IPACMDBG_H("Received IPA_TETHERING_STATS_UPDATE_EVENT event.\n");
if (IPACM_Wan::isWanUP(ipa_if_num) || IPACM_Wan::isWanUP_V6(ipa_if_num))
{
- if(IPACM_Wan::backhaul_is_sta_mode == false) /* LTE */
+ if(IPACM_Wan::backhaul_mode == Q6_WAN) /* LTE */
{
ipa_get_data_stats_resp_msg_v01 *data = (ipa_get_data_stats_resp_msg_v01 *)param;
if (data->ipa_stats_type != QMI_IPA_STATS_TYPE_PIPE_V01)
@@ -1682,6 +1682,15 @@
IPACMDBG_H("tx:%d, rt rule hdl=%x ip-type: %d\n", tx_index,
get_client_memptr(wlan_client, wlan_index)->wifi_rt_hdl[tx_index].wifi_rt_rule_hdl_v6_wan[v6_num], iptype);
+
+ /* send client-v6 info to pcie modem only with global ipv6 with tx_index = 0 one time*/
+ if(is_global_ipv6_addr(get_client_memptr(wlan_client, wlan_index)->v6_addr[v6_num]) && (IPACM_Wan::backhaul_mode == Q6_MHI_WAN))
+ {
+ if (add_connection(wlan_index, v6_num))
+ {
+ IPACMERR("PCIE filter rule addition failed! (%d-client) %d v6-entry\n",wlan_index, v6_num);
+ }
+ }
}
}
@@ -1871,8 +1880,8 @@
/* delete wan filter rule */
if (IPACM_Wan::isWanUP(ipa_if_num) && rx_prop != NULL)
{
- IPACMDBG_H("LAN IF goes down, backhaul type %d\n", IPACM_Wan::backhaul_is_sta_mode);
- IPACM_Lan::handle_wan_down(IPACM_Wan::backhaul_is_sta_mode);
+ IPACMDBG_H("LAN IF goes down, backhaul type %d\n", IPACM_Wan::backhaul_mode);
+ IPACM_Lan::handle_wan_down(IPACM_Wan::backhaul_mode);
#ifdef FEATURE_IPA_ANDROID
#ifndef FEATURE_IPACM_HAL
/* Clean-up tethered-iface list */
@@ -1883,8 +1892,8 @@
if (IPACM_Wan::isWanUP_V6(ipa_if_num) && rx_prop != NULL)
{
- IPACMDBG_H("LAN IF goes down, backhaul type %d\n", IPACM_Wan::backhaul_is_sta_mode);
- handle_wan_down_v6(IPACM_Wan::backhaul_is_sta_mode);
+ IPACMDBG_H("LAN IF goes down, backhaul type %d\n", IPACM_Wan::backhaul_mode);
+ handle_wan_down_v6(IPACM_Wan::backhaul_mode);
#ifdef FEATURE_IPA_ANDROID
/* Clean-up tethered-iface list */
IPACM_Wan::delete_tether_iface(IPA_IP_v6, ipa_if_num);
@@ -2426,3 +2435,147 @@
{
return m_is_guest_ap;
}
+
+int IPACM_Wlan::add_connection(int client_index, int v6_num)
+{
+ int len, res = IPACM_SUCCESS;
+ uint8_t mux_id;
+ ipa_ioc_add_flt_rule *pFilteringTable = NULL;
+ int fd;
+
+ mux_id = IPACM_Iface::ipacmcfg->GetQmapId();
+ /* contruct filter rules to pcie modem */
+ struct ipa_flt_rule_add flt_rule_entry;
+ ipa_ioc_generate_flt_eq flt_eq;
+
+ IPACMDBG("\n");
+ len = sizeof(struct ipa_ioc_add_flt_rule) + sizeof(struct ipa_flt_rule_add);
+ pFilteringTable = (struct ipa_ioc_add_flt_rule*)malloc(len);
+ if (pFilteringTable == NULL)
+ {
+ IPACMERR("Error Locate ipa_flt_rule_add memory...\n");
+ return IPACM_FAILURE;
+ }
+ memset(pFilteringTable, 0, len);
+
+
+ pFilteringTable->commit = 1;
+ pFilteringTable->global = false;
+ pFilteringTable->ip = IPA_IP_v6;
+ pFilteringTable->num_rules = (uint8_t)1;
+
+ /* Configuring Filtering Rule */
+ memset(&flt_rule_entry, 0, sizeof(struct ipa_flt_rule_add));
+ flt_rule_entry.at_rear = true;
+ flt_rule_entry.flt_rule_hdl = -1;
+ flt_rule_entry.status = -1;
+
+ flt_rule_entry.rule.retain_hdr = 1;
+ flt_rule_entry.rule.to_uc = 0;
+ flt_rule_entry.rule.eq_attrib_type = 1;
+ flt_rule_entry.rule.action = IPA_PASS_TO_ROUTING;
+#ifdef FEATURE_IPA_V3
+ flt_rule_entry.rule.hashable = true;
+#endif
+ flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_DST_ADDR;
+ flt_rule_entry.rule.attrib.u.v6.dst_addr[0] = get_client_memptr(wlan_client, client_index)->v6_addr[v6_num][0];
+ flt_rule_entry.rule.attrib.u.v6.dst_addr[1] = get_client_memptr(wlan_client, client_index)->v6_addr[v6_num][1];
+ flt_rule_entry.rule.attrib.u.v6.dst_addr[2] = get_client_memptr(wlan_client, client_index)->v6_addr[v6_num][2];
+ flt_rule_entry.rule.attrib.u.v6.dst_addr[3] = get_client_memptr(wlan_client, client_index)->v6_addr[v6_num][3];
+ flt_rule_entry.rule.attrib.u.v6.dst_addr_mask[0] = 0xFFFFFFFF;
+ flt_rule_entry.rule.attrib.u.v6.dst_addr_mask[1] = 0xFFFFFFFF;
+ flt_rule_entry.rule.attrib.u.v6.dst_addr_mask[2] = 0xFFFFFFFF;
+ flt_rule_entry.rule.attrib.u.v6.dst_addr_mask[3] = 0xFFFFFFFF;
+
+ IPACMDBG_H("ipv6 address got: 0x%x:%x:%x:%x\n", get_client_memptr(wlan_client, client_index)->v6_addr[v6_num][0],
+ get_client_memptr(wlan_client, client_index)->v6_addr[v6_num][1],
+ get_client_memptr(wlan_client, client_index)->v6_addr[v6_num][2],
+ get_client_memptr(wlan_client, client_index)->v6_addr[v6_num][3]);
+
+ /* change to network order for modem */
+ change_to_network_order(IPA_IP_v6, &flt_rule_entry.rule.attrib);
+
+ memset(&flt_eq, 0, sizeof(flt_eq));
+ memcpy(&flt_eq.attrib, &flt_rule_entry.rule.attrib, sizeof(flt_eq.attrib));
+ flt_eq.ip = IPA_IP_v6;
+
+ fd = open(IPA_DEVICE_NAME, O_RDWR);
+ if (fd < 0)
+ {
+ IPACMERR("Failed opening %s.\n", IPA_DEVICE_NAME);
+ free(pFilteringTable);
+ return IPACM_FAILURE;
+ }
+
+ if(0 != ioctl(fd, IPA_IOC_GENERATE_FLT_EQ, &flt_eq))
+ {
+ IPACMERR("Failed to get eq_attrib\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ memcpy(&flt_rule_entry.rule.eq_attrib,
+ &flt_eq.eq_attrib,
+ sizeof(flt_rule_entry.rule.eq_attrib));
+ memcpy(&(pFilteringTable->rules[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_add));
+
+ if(false == m_filtering.AddOffloadFilteringRule(pFilteringTable, mux_id))
+ {
+ IPACMERR("Failed to install WAN DL filtering table.\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
+ get_client_memptr(wlan_client, client_index)->v6_rt_rule_id[v6_num] = pFilteringTable->rules[0].flt_rule_hdl;
+
+fail:
+ close(fd);
+ if(pFilteringTable != NULL)
+ {
+ free(pFilteringTable);
+ }
+ return res;
+}
+
+int IPACM_Wlan::del_connection(int client_index, int v6_num)
+{
+ int len, res = IPACM_SUCCESS;
+ ipa_ioc_del_flt_rule *pFilteringTable = NULL;
+
+ struct ipa_flt_rule_del flt_rule_entry;
+
+ IPACMDBG("\n");
+ len = sizeof(struct ipa_ioc_del_flt_rule) + sizeof(struct ipa_flt_rule_del);
+ pFilteringTable = (struct ipa_ioc_del_flt_rule*)malloc(len);
+ if (pFilteringTable == NULL)
+ {
+ IPACMERR("Error Locate ipa_ioc_del_flt_rule memory...\n");
+ return IPACM_FAILURE;
+ }
+ memset(pFilteringTable, 0, len);
+
+
+ pFilteringTable->commit = 1;
+ pFilteringTable->ip = IPA_IP_v6;
+ pFilteringTable->num_hdls = (uint8_t)1;
+
+ /* Configuring Software-Routing Filtering Rule */
+ memset(&flt_rule_entry, 0, sizeof(struct ipa_flt_rule_del));
+ flt_rule_entry.hdl = get_client_memptr(wlan_client, client_index)->v6_rt_rule_id[v6_num];
+
+ memcpy(&(pFilteringTable->hdl[0]), &flt_rule_entry, sizeof(struct ipa_flt_rule_del));
+
+ if(false == m_filtering.DelOffloadFilteringRule(pFilteringTable))
+ {
+ IPACMERR("Failed to install WAN DL filtering table.\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ get_client_memptr(wlan_client, client_index)->v6_rt_rule_id[v6_num] = 0;
+
+fail:
+ if(pFilteringTable != NULL)
+ {
+ free(pFilteringTable);
+ }
+ return res;
+}