Fixed softap reload issue

Change-Id: I40d99b380abe14dced4d036e5906284efbad492d

diff --git a/src/mobileap_softap.c b/src/mobileap_softap.c
index 8b25132..928a9c9 100755 (executable)
--- a/src/mobileap_softap.c
+++ b/src/mobileap_softap.c
@@ -169,7 +169,7 @@ static int __execute_hostapd(const mobile_ap_type_e type, softap_settings_t *set
                        settings->ssid,
                        settings->channel,
                        settings->hide_mode ? 2 : 0,
-                       strlen(settings->mode) ? settings->mode : "g",
+                       settings->mode,
                        settings->max_sta);
 #else
        snprintf(buf, sizeof(buf), HOSTAPD_CONF,
@@ -178,7 +178,7 @@ static int __execute_hostapd(const mobile_ap_type_e type, softap_settings_t *set
                        settings->ssid,
                        settings->channel,
                        settings->hide_mode ? 2 : 0,
-                       strlen(settings->mode) ? settings->mode : "g",
+                       settings->mode,
                        settings->max_sta,
                        settings->mac_filter,
                        HOSTAPD_ALLOWED_LIST,
@@ -278,7 +278,7 @@ static int __execute_hostapd_wps(const mobile_ap_type_e type, softap_settings_t
                        settings->ssid,
                        settings->channel,
                        settings->hide_mode,
-                       strlen(settings->mode) ? settings->mode : "g",
+                       settings->mode,
                        settings->max_sta,
                        settings->mac_filter,
                        HOSTAPD_ALLOWED_LIST,

diff --git a/src/mobileap_wifi.c b/src/mobileap_wifi.c
index dab030e..e4ad418 100755 (executable)
--- a/src/mobileap_wifi.c
+++ b/src/mobileap_wifi.c
@@ -324,6 +324,8 @@ static mobile_ap_error_code_e __update_softap_settings(softap_settings_t *dst, s
 
        if (strlen(src->mode))
                g_strlcpy(dst->mode, src->mode, sizeof(dst->mode));
+       else
+               g_strlcpy(dst->mode, "g", sizeof(dst->mode));
 
        if (strlen(src->vendor_elements))
                g_strlcpy(dst->vendor_elements, src->vendor_elements, sizeof(dst->vendor_elements));
@@ -360,6 +362,9 @@ static gboolean __is_equal_softap_settings(softap_settings_t *a, softap_settings
        if (strcmp(a->mode, b->mode) != 0)
                return FALSE;
 
+       if (strcmp(a->vendor_elements, b->vendor_elements) != 0)
+               return FALSE;
+
        if (a->channel != b->channel)
                return FALSE;
 
@@ -1367,7 +1372,7 @@ gboolean softap_reload_settings(Softap *obj,
                                sizeof(settings.security_type));
        }
 
-       g_strlcpy(wifi_ap_settings.vendor_elements, vendor_elements, sizeof(wifi_ap_settings.vendor_elements));
+       g_strlcpy(settings.vendor_elements, vendor_elements, sizeof(settings.vendor_elements));
 
        settings.hide_mode = (!visibility);
        settings.address_type = MOBILE_AP_ADDRESS_TYPE_IPV4;