DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

D-Bus: Add InvitationReceived Signal

Browse source 
This is equivalent to the P2P_EVENT_INVITATION_RECEIVED signal on the
control interface. It can be used to sent the Invitation Received signal
to applications written using D-Bus.

Signed-off-by: Maneesh Jain <maneesh.jain@samsung.com>
This commit is contained in:
Maneesh Jain 2015-06-18 09:46:34 +05:30 • committed by Jouni Malinen
parent 0a7b2a02eb
commit be5ab8d4ab
7 changed files with 112 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

63
wpa_supplicant/dbus/dbus_new.c
View file

@ -1896,6 +1896,63 @@ void wpas_dbus_signal_p2p_group_formation_failure(struct wpa_supplicant *wpa_s,
dbus_message_unref(msg);
}
/**
* wpas_dbus_signal_p2p_invitation_received - Emit InvitationReceived signal
* @wpa_s: %wpa_supplicant network interface data
* @sa: Source address of the Invitation Request
* @dev_add: GO Device Address
* @bssid: P2P Group BSSID or %NULL if not received
* @id: Persistent group id or %0 if not persistent group
* @op_freq: Operating frequency for the group
*/
void wpas_dbus_signal_p2p_invitation_received(struct wpa_supplicant *wpa_s,
const u8 *sa, const u8 *dev_addr,
const u8 *bssid, int id,
int op_freq)
{
DBusMessage *msg;
DBusMessageIter iter, dict_iter;
struct wpas_dbus_priv *iface;
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,
"InvitationReceived");
if (msg == NULL)
return;
dbus_message_iter_init_append(msg, &iter);
if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
(sa &&
!wpa_dbus_dict_append_byte_array(&dict_iter, "sa",
(const char *) sa, ETH_ALEN)) ||
(dev_addr &&
!wpa_dbus_dict_append_byte_array(&dict_iter, "go_dev_addr",
(const char *) dev_addr,
ETH_ALEN)) ||
(bssid &&
!wpa_dbus_dict_append_byte_array(&dict_iter, "bssid",
(const char *) bssid,
ETH_ALEN)) ||
(id &&
!wpa_dbus_dict_append_int32(&dict_iter, "persistent_id", id)) ||
!wpa_dbus_dict_append_int32(&dict_iter, "op_freq", op_freq) ||
!wpa_dbus_dict_close_write(&iter, &dict_iter)) {
dbus_message_unref(msg);
return;
}
dbus_connection_send(iface->con, msg, NULL);
}
#endif /* CONFIG_P2P */
@ -3281,6 +3338,12 @@ static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = {
END_ARGS
}
},
{ "InvitationReceived", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
{
{ "properties", "a{sv}", ARG_OUT },
END_ARGS
}
},
#endif /* CONFIG_P2P */
#ifdef CONFIG_AP
{ "ProbeRequest", WPAS_DBUS_NEW_IFACE_INTERFACE,

12
wpa_supplicant/dbus/dbus_new.h
View file

@ -233,6 +233,10 @@ void wpas_dbus_signal_sta_authorized(struct wpa_supplicant *wpa_s,
const u8 *sta);
void wpas_dbus_signal_sta_deauthorized(struct wpa_supplicant *wpa_s,
const u8 *sta);
void wpas_dbus_signal_p2p_invitation_received(struct wpa_supplicant *wpa_s,
const u8 *sa, const u8 *dev_addr,
const u8 *bssid, int id,
int op_freq);
#else /* CONFIG_CTRL_IFACE_DBUS_NEW */
@ -540,6 +544,14 @@ void wpas_dbus_signal_sta_deauthorized(struct wpa_supplicant *wpa_s,
{
}
static inline
void wpas_dbus_signal_p2p_invitation_received(struct wpa_supplicant *wpa_s,
const u8 *sa, const u8 *dev_addr,
const u8 *bssid, int id,
int op_freq)
{
}
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
#endif /* CTRL_IFACE_DBUS_H_NEW */

2
wpa_supplicant/dbus/dbus_new_introspect.c
View file

@ -257,7 +257,7 @@ DBusMessage * wpa_dbus_introspect(DBusMessage *message,
DBusMessage *reply;
struct wpabuf *xml;
xml = wpabuf_alloc(10000);
xml = wpabuf_alloc(15000);
if (xml == NULL)
return NULL;