D-Bus: Remove useless wpa_s->conf checks

[mech_eap.git] / wpa_supplicant / dbus / dbus_new_handlers_p2p.c

diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
index 8ba2816..e24b216 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
@@ -1695,15 +1695,6 @@ dbus_bool_t wpas_dbus_getter_persistent_groups(DBusMessageIter *iter,
        unsigned int i = 0, num = 0;
        dbus_bool_t success = FALSE;
 
-       if (wpa_s->conf == NULL) {
-               wpa_printf(MSG_ERROR, "dbus: %s: "
-                          "An error occurred getting persistent groups list",
-                          __func__);
-               dbus_set_error_const(error, DBUS_ERROR_FAILED, "an error "
-                                    "occurred getting persistent groups list");
-               return FALSE;
-       }
-
        for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
                if (network_is_persistent_group(ssid))
                        num++;
@@ -2194,7 +2185,7 @@ dbus_bool_t wpas_dbus_setter_p2p_group_vendor_ext(DBusMessageIter *iter,
                                                  void *user_data)
 {
        struct wpa_supplicant *wpa_s = user_data;
-       DBusMessageIter variant_iter, iter_dict;
+       DBusMessageIter variant_iter, iter_dict, array_iter, sub;
        struct wpa_dbus_dict_entry entry = { .type = DBUS_TYPE_STRING };
        unsigned int i;
        struct hostapd_data *hapd = NULL;
@@ -2206,6 +2197,82 @@ dbus_bool_t wpas_dbus_setter_p2p_group_vendor_ext(DBusMessageIter *iter,
                return FALSE;
 
        dbus_message_iter_recurse(iter, &variant_iter);
+       if (dbus_message_iter_get_arg_type(&variant_iter) != DBUS_TYPE_ARRAY)
+               return FALSE;
+
+       /*
+        * This is supposed to be array of bytearrays (aay), but the earlier
+        * implementation used a dict with "WPSVendorExtensions" as the key in
+        * this setter function which does not match the format used by the
+        * getter function. For backwards compatibility, allow both formats to
+        * be used in the setter.
+        */
+       if (dbus_message_iter_get_element_type(&variant_iter) ==
+           DBUS_TYPE_ARRAY) {
+               /* This is the proper format matching the getter */
+               struct wpabuf *vals[MAX_WPS_VENDOR_EXTENSIONS];
+
+               dbus_message_iter_recurse(&variant_iter, &array_iter);
+
+               if (dbus_message_iter_get_arg_type(&array_iter) !=
+                   DBUS_TYPE_ARRAY ||
+                   dbus_message_iter_get_element_type(&array_iter) !=
+                   DBUS_TYPE_BYTE) {
+                       wpa_printf(MSG_DEBUG,
+                                  "dbus: Not an array of array of bytes");
+                       return FALSE;
+               }
+
+               i = 0;
+               os_memset(vals, 0, sizeof(vals));
+
+               while (dbus_message_iter_get_arg_type(&array_iter) ==
+                      DBUS_TYPE_ARRAY) {
+                       char *val;
+                       int len;
+
+                       if (i == MAX_WPS_VENDOR_EXTENSIONS) {
+                               wpa_printf(MSG_DEBUG,
+                                          "dbus: Too many WPSVendorExtensions values");
+                               i = MAX_WPS_VENDOR_EXTENSIONS + 1;
+                               break;
+                       }
+
+                       dbus_message_iter_recurse(&array_iter, &sub);
+                       dbus_message_iter_get_fixed_array(&sub, &val, &len);
+                       wpa_hexdump(MSG_DEBUG, "dbus: WPSVendorExtentions[]",
+                                   val, len);
+                       vals[i] = wpabuf_alloc_copy(val, len);
+                       if (vals[i] == NULL) {
+                               i = MAX_WPS_VENDOR_EXTENSIONS + 1;
+                               break;
+                       }
+                       i++;
+                       dbus_message_iter_next(&array_iter);
+               }
+
+               if (i > MAX_WPS_VENDOR_EXTENSIONS) {
+                       for (i = 0; i < MAX_WPS_VENDOR_EXTENSIONS; i++)
+                               wpabuf_free(vals[i]);
+                       return FALSE;
+               }
+
+               for (i = 0; i < MAX_WPS_VENDOR_EXTENSIONS; i++) {
+                       wpabuf_free(hapd->conf->wps_vendor_ext[i]);
+                       hapd->conf->wps_vendor_ext[i] = vals[i];
+               }
+
+               hostapd_update_wps(hapd);
+
+               return TRUE;
+       }
+
+       if (dbus_message_iter_get_element_type(&variant_iter) !=
+           DBUS_TYPE_DICT_ENTRY)
+               return FALSE;
+
+       wpa_printf(MSG_DEBUG,
+                  "dbus: Try to use backwards compatibility version of WPSVendorExtensions setter");
        if (!wpa_dbus_dict_open_read(&variant_iter, &iter_dict, error))
                return FALSE;
 
@@ -2285,6 +2352,7 @@ DBusMessage * wpas_dbus_handler_p2p_add_service(DBusMessage *message,
                        version = entry.uint32_value;
                } else if (!os_strcmp(entry.key, "service") &&
                             (entry.type == DBUS_TYPE_STRING)) {
+                       os_free(service);
                        service = os_strdup(entry.str_value);
                } else if (!os_strcmp(entry.key, "query")) {
                        if ((entry.type != DBUS_TYPE_ARRAY) ||
@@ -2310,8 +2378,6 @@ DBusMessage * wpas_dbus_handler_p2p_add_service(DBusMessage *message,
                if (wpas_p2p_service_add_upnp(wpa_s, version, service) != 0)
                        goto error;
 
-               os_free(service);
-               service = NULL;
        } else if (bonjour == 1) {
                if (query == NULL || resp == NULL)
                        goto error;
@@ -2323,6 +2389,7 @@ DBusMessage * wpas_dbus_handler_p2p_add_service(DBusMessage *message,
        } else
                goto error;
 
+       os_free(service);
        return reply;
 error_clear:
        wpa_dbus_dict_entry_clear(&entry);
@@ -2376,9 +2443,10 @@ DBusMessage * wpas_dbus_handler_p2p_delete_service(
                            entry.type == DBUS_TYPE_INT32)
                                version = entry.uint32_value;
                        else if (!os_strcmp(entry.key, "service") &&
-                                entry.type == DBUS_TYPE_STRING)
+                                entry.type == DBUS_TYPE_STRING) {
+                               os_free(service);
                                service = os_strdup(entry.str_value);
-                       else
+                       } else
                                goto error_clear;
 
                        wpa_dbus_dict_entry_clear(&entry);
@@ -2388,7 +2456,6 @@ DBusMessage * wpas_dbus_handler_p2p_delete_service(
                        goto error;
 
                ret = wpas_p2p_service_del_upnp(wpa_s, version, service);
-               os_free(service);
                if (ret != 0)
                        goto error;
        } else if (bonjour == 1) {
@@ -2400,6 +2467,7 @@ DBusMessage * wpas_dbus_handler_p2p_delete_service(
                                if ((entry.type != DBUS_TYPE_ARRAY) ||
                                    (entry.array_type != DBUS_TYPE_BYTE))
                                        goto error_clear;
+                               wpabuf_free(query);
                                query = wpabuf_alloc_copy(
                                        entry.bytearray_value,
                                        entry.array_len);
@@ -2415,14 +2483,17 @@ DBusMessage * wpas_dbus_handler_p2p_delete_service(
                ret = wpas_p2p_service_del_bonjour(wpa_s, query);
                if (ret != 0)
                        goto error;
-               wpabuf_free(query);
        } else
                goto error;
 
+       wpabuf_free(query);
+       os_free(service);
        return reply;
 error_clear:
        wpa_dbus_dict_entry_clear(&entry);
 error:
+       wpabuf_free(query);
+       os_free(service);
        return wpas_dbus_error_invalid_args(message, NULL);
 }
 
@@ -2558,7 +2629,8 @@ DBusMessage * wpas_dbus_handler_p2p_service_sd_res(
                           entry.type == DBUS_TYPE_INT32) {
                        freq = entry.uint32_value;
                } else if (!os_strcmp(entry.key, "dialog_token") &&
-                          entry.type == DBUS_TYPE_UINT32) {
+                          (entry.type == DBUS_TYPE_UINT32 ||
+                           entry.type == DBUS_TYPE_INT32)) {
                        dlg_tok = entry.uint32_value;
                } else if (!os_strcmp(entry.key, "tlvs")) {
                        if (entry.type != DBUS_TYPE_ARRAY ||