Use one constant for length of MAC address

Change-Id: I118eea1ee35a68235b24653b6dc8afa624007f5c

diff --git a/include/network_config.h b/include/network_config.h
index 5b007b2..dbb3181 100755 (executable)
--- a/include/network_config.h
+++ b/include/network_config.h
@@ -41,7 +41,7 @@ extern "C" {
 #define NET_PROXY_LEN_MAX 64                                           /** Maximum length of proxy string */
 #define        NET_DNS_ADDR_MAX 2                                                      /** MAX number of DNS Address */
 #define        NET_MAX_DEVICE_NAME_LEN 32                                      /** Maximum length of device name  */
-#define        NET_MAX_MAC_ADDR_LEN 32                                         /** Maximum length of MAC address  */
+#define        WIFI_MAC_ADDR_LEN 17                                            /** Maximum length of MAC address  */
 #define        NET_IPV6_MAX_PRIVACY_LEN 9                                      /** Maximum length of IPv6 Privacy
                                                                                                                ["enabled", "disabled", "preferred"]*/
 #define        NET_IPV6_MAX_PREFIX_LEN 128                                     /** Maximum length of IPv6 Prefix */
@@ -88,12 +88,12 @@ typedef struct {
 } net_addr_s;
 
 typedef struct {
-       char ProfileName[NET_PROFILE_NAME_LEN_MAX+1];   /** Profile name */
+       char ProfileName[NET_PROFILE_NAME_LEN_MAX + 1]; /** Profile name */
 } net_profile_name_s;
 
 typedef struct {
-       char ProfileName[NET_PROFILE_NAME_LEN_MAX+1];   /** Profile Name of the connection link */
-       char DevName[NET_MAX_DEVICE_NAME_LEN+1];                /** Device Name of the connection link */
+       char ProfileName[NET_PROFILE_NAME_LEN_MAX + 1]; /** Profile Name of the connection link */
+       char DevName[NET_MAX_DEVICE_NAME_LEN + 1];              /** Device Name of the connection link */
        net_dns_config_type_e DnsConfigType;            /** IPv4 Dns configuration type */
        net_dns_config_type_e DnsConfigType6;           /** IPv6 Dns configuration type */
        net_addr_s DnsAddr[NET_DNS_ADDR_MAX];                   /** IPv4 Dns Server Address of the connection link */
@@ -112,13 +112,13 @@ typedef struct {
        net_addr_s ServerAddr;                                                  /** DHCP Server Address */
        int DHCPLeaseDuration;                                                  /** DHCP Lease duration in seconds */
        net_proxy_type_e ProxyMethod;                                   /** Proxy Method type */
-       char ProxyAddr[NET_PROXY_LEN_MAX+1];                    /** Proxy address */
-       char MacAddr[NET_MAX_MAC_ADDR_LEN+1];                   /** MAC address */
+       char ProxyAddr[NET_PROXY_LEN_MAX + 1];                  /** Proxy address */
+       char MacAddr[WIFI_MAC_ADDR_LEN + 1];                    /** MAC address */
        net_addr_s IpAddr6;                                                             /** IP Address for the connection link */
        int PrefixLen6;                                                                 /** IPv6 Prefix Length for the connection link */
        char BDefGateway6;                                                              /** Whether gateway address present or not */
        net_addr_s GatewayAddr6;                                                /** Gateway address */
-       char Privacy6[NET_IPV6_MAX_PRIVACY_LEN+1];              /** Privacy of the connection link */
+       char Privacy6[NET_IPV6_MAX_PRIVACY_LEN + 1];            /** Privacy of the connection link */
 } net_dev_info_s;
 
 #ifdef __cplusplus

diff --git a/include/network_interface.h b/include/network_interface.h
index 0487159..1d82be2 100755 (executable)
--- a/include/network_interface.h
+++ b/include/network_interface.h
@@ -186,7 +186,7 @@ typedef struct {
        char ProfileName[NET_PROFILE_NAME_LEN_MAX+1];   /** Profile name */
        net_state_type_e ProfileState;                                  /** Service state */
        char essid[NET_WLAN_ESSID_LEN+1];                               /** ESSID */
-       char bssid[NET_MAX_MAC_ADDR_LEN+1];                             /** Basic service set identification */
+       char bssid[WIFI_MAC_ADDR_LEN+1];                                /** Basic service set identification */
        unsigned char Strength;                                                 /**  Strength : between 0 and 100 */
        unsigned int frequency;                                                 /** Frequency band(MHz) */
        int max_rate;                                                           /** Maximum speed of the line(Mbps) */
@@ -241,14 +241,14 @@ typedef struct {
 
 typedef struct {
        unsigned char ssid[NET_WLAN_ESSID_LEN + 1];
-       char bssid[NET_WLAN_BSSID_LEN + 1];
+       char bssid[WIFI_MAC_ADDR_LEN + 1];
        int rssi;
        int mode;
 } net_bssid_scan_bss_info_s;
 
 typedef struct {
        char ssid[NET_WLAN_ESSID_LEN + 1];
-       char bssid[NET_WLAN_BSSID_LEN + 1];
+       char bssid[WIFI_MAC_ADDR_LEN + 1];
        GSList *vsie_list;
        int freq;
        int rssi;

diff --git a/include/network_wlan.h b/include/network_wlan.h
index a95e77a..7310a9e 100755 (executable)
--- a/include/network_wlan.h
+++ b/include/network_wlan.h
@@ -31,9 +31,6 @@ extern "C" {
 /** Length of ESSID: 32(raw essid size) x 3(U+FFFD REPLACEMENT CHARACTER) */
 #define NET_WLAN_ESSID_LEN                                             96
 
-/** Length of BSSID */
-#define NET_WLAN_BSSID_LEN                                             17
-
 /** Length of Frequency */
 #define NET_WLAN_FREQ_LEN                                              5
 

diff --git a/src/network_interface.c b/src/network_interface.c
index 2fb9b2a..890c5b5 100755 (executable)
--- a/src/network_interface.c
+++ b/src/network_interface.c
@@ -257,7 +257,7 @@ static int __net_extract_common_info(const char *key, GVariant *variant, net_pro
                                value = g_variant_get_string(var, NULL);
 
                                if (value != NULL)
-                                       g_strlcpy(net_info->MacAddr, value, NET_MAX_MAC_ADDR_LEN);
+                                       g_strlcpy(net_info->MacAddr, value, WIFI_MAC_ADDR_LEN + 1);
                        }
                }
                g_variant_iter_free(iter);
@@ -934,7 +934,7 @@ static int __net_extract_wifi_info(GVariantIter *array, net_profile_info_s* Prof
                        value = g_variant_get_string(var, NULL);
 
                        if (value != NULL)
-                               g_strlcpy(ProfInfo->bssid, value, NET_MAX_MAC_ADDR_LEN);
+                               g_strlcpy(ProfInfo->bssid, value, WIFI_MAC_ADDR_LEN + 1);
 
                } else if (g_strcmp0(key, "MaxSpeed") == 0) {
                        ProfInfo->max_rate = g_variant_get_int32(var);

diff --git a/src/network_signal.c b/src/network_signal.c
index 86b8182..ff06f78 100755 (executable)
--- a/src/network_signal.c
+++ b/src/network_signal.c
@@ -372,7 +372,7 @@ static int __net_handle_wifi_bssid_scan_rsp(GVariant *param)
                        }
 
                        memcpy(bss->ssid, ssid, ssid_len);
-                       g_strlcpy(bss->bssid, bssid, NET_WLAN_BSSID_LEN+1);
+                       g_strlcpy(bss->bssid, bssid, WIFI_MAC_ADDR_LEN + 1);
                        bss->rssi = rssi;
                        bss->mode = mode;
                        bss_info_list = g_slist_append(bss_info_list, bss);
@@ -517,7 +517,7 @@ static int __net_handle_wifi_netlink_scan_rsp(GVariant *param)
                        }
 
                        g_strlcpy(bss->ssid, ssid, strlen(ssid)+1);
-                       g_strlcpy(bss->bssid, bssid, NET_WLAN_BSSID_LEN+1);
+                       g_strlcpy(bss->bssid, bssid, WIFI_MAC_ADDR_LEN + 1);
                        bss->freq = freq;
                        bss->rssi = rssi;
                        bss->security_type = sec_type;

diff --git a/src/wifi_internal.c b/src/wifi_internal.c
index 79cf498..d3b1b4b 100755 (executable)
--- a/src/wifi_internal.c
+++ b/src/wifi_internal.c
@@ -412,7 +412,7 @@ static void __update_bss_profile_iterator(GSList *bss_list)
                }
 
                g_strlcpy(profile->essid, (char *)ap->ssid, NET_WLAN_ESSID_LEN+1);
-               g_strlcpy(profile->bssid, ap->bssid, NET_MAX_MAC_ADDR_LEN+1);
+               g_strlcpy(profile->bssid, ap->bssid, WIFI_MAC_ADDR_LEN + 1);
 
                profile->wlan_mode = ap->mode;
 
@@ -452,8 +452,8 @@ static void __update_netlink_scan_profile_iterator(GSList *bss_list)
                        return;
                }
 
-               g_strlcpy(profile->essid, ap->ssid, NET_WLAN_ESSID_LEN+1);
-               g_strlcpy(profile->bssid, ap->bssid, NET_MAX_MAC_ADDR_LEN+1);
+               g_strlcpy(profile->essid, ap->ssid, NET_WLAN_ESSID_LEN + 1);
+               g_strlcpy(profile->bssid, ap->bssid, WIFI_MAC_ADDR_LEN + 1);
 
                if (ap->vsie_list) {
                        GSList *list;

diff --git a/src/wifi_manager.c b/src/wifi_manager.c
index 1531af0..9900030 100755 (executable)
--- a/src/wifi_manager.c
+++ b/src/wifi_manager.c
@@ -25,7 +25,6 @@
 #include "network_internal.h"
 #include "wifi_internal.h"
 
-#define WIFI_MAC_ADDR_LENGTH   17
 #define WIFI_MAC_ADDR_PATH             "/sys/class/net/wlan0/address"
 
 //LCOV_EXCL_START
@@ -402,7 +401,7 @@ EXPORT_API int wifi_manager_get_mac_address(wifi_manager_h wifi, char **mac_addr
        if (_get_tizen_profile() == TIZEN_PROFILE_TV) {
                //LCOV_EXCL_START
                FILE *fp = NULL;
-               char buf[WIFI_MAC_ADDR_LENGTH + 1];
+               char buf[WIFI_MAC_ADDR_LEN + 1];
                if (0 == access(WIFI_MAC_ADDR_PATH, F_OK))
                        fp = fopen(WIFI_MAC_ADDR_PATH, "r");
 
@@ -423,7 +422,7 @@ EXPORT_API int wifi_manager_get_mac_address(wifi_manager_h wifi, char **mac_addr
 
                WIFI_LOG(WIFI_INFO, "%s : %s\n", WIFI_MAC_ADDR_PATH, buf);
 
-               *mac_address = strndup(buf, WIFI_MAC_ADDR_LENGTH + 1);
+               *mac_address = strndup(buf, WIFI_MAC_ADDR_LEN + 1);
                if (*mac_address == NULL) {
                        WIFI_LOG(WIFI_ERROR, "strndup() failed");
                        fclose(fp);