jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

P2P: Add group started notification

Browse source 
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Jean-Michel Bachot 2011-06-12 14:35:37 -07:00 committed by Jouni Malinen
parent dd8a7e0547
commit 4b6baa2f5e
3 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wpa_supplicant/notify.c
View file

@ -436,6 +436,13 @@ void wpas_notify_p2p_provision_discovery(struct wpa_supplicant *wpa_s,
unsigned int generated_pin) unsigned int generated_pin)
{ {
} }
void wpas_notify_p2p_group_started(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, int network_id,
int client)
{
}
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */

3
wpa_supplicant/notify.h
View file

@ -108,5 +108,8 @@ void wpas_notify_p2p_provision_discovery(struct wpa_supplicant *wpa_s,
enum p2p_prov_disc_status status, enum p2p_prov_disc_status status,
u16 config_methods, u16 config_methods,
unsigned int generated_pin); unsigned int generated_pin);
void wpas_notify_p2p_group_started(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, int network_id,
int client);
#endif /* NOTIFY_H */ #endif /* NOTIFY_H */

35
wpa_supplicant/p2p_supplicant.c
View file

@ -368,9 +368,9 @@ static int wpas_p2p_persistent_group(struct wpa_supplicant *wpa_s,
} }
static void wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s, static int wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, struct wpa_ssid *ssid,
const u8 *go_dev_addr) const u8 *go_dev_addr)
{ {
struct wpa_ssid *s; struct wpa_ssid *s;
int changed = 0; int changed = 0;
@ -399,7 +399,8 @@ static void wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s,
changed = 1; changed = 1;
s = wpa_config_add_network(wpa_s->conf); s = wpa_config_add_network(wpa_s->conf);
if (s == NULL) if (s == NULL)
return; return -1;
wpas_notify_network_added(wpa_s, s);
wpa_config_set_network_defaults(s); wpa_config_set_network_defaults(s);
} }
@ -439,6 +440,8 @@ static void wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s,
wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration"); wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
} }
#endif /* CONFIG_NO_CONFIG_WRITE */ #endif /* CONFIG_NO_CONFIG_WRITE */
return s->id;
} }
@ -450,6 +453,7 @@ static void wpas_group_formation_completed(struct wpa_supplicant *wpa_s,
int client; int client;
int persistent; int persistent;
u8 go_dev_addr[ETH_ALEN]; u8 go_dev_addr[ETH_ALEN];
int network_id = -1;
/* /*
* This callback is likely called for the main interface. Update wpa_s * This callback is likely called for the main interface. Update wpa_s
@ -529,8 +533,12 @@ static void wpas_group_formation_completed(struct wpa_supplicant *wpa_s,
} }
if (persistent) if (persistent)
wpas_p2p_store_persistent_group(wpa_s->parent, ssid, network_id = wpas_p2p_store_persistent_group(wpa_s->parent,
go_dev_addr); ssid, go_dev_addr);
if (network_id < 0)
network_id = ssid->id;
if (!client)
wpas_notify_p2p_group_started(wpa_s, ssid, network_id, 0);
} }
@ -836,6 +844,7 @@ static void p2p_go_configured(void *ctx, void *data)
struct wpa_supplicant *wpa_s = ctx; struct wpa_supplicant *wpa_s = ctx;
struct p2p_go_neg_results *params = data; struct p2p_go_neg_results *params = data;
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
int network_id = -1;
ssid = wpa_s->current_ssid; ssid = wpa_s->current_ssid;
if (ssid && ssid->mode == WPAS_MODE_P2P_GO) { if (ssid && ssid->mode == WPAS_MODE_P2P_GO) {
@ -851,10 +860,14 @@ static void p2p_go_configured(void *ctx, void *data)
params->passphrase ? params->passphrase : "", params->passphrase ? params->passphrase : "",
MAC2STR(wpa_s->parent->own_addr), MAC2STR(wpa_s->parent->own_addr),
params->persistent_group ? " [PERSISTENT]" : ""); params->persistent_group ? " [PERSISTENT]" : "");
if (params->persistent_group) if (params->persistent_group)
wpas_p2p_store_persistent_group( network_id = wpas_p2p_store_persistent_group(
wpa_s->parent, ssid, wpa_s->parent, ssid,
wpa_s->parent->own_addr); wpa_s->parent->own_addr);
if (network_id < 0)
network_id = ssid->id;
wpas_notify_p2p_group_started(wpa_s, ssid, network_id, 0);
wpas_p2p_cross_connect_setup(wpa_s); wpas_p2p_cross_connect_setup(wpa_s);
wpas_p2p_set_group_idle_timeout(wpa_s); wpas_p2p_set_group_idle_timeout(wpa_s);
return; return;
@ -3772,6 +3785,7 @@ void wpas_p2p_completed(struct wpa_supplicant *wpa_s)
struct wpa_ssid *ssid = wpa_s->current_ssid; struct wpa_ssid *ssid = wpa_s->current_ssid;
const char *ssid_txt; const char *ssid_txt;
u8 go_dev_addr[ETH_ALEN]; u8 go_dev_addr[ETH_ALEN];
int network_id = -1;
int persistent; int persistent;
if (!wpa_s->show_group_started || !ssid) if (!wpa_s->show_group_started || !ssid)
@ -3810,8 +3824,11 @@ void wpas_p2p_completed(struct wpa_supplicant *wpa_s)
} }
if (persistent) if (persistent)
wpas_p2p_store_persistent_group(wpa_s->parent, ssid, network_id = wpas_p2p_store_persistent_group(wpa_s->parent,
go_dev_addr); ssid, go_dev_addr);
if (network_id < 0)
network_id = ssid->id;
wpas_notify_p2p_group_started(wpa_s, ssid, network_id, 1);
} }