Make wpa_config_parse_string() a shared function

This will be used in future hostapd configuration parser changes.

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/utils/common.c b/src/utils/common.c
index 6d7a20034e190eb27996fa09edc81716427a3d0d..e0d20d2c3205668e7621f0ff78eff77e21a019e8 100644 (file)
--- a/src/utils/common.c
+++ b/src/utils/common.c
@@ -505,3 +505,64 @@ void * __hide_aliasing_typecast(void *foo)
 {
        return foo;
 }
+
+
+char * wpa_config_parse_string(const char *value, size_t *len)
+{
+       if (*value == '"') {
+               const char *pos;
+               char *str;
+               value++;
+               pos = os_strrchr(value, '"');
+               if (pos == NULL || pos[1] != '\0')
+                       return NULL;
+               *len = pos - value;
+               str = os_malloc(*len + 1);
+               if (str == NULL)
+                       return NULL;
+               os_memcpy(str, value, *len);
+               str[*len] = '\0';
+               return str;
+       } else if (*value == 'P' && value[1] == '"') {
+               const char *pos;
+               char *tstr, *str;
+               size_t tlen;
+               value += 2;
+               pos = os_strrchr(value, '"');
+               if (pos == NULL || pos[1] != '\0')
+                       return NULL;
+               tlen = pos - value;
+               tstr = os_malloc(tlen + 1);
+               if (tstr == NULL)
+                       return NULL;
+               os_memcpy(tstr, value, tlen);
+               tstr[tlen] = '\0';
+
+               str = os_malloc(tlen + 1);
+               if (str == NULL) {
+                       os_free(tstr);
+                       return NULL;
+               }
+
+               *len = printf_decode((u8 *) str, tlen + 1, tstr);
+               os_free(tstr);
+
+               return str;
+       } else {
+               u8 *str;
+               size_t tlen, hlen = os_strlen(value);
+               if (hlen & 1)
+                       return NULL;
+               tlen = hlen / 2;
+               str = os_malloc(tlen + 1);
+               if (str == NULL)
+                       return NULL;
+               if (hexstr2bin(value, str, tlen)) {
+                       os_free(str);
+                       return NULL;
+               }
+               str[tlen] = '\0';
+               *len = tlen;
+               return (char *) str;
+       }
+}

diff --git a/src/utils/common.h b/src/utils/common.h
index fbc61191efefecc341d0886dd75b389c931963f2..3833ce264c8fcfd0abbcc52d0b9fe3cfd54709a2 100644 (file)
--- a/src/utils/common.h
+++ b/src/utils/common.h
@@ -446,6 +446,8 @@ size_t printf_decode(u8 *buf, size_t maxlen, const char *str);
 
 const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len);
 
+char * wpa_config_parse_string(const char *value, size_t *len);
+
 static inline int is_zero_ether_addr(const u8 *a)
 {
        return !(a[0] | a[1] | a[2] | a[3] | a[4] | a[5]);

diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index c09f3104ea02fa6ba2b41bdd335e4ec66af03e19..c3cbca6c0fee412e2c632bab3c59d48ae2538426 100644 (file)
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -53,67 +53,6 @@ struct parse_data {
 };
 
 
-static char * wpa_config_parse_string(const char *value, size_t *len)
-{
-       if (*value == '"') {
-               const char *pos;
-               char *str;
-               value++;
-               pos = os_strrchr(value, '"');
-               if (pos == NULL || pos[1] != '\0')
-                       return NULL;
-               *len = pos - value;
-               str = os_malloc(*len + 1);
-               if (str == NULL)
-                       return NULL;
-               os_memcpy(str, value, *len);
-               str[*len] = '\0';
-               return str;
-       } else if (*value == 'P' && value[1] == '"') {
-               const char *pos;
-               char *tstr, *str;
-               size_t tlen;
-               value += 2;
-               pos = os_strrchr(value, '"');
-               if (pos == NULL || pos[1] != '\0')
-                       return NULL;
-               tlen = pos - value;
-               tstr = os_malloc(tlen + 1);
-               if (tstr == NULL)
-                       return NULL;
-               os_memcpy(tstr, value, tlen);
-               tstr[tlen] = '\0';
-
-               str = os_malloc(tlen + 1);
-               if (str == NULL) {
-                       os_free(tstr);
-                       return NULL;
-               }
-
-               *len = printf_decode((u8 *) str, tlen + 1, tstr);
-               os_free(tstr);
-
-               return str;
-       } else {
-               u8 *str;
-               size_t tlen, hlen = os_strlen(value);
-               if (hlen & 1)
-                       return NULL;
-               tlen = hlen / 2;
-               str = os_malloc(tlen + 1);
-               if (str == NULL)
-                       return NULL;
-               if (hexstr2bin(value, str, tlen)) {
-                       os_free(str);
-                       return NULL;
-               }
-               str[tlen] = '\0';
-               *len = tlen;
-               return (char *) str;
-       }
-}
-
-
 static int wpa_config_parse_str(const struct parse_data *data,
                                struct wpa_ssid *ssid,
                                int line, const char *value)