diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2016-11-17 22:53:39 +0000 |
|---|---|---|
| committer | davidevinavil <davidevinavil@gmail.com> | 2017-01-21 18:22:21 +0100 |
| commit | 818d87b312de5d56937381b551abe084bba72c9f (patch) | |
| tree | df5fa61d4888d405451457a06fdf579f6cffc79c /data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp | |
| parent | e92469a9912251fcc57cc8f97390c72d8078adfa (diff) | |
z2_plus: Update IPACM from upstream
* Tag LA.UM.5.5.r1-00100-8x96.0
Change-Id: Ia960f038ffcec1a7d93b1bd205b777d05c786cf3
Diffstat (limited to 'data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp')
| -rw-r--r-- | data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp b/data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp index df6c888..29ce787 100644 --- a/data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp +++ b/data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp @@ -112,6 +112,7 @@ IPACM_Config::IPACM_Config() { iface_table = NULL; alg_table = NULL; + pNatIfaces = NULL; memset(&ipa_client_rm_map_tbl, 0, sizeof(ipa_client_rm_map_tbl)); memset(&ipa_rm_tbl, 0, sizeof(ipa_rm_tbl)); ipa_rm_a2_check=0; @@ -222,7 +223,7 @@ int IPACM_Config::Init(void) /* copy bridge interface name to ipacmcfg */ if( iface_table[i].if_cat == VIRTUAL_IF) { - memcpy(ipa_virtual_iface_name, iface_table[i].iface_name, sizeof(ipa_virtual_iface_name)); + strlcpy(ipa_virtual_iface_name, iface_table[i].iface_name, sizeof(ipa_virtual_iface_name)); IPACMDBG_H("ipa_virtual_iface_name(%s) \n", ipa_virtual_iface_name); } } @@ -286,10 +287,6 @@ int IPACM_Config::Init(void) IPACMDBG_H("ipacm_odu_enable %d\n", ipacm_odu_enable); IPACMDBG_H("ipacm_odu_mode %d\n", ipacm_odu_router_mode); IPACMDBG_H("ipacm_odu_embms_enable %d\n", ipacm_odu_embms_enable); - - ipacm_ip_passthrough_mode = cfg->ip_passthrough_mode; - IPACMDBG_H("ipacm_ip_passthrough_mode %d. \n", ipacm_ip_passthrough_mode); - ipa_num_wlan_guest_ap = cfg->num_wlan_guest_ap; IPACMDBG_H("ipa_num_wlan_guest_ap %d\n",ipa_num_wlan_guest_ap); |