openharmony/third_party_wpa_supplicant
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_wpa_supplicant synced 2025-02-17 06:29:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!323 find bugs for sta and p2p

Browse Source 
Merge pull request !323 from Aurora/zcf_1226
This commit is contained in:
openharmony_ci 2024-01-09 06:16:34 +00:00 committed by Gitee
commit ef2690066a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c
View File

@ -126,6 +126,13 @@ enum p2p_group_removal_reason {
P2P_GROUP_REMOVAL_GO_LEAVE_CHANNEL
};
enum prov_disc_type {
PROV_DISC_TYPE_SHOW_PIN,
PROV_DISC_TYPE_ENTER_PIN,
PROV_DISC_TYPE_PBC_REQ,
PROV_DISC_TYPE_PBC_RESP,
PROV_DISC_TYPE_FAILURE,
};
static void wpas_p2p_long_listen_timeout(void *eloop_ctx, void *timeout_ctx);
static struct wpa_supplicant *
@ -996,12 +1003,16 @@ static int wpas_p2p_group_delete(struct wpa_supplicant *wpa_s,
struct P2pGroupRemovedParam p2pGroupRemovedParam;
#endif
#ifdef CONFIG_VENDOR_EXT
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P_EVENT_GROUP_REMOVED "%s %s%s "MACSTR,
wpa_s->ifname, gtype, reason, MAC2STR(ssid->bssid));
if (ssid) {
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P_EVENT_GROUP_REMOVED "%s %s%s "MACSTR,
wpa_s->ifname, gtype, reason, MAC2STR(ssid->bssid));
}
#ifdef CONFIG_LIBWPA_VENDOR
os_snprintf((char *) p2pGroupRemovedParam.groupIfName, WIFI_P2P_GROUP_IFNAME_LENGTH, "%s %s%s "MACSTR,
wpa_s->ifname, gtype, reason, MAC2STR(ssid->bssid));
if (ssid) {
os_snprintf((char *) p2pGroupRemovedParam.groupIfName, WIFI_P2P_GROUP_IFNAME_LENGTH, "%s %s%s "MACSTR,
wpa_s->ifname, gtype, reason, MAC2STR(ssid->bssid));
}
#endif
#else
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
@ -1449,12 +1460,12 @@ static void wpas_p2p_group_started(struct wpa_supplicant *wpa_s,
p2pGroupStartedParam.isGo = go;
p2pGroupStartedParam.isPersistent = persistent;
p2pGroupStartedParam.frequency = freq;
os_memcpy(p2pGroupStartedParam.groupIfName, wpa_s->ifname, WIFI_P2P_GROUP_IFNAME_LENGTH);
os_memcpy(p2pGroupStartedParam.ssid, ssid_txt, WIFI_SSID_LENGTH);
os_memcpy(p2pGroupStartedParam.psk, psk_txt, WIFI_P2P_PASSWORD_SIZE);
os_memcpy(p2pGroupStartedParam.passphrase, passphrase, WIFI_P2P_PASSWORD_SIZE);
os_memcpy(p2pGroupStartedParam.goDeviceAddress, go_dev_addr, ETH_ALEN);
wpa_printf(MSG_INFO, "WPA_EVENT_GROUP_START ssid=%s bssid=" MACSTR_SEC, p2pGroupStartedParam.ssid,
MAC2STR_SEC(p2pGroupStartedParam.goDeviceAddress));
wpa_printf(MSG_INFO, "WPA_EVENT_GROUP_START ssid=%s ", p2pGroupStartedParam.ssid);
WpaEventReport(wpa_s->ifname, WPA_EVENT_GROUP_START, (void *) &p2pGroupStartedParam);
#endif
#ifdef CONFIG_MAGICLINK
@ -2839,7 +2850,9 @@ static void wpas_dev_lost(void *ctx, const u8 *dev_addr)
#ifdef CONFIG_LIBWPA_VENDOR
struct P2pDeviceLostParam p2pDeviceLostParam;
os_memcpy(p2pDeviceLostParam.p2pDeviceAddress, dev_addr, ETH_ALEN);
p2pDeviceLostParam.networkId = wpa_s->current_ssid->id;
if (wpa_s->current_ssid) {
p2pDeviceLostParam.networkId = wpa_s->current_ssid->id;
}
WpaEventReport(wpa_s->ifname, WPA_EVENT_DEVICE_LOST, (void *) &p2pDeviceLostParam);
#endif
wpas_notify_p2p_device_lost(wpa_s, dev_addr);
@ -3019,6 +3032,7 @@ static void wpas_prov_disc_local_display(struct wpa_supplicant *wpa_s,
" %08d%s", MAC2STR_SEC(peer), generated_pin, params);
#ifdef CONFIG_LIBWPA_VENDOR
struct P2pProvisionDiscoveryCompletedParam p2pProvisionDiscoveryCompletedParam;
p2pProvisionDiscoveryCompletedParam.provDiscStatusCode = PROV_DISC_TYPE_SHOW_PIN;
os_memcpy(p2pProvisionDiscoveryCompletedParam.p2pDeviceAddress, peer, ETH_ALEN);
os_snprintf((char *)p2pProvisionDiscoveryCompletedParam.generatedPin, WIFI_PIN_CODE_LENGTH, "%08d", generated_pin);
wpa_printf(MSG_INFO, "WPA_EVENT_PROVISION_DISCOVERY_COMPLETED %s " MACSTR_SEC,
@ -3039,6 +3053,7 @@ static void wpas_prov_disc_local_keypad(struct wpa_supplicant *wpa_s,
"%s", MAC2STR_SEC(peer), params);
#ifdef CONFIG_LIBWPA_VENDOR
struct P2pProvisionDiscoveryCompletedParam p2pProvisionDiscoveryCompletedParam;
p2pProvisionDiscoveryCompletedParam.provDiscStatusCode = PROV_DISC_TYPE_ENTER_PIN;
os_memcpy(p2pProvisionDiscoveryCompletedParam.p2pDeviceAddress, peer, ETH_ALEN);
wpa_printf(MSG_INFO, "WPA_EVENT_PROVISION_DISCOVERY_COMPLETED " MACSTR_SEC,
MAC2STR_SEC(p2pProvisionDiscoveryCompletedParam.p2pDeviceAddress));
@ -3111,6 +3126,7 @@ static void wpas_prov_disc_req(void *ctx, const u8 *peer, u16 config_methods,
MAC2STR_SEC(peer), params);
#ifdef CONFIG_LIBWPA_VENDOR
struct P2pProvisionDiscoveryCompletedParam p2pProvisionDiscoveryCompletedParam;
p2pProvisionDiscoveryCompletedParam.provDiscStatusCode = PROV_DISC_TYPE_PBC_REQ;
os_memcpy(p2pProvisionDiscoveryCompletedParam.p2pDeviceAddress, peer, ETH_ALEN);
wpa_printf(MSG_INFO, "WPA_EVENT_PROVISION_DISCOVERY_COMPLETED " MACSTR_SEC,
MAC2STR_SEC(p2pProvisionDiscoveryCompletedParam.p2pDeviceAddress));
@ -3171,6 +3187,7 @@ static void wpas_prov_disc_resp(void *ctx, const u8 *peer, u16 config_methods)
MACSTR_SEC "%s", MAC2STR_SEC(peer), params);
#ifdef CONFIG_LIBWPA_VENDOR
struct P2pProvisionDiscoveryCompletedParam p2pProvisionDiscoveryCompletedParam;
p2pProvisionDiscoveryCompletedParam.provDiscStatusCode = PROV_DISC_TYPE_PBC_RESP;
os_memcpy(p2pProvisionDiscoveryCompletedParam.p2pDeviceAddress, peer, ETH_ALEN);
wpa_printf(MSG_INFO, "WPA_EVENT_PROVISION_DISCOVERY_COMPLETED " MACSTR_SEC,
MAC2STR_SEC(p2pProvisionDiscoveryCompletedParam.p2pDeviceAddress));
@ -3240,8 +3257,11 @@ static void wpas_prov_disc_fail(void *ctx, const u8 *peer,
MAC2STR_SEC(peer), status);
}
#ifdef CONFIG_LIBWPA_VENDOR
struct P2pProvisionDiscoveryCompletedParam p2pProvisionDiscoveryCompletedParam;
p2pProvisionDiscoveryCompletedParam.provDiscStatusCode = PROV_DISC_TYPE_FAILURE;
wpa_printf(MSG_INFO, "WPA_EVENT_PROVISION_DISCOVERY_COMPLETED");
WpaEventReport(wpa_s->ifname, WPA_EVENT_PROVISION_DISCOVERY_COMPLETED, NULL);
WpaEventReport(wpa_s->ifname, WPA_EVENT_PROVISION_DISCOVERY_COMPLETED,
(void *) &p2pProvisionDiscoveryCompletedParam);
#endif
wpas_notify_p2p_provision_discovery(wpa_s, peer, 0 /* response */,
status, 0, 0);

2
wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c
View File

@ -7056,7 +7056,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
if (strcmp(wpa_s->ifname, "wlan0") == 0) {
gWpaWlan = wpa_s;
wpa_printf(MSG_ERROR, "gWpaWlan =%p", gWpaWlan);
} else if (strcmp(wpa_s->ifname, "p2p-dev-wlan0") == 0) {
} else if ((strcmp(wpa_s->ifname, "p2p-dev-wlan0") == 0) || (strcmp(wpa_s->ifname, "p2p0") == 0)) {
gWpaP2p = wpa_s;
wpa_printf(MSG_ERROR, "gWpaP2p =%p", gWpaP2p);
} else {