backed out the change made according to the security's guideline.submit/tizen/20190814.071001accepted/tizen/unified/20190816.112350

Change-Id: I5fa3b7b3bc3215dbf26f1f7e8c68db91d94477bc
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

1 files changed, 16 insertions, 22 deletions

diff --git a/src/wifi-scan.c b/src/wifi-scan.c
index 22cedbc..f4583b0 100755..100644
--- a/src/wifi-scan.c
+++ b/src/wifi-scan.c
@@ -182,10 +182,10 @@ gboolean __arp_packet_receive(GIOChannel *source, GIOCondition condition,
 				arp_recv.s_hwaddr[0], arp_recv.s_hwaddr[1], arp_recv.s_hwaddr[2],
 				arp_recv.s_hwaddr[3], arp_recv.s_hwaddr[4], arp_recv.s_hwaddr[5]);
 
-			snprintf(tbuf, sizeof(tbuf), "%02x:%02x:%02x:%02x:%02x:%02x",
+			snprintf(tbuf, MAC_ADDRESS_STRING_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x",
 				arp_recv.t_hwaddr[0], arp_recv.t_hwaddr[1], arp_recv.t_hwaddr[2],
 				arp_recv.t_hwaddr[3], arp_recv.t_hwaddr[4], arp_recv.t_hwaddr[5]);
-			snprintf(sbuf, sizeof(sbuf), "%02x:%02x:%02x:%02x:%02x:%02x",
+			snprintf(sbuf, MAC_ADDRESS_STRING_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x",
 				arp_recv.s_hwaddr[0], arp_recv.s_hwaddr[1], arp_recv.s_hwaddr[2],
 				arp_recv.s_hwaddr[3], arp_recv.s_hwaddr[4], arp_recv.s_hwaddr[5]);
 
@@ -197,17 +197,15 @@ gboolean __arp_packet_receive(GIOChannel *source, GIOCondition condition,
 			if (!strcasecmp(tbuf , "00:00:00:00:00:00"))
 				UA_WIFI_INFO("Broadcast packet.");
 
-			snprintf(ip_sbuff, sizeof(ip_sbuff), "%d.%d.%d.%d",
-				arp_recv.s_IPaddr[0], arp_recv.s_IPaddr[1],
-				arp_recv.s_IPaddr[2], arp_recv.s_IPaddr[3]);
-			UA_WIFI_INFO("source ip_sbuff = %s target ip = %d source ip = %d",
-				ip_sbuff, target_ip, __convert_uchar_to_uint(arp_recv.s_IPaddr));
+			snprintf(ip_sbuff, IP_ADDRESS_STRING_SIZE, "%d.%d.%d.%d", arp_recv.s_IPaddr[0],
+				arp_recv.s_IPaddr[1], arp_recv.s_IPaddr[2], arp_recv.s_IPaddr[3]);
+			UA_WIFI_INFO("source ip_sbuff = %s target ip = %d source ip = %d", ip_sbuff,
+				target_ip, __convert_uchar_to_uint(arp_recv.s_IPaddr));
 
-			snprintf(ip_tbuff, sizeof(ip_tbuff), "%d.%d.%d.%d",
-				arp_recv.t_IPaddr[0], arp_recv.t_IPaddr[1],
-				arp_recv.t_IPaddr[2], arp_recv.t_IPaddr[3]);
-			UA_WIFI_INFO("target ip_tbuff = %s target ip = %d source ip = %d",
-				ip_tbuff, target_ip, __convert_uchar_to_uint(arp_recv.s_IPaddr));
+			snprintf(ip_tbuff, IP_ADDRESS_STRING_SIZE, "%d.%d.%d.%d", arp_recv.t_IPaddr[0],
+				arp_recv.t_IPaddr[1], arp_recv.t_IPaddr[2], arp_recv.t_IPaddr[3]);
+			UA_WIFI_INFO("target ip_tbuff = %s target ip = %d source ip = %d", ip_tbuff,
+				target_ip, __convert_uchar_to_uint(arp_recv.s_IPaddr));
 
 			mac_cmp = strcasecmp(sbuf, arp_data->arp_target_mac);//same target mac ip is valid
 
@@ -353,7 +351,7 @@ static int __init_arp(const char *mac)
 	arp_data->addr.sll_protocol = htons(ETH_P_ARP);
 	/* sll_addr is not a null-terminated buffer, it is defined in linux header files
 	 * therefore, it is impossible to addd NULL character to tail */
-	memcpy(arp_data->addr.sll_addr, dest_mac, sizeof(arp_data->addr.sll_addr));
+	memcpy(arp_data->addr.sll_addr, dest_mac, ETHER_ADDR_LEN);
 
 	arp_data->arp_sock_io = g_io_channel_unix_new(arp_data->arp_id);
 
@@ -401,16 +399,14 @@ gboolean __send_arp_ip_packet_timeout(gpointer user_data)
 	source_ip = inet_addr(__nm_get_ip_address());
 	/* s_IPaddr is not a null-terminated buffer, it is defined in linux header files
 	 * therefore, it is impossible to addd NULL character to tail */
-	memcpy(arp_data->arp.s_IPaddr, &source_ip,
-		sizeof(arp_data->arp.s_IPaddr));  // source IP address
+	memcpy(arp_data->arp.s_IPaddr, &source_ip, IP_ADD_LENGTH);  // source IP address
 	/*
 	snprintf(ip_buff, IP_ADDRESS_STRING_SIZE, "%d.%d.%d.%d",
 	arp.s_IPaddr[0],arp.s_IPaddr[1],arp.s_IPaddr[2],pArping->arp_send_ip_addr);
 	*/
 
 	target_ip = inet_addr(arp_data->arp_source_ip);
-	memcpy(arp_data->arp.t_IPaddr, &target_ip,
-		sizeof(arp_data->arp.t_IPaddr)); // target IP address
+	memcpy(arp_data->arp.t_IPaddr, &target_ip, IP_ADD_LENGTH); // target IP address
 	g_strlcpy(arp_target_ip, arp_data->arp_source_ip, MAX_SIZE_BUFFER);
 
 	UA_WIFI_INFO("arp_target_ip = %s ", arp_target_ip);
@@ -440,10 +436,9 @@ gboolean __send_arp_unimul_packet_timeout(gpointer user_data)
 	/* s_IPaddr is not a null-terminated buffer, it is defined in linux header files
 	 * therefore, it is impossible to addd NULL character to tail */
 	source_ip = inet_addr(__nm_get_ip_address());
-	memcpy(arp_data->arp.s_IPaddr, &source_ip,
-		sizeof(arp_data->arp.s_IPaddr)); // source IP address
+	memcpy(arp_data->arp.s_IPaddr, &source_ip, IP_ADD_LENGTH); // source IP address
 
-	snprintf(ip_buff, sizeof(ip_buff), "%d.%d.%d.%d",
+	snprintf(ip_buff, IP_ADDRESS_STRING_SIZE, "%d.%d.%d.%d",
 		arp_data->arp.s_IPaddr[0], arp_data->arp.s_IPaddr[1],
 		arp_data->arp.s_IPaddr[2], arp_data->arp_send_ip_addr);
 
@@ -452,8 +447,7 @@ gboolean __send_arp_unimul_packet_timeout(gpointer user_data)
 
 	/* t_IPaddr is not a null-terminated buffer, it is defined in linux header files
 	 * therefore, it is impossible to addd NULL character to tail */
-	memcpy(arp_data->arp.t_IPaddr, &target_ip,
-		sizeof(arp_data->arp.s_IPaddr)); // target IP address
+	memcpy(arp_data->arp.t_IPaddr, &target_ip, IP_ADD_LENGTH); // target IP address
 
 	if (arp_data->arp_send_ip_addr == 1 || arp_data->arp_send_ip_addr == 255)
 		UA_WIFI_INFO("Arp target ip: %s", arp_target_ip);