From patchwork Mon Sep 1 04:23:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Copeland X-Patchwork-Id: 384636 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 85BC71400B5 for ; Mon, 1 Sep 2014 14:25:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 9B2F79D39C; Mon, 1 Sep 2014 00:25:32 -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 cqhRvYqdH34K; Mon, 1 Sep 2014 00:25:32 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 8C66E9D39F; Mon, 1 Sep 2014 00:24:17 -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 324DB17C066 for ; Mon, 1 Sep 2014 00:24:16 -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 Ygtvj8bRhI1W for ; Mon, 1 Sep 2014 00:24:09 -0400 (EDT) Received: from mail-ig0-f178.google.com (mail-ig0-f178.google.com [209.85.213.178]) (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 992CB9D39C for ; Mon, 1 Sep 2014 00:24:02 -0400 (EDT) Received: by mail-ig0-f178.google.com with SMTP id hn18so5223220igb.11 for ; Sun, 31 Aug 2014 21:24:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=X1Ezg3yJFGXHmTrPEwHivysacLSO5HPu25mWE28tfsw=; b=ecspB9Ma1MpfWXJKFLzCe5nutnKnkBxwSXRhhg9JWAaN/XzxJu5qwuVK3ZECmxolRY JlFNtSxPwu/VoGr8L23e6VOHTbcC+S6IKRCFkl8wyYq0/EnN9Xg5nYmylpTu7l78WpzG gVDJLftu3nPosUyPxT9PXaNnFimCD+y0Aw9RdicUGDadMo3RThYvyvILvvqCC43zEhHN t1QiawK2lzWGCRGB5ADdD4uOKhjNXa+OYPaPQWyzxCRU/NuVQMtEVMfepls86GfGIqZx QDOhlMa6Il2WChP37JcIusvhui6WVIvqFtE5VwZtkEirtDczUzBDQwV5IYgT+znVYzER 0eUg== X-Gm-Message-State: ALoCoQlgf82OriLoTG10lDp82yE/WL5CxAauc1Wt+TxiIvr1/hHgTXbv+xq4QQtm231dW/REBFxd X-Received: by 10.50.50.198 with SMTP id e6mr18525134igo.1.1409545441709; Sun, 31 Aug 2014 21:24:01 -0700 (PDT) Received: from hash ([2001:470:1d:6db:230:48ff:fe9d:9c89]) by mx.google.com with ESMTPSA id y3sm4373600ign.1.2014.08.31.21.24.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 31 Aug 2014 21:24:01 -0700 (PDT) Received: from glass.lan ([192.168.1.51] helo=glass) by hash with esmtp (Exim 4.80) (envelope-from ) id 1XOJ9J-0005A5-Au; Mon, 01 Sep 2014 00:23:25 -0400 Received: from bob by glass with local (Exim 4.84_RC2) (envelope-from ) id 1XOJ9r-0000dN-UM; Mon, 01 Sep 2014 00:23:59 -0400 From: Bob Copeland To: hostap@lists.shmoo.com Subject: [PATCH v2 15/20] sample conf: add description for new mesh options Date: Mon, 1 Sep 2014 00:23:34 -0400 Message-Id: <1409545419-2301-16-git-send-email-me@bobcopeland.com> X-Mailer: git-send-email 2.1.0.rc1 In-Reply-To: <1409545419-2301-1-git-send-email-me@bobcopeland.com> References: <1409545419-2301-1-git-send-email-me@bobcopeland.com> Cc: Javier Lopez 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: Thomas Pedersen Modify sample wpa_supplicant.conf file to include user_mpm option and new network mode (5), including open and secure mesh networking. Signed-off-by: Javier Lopez Signed-off-by: Jason Mobarak Signed-off-by: Thomas Pedersen --- wpa_supplicant/config.c | 12 ++++++++++++ wpa_supplicant/config_file.c | 2 ++ wpa_supplicant/wpa_supplicant.conf | 26 ++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 0b80ce2..b1069ce 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -677,6 +677,18 @@ static char * wpa_config_write_key_mgmt(const struct parse_data *data, } #endif /* CONFIG_WPS */ +#ifdef CONFIG_SAE + if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { + ret = os_snprintf(pos, end - pos, "%sSAE", + pos == buf ? "" : " "); + if (ret < 0 || ret >= end - pos) { + end[-1] = '\0'; + return buf; + } + pos += ret; + } +#endif /* CONFIG_SAE */ + if (pos == buf) { os_free(buf); buf = NULL; diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c index 3f6da1c..eec0653 100644 --- a/wpa_supplicant/config_file.c +++ b/wpa_supplicant/config_file.c @@ -743,6 +743,8 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid) INT(update_identifier); #endif /* CONFIG_HS20 */ + STR(mesh_ht_mode); + #undef STR #undef INT #undef INT_DEF diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf index 2a0dc20..f0c8636 100644 --- a/wpa_supplicant/wpa_supplicant.conf +++ b/wpa_supplicant/wpa_supplicant.conf @@ -114,6 +114,15 @@ eapol_version=1 # networks are found, a new IBSS or AP mode network is created. ap_scan=1 +# MPM residency +# By default, wpa_supplicant implements the mesh peering manager (MPM) +# for an open mesh. However, if the driver can implement the MPM, you +# may set this to 0 to use the driver version. +# When AMPE is enabled, the wpa_supplicant MPM is always used. +# 0: MPM lives in the driver +# 1: wpa_supplicant provides an MPM which handles peering (default) +user_mpm=1 + # EAP fast re-authentication # By default, fast re-authentication is enabled for all EAP methods that # support it. This variable can be used to disable fast re-authentication. @@ -1285,6 +1294,23 @@ network={ psk="secret passphrase" } +# open mesh network +network={ + ssid="test mesh" + mode=5 + frequency=2437 + key_mgmt=NONE +} + +# secure (SAE + AMPE) network +network={ + ssid="secure mesh" + mode=5 + frequency=2437 + key_mgmt=SAE + psk="very secret passphrase" +} + # Catch all example that allows more or less all configuration modes network={