From patchwork Mon Mar 17 04:54:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqiang Liu X-Patchwork-Id: 330755 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 ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E9B1C2C00B0 for ; Mon, 17 Mar 2014 15:55:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 697D49C19F; Mon, 17 Mar 2014 00:55:30 -0400 (EDT) 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 FFSHlzKfwzBb; Mon, 17 Mar 2014 00:55:30 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id F1C139C0D7; Mon, 17 Mar 2014 00:55:24 -0400 (EDT) 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 2804F9C0D7 for ; Mon, 17 Mar 2014 00:55:23 -0400 (EDT) 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 P2LPi4ZZf9-4 for ; Mon, 17 Mar 2014 00:55:16 -0400 (EDT) Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) (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 905D49C0D5 for ; Mon, 17 Mar 2014 00:55:16 -0400 (EDT) Received: by mail-pa0-f52.google.com with SMTP id rd3so5240790pab.39 for ; Sun, 16 Mar 2014 21:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=52nqPVJe58xBv0bgbLtAEPR8SyY5tM6uTivR2/hMm3g=; b=ZyTe0g+WFNOQx8fQZCkfdxKtbOAsnUANRfS6C7Sucrj8pisewXo4c1NTcBl5l38x4/ wNpPP4FdzLKrcy8lBkSdzbIe9ipV+p7u9KgHgLK4sQtRCyw63ivtPKfJcVNFa0IUdyMy HlSgdIUT405n0A9iVp2TdzXwMxNKJME1b+0aOMbqSROkGAdQdJ6+eN32HLokCRys0miL ahz6/EtR9ziOl9XFW50uvLkeIaFqHdLli/dRvXrquLOMX8mNmQtJYcAmu5erHs0A01XO tV2pqoQc5gH5hi5Nm2Oj/T5EA5vbcpsXawhEGZcz7zl86ri7R193HI2uV6LfAFWZIjbw CHEg== X-Received: by 10.68.194.65 with SMTP id hu1mr1093330pbc.158.1395032115613; Sun, 16 Mar 2014 21:55:15 -0700 (PDT) Received: from localhost.localdomain ([27.17.16.94]) by mx.google.com with ESMTPSA id tu3sm65942336pab.1.2014.03.16.21.55.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 16 Mar 2014 21:55:15 -0700 (PDT) From: Guoqiang Liu To: hostap@lists.shmoo.com Subject: [PATCH] P2P: make p2p_no_group_iface configurable with dbus Date: Mon, 17 Mar 2014 12:54:00 +0800 Message-Id: <1395032040-9146-1-git-send-email-guoqiang.liu@archermind.com> X-Mailer: git-send-email 1.7.9.5 Cc: guoqiang.liu@archermind.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 From: Guoqiang Liu Some old device need to set p2p_no_group_iface 1 to set up a p2p connection, So open a dbus interface to configure it. Signed-off-by: Guoqiang Liu --- wpa_supplicant/dbus/dbus_new_handlers_p2p.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c index 2b83637..6403e14 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c +++ b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c @@ -825,6 +825,11 @@ dbus_bool_t wpas_dbus_getter_p2p_device_config(DBusMessageIter *iter, wpa_s->conf->disassoc_low_ack)) goto err_no_mem; + /* No Group Iface */ + if (!wpa_dbus_dict_append_bool(&dict_iter, "NoGroupIface", + wpa_s->conf->p2p_no_group_iface)) + goto err_no_mem; + if (!wpa_dbus_dict_close_write(&variant_iter, &dict_iter) || !dbus_message_iter_close_container(iter, &variant_iter)) goto err_no_mem; @@ -974,6 +979,9 @@ dbus_bool_t wpas_dbus_setter_p2p_device_config(DBusMessageIter *iter, else if (os_strcmp(entry.key, "disassoc_low_ack") == 0 && entry.type == DBUS_TYPE_UINT32) wpa_s->conf->disassoc_low_ack = entry.uint32_value; + else if ((os_strcmp(entry.key, "NoGroupIface") == 0) && + (entry.type == DBUS_TYPE_BOOLEAN)) + wpa_s->conf->p2p_no_group_iface = entry.bool_value; else goto error;