Merge "ipacm: KW fix"
diff --git a/ipacm/src/IPACM_Log.cpp b/ipacm/src/IPACM_Log.cpp
index d0bd108..3e2e668 100644
--- a/ipacm/src/IPACM_Log.cpp
+++ b/ipacm/src/IPACM_Log.cpp
@@ -86,7 +86,7 @@
printf("create ipacm_log socket successfully\n");
}
ipacmlog_socket.sun_family = AF_UNIX;
- strcpy(ipacmlog_socket.sun_path, IPACMLOG_FILE);
+ strlcpy(ipacmlog_socket.sun_path, IPACMLOG_FILE,sizeof(ipacmlog_socket.sun_path));
len = strlen(ipacmlog_socket.sun_path) + sizeof(ipacmlog_socket.sun_family);
memcpy(ipacm_log_buffer.user_data, user_data, MAX_BUF_LEN);
diff --git a/ipacm/src/IPACM_Neighbor.cpp b/ipacm/src/IPACM_Neighbor.cpp
index 8d5a16f..5ed5453 100644
--- a/ipacm/src/IPACM_Neighbor.cpp
+++ b/ipacm/src/IPACM_Neighbor.cpp
@@ -127,16 +127,15 @@
IPACMERR("Unable to allocate memory\n");
return;
}
+ memset(data_all,0,sizeof(ipacm_event_data_all));
data_all->iptype = IPA_IP_v4;
data_all->if_index = neighbor_client[i].iface_index;
data_all->ipv4_addr = neighbor_client[i].v4_addr; //use previous ipv4 address
memcpy(data_all->mac_addr,
neighbor_client[i].mac_addr,
sizeof(data_all->mac_addr));
-#ifdef FEATURE_L2TP
memcpy(data_all->iface_name, neighbor_client[i].iface_name,
sizeof(data_all->iface_name));
-#endif
evt_data.evt_data = (void *)data_all;
IPACM_EvtDispatcher::PostEvt(&evt_data);
/* ask for replaced iface name*/
diff --git a/ipacm/src/IPACM_Netlink.cpp b/ipacm/src/IPACM_Netlink.cpp
index ae663e8..e2ecd50 100644
--- a/ipacm/src/IPACM_Netlink.cpp
+++ b/ipacm/src/IPACM_Netlink.cpp
@@ -849,9 +849,7 @@
evt_data.event = IPA_ADDR_ADD_EVENT;
data_addr->if_index = msg_ptr->nl_addr_info.metainfo.ifa_index;
-#ifdef FEATURE_L2TP
strlcpy(data_addr->iface_name, dev_name, sizeof(data_addr->iface_name));
-#endif
if(AF_INET6 == msg_ptr->nl_addr_info.attr_info.prefix_addr.ss_family)
{
IPACMDBG("Posting IPA_ADDR_ADD_EVENT with if index:%d, ipv6 addr:0x%x:%x:%x:%x\n",
@@ -1424,9 +1422,7 @@
msg_ptr->nl_neigh_info.attr_info.lladdr_hwaddr.sa_data,
sizeof(data_all->mac_addr));
data_all->if_index = msg_ptr->nl_neigh_info.metainfo.ndm_ifindex;
-#ifdef FEATURE_L2TP
strlcpy(data_all->iface_name, dev_name, sizeof(data_all->iface_name));
-#endif
/* Add support to replace src-mac as bridge0 mac */
if((msg_ptr->nl_neigh_info.metainfo.ndm_family == AF_BRIDGE) &&
(msg_ptr->nl_neigh_info.metainfo.ndm_state == NUD_PERMANENT))