diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2018-09-07 17:34:01 +0100 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-09-13 15:22:10 +0200 |
| commit | 9b3b1b12a25947f1d09e445e96cb66e5190275ac (patch) | |
| tree | 03b1e1fa70f82097e81f4a271645dee3391767d7 /data-ipa-cfg-mgr/ipanat/src | |
| parent | 0bde58e2bc8440f4d98f0d383dad26f450ad8fd8 (diff) | |
msm8996-common: Update IPACM for P release
* Tag: LA.UM.7.5.r1-02200-8x96.0
Change-Id: Id7f0760c0dd1e5476db88d6089d0084eae127a49
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'data-ipa-cfg-mgr/ipanat/src')
| -rw-r--r-- | data-ipa-cfg-mgr/ipanat/src/Android.mk | 4 | ||||
| -rw-r--r-- | data-ipa-cfg-mgr/ipanat/src/ipa_nat_drvi.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/data-ipa-cfg-mgr/ipanat/src/Android.mk b/data-ipa-cfg-mgr/ipanat/src/Android.mk index f20fc4a..4242a3a 100644 --- a/data-ipa-cfg-mgr/ipanat/src/Android.mk +++ b/data-ipa-cfg-mgr/ipanat/src/Android.mk @@ -3,14 +3,14 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_C_INCLUDES := $(LOCAL_PATH)/../inc -LOCAL_C_INCLUDES += $(LOCAL_PATH) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_ADDITIONAL_DEPENDENCIES := INSTALLED_KERNEL_HEADERS LOCAL_SRC_FILES := ipa_nat_drv.c \ ipa_nat_drvi.c - +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../inc +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_CFLAGS := -DDEBUG -Wall -Werror diff --git a/data-ipa-cfg-mgr/ipanat/src/ipa_nat_drvi.c b/data-ipa-cfg-mgr/ipanat/src/ipa_nat_drvi.c index 3e619fe..675dcf5 100644 --- a/data-ipa-cfg-mgr/ipanat/src/ipa_nat_drvi.c +++ b/data-ipa-cfg-mgr/ipanat/src/ipa_nat_drvi.c @@ -35,17 +35,21 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define strlcpy g_strlcpy #else #ifndef FEATURE_IPA_ANDROID -static size_t strlcpy(char * dst, const char * src, size_t size) { +static size_t strlcpy(char * dst, const char * src, size_t size) +{ + size_t i; + if (size < 1) return 0; - strncpy(dst, src, size - 1); - dst[size - 1] = 0; + for (i = 0; i < (size - 1) && src[i] != '\0'; i++) + dst[i] = src[i]; + for (; i < size; i++) + dst[i] = '\0'; return strlen(dst); } #endif #endif - struct ipa_nat_cache ipv4_nat_cache; pthread_mutex_t nat_mutex = PTHREAD_MUTEX_INITIALIZER; |