MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tag 'LA.UM.10.2.1.r1-02700-sdm660.0' of https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/data-ipa-cfg-mgr into 12-4.19

Browse source 
"LA.UM.10.2.1.r1-02700-sdm660.0"

Signed-off-by: OdSazib <odsazib@gmail.com>
Change-Id: Ib2decfac960d6a2c58150fb533f88cfe30fde09d
Signed-off-by: pix106 <sbordenave@gmail.com>
This commit is contained in:
OdSazib 2021-11-12 20:08:28 +06:00 committed by pix106
parent aafd6958ff
commit f87f2e57eb
18 changed files with 65 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data-ipa-cfg-mgr/hal/Android.bp
View file

@ -12,6 +12,7 @@ cc_library_shared {
shared_libs: [
"libhidlbase",
"liblog",
"libcutils",
"libdl",
"libbase",
"libutils",

2
data-ipa-cfg-mgr/hal/src/CtUpdateAmbassador.cpp
View file

@ -33,7 +33,7 @@
/* External Includes */
#include <arpa/inet.h>
#include <log/log.h>
#include <cutils/log.h>
/* HIDL Includes */
#include <android/hardware/tetheroffload/control/1.0/ITetheringOffloadCallback.h>

2
data-ipa-cfg-mgr/hal/src/HAL.cpp
View file

@ -39,7 +39,7 @@
#include <linux/netfilter/nfnetlink_compat.h>
/* External Includes */
#include <log/log.h>
#include <cutils/log.h>
#include <cstring>
#include <sys/socket.h>
#include <sys/types.h>

2
data-ipa-cfg-mgr/hal/src/IpaEventRelay.cpp
View file

@ -28,7 +28,7 @@
*/
#define LOG_TAG "IPAHALService/IpaEventRelay"
/* External Includes */
#include <log/log.h>
#include <cutils/log.h>
/* HIDL Includes */
#include <android/hardware/tetheroffload/control/1.0/ITetheringOffloadCallback.h>

2
data-ipa-cfg-mgr/hal/src/LocalLogBuffer.cpp
View file

@ -29,7 +29,7 @@
#define LOG_TAG "IPAHALService/dump"
/* External Includes */
#include <log/log.h>
#include <cutils/log.h>
#include <deque>
#include <string>
#include <sys/types.h>

4
data-ipa-cfg-mgr/ipacm/Android.bp
View file

@ -3,9 +3,9 @@ cc_binary {
name: "ipacm",
local_include_dirs: ["src"] + ["inc"],
header_libs: ["generated_kernel_headers"],
header_libs: ["qti_kernel_headers"],
cflags: ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
cflags: ["-v"] + ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
"-DFEATURE_IPACM_HAL",
"-DDEBUG",
"-Wall",

3
data-ipa-cfg-mgr/ipacm/inc/IPACM_ConntrackClient.h
View file

@ -33,6 +33,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifndef in_addr_t
typedef uint32_t in_addr_t;
#endif
#include <arpa/inet.h>
#include <netinet/in.h>
#include <errno.h>

3
data-ipa-cfg-mgr/ipacm/inc/IPACM_ConntrackListener.h
View file

@ -35,6 +35,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string.h>
#include <fcntl.h>
#ifndef in_addr_t
typedef uint32_t in_addr_t;
#endif
#include <arpa/inet.h>
#include <netinet/in.h>
#include <errno.h>

1
data-ipa-cfg-mgr/ipacm/inc/IPACM_Netlink.h
View file

@ -52,7 +52,6 @@ extern "C"
#include <sys/select.h>
#include <sys/socket.h>
#include <linux/socket.h>
#include <inaddr.h>
#define sockaddr_storage __kernel_sockaddr_storage
#include <linux/if.h>
#include <linux/if_addr.h>

3
data-ipa-cfg-mgr/ipacm/inc/IPACM_Xml.h
View file

@ -45,6 +45,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifndef in_addr_t
typedef uint32_t in_addr_t;
#endif
#include <arpa/inet.h>
#include <stdint.h>
#include <libxml/parser.h>

3
data-ipa-cfg-mgr/ipacm/src/IPACM_ConntrackClient.cpp
View file

@ -31,6 +31,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#ifndef in_addr_t
typedef uint32_t in_addr_t;
#endif
#include <arpa/inet.h>
#include <netinet/in.h>
#include <sys/ioctl.h>

8
data-ipa-cfg-mgr/ipacm/src/IPACM_Lan.cpp
View file

@ -3335,7 +3335,7 @@ fail:
/* install UL filter rule from Q6 */
int IPACM_Lan::handle_uplink_filter_rule(ipacm_ext_prop *prop, ipa_ip_type iptype, uint8_t xlat_mux_id)
{
ipa_flt_rule_add flt_rule_entry;
static ipa_flt_rule_add flt_rule_entry;
int len = 0, cnt, ret = IPACM_SUCCESS;
ipa_ioc_add_flt_rule *pFilteringTable;
ipa_fltr_installed_notif_req_msg_v01 flt_index;
@ -6632,11 +6632,11 @@ int IPACM_Lan::construct_mtu_rule(struct ipa_flt_rule *rule, ipa_ip_type iptype,
&flt_eq.eq_attrib, sizeof(rule->eq_attrib));
//add IHL offsets
#ifdef FEATURE_IPA_V3
if(IPACM_Iface::ipacmcfg->GetIPAVer() >= IPA_HW_v3_0)
rule->eq_attrib.rule_eq_bitmap |= (1<<10);
#else
else
rule->eq_attrib.rule_eq_bitmap |= (1<<4);
#endif
rule->eq_attrib.num_ihl_offset_range_16 = 1;
if (iptype == IPA_IP_v4)
rule->eq_attrib.ihl_offset_range_16[0].offset = 0x82;

25
data-ipa-cfg-mgr/ipacm/src/IPACM_Wan.cpp
View file

@ -134,6 +134,10 @@ IPACM_Wan::IPACM_Wan(int iface_index,
is_ipv6_frag_firewall_flt_rule_installed = false;
ipv6_frag_firewall_flt_rule_hdl = 0;
icmpv6_exception_hdl = 0;
tcp_fin_hdl = 0;
tcp_rst_hdl = 0;
mtu_v4 = DEFAULT_MTU_SIZE;
mtu_v4_set = false;
mtu_v6 = DEFAULT_MTU_SIZE;
@ -7580,6 +7584,13 @@ int IPACM_Wan::add_offload_frag_rule()
uint8_t mux_id;
ipa_ioc_add_flt_rule *pFilteringTable = NULL;
/* Return if rules are there */
if (mhi_dl_v4_frag_hdl)
{
IPACMERR("frag rule have not been deleted. Don't install again\n");
return IPACM_FAILURE;
}
mux_id = ext_prop->ext[0].mux_id;
/* contruct filter rules to pcie modem */
struct ipa_flt_rule_add flt_rule_entry;
@ -7721,6 +7732,13 @@ int IPACM_Wan::add_icmpv6_exception_rule()
uint8_t mux_id;
ipa_ioc_add_flt_rule *pFilteringTable = NULL;
/* Return if rules are there */
if (icmpv6_exception_hdl)
{
IPACMERR("icmpv6 rule have not been deleted. Don't install again\n");
return IPACM_FAILURE;
}
mux_id = ext_prop->ext[0].mux_id;
/* contruct filter rules to pcie modem */
struct ipa_flt_rule_add flt_rule_entry;
@ -7858,6 +7876,13 @@ int IPACM_Wan::add_tcp_fin_rst_exception_rule()
uint8_t mux_id;
ipa_ioc_add_flt_rule *pFilteringTable = NULL;
/* Return if rules are there */
if (tcp_fin_hdl || tcp_rst_hdl)
{
IPACMERR("tcp RST/FIN rules have not been deleted. Don't install again\n");
return IPACM_FAILURE;
}
mux_id = ext_prop->ext[0].mux_id;
/* contruct filter rules to pcie modem */
struct ipa_flt_rule_add flt_rule_entry;

3
data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp
View file

@ -39,6 +39,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sys/socket.h>
#include <netinet/in.h>
#ifndef in_addr_t
typedef uint32_t in_addr_t;
#endif
#include <arpa/inet.h>
#include "IPACM_Xml.h"

10
data-ipa-cfg-mgr/ipacm/src/ipacm.rc
View file

@ -25,12 +25,10 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# msm specific files that need to be created on /data
on post-fs-data
mkdir /data/vendor/ipa 0770 radio radio
chmod 0770 /data/vendor/ipa
service vendor.ipacm /system/vendor/bin/ipacm
class late_start
class main
user radio
group radio inet
on post-fs-data
start vendor.ipacm

6
data-ipa-cfg-mgr/ipacm_vendor_product.mk
View file

@ -1,9 +1,11 @@
TARGET_DISABLE_IPACM := false
ifneq ($(TARGET_BOARD_SUFFIX),_au)
#IPACM_DATA
IPACM_DATA += IPACM_cfg.xml
IPACM_DATA += ipacm
IPACM_DATA += ipacm.rc
endif
ifeq ($(TARGET_USES_QMAA),true)
ifneq ($(TARGET_USES_QMAA_OVERRIDE_DATA),true)
@ -12,6 +14,7 @@ endif #TARGET_USES_QMAA_OVERRIDE_DATA
endif #TARGET_USES_QMAA
BOARD_IPA_LOW_RAM_EXCP_LIST := bengal
BOARD_IPA_LOW_RAM_EXCP_LIST += monaco
ifeq ($(TARGET_HAS_LOW_RAM),true)
ifneq ($(call is-board-platform-in-list,$(BOARD_IPA_LOW_RAM_EXCP_LIST)),true)
@ -25,6 +28,9 @@ BOARD_PLATFORM_LIST += msm8916
BOARD_PLATFORM_LIST += msm8917
BOARD_PLATFORM_LIST += qm215
BOARD_PLATFORM_LIST += msm8937
ifeq ($(TARGET_BOARD_SUFFIX),_au)
BOARD_PLATFORM_LIST += msmnile
endif
BOARD_IPAv3_LIST := msm8998
BOARD_IPAv3_LIST += sdm845
BOARD_IPAv3_LIST += sdm710

2
data-ipa-cfg-mgr/ipanat/Android.bp
View file

@ -3,7 +3,7 @@
cc_library_shared {
name: "libipanat",
header_libs: ["generated_kernel_headers"],
header_libs: ["qti_kernel_headers"],
srcs: [
"src/ipa_nat_drv.c",

5
data-ipa-cfg-mgr/ipanat/test/Android.mk
View file

@ -10,7 +10,8 @@ include $(CLEAR_VARS)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ipanat/inc
LOCAL_HEADER_LIBRARIES := generated_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_MODULE := ipa_nat_test
LOCAL_SRC_FILES := ipa_nat_test000.c \
@ -41,7 +42,7 @@ LOCAL_SRC_FILES := ipa_nat_test000.c \
LOCAL_SHARED_LIBRARIES := libipanat
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/kernel-tests/ip_accelerator
include $(BUILD_EXECUTABLE)