openwrt-feed-batman-adv: enable batadv_vlan protocol

Message ID 1400489521-22006-1-git-send-email-antonio@meshcoding.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Antonio Quartulli May 19, 2014, 8:52 a.m. UTC
  From: Antonio Quartulli <antonio@open-mesh.com>

This protocol can be used to change VLAN-specific settings
of a batman-adv soft-interface.
At the moment only ap_isolation is available, but new ones
can be easily added as soon as batman-adv get to support more.

Interface configuration example:

config interface 'bat0vlan1'
	option protocol 'batadv_vlan'
	option ifname 'bat0.1'
	option ap_isolation '1'

Cc: Bastian Bittorf <bittorf@bluebottle.com>
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
---

**this patch has been tested only with the stable package in openwrt-routing**


 batman-adv-devel/Makefile                          |  1 +
 .../files/lib/netifd/proto/batadv_vlan.sh          | 29 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh
  

Comments

Marek Lindner June 2, 2014, 4:20 p.m. UTC | #1
On Monday 19 May 2014 10:52:01 Antonio Quartulli wrote:
> From: Antonio Quartulli <antonio@open-mesh.com>
> 
> This protocol can be used to change VLAN-specific settings
> of a batman-adv soft-interface.
> At the moment only ap_isolation is available, but new ones
> can be easily added as soon as batman-adv get to support more.
> 
> Interface configuration example:
> 
> config interface 'bat0vlan1'
> 	option protocol 'batadv_vlan'
> 	option ifname 'bat0.1'
> 	option ap_isolation '1'

Applied in revision 26284d3.

How about moving this documentation to the OpenWrt config page in our wiki ?
http://www.open-mesh.org/projects/batman-adv/wiki/Batman-adv-openwrt-config

Thanks,
Marek
  
Antonio Quartulli June 2, 2014, 7:14 p.m. UTC | #2
On 02/06/14 18:20, Marek Lindner wrote:
> How about moving this documentation to the OpenWrt config page in our wiki ?
> http://www.open-mesh.org/projects/batman-adv/wiki/Batman-adv-openwrt-config
> 

Yeah, good suggestion. I'll do it soon.

Cheers,
  

Patch

diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile
index e8b0881..76f5861 100644
--- a/batman-adv-devel/Makefile
+++ b/batman-adv-devel/Makefile
@@ -78,6 +78,7 @@  define KernelPackage/batman-adv-devel/install
 	$(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv
 	$(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net
 	$(INSTALL_BIN) ./files/lib/netifd/proto/batadv.sh $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/lib/netifd/proto/batadv_vlan.sh $(1)/lib/netifd/proto
 endef
 
 $(eval $(call KernelPackage,batman-adv-devel))
diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh b/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh
new file mode 100644
index 0000000..85002c3
--- /dev/null
+++ b/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh
@@ -0,0 +1,29 @@ 
+#!/bin/sh
+
+. /lib/functions.sh
+. ../netifd-proto.sh
+init_proto "$@"
+
+proto_batadv_vlan_init_config() {
+	proto_config_add_string "ap_isolation"
+}
+
+proto_batadv_vlan_setup() {
+	local config="$1"
+	local iface="$2"
+
+	# VLAN specific variables
+	local device="${iface%.*}"
+	local vid="${iface#*.}"
+
+	# batadv_vlan options
+	local ap_isolation
+
+	json_get_vars ap_isolation
+
+	echo "$ap_isolation" > "/sys/class/net/${device}/mesh/vlan${vid}/ap_isolation"
+	proto_init_update "$iface" 1
+	proto_send_update "$config"
+}
+
+add_protocol batadv_vlan