From: Andrei Otcheretianski <andrei.otcheretianski@xxxxxxxxx> When P2P Device interface is used and an existing interface is used for P2P GO/Client, the P2P Device configuration is not cloned to the configuration of the existing interface. Thus, configurations such as idle_group_time etc. are not propagated to the P2P GO/Client interface. Handle this by copying all configurations of the P2P device interface to the reused interface, with the following exceptions: 1. Copy the NFC key data only if it was not set in the configuration file. 2. The WPS string fields are set only if they were not previously set in the configuration of the destination interface (based on the assumption that these fields should be identical among all interfaces). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@xxxxxxxxx> --- wpa_supplicant/p2p_supplicant.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index b375155..743c78b 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -1951,7 +1951,12 @@ static void wpas_p2p_clone_config(struct wpa_supplicant *dst, d = dst->conf; s = src->conf; -#define C(n) if (s->n) d->n = os_strdup(s->n) +#define C(n) \ +do { \ + if (s->n && !d->n) \ + d->n = os_strdup(s->n); \ +} while (0) + C(device_name); C(manufacturer); C(model_name); @@ -1979,28 +1984,14 @@ static void wpas_p2p_clone_config(struct wpa_supplicant *dst, d->disable_scan_offload = s->disable_scan_offload; d->passive_scan = s->passive_scan; - if (s->wps_nfc_dh_privkey && s->wps_nfc_dh_pubkey) { - d->wps_nfc_dh_privkey = wpabuf_dup(s->wps_nfc_dh_privkey); - d->wps_nfc_dh_pubkey = wpabuf_dup(s->wps_nfc_dh_pubkey); - } - d->p2p_cli_probe = s->p2p_cli_probe; -} - - -static void wpas_p2p_clone_config_dh(struct wpa_supplicant *dst, - const struct wpa_supplicant *src) -{ - struct wpa_config *d; - const struct wpa_config *s; - - d = dst->conf; - s = src->conf; - if (s->wps_nfc_dh_privkey && s->wps_nfc_dh_pubkey && - !d->wps_nfc_dh_privkey && !d->wps_nfc_dh_pubkey) { + !d->wps_nfc_pw_from_config) { + wpabuf_free(d->wps_nfc_dh_privkey); + wpabuf_free(d->wps_nfc_dh_pubkey); d->wps_nfc_dh_privkey = wpabuf_dup(s->wps_nfc_dh_privkey); d->wps_nfc_dh_pubkey = wpabuf_dup(s->wps_nfc_dh_pubkey); } + d->p2p_cli_probe = s->p2p_cli_probe; } @@ -2255,7 +2246,7 @@ static void wpas_go_neg_completed(void *ctx, struct p2p_go_neg_results *res) group_wpa_s = wpa_s->parent; wpa_s->global->p2p_group_formation = group_wpa_s; if (group_wpa_s != wpa_s) - wpas_p2p_clone_config_dh(group_wpa_s, wpa_s); + wpas_p2p_clone_config(group_wpa_s, wpa_s); } group_wpa_s->p2p_in_provisioning = 1; @@ -5994,7 +5985,7 @@ wpas_p2p_get_group_iface(struct wpa_supplicant *wpa_s, int addr_allocated, "P2P: Use primary interface for group operations"); wpa_s->p2p_first_connection_timeout = 0; if (wpa_s != wpa_s->p2pdev) - wpas_p2p_clone_config_dh(wpa_s, wpa_s->p2pdev); + wpas_p2p_clone_config(wpa_s, wpa_s->p2pdev); return wpa_s; } -- 1.9.1 _______________________________________________ Hostap mailing list Hostap@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/hostap