[PATCH 5/6] P2P: Add WpsFailed signal in P2P D-Bus.
Sane, Jayant
jayant.sane at intel.com
Thu Jun 9 12:41:02 EDT 2011
Signal is triggered if an error occurs during wps exchange phase.
Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot at intel.com>
Signed-off-by: Jayant Sane <jayant.sane at intel.com>
---
Note: This patch set applies on top of earlier submitted "DBus-add-support-for-P2P" series
of patches
wpa_supplicant/ap.c | 3 +-
wpa_supplicant/dbus/dbus_new.c | 50 +++++++++++++++++++++++++++++++++++++++
wpa_supplicant/dbus/dbus_new.h | 8 ++++++
wpa_supplicant/notify.c | 7 +++++
wpa_supplicant/notify.h | 2 +
wpa_supplicant/p2p_supplicant.c | 13 ++++++++++
wpa_supplicant/p2p_supplicant.h | 2 +
wpa_supplicant/wps_supplicant.c | 3 ++
8 files changed, 87 insertions(+), 1 deletions(-)
diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 3dbbfe3..0a0eb3b 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -226,10 +226,10 @@ static void ap_wps_event_cb(void *ctx, enum wps_event event,
{
#ifdef CONFIG_P2P
struct wpa_supplicant *wpa_s = ctx;
+ struct wps_event_fail *fail = &data->fail;
if (event == WPS_EV_FAIL && wpa_s->parent && wpa_s->parent != wpa_s &&
wpa_s == wpa_s->global->p2p_group_formation) {
- struct wps_event_fail *fail = &data->fail;
/*
* src/ap/wps_hostapd.c has already sent this on the main
@@ -240,6 +240,7 @@ static void ap_wps_event_cb(void *ctx, enum wps_event event,
"msg=%d config_error=%d",
fail->msg, fail->config_error);
}
+ wpas_p2p_wps_failed(wpa_s, fail);
#endif /* CONFIG_P2P */
}
diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index 3c3d268..d130d71 100644
--- a/wpa_supplicant/dbus/dbus_new.c
+++ b/wpa_supplicant/dbus/dbus_new.c
@@ -1269,6 +1269,49 @@ error:
dbus_message_unref(msg);
}
+/**
+ * wpas_dbus_signal_p2p_wps_failed - Signals Fail WPS event
+ * @wpa_s: %wpa_supplicant network interface data
+ *
+ * Sends Event dbus signal with name "fail" and dictionary containing
+ * "msg field with fail message number (int32) as arguments
+ */
+void wpas_dbus_signal_p2p_wps_failed(struct wpa_supplicant *wpa_s,
+ struct wps_event_fail *fail)
+{
+
+ DBusMessage *msg;
+ DBusMessageIter iter, dict_iter;
+ struct wpas_dbus_priv *iface;
+ char *key = "fail";
+
+ iface = wpa_s->global->dbus;
+
+ /* Do nothing if the control interface is not turned on */
+ if (iface == NULL)
+ return;
+
+ msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_P2PDEVICE,
+ "WpsFailed");
+ if (msg == NULL)
+ return;
+
+ dbus_message_iter_init_append(msg, &iter);
+
+ if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
+ !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
+ !wpa_dbus_dict_append_int32(&dict_iter, "msg", fail->msg) ||
+ !wpa_dbus_dict_append_int16(&dict_iter, "config_error",
+ fail->config_error) ||
+ !wpa_dbus_dict_close_write(&iter, &dict_iter))
+ wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
+ else
+ dbus_connection_send(iface->con, msg, NULL);
+
+ dbus_message_unref(msg);
+}
+
#endif /*CONFIG_P2P*/
/**
@@ -2428,6 +2471,13 @@ static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = {
END_ARGS
}
},
+ { "WpsFailed", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
+ {
+ { "name", "s", ARG_OUT },
+ { "args", "a{sv}", ARG_OUT },
+ END_ARGS
+ }
+ },
#endif /* CONFIG_P2P */
{ NULL, NULL, { END_ARGS } }
};
diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
index e8376fe..9d5db71 100644
--- a/wpa_supplicant/dbus/dbus_new.h
+++ b/wpa_supplicant/dbus/dbus_new.h
@@ -187,6 +187,8 @@ void wpas_dbus_signal_p2p_sd_response(struct wpa_supplicant *wpa_s,
const u8 *tlvs, size_t tlvs_len);
void wpas_dbus_signal_p2p_peer_joined(struct wpa_supplicant *wpa_s,
const u8 *member);
+void wpas_dbus_signal_p2p_wps_failed(struct wpa_supplicant *wpa_s,
+ struct wps_event_fail *fail);
#else /* CONFIG_CTRL_IFACE_DBUS_NEW */
@@ -410,6 +412,12 @@ wpas_dbus_signal_p2p_peer_disconnected(struct wpa_supplicant *wpa_s,
const u8 *member)
{
}
+
+static inline void
+wpas_dbus_signal_p2p_wps_failed(struct wpa_supplicant *wpa_s,
+ struct wps_event_fail *fail)
+{
+}
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
#endif /* CTRL_IFACE_DBUS_H_NEW */
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 7741366..bfd8fd3 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -474,6 +474,13 @@ void wpas_notify_p2p_group_started(struct wpa_supplicant *wpa_s,
wpas_dbus_signal_p2p_group_started(wpa_s, ssid, client, network_id);
}
+
+void wpas_notify_p2p_wps_failed(struct wpa_supplicant *wpa_s,
+ struct wps_event_fail *fail)
+{
+ wpas_dbus_signal_p2p_wps_failed(wpa_s, fail);
+}
+
#endif /* CONFIG_P2P */
diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h
index 7bbce19..87c45c8 100644
--- a/wpa_supplicant/notify.h
+++ b/wpa_supplicant/notify.h
@@ -115,4 +115,6 @@ void wpas_notify_p2p_group_started(struct wpa_supplicant *wpa_s,
int client);
void wpas_notify_ap_sta_deauthorized(struct wpa_supplicant *wpa_s,
const u8 *sta);
+void wpas_notify_p2p_wps_failed(struct wpa_supplicant *wpa_s,
+ struct wps_event_fail *fail);
#endif /* NOTIFY_H */
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index e5534f4..6233167 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -3511,6 +3511,19 @@ void wpas_p2p_wps_success(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
wpas_group_formation_completed(wpa_s, 1);
}
+void wpas_p2p_wps_failed(struct wpa_supplicant *wpa_s,
+ struct wps_event_fail *fail)
+{
+ if (!wpa_s->p2p_in_provisioning) {
+ wpa_printf(MSG_DEBUG, "P2P: Ignore WPS fail event - P2P "
+ "provisioning not in progress");
+ return;
+ }
+ eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s->parent,
+ NULL);
+ wpas_notify_p2p_wps_failed(wpa_s, fail);
+}
+
int wpas_p2p_prov_disc(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
const char *config_method)
diff --git a/wpa_supplicant/p2p_supplicant.h b/wpa_supplicant/p2p_supplicant.h
index e6486eb..09cd18b 100644
--- a/wpa_supplicant/p2p_supplicant.h
+++ b/wpa_supplicant/p2p_supplicant.h
@@ -125,5 +125,7 @@ void wpas_p2p_update_best_channels(struct wpa_supplicant *wpa_s,
int wpas_p2p_unauthorize(struct wpa_supplicant *wpa_s, const char *addr);
int wpas_p2p_disconnect(struct wpa_supplicant *wpa_s);
void wpas_p2p_cancel_connect_timeout_after_invite(void *ctx);
+void wpas_p2p_wps_failed(struct wpa_supplicant *wpa_s,
+ struct wps_event_fail *fail);
#endif /* P2P_SUPPLICANT_H */
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 778ccaf..0abe145 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -470,6 +470,9 @@ static void wpa_supplicant_wps_event_fail(struct wpa_supplicant *wpa_s,
}
wpas_clear_wps(wpa_s);
wpas_notify_wps_event_fail(wpa_s, fail);
+#ifdef CONFIG_P2P
+ wpas_p2p_wps_failed(wpa_s, fail);
+#endif /* CONFIG_P2P */
}
--
1.7.1
More information about the HostAP
mailing list