From patchwork Sat Nov 23 00:39:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Shmidt X-Patchwork-Id: 293615 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 12E782C00EF for ; Sat, 23 Nov 2013 11:41:50 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 739379C1B9; Fri, 22 Nov 2013 19:41:46 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N6D6zFkDKV3a; Fri, 22 Nov 2013 19:41:46 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id AAE679C178; Fri, 22 Nov 2013 19:41:40 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id E363F9C178 for ; Fri, 22 Nov 2013 19:41:39 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 63jqmomZe7nj for ; Fri, 22 Nov 2013 19:41:34 -0500 (EST) Received: from mail-qa0-f73.google.com (mail-qa0-f73.google.com [209.85.216.73]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id DC6D99C172 for ; Fri, 22 Nov 2013 19:41:34 -0500 (EST) Received: by mail-qa0-f73.google.com with SMTP id o15so778564qap.4 for ; Fri, 22 Nov 2013 16:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:date:subject:to:message-id; bh=GuRqQwNnK69J8GZ00IMeZoQ6VJwXF6M7FHRzYy1Zp+o=; b=XItmNgF4ktvCL0JDpQxUE2BgLvfqiCzALp/DjIpmqN/D4FDXWlEJCukAC+NOUh1xfU 9kS7n4U3n47+AIqmabFaStoFuzRKFmGEeZTdY1M0FfbQpfRe+p3hWkd2bu7dwYsXUt5v TV1Mdz4HT/SFoRn1tXy6+bQmL8IM49b55e9qb3G249NFqDkos0wjBInQ7VIEd6kTaGAd Ol9Yca+jVYSjz0H/SqwxdEMIE1pqalAD2ATnPKGVGxjiHrMmKJ4MRUAnOf1apDtIWi/R OTaIo0GEpFtNBa3yMHFOn0ABiS2zIevfdx11EQsQB3RHW8NM418DZ4hrtxzjuzfTnlQr 8JnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:date:subject:to:message-id; bh=GuRqQwNnK69J8GZ00IMeZoQ6VJwXF6M7FHRzYy1Zp+o=; b=NAGL3ScRguAvIgVJ0BzopRUsX7N01gWK75o322NGLqRTQ1Mwrf46oF696gZcb2BiAN C5oc5/pcZm64ailX/znigpIpxy82DK2BPAdHlU4316cZV4EUdY2QeafbFGqEIMzlDVv7 mWAIRuticcao6HaYvstMq4V1+tcOBFIMOB39sgNdOvmKquj7PFAVXdGYv3pmc5+mBedQ xqewyPsCflaBBP4OyqI84yHcu8cChUch6hm2RUssE3UwBFJVXc3o/y7q+d7HKhVGqi66 Peq2LPr7y5OwMbMg6jrL47l/4QWBkL/ZhmdUQTMaJ7Ya2IjGVKc7QGQ6Fga57bQsy5px rQlQ== X-Gm-Message-State: ALoCoQl7dQ2xNCnLcfv0gQ3Pk2r1SRMOU84v1rbSosR0UhR+20d83AGODDZulP/q0CEHDST7BmYlm0tIeE2wMAnn/1yCBRGLw/B5cE4AyranhN/gwrCX48o+74RYj1D6V8jV+kpycQJSl7jvV6tvASPG2aaDOqmoDaKi+nrTSp1b+SE1xqwOruLlauU+jCWtq/T/Dx1r0j5GJsa9+xFyy4awhWtGLOaFwDzfqeYqzExfVhDa/y9Uqjw= X-Received: by 10.236.51.9 with SMTP id a9mr6998471yhc.41.1385167293529; Fri, 22 Nov 2013 16:41:33 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id g13si301449yhi.0.2013.11.22.16.41.33 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Nov 2013 16:41:33 -0800 (PST) Received: from ushik.mtv.corp.google.com (ushik.mtv.corp.google.com [172.18.120.113]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 485605A41F8 for ; Fri, 22 Nov 2013 16:41:33 -0800 (PST) Received: by ushik.mtv.corp.google.com (Postfix, from userid 57417) id B2FE013FDEA; Fri, 22 Nov 2013 16:41:32 -0800 (PST) From: Dmitry Shmidt Date: Fri, 22 Nov 2013 16:39:37 -0800 Subject: [PATCH] P2P: WFd: Add wfd_dev_info= field for device found event To: hostap@lists.shmoo.com Message-Id: <20131123004132.B2FE013FDEA@ushik.mtv.corp.google.com> X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com Signed-off-by: Dmitry Shmidt --- wpa_supplicant/p2p_supplicant.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index fecc259..1ef0391 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -1442,16 +1442,27 @@ void wpas_dev_found(void *ctx, const u8 *addr, #ifndef CONFIG_NO_STDOUT_DEBUG struct wpa_supplicant *wpa_s = ctx; char devtype[WPS_DEV_TYPE_BUFSIZE]; - +#define WFD_DEV_INFO_SIZE 9 + char wfd_dev_info_hex[2 * WFD_DEV_INFO_SIZE + 1]; + os_memset(wfd_dev_info_hex, 0, sizeof(wfd_dev_info_hex)); +#ifdef CONFIG_WIFI_DISPLAY + if (info->wfd_subelems) { + wpa_snprintf_hex(wfd_dev_info_hex, sizeof(wfd_dev_info_hex), + wpabuf_head(info->wfd_subelems), + WFD_DEV_INFO_SIZE); + } +#endif /* CONFIG_WIFI_DISPLAY */ 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", + "dev_capab=0x%x group_capab=0x%x%s%s", MAC2STR(addr), MAC2STR(info->p2p_device_addr), wps_dev_type_bin2str(info->pri_dev_type, devtype, sizeof(devtype)), - info->device_name, info->config_methods, - info->dev_capab, info->group_capab); + info->device_name, info->config_methods, + info->dev_capab, info->group_capab, + wfd_dev_info_hex[0] ? " wfd_dev_info=0x" : "", + wfd_dev_info_hex); #endif /* CONFIG_NO_STDOUT_DEBUG */ wpas_notify_p2p_device_found(ctx, info->p2p_device_addr, new_device);