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

D-Bus: Capture group ifname before switching to global P2P instance

Browse source 
The P2P DBus interface was using the wrong interface name when calling
wpas_p2p_invite_group(). Capture the group interface name before calling
the method to fix this.

Signed-off-by: Hicham Hassoubi <Hicham_hassoubi@bose.com>
This commit is contained in:
Hassoubi, Hicham 2021-12-03 20:10:07 +00:00 • committed by Jouni Malinen
parent 36973aac2c
commit 97607de5e6
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -744,6 +744,7 @@ DBusMessage * wpas_dbus_handler_p2p_invite(DBusMessage *message,
unsigned int group_id = 0; unsigned int group_id = 0;
int persistent = 0; int persistent = 0;
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
const char *group_ifname;
if (!wpa_dbus_p2p_check_enabled(wpa_s, message, &reply, NULL)) if (!wpa_dbus_p2p_check_enabled(wpa_s, message, &reply, NULL))
return reply; return reply;
@ -777,6 +778,8 @@ DBusMessage * wpas_dbus_handler_p2p_invite(DBusMessage *message,
!p2p_peer_known(wpa_s->global->p2p, peer_addr)) !p2p_peer_known(wpa_s->global->p2p, peer_addr))
goto err; goto err;
/* Capture the interface name for the group first */
group_ifname = wpa_s->ifname;
wpa_s = wpa_s->global->p2p_init_wpa_s; wpa_s = wpa_s->global->p2p_init_wpa_s;
if (persistent) { if (persistent) {
@ -821,7 +824,7 @@ DBusMessage * wpas_dbus_handler_p2p_invite(DBusMessage *message,
/* /*
* No group ID means propose to a peer to join my active group * No group ID means propose to a peer to join my active group
*/ */
if (wpas_p2p_invite_group(wpa_s, wpa_s->ifname, if (wpas_p2p_invite_group(wpa_s, group_ifname,
peer_addr, NULL, false)) { peer_addr, NULL, false)) {
reply = wpas_dbus_error_unknown_error( reply = wpas_dbus_error_unknown_error(
message, "Failed to join to an active group"); message, "Failed to join to an active group");