diff options
| author | Jouni Malinen <j@w1.fi> | 2011-12-06 21:57:17 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2011-12-06 21:57:17 +0200 |
| commit | c3f42784454e413dcec09c8fd8c77cbe68186ed7 (patch) | |
| tree | da7b4777f9b5bfac47c3046e611e1ea434f7ef79 /src/p2p | |
| parent | ec437d9e748a44d6dc31fb54e9f601e092f7dfcf (diff) | |
| download | external_wpa_supplicant_8_ti-c3f42784454e413dcec09c8fd8c77cbe68186ed7.zip external_wpa_supplicant_8_ti-c3f42784454e413dcec09c8fd8c77cbe68186ed7.tar.gz external_wpa_supplicant_8_ti-c3f42784454e413dcec09c8fd8c77cbe68186ed7.tar.bz2 | |
P2P: Add group ifname to P2P-PROV-DISC-* events
If Provision Discovery Request is sent for GO role (i.e., P2P Group ID
attribute is included), add the group interface name to the control
interface event on the GO. This makes it easier to figure out which
ctrl_iface needs to be used for wps_pbc/wps_pin command to authorize
the joining P2P client.
Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/p2p.h | 5 | ||||
| -rw-r--r-- | src/p2p/p2p_pd.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h index 4735ace..1159121 100644 --- a/src/p2p/p2p.h +++ b/src/p2p/p2p.h @@ -594,6 +594,8 @@ struct p2p_config { * @supp_config_methods: Supported configuration Methods * @dev_capab: Device Capabilities * @group_capab: Group Capabilities + * @group_id: P2P Group ID (or %NULL if not included) + * @group_id_len: Length of P2P Group ID * * This callback is used to indicate reception of a Provision Discovery * Request frame that the P2P module accepted. @@ -601,7 +603,8 @@ struct p2p_config { void (*prov_disc_req)(void *ctx, const u8 *peer, u16 config_methods, const u8 *dev_addr, const u8 *pri_dev_type, const char *dev_name, u16 supp_config_methods, - u8 dev_capab, u8 group_capab); + u8 dev_capab, u8 group_capab, + const u8 *group_id, size_t group_id_len); /** * prov_disc_resp - Callback on Provisiong Discovery Response diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c index ac086b9..903c9ee 100644 --- a/src/p2p/p2p_pd.c +++ b/src/p2p/p2p_pd.c @@ -191,8 +191,8 @@ out: msg.device_name, msg.config_methods, msg.capability ? msg.capability[0] : 0, msg.capability ? msg.capability[1] : - 0); - + 0, + msg.group_id, msg.group_id_len); } p2p_parse_free(&msg); } |