D-Bus: Fix wpas_dbus_signal_p2p_invitation_result() documentation

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

diff --git a/wpa_supplicant/dbus/dbus_new_handlers_wps.c b/wpa_supplicant/dbus/dbus_new_handlers_wps.c
index 3a7651c..dcae0a9 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers_wps.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers_wps.c
@@ -247,48 +247,48 @@ DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
                dbus_message_iter_next(&dict_iter);
        }
 
+#ifdef CONFIG_AP
+       if (wpa_s->ap_iface && params.type == 1) {
+               if (params.pin == NULL) {
+                       wpa_printf(MSG_DEBUG,
+                                  "dbus: WPS.Start - Pin required for registrar role");
+                       return wpas_dbus_error_invalid_args(
+                               message, "Pin required for registrar role.");
+               }
+               ret = wpa_supplicant_ap_wps_pin(wpa_s,
+                                               params.bssid,
+                                               params.pin,
+                                               npin, sizeof(npin), 0);
+       } else if (wpa_s->ap_iface) {
+               ret = wpa_supplicant_ap_wps_pbc(wpa_s,
+                                               params.bssid,
+                                               params.p2p_dev_addr);
+       } else
+#endif /* CONFIG_AP */
        if (params.role == 0) {
                wpa_printf(MSG_DEBUG, "dbus: WPS.Start - Role not specified");
                return wpas_dbus_error_invalid_args(message,
                                                    "Role not specified");
-       } else if (params.role == 1 && params.type == 0) {
+       } else if (params.role == 2) {
+               if (params.pin == NULL) {
+                       wpa_printf(MSG_DEBUG,
+                                  "dbus: WPS.Start - Pin required for registrar role");
+                       return wpas_dbus_error_invalid_args(
+                               message, "Pin required for registrar role.");
+               }
+               ret = wpas_wps_start_reg(wpa_s, params.bssid, params.pin,
+                                        NULL);
+       } else if (params.type == 0) {
                wpa_printf(MSG_DEBUG, "dbus: WPS.Start - Type not specified");
                return wpas_dbus_error_invalid_args(message,
                                                    "Type not specified");
-       } else if (params.role == 2 && params.pin == NULL) {
-               wpa_printf(MSG_DEBUG,
-                          "dbus: WPS.Start - Pin required for registrar role");
-               return wpas_dbus_error_invalid_args(
-                       message, "Pin required for registrar role.");
-       }
-
-       if (params.role == 2)
-               ret = wpas_wps_start_reg(wpa_s, params.bssid, params.pin,
-                                        NULL);
-       else if (params.type == 1) {
-#ifdef CONFIG_AP
-               if (wpa_s->ap_iface)
-                       ret = wpa_supplicant_ap_wps_pin(wpa_s,
-                                                       params.bssid,
-                                                       params.pin,
-                                                       npin, sizeof(npin), 0);
-               else
-#endif /* CONFIG_AP */
-               {
-                       ret = wpas_wps_start_pin(wpa_s, params.bssid,
-                                                params.pin, 0,
-                                                DEV_PW_DEFAULT);
-                       if (ret > 0)
-                               os_snprintf(npin, sizeof(npin), "%08d", ret);
-               }
+       } else if (params.type == 1) {
+               ret = wpas_wps_start_pin(wpa_s, params.bssid,
+                                        params.pin, 0,
+                                        DEV_PW_DEFAULT);
+               if (ret > 0)
+                       os_snprintf(npin, sizeof(npin), "%08d", ret);
        } else {
-#ifdef CONFIG_AP
-               if (wpa_s->ap_iface)
-                       ret = wpa_supplicant_ap_wps_pbc(wpa_s,
-                                                       params.bssid,
-                                                       params.p2p_dev_addr);
-               else
-#endif /* CONFIG_AP */
                ret = wpas_wps_start_pbc(wpa_s, params.bssid, 0);
        }
 
@@ -303,10 +303,8 @@ DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
        }
 
        reply = dbus_message_new_method_return(message);
-       if (!reply) {
-               return dbus_message_new_error(message, DBUS_ERROR_NO_MEMORY,
-                                             NULL);
-       }
+       if (!reply)
+               return wpas_dbus_error_no_memory(message);
 
        dbus_message_iter_init_append(reply, &iter);
        if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
@@ -314,8 +312,7 @@ DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
             !wpa_dbus_dict_append_string(&dict_iter, "Pin", npin)) ||
            !wpa_dbus_dict_close_write(&iter, &dict_iter)) {
                dbus_message_unref(reply);
-               return dbus_message_new_error(message, DBUS_ERROR_NO_MEMORY,
-                                             NULL);
+               return wpas_dbus_error_no_memory(message);
        }
 
        return reply;
@@ -323,6 +320,26 @@ DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
 
 
 /**
+ * wpas_dbus_handler_wps_cancel - Cancel ongoing WPS configuration
+ * @message: Pointer to incoming dbus message
+ * @wpa_s: %wpa_supplicant data structure
+ * Returns: NULL on success or DBus error on failure
+ *
+ * Handler for "Cancel" method call. Returns NULL if WPS cancel successfull
+ * or DBus error on WPS cancel failure
+ */
+DBusMessage * wpas_dbus_handler_wps_cancel(DBusMessage *message,
+                                          struct wpa_supplicant *wpa_s)
+{
+       if (wpas_wps_cancel(wpa_s))
+               return wpas_dbus_error_unknown_error(message,
+                                                    "WPS cancel failed");
+
+       return NULL;
+}
+
+
+/**
  * wpas_dbus_getter_process_credentials - Check if credentials are processed
  * @message: Pointer to incoming dbus message
  * @wpa_s: %wpa_supplicant data structure
@@ -361,6 +378,8 @@ dbus_bool_t wpas_dbus_setter_process_credentials(DBusMessageIter *iter,
        struct wpa_supplicant *wpa_s = user_data;
        dbus_bool_t process_credentials, old_pc;
 
+       if (!wpa_s->dbus_new_path)
+               return FALSE;
        if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_BOOLEAN,
                                              &process_credentials))
                return FALSE;