Get VSIE from vconf key

Change-Id: I1b1116f7e3426575ce926c7319bc61350101762f

diff --git a/src/softap.c b/src/softap.c
index f7309b579f4714f8509370e77d73605475ffe2cf..3ec843fa52ddb65aba46972b3c7a369f0cb481fa 100755 (executable)
--- a/src/softap.c
+++ b/src/softap.c
@@ -167,6 +167,20 @@ static softap_error_e __get_visibility(bool *visible)
        return SOFTAP_ERROR_NONE;
 }
 
+static softap_error_e __get_vsie(char *vsie, unsigned int size)
+{
+       char *ptr = NULL;
+
+       ptr = vconf_get_str(VCONFKEY_SOFTAP_VSIE);
+       if (ptr == NULL)
+               return SOFTAP_ERROR_OPERATION_FAILED;
+
+       g_strlcpy(vsie, ptr, size);
+       free(ptr);
+
+       return SOFTAP_ERROR_NONE;
+}
+
 static int __get_initial_passphrase(char *passphrase, unsigned int size)
 {
        if (passphrase == NULL ||
@@ -1640,14 +1654,15 @@ API int softap_get_vendor_element(softap_h softap, char **vendor_element)
        _retvm_if(vendor_element == NULL, SOFTAP_ERROR_INVALID_PARAMETER,
                        "parameter(vendor) is NULL\n");
 
-       __softap_h *sa = (__softap_h *)softap;
+       char val[SOFTAP_VENDOR_MAX_LEN + 1] = {0, };
 
-       if (strlen(sa->vendor) == 0) {
-               DBG("vendor_element is not set");
-               return SOFTAP_ERROR_NONE;
+       int ret = __get_vsie(val, sizeof(val));
+       if (ret != SOFTAP_ERROR_NONE) {
+               ERR("Failed to get vendor elements");
+               return ret;
        }
 
-       *vendor_element = strdup(sa->vendor);
+       *vendor_element = strdup(val);
        if (*vendor_element == NULL) {
                ERR("strdup is failed");
                return SOFTAP_ERROR_OUT_OF_MEMORY;

diff --git a/test/softap_test.c b/test/softap_test.c
index c7980112d9ab953d16662613a5bd71fe57444aca..4c07a4c7eab2f2cdb0ba8b38fce4e5241b44f282 100755 (executable)
--- a/test/softap_test.c
+++ b/test/softap_test.c
@@ -497,7 +497,7 @@ static int test_softap_set_vendor_element(void)
        int ret;
        char vendor[1024];
 
-       printf("Input vendor elements(hex): ");
+       printf("Input vendor elements(e.g. DD050016328000, DD050016321000): ");
        ret = scanf("%1023s", vendor);
 
        ret = softap_set_vendor_element(sa, vendor);