diff options
Diffstat (limited to 'data-ipa-cfg-mgr/ipanat')
| -rw-r--r-- | data-ipa-cfg-mgr/ipanat/inc/ipa_nat_drv.h | 3 | ||||
| -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 |
3 files changed, 13 insertions, 6 deletions
diff --git a/data-ipa-cfg-mgr/ipanat/inc/ipa_nat_drv.h b/data-ipa-cfg-mgr/ipanat/inc/ipa_nat_drv.h index 4ef8779..d5aa0c6 100644 --- a/data-ipa-cfg-mgr/ipanat/inc/ipa_nat_drv.h +++ b/data-ipa-cfg-mgr/ipanat/inc/ipa_nat_drv.h @@ -26,6 +26,8 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef IPA_NAT_DRV_H +#define IPA_NAT_DRV_H #include "string.h" /* memset */ #include "stdlib.h" /* free, malloc */ @@ -142,3 +144,4 @@ int ipa_nat_query_timestamp(uint32_t table_handle, int ipa_nat_modify_pdn(uint32_t tbl_hdl, uint8_t pdn_index, ipa_nat_pdn_entry *pdn_info); +#endif /* IPA_NAT_DRV_H */
\ No newline at end of file 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; |