wfd: Add callback to return WFD R2 Information element
Bug: 179342930
Test: atest VtsHalWifiSupplicantP2pV1_4TargetTest
Change-Id: I2a6f6ee809ae2020a6e354bec5a452892c000916
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 45c8744..759a05e 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -2495,10 +2495,13 @@
{
u8 *wfd_dev_info = NULL;
u8 wfd_dev_info_len = 0;
+ u8 *wfd_r2_dev_info = NULL;
+ u8 wfd_r2_dev_info_len = 0
#ifndef CONFIG_NO_STDOUT_DEBUG
struct wpa_supplicant *wpa_s = ctx;
char devtype[WPS_DEV_TYPE_BUFSIZE];
char *wfd_dev_info_hex = NULL;
+ char *wfd_r2_dev_info_hex = NULL;
#ifdef CONFIG_WIFI_DISPLAY
wfd_dev_info_hex = wifi_display_subelem_hex(info->wfd_subelems,
@@ -2509,6 +2512,15 @@
// Only used for notification, so not handling error.
hexstr2bin(wfd_dev_info_hex, wfd_dev_info, wfd_dev_info_len);
}
+
+ wfd_r2_dev_info_hex = wifi_display_subelem_hex(info->wfd_subelems,
+ WFD_SUBELEM_R2_DEVICE_INFO);
+ if (wfd_r2_dev_info_hex) {
+ wfd_r2_dev_info_len = strlen(wfd_r2_dev_info_hex) / 2;
+ wfd_r2_dev_info = os_zalloc(wfd_r2_dev_info_len);
+ // Only used for notification, so not handling error.
+ hexstr2bin(wfd_r2_dev_info_hex, wfd_r2_dev_info, wfd_r2_dev_info_len);
+ }
#endif /* CONFIG_WIFI_DISPLAY */
if (info->p2ps_instance) {
@@ -2560,7 +2572,7 @@
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_DEVICE_FOUND MACSTR
" p2p_dev_addr=" MACSTR
" pri_dev_type=%s name='%s' config_methods=0x%x "
- "dev_capab=0x%x group_capab=0x%x%s%s%s new=%d",
+ "dev_capab=0x%x group_capab=0x%x%s%s%s%s%s new=%d",
MAC2STR(addr), MAC2STR(info->p2p_device_addr),
wps_dev_type_bin2str(info->pri_dev_type, devtype,
sizeof(devtype)),
@@ -2568,15 +2580,19 @@
info->dev_capab, info->group_capab,
wfd_dev_info_hex ? " wfd_dev_info=0x" : "",
wfd_dev_info_hex ? wfd_dev_info_hex : "",
+ wfd_r2_dev_info_hex ? " wfd_r2_dev_info=0x" : "",
+ wfd_r2_dev_info_hex ? wfd_r2_dev_info_hex : "",
info->vendor_elems ? " vendor_elems=1" : "",
new_device);
done:
os_free(wfd_dev_info_hex);
+ os_free(wfd_r2_dev_info_hex);
#endif /* CONFIG_NO_STDOUT_DEBUG */
wpas_notify_p2p_device_found(ctx, addr, info, wfd_dev_info,
- wfd_dev_info_len, new_device);
+ wfd_dev_info_len, wfd_r2_dev_info,
+ wfd_r2_dev_info_len, new_device);
os_free(wfd_dev_info);
}