From patchwork Sat Jul 27 19:54:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: michael-dev X-Patchwork-Id: 262506 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 502A92C010B for ; Sun, 28 Jul 2013 05:56:02 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 6A39A17C0E9; Sat, 27 Jul 2013 15:56:00 -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 W1PCUjaJ84Rm; Sat, 27 Jul 2013 15:56:00 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id D9C5B17C110; Sat, 27 Jul 2013 15:55:13 -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 E3BF117C110 for ; Sat, 27 Jul 2013 15:55:12 -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 TeLy6GFdXzBw for ; Sat, 27 Jul 2013 15:55:07 -0400 (EDT) Received: from mail.fem.tu-ilmenau.de (mail.fem.tu-ilmenau.de [141.24.101.79]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 8B3CC17C0E9 for ; Sat, 27 Jul 2013 15:54:47 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.fem.tu-ilmenau.de (Postfix) with ESMTP id 2336464F8 for ; Sat, 27 Jul 2013 21:54:47 +0200 (CEST) X-Virus-Scanned: amavisd-new at fem.tu-ilmenau.de Received: from mail.fem.tu-ilmenau.de ([127.0.0.1]) by localhost (mail.fem.tu-ilmenau.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PDpzJtZ1aAUV; Sat, 27 Jul 2013 21:54:46 +0200 (CEST) Received: from a234.fem.tu-ilmenau.de (unknown [10.42.51.234]) by mail.fem.tu-ilmenau.de (Postfix) with ESMTP; Sat, 27 Jul 2013 21:54:46 +0200 (CEST) Received: from [10.42.51.234] (localhost [127.0.0.1]) by a234.fem.tu-ilmenau.de (Postfix) with ESMTP id 7E47ABED2D; Sat, 27 Jul 2013 21:54:46 +0200 (CEST) Subject: [PATCH v4 04/25] add CONFIG_VLAN_TAGGED configuration option To: hostap@lists.shmoo.com From: Michael Braun Date: Sat, 27 Jul 2013 21:54:46 +0200 Message-ID: <20130727195446.17627.56266.stgit@ray-controller> In-Reply-To: <20130727195247.17627.28374.stgit@ray-controller> References: <20130727195247.17627.28374.stgit@ray-controller> User-Agent: StGit/0.16 MIME-Version: 1.0 Cc: projekt-wlan@fem.tu-ilmenau.de 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: , Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com Signed-hostap: Michael Braun --- hostapd/Makefile | 3 +++ hostapd/defconfig | 3 +++ hostapd/hostapd.conf | 14 ++++++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/hostapd/Makefile b/hostapd/Makefile index a30a244..78dcad5 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -130,6 +130,9 @@ OBJS += ../src/ap/vlan_util.o endif CFLAGS += -DCONFIG_VLAN_NETLINK endif +ifdef CONFIG_VLAN_TAGGED +CFLAGS += -DCONFIG_VLAN_TAGGED +endif endif ifdef CONFIG_NO_CTRL_IFACE diff --git a/hostapd/defconfig b/hostapd/defconfig index c288f46..4e9664d 100644 --- a/hostapd/defconfig +++ b/hostapd/defconfig @@ -174,6 +174,9 @@ CONFIG_IPV6=y # Note: This requires libnl 3.1 or newer. #CONFIG_VLAN_NETLINK=y +# Enable support for tagged VLANs. +# CONFIG_VLAN_TAGGED=y + # Remove support for dumping state into a file on SIGUSR1 signal # This can be used to reduce binary size at the cost of disabling a debugging # option. diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf index c46dff5..a1dbdfe 100644 --- a/hostapd/hostapd.conf +++ b/hostapd/hostapd.conf @@ -840,10 +840,14 @@ own_ip_addr=127.0.0.1 # Dynamic VLAN mode; allow RADIUS authentication server to decide which VLAN # is used for the stations. This information is parsed from following RADIUS -# attributes based on RFC 3580 and RFC 2868: Tunnel-Type (value 13 = VLAN), -# Tunnel-Medium-Type (value 6 = IEEE 802), Tunnel-Private-Group-ID (value -# VLANID as a string). Optionally, the local MAC ACL list (accept_mac_file) can -# be used to set static client MAC address to VLAN ID mapping. +# attributes based on RFC 3580, RFC 2868 and RFC 4675: +# a) Tunnel-Type (value 13 = VLAN), Tunnel-Medium-Type (value 6 = IEEE 802), +# Tunnel-Private-Group-ID (value VLANID as a string) +# b) Egress-VLAN-ID (see RFC 4675). +# Optionally, the local MAC ACL list (accept_mac_file) can be used to set +# static client MAC address to VLAN ID mapping. If tagged vlans are used, +# append "t" and the tagged vlan id to the untagged vlan id (multiple times +# if needed). # 0 = disabled (default) # 1 = option; use default interface if RADIUS server does not include VLAN ID # 2 = required; reject authentication if RADIUS server does not include VLAN ID @@ -855,6 +859,8 @@ own_ip_addr=127.0.0.1 # multiple BSSIDs or SSIDs. Each line in this text file is defining a new # interface and the line must include VLAN ID and interface name separated by # white space (space or tab). +# If tagged vlans are used, append "t" and the tagged vlan id to the untagged +# vlan id (multiple times if needed). # If no entries are provided by this file, the station is statically mapped # to . interfaces. #vlan_file=/etc/hostapd.vlan