From 3ffbdf95402e827188a03d9efe23dae68b1ed44d Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Fri, 4 Oct 2013 16:05:50 +0200
Subject: [PATCH 1/4] Changed configuration to include batman interface to
 br-lan

---
 Makefile                            |   2 +-
 src/data/etc/mesh.config            |  14 +++-
 src/data/usr/share/mesh/mesh.common | 119 ++++++++++++++++++----------
 3 files changed, 86 insertions(+), 49 deletions(-)

diff --git a/Makefile b/Makefile
index e48e156..997b274 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = piratebox-mesh
-VERSION = 0.3.0
+VERSION = 1.0.2
 ARCH = all
 IPK = $(NAME)_$(VERSION)_$(ARCH).ipk
 IPKDIR = src
diff --git a/src/data/etc/mesh.config b/src/data/etc/mesh.config
index d6faf77..a4caf6c 100644
--- a/src/data/etc/mesh.config
+++ b/src/data/etc/mesh.config
@@ -17,7 +17,7 @@ MESH_IF=mesh0
 MESH_CHANNEL=0
 # Mesh-SSID
 MESH_SSID="PB-Mesh"
-# Needed MTU for B.A.T.M.A.N.
+# Needed MTU on Wifi-Interface for B.A.T.M.A.N.
 MTU_NEEDED=1528
 # Change this to 2nd card, if needed
 IW_DEVICE=phy0
@@ -50,7 +50,7 @@ IPV6_FIXED=""
 ####--------
 #  Extracts the fe80 address and adds an choosen prefix
 ####
-SET_GENERATED_IPV6="yes"
+SET_GENERATED_IPV6="no"
 #used for mesh if
 IPV6_GEN_PREFIX="fdc0:ffea"
 #Enter without /
@@ -59,7 +59,7 @@ IPV6_GEN_NETMASK="48"
 
 #---------------------------------------------
 # IPV4 Stuff
-SET_IPV4="yes"
+SET_IPV4="no"
 # Do you want to choose your IP? 
 IPV4_FIXED=""
 IPV4_SUBNET_MASK="255.0.0.0"
@@ -68,8 +68,14 @@ IPV4_SUBNET_MASK="255.0.0.0"
 IPV4_GENERATE="no"
 
 #Load from file or openWRT config (if openwrt)
-IPV4_LOAD="yes"
+IPV4_LOAD="no"
 
 IPV4_IP_SAVE=/etc/mesh_ipv4.cfg
 
+#---------------------------------------------
+# Bridging options
+###  Should the BATMAN interface included to some available(!) bridge-devices
+ADD_BRIDGE="yes"
+BRIDGE_NAME="br-lan"
+
 #----- Configuration END
diff --git a/src/data/usr/share/mesh/mesh.common b/src/data/usr/share/mesh/mesh.common
index f737a50..2b18b6e 100755
--- a/src/data/usr/share/mesh/mesh.common
+++ b/src/data/usr/share/mesh/mesh.common
@@ -108,6 +108,30 @@ modify_MAC() {
   fi
 }
 
+
+do_bridge_add(){
+  echo "Adding $BAT_IF to bridge $BRIDGE_NAME "
+  brctl addif "$BRIDGE_NAME"  "$BAT_IF"
+  check_rc $?
+
+  ## If we are working in a bridge, disable ipv6 on that device, too
+  # Only disable, if IPV6 exists on device
+  if [ -e "/proc/sys/net/ipv6/conf/$BAT_IF/disable_ipv6" ] ; then
+          echo "Disabling IPV6 for $BAT_IF - IF without any configuration!"
+          echo "1" > /proc/sys/net/ipv6/conf/$BAT_IF/disable_ipv6
+          check_rc $?
+  fi
+
+}
+
+do_bridge_remove() {
+  echo "Removing $BAT_IF from bridge $BRIDGE_NAME "
+  brctl delif "$BRIDGE_NAME"  "$BAT_IF"
+
+}
+
+
+
 do_wlan_if_up() {
    echo  "Setting up AdHoc Interface for B.A.T.M.A.N. "
    iw $IW_DEVICE interface add $MESH_IF type adhoc
@@ -203,7 +227,7 @@ do_batman_up() {
   fi
 
   #Load if not OpenWRt from dataset
-   [ "$OPENWRT" = "yes" ] &&   load_gen_ipv4 
+   [ "$IPV4_LOAD" = "yes" ] &&   load_gen_ipv4 
 
   if [ "$SET_IPV4" = "yes" ] ; then
     echo "Setting up ipv4 address ->$IPV4_FIXED<-  on  $BAT_IF"
@@ -264,15 +288,18 @@ build_mesh() {
   echo "Starting Mesh Network with uci-collect..."
   [ "$OPENWRT" = "yes" ] &&  echo "Starting Mesh Network with uci-collect..." \
   	&& uci_get_details
-  [ "$EXCHANGE_MAC" = "yes" ]  &&  modify_MAC
+  # Run Modify_MAC always because severall Variables are shifted internally
+  modify_MAC
   do_wlan_if_up
   mesh_start
   do_batman_up
+  [ "$ADD_BRIDGE" = "yes" ] && do_bridge_add
   echo "finished"
 }
 
 destroy_mesh() {
   echo "Stopping Mesh Network..."
+  [ "$ADD_BRIDGE" = "yes" ] && do_bridge_remove
   mesh_stop
   do_batman_down
   do_wlan_if_down
@@ -281,49 +308,53 @@ destroy_mesh() {
 
 
 openwrt_postinst() {
-  echo "Generating IPv4 ..."
-  generate_ipv4 
-  save_gen_ipv4 
-  echo "Generated $IPV4_FIXED for this box!"
-
-  echo "Backuping /etc/config/network"
-  cp -v  /etc/config/network /etc/config/network_pre_mesh.backup
-  echo "Backuping /etc/config/firewall"
-  cp -v  /etc/config/firewall /etc/config/firewall_pre_mesh.backup
-
-  echo "Do interface $OPENWRT_NETWORK  setup on /etc/config/network"
-  uci set network.$OPENWRT_NETWORK=interface
-  uci set network.$OPENWRT_NETWORK.ipaddr=$IPV4_FIXED
-  uci set network.$OPENWRT_NETWORK.netmask=$IPV4_SUBNET_MASK
-  uci set network.$OPENWRT_NETWORK.proto=static
-  uci set network.$OPENWRT_NETWORK.ifname=$BAT_IF
-  uci commit
-
-  echo "Do firewall configuration /etc/config/firewall"
-
-  #Enable Forward on lan zone. Lan zone is always the first
-  # in MR3020
-  echo " ... enabling forward on lan"
-  uci set firewall.@zone[0].forward=ACCEPT
- 
-  echo " ... inserting new zone $OPENWRT_NETWORK"
-  uci add firewall zone
-  uci set firewall.@zone[-1].name=$OPENWRT_NETWORK
-  uci set firewall.@zone[-1].masq=1
-  uci set firewall.@zone[-1].mtu_fix=1
-  uci set firewall.@zone[-1].input=ACCEPT
-  uci set firewall.@zone[-1].output=ACCEPT
-  uci set firewall.@zone[-1].forward=REJECT
-
-  echo " ... adding new forward-rule"
-  uci add firewall forwarding
-  uci set firewall.@forwarding[-1].src=lan
-  uci set firewall.@forwarding[-1].dest=$OPENWRT_NETWORK
-
-  uci commit
+
+  if [ "$SET_IPV4" = "yes" ] ; then
+	  echo "Generating IPv4 ..."
+	  generate_ipv4 
+	  save_gen_ipv4 
+	  echo "Generated $IPV4_FIXED for this box!"
+
+	  echo "Backuping /etc/config/network"
+	  cp -v  /etc/config/network /etc/config/network_pre_mesh.backup
+	  echo "Backuping /etc/config/firewall"
+	  cp -v  /etc/config/firewall /etc/config/firewall_pre_mesh.backup
+
+	  echo "Do interface $OPENWRT_NETWORK  setup on /etc/config/network"
+	  uci set network.$OPENWRT_NETWORK=interface
+	  uci set network.$OPENWRT_NETWORK.ipaddr=$IPV4_FIXED
+	  uci set network.$OPENWRT_NETWORK.netmask=$IPV4_SUBNET_MASK
+	  uci set network.$OPENWRT_NETWORK.proto=static
+	  uci set network.$OPENWRT_NETWORK.ifname=$BAT_IF
+	  uci commit
+
+	  echo "Do firewall configuration /etc/config/firewall"
+
+	  #Enable Forward on lan zone. Lan zone is always the first
+	  # in MR3020
+	  echo " ... enabling forward on lan"
+	  uci set firewall.@zone[0].forward=ACCEPT
+	 
+	  echo " ... inserting new zone $OPENWRT_NETWORK"
+	  uci add firewall zone
+	  uci set firewall.@zone[-1].name=$OPENWRT_NETWORK
+	  uci set firewall.@zone[-1].masq=1
+	  uci set firewall.@zone[-1].mtu_fix=1
+	  uci set firewall.@zone[-1].input=ACCEPT
+	  uci set firewall.@zone[-1].output=ACCEPT
+	  uci set firewall.@zone[-1].forward=REJECT
+
+	  echo " ... adding new forward-rule"
+	  uci add firewall forwarding
+	  uci set firewall.@forwarding[-1].src=lan
+	  uci set firewall.@forwarding[-1].dest=$OPENWRT_NETWORK
+
+	  uci commit
  
-  echo "Reloading Firewall"
-  /etc/init.d/firewall reload
+	  echo "Reloading Firewall"
+	  /etc/init.d/firewall reload
+
+  fi
 
 }
 

From 637af64163480ef74cf70a2b9d3b8a9464f297d6 Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Wed, 9 Oct 2013 12:34:35 +0200
Subject: [PATCH 2/4] impementing one_net stuff including supressed dhcp
 broadcast via gw mode

---
 Makefile                            | 4 ++--
 src/control/control                 | 2 +-
 src/data/etc/mesh.config            | 4 ++++
 src/data/usr/share/mesh/mesh.common | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 997b274..8bee79a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = piratebox-mesh
-VERSION = 1.0.2
+VERSION = 1.1.1
 ARCH = all
 IPK = $(NAME)_$(VERSION)_$(ARCH).ipk
 IPKDIR = src
@@ -20,7 +20,7 @@ data: $(IPKDIR)/data.tar.gz $(IPKPSDIR)/data.tar.gz
 
 
 $(IPK): $(IPKDIR)/control.tar.gz $(IPKDIR)/data.tar.gz $(IPKDIR)/control $(IPKDIR)/data
-	tar czf $@ -C $(IPKDIR) control.tar.gz data.tar.gz debian-binary
+	tar czf $@ -C $(IPKDIR) ./control.tar.gz ./data.tar.gz debian-binary
 
 all: $(IPK) $(NON_WRT)
 
diff --git a/src/control/control b/src/control/control
index 33853c0..753893d 100644
--- a/src/control/control
+++ b/src/control/control
@@ -1,5 +1,5 @@
 Package: piratebox-mesh
-Version: 0.2.8
+Version: 1.1.1
 Depends: kmod-batman-adv wireless-tools 
 Provides: 
 Source: package/piratebox-mesh
diff --git a/src/data/etc/mesh.config b/src/data/etc/mesh.config
index a4caf6c..000c1a4 100644
--- a/src/data/etc/mesh.config
+++ b/src/data/etc/mesh.config
@@ -40,6 +40,10 @@ DISABLE_RTS="yes"
 BAT_IF=bat0
 # Increase lookup Frequency to 5s
 BAT_INT=5000
+# Gateway mode ( off ; client ; server )
+#  for NODE only (not be a PirateBox-AP at the same time), choose client
+#  that will stick the client to the next PBx (hopefully)
+BAT_GW=server
 
 #-------------------------------------------
 # SET Ipv6 Stuff
diff --git a/src/data/usr/share/mesh/mesh.common b/src/data/usr/share/mesh/mesh.common
index 2b18b6e..a5fadd5 100755
--- a/src/data/usr/share/mesh/mesh.common
+++ b/src/data/usr/share/mesh/mesh.common
@@ -234,6 +234,10 @@ do_batman_up() {
      ifconfig  "$BAT_IF"   $IPV4_FIXED netmask $IPV4_SUBNET_MASK
      check_rc $?
   fi
+
+  echo "Setting up GatewayMode to $BAT_GW"
+  batctl gw $BAT_GW 
+  check_rc $?
 }
 
 mesh_start() {

From 2c505c98a327fdecc2784cd89f4c5ed37e9b3b2d Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Sat, 12 Jul 2014 18:11:14 +0200
Subject: [PATCH 3/4] cleanup old mesh packages

---
 piratebox-mesh_0.1_all.ipk          | Bin 2581 -> 0 bytes
 piratebox-mesh_0.2.4_all.ipk        | Bin 6800 -> 0 bytes
 piratebox-mesh_0.2.4_all_NON_WRT.sh | 446 ---------------------------
 piratebox-mesh_0.2.5_all.ipk        | Bin 4656 -> 0 bytes
 piratebox-mesh_0.2.5_all_NON_WRT.sh | 448 ----------------------------
 5 files changed, 894 deletions(-)
 delete mode 100644 piratebox-mesh_0.1_all.ipk
 delete mode 100644 piratebox-mesh_0.2.4_all.ipk
 delete mode 100644 piratebox-mesh_0.2.4_all_NON_WRT.sh
 delete mode 100644 piratebox-mesh_0.2.5_all.ipk
 delete mode 100644 piratebox-mesh_0.2.5_all_NON_WRT.sh

diff --git a/piratebox-mesh_0.1_all.ipk b/piratebox-mesh_0.1_all.ipk
deleted file mode 100644
index c03efaac072e502a4d249930bea954e75c603707..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2581
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

diff --git a/piratebox-mesh_0.2.4_all.ipk b/piratebox-mesh_0.2.4_all.ipk
deleted file mode 100644
index a524c6adf317f4d5cae254b3cd31d893380ca344..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6800
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

diff --git a/piratebox-mesh_0.2.4_all_NON_WRT.sh b/piratebox-mesh_0.2.4_all_NON_WRT.sh
deleted file mode 100644
index 4db37f8..0000000
--- a/piratebox-mesh_0.2.4_all_NON_WRT.sh
+++ /dev/null
@@ -1,446 +0,0 @@
-#!/bin/sh
-
-#------------------------------------ 
-#  Configuration for piratebox-mesh
-#------------------------------------
-
-RADIODEVICE=radio0
-OPENWRT=no
-OPENWRT_NETWORK="meshwork"
-# Interface for normal AP Mode
-AP_IF=wlan0
-# Interface for MESH
-MESH_IF=mesh0
-# Channel
-#  If 0 it will use the same channel as configured 
-#       in /etc/config/wireless -> RADIODEVICE
-MESH_CHANNEL=0
-# Mesh-SSID
-MESH_SSID="PB-Mesh"
-# Needed MTU for B.A.T.M.A.N.
-MTU_NEEDED=1528
-# Change this to 2nd card, if needed
-IW_DEVICE=phy0
-# Source MAC Adress.. If non WRT should be filled
-SOURCEMAC=""
-# Modified MAC
-#   if empty, it will exchange a few letters for itself
-MODMAC=""
-# Needed for 2nd device comming up
-EXCHANGE_MAC="yes"
-
-#Fixed BSSID to avoid cell splitting
-CUSTOM_BSSID="12:CA:FF:EE:BA:BA"
-
-#Disable RTS/CTS
-DISABLE_RTS="yes"
-
-####
-# BATMAN stuff
-BAT_IF=bat0
-# Increase lookup Frequency to 5s
-BAT_INT=5000
-
-#-------------------------------------------
-# SET Ipv6 Stuff
-SET_IPV6="no"
-# Do you want a fixed address?
-IPV6_FIXED=""
-
-####--------
-#  Extracts the fe80 address and adds an choosen prefix
-####
-SET_GENERATED_IPV6="yes"
-#used for mesh if
-IPV6_GEN_PREFIX="fdc0:ffea"
-#Enter without /
-IPV6_GEN_NETMASK="48"
-#---------------------------------------------
-
-#---------------------------------------------
-# IPV4 Stuff
-SET_IPV4="yes"
-# Do you want to choose your IP? 
-IPV4_FIXED=""
-IPV4_SUBNET_MASK="255.0.0.0"
-
-# Generates a 10.x.y.z  IP Adress
-IPV4_GENERATE="no"
-
-#Load from file or openWRT config (if openwrt)
-IPV4_LOAD="yes"
-
-IPV4_IP_SAVE=/etc/mesh_ipv4.cfg
-
-#----- Configuration END
-
-#-------- Common Functiond
-BATCTL_FOUND="yes"
-V6_GEN_RESULT=""
-
-check_rc() {
-  MSG=""
-  if [ -n "$2" ] ; then
-    MSG="Error in $2"
-  else
-    MSG="Failed with RC $1"
-  fi
-  [ "$1" != "0" ] && echo $MSG && exit 255
-}
-
-
-uci_get_details() {
-  #get mac Adress from uci
-  SOURCEMAC=$(uci get wireless.$RADIODEVICE.macaddr)
-  check_rc $? "getting  SourceMac"
-  [[ $MESH_CHANNEL = "0" ]] && MESH_CHANNEL=$( uci get wireless.$RADIODEVICE.channel)
-  check_rc $? "getting Channel"
-
-  if [ "$IPV4_LOAD" = "yes" ] ; then
-     $IPV4_FIXED=$(uci get network.$OPENWRT_NETWORK.ipaddr) 
-     check_rc $? "getting  IPv4 from openwrt config"
-  fi
-}
-
-generate_v6() {
-  IF=$1
-  PREFIX="fd00"
-
-  test -n "$2" && PREFIX=$2
-
-  CURRENT_GEN=`ifconfig $IF |
-          grep "inet6 addr: fe80" |
-          sed  -n "s|^.*::\([^/]*\)/.*|\1|p" |
-          tr -d ":"`
-
-  FIXED=`echo ${CURRENT_GEN} | tr -d "\012" | 
-                 sed "s|\(....\)\(....\)\(....\)\(....\)|\1:\2:\3:\4|"`
-
-  echo "Extracted for $IF : $PREFIX::$FIXED "
-  V6_GEN_RESULT="$PREFIX::$FIXED"
-}
-
-
-RANDOM_NUM=0
-random_num() {
-  NUM=$((`</dev/urandom tr -dc 1-9 | head -c3`))
-  [[ "$NUM" >  "254" ]] && NUM=$(($NUM / 7))
-  RANDOM_NUM=$NUM
-}
-
-RANDOM_IP_NUM=0
-random_ip_num() {
-  #Repeat until IP is in range
-  RANDOM_IP_NUM=0
-  RANDOM_NUM=0
-  until  [[  "$RANDOM_NUM" -gt "000" ]] && [[ $RANDOM_NUM -lt "255" ]]
-  do
-     random_num
-     [[ 1 == 2  ]] && echo  "Result random_num $RANDOM_NUM" 
-  done
-  RANDOM_IP_NUM=$RANDOM_NUM
-
-   [[ 1 == 2  ]] &&  echo "result random_ip_num $RANDOM_IP_NUM"
-}
-
-
-generate_ipv4() {
-    # 10.x.y.z
-    x=0
-    y=0
-    z=0
-
-    random_ip_num
-    x=$RANDOM_IP_NUM
-    random_ip_num
-    y=$RANDOM_IP_NUM
-    random_ip_num
-    z=$RANDOM_IP_NUM
-
-    IPV4_FIXED="10.$x.$y.$z"
-} 
-
-modify_MAC() {
-  # Modify MAC for 2nd interface if not set
-  #Change two letters
-  if [ "$MODMAC" = "" ] ;  then
-    MODMAC=$( echo $SOURCEMAC | sed 's/c/a/'  | sed 's/1/2/' )
-    check_rc $?  "sed :( "
-    echo "Found MAC for $RADIODEVICE :  $SOURCEMAC"
-    echo " modified for 2nd Wifi-if  :  $MODMAC"
-  fi
-}
-
-do_wlan_if_up() {
-   echo  "Setting up AdHoc Interface for B.A.T.M.A.N. "
-   iw $IW_DEVICE interface add $MESH_IF type adhoc
-   check_rc $?
-
-   echo "Setting fixed BSSID up"
-   iwconfig $MESH_IF ap $CUSTOM_BSSID
-   check_rc $?
-
-   if [ "$DISABLE_RTS" = "yes" ] ; then
-     echo "Disabling RTS/CTS "
-     iwconfig $MESH_IF rts off
-     check_rc $?
-   fi
-
-  echo "Increasing MTU for $MESH_IF to $MTU_NEEDED"
-  ifconfig $MESH_IF mtu $MTU_NEEDED
-  check_rc $?
-
-  # Only disable, if IPV6 exists on device
-  if [ -e "/proc/sys/net/ipv6/conf/$MESH_IF/disable_ipv6" ] ; then
-	  echo "Disabling IPV6 for $MESH_IF - IF without any configuration!"
-	  echo "1" > /proc/sys/net/ipv6/conf/$MESH_IF/disable_ipv6
-	  check_rc $?
-  fi	  
-
-  if [ "$EXCHANGE_MAC" = "yes" ] ; then
-    echo "Changing $MESH_IF MAC to $MODMAC"
-    ifconfig $MESH_IF hw ether $MODMAC
-    check_rc $?
-  fi
-
-  echo "Setting up Channel $MESH_CHANNEL"
-  iwconfig $MESH_IF channel $MESH_CHANNEL
-  check_rc $?
-
-  echo "Setting SSID for Mesh $MESH_SSID"
-  iwconfig $MESH_IF  essid  $MESH_SSID
-  check_rc $?
-}
-
-
-save_gen_ipv4() {
-     #Save IPv4 Address to tmp-space for later use
-     echo "$IPV4_FIXED" > $IPV4_IP_SAVE
-}
-
-load_gen_ipv4() {
-     IPV4_FIXED=$(cat $IPV4_IP_SAVE)
-}
-
-do_batman_up() {
-  if [ "$BATCTL_FOUND" = "yes" ] ; then
-     echo "Adding $MESH_IF to B.A.T.M.A.N."
-     batctl if add  $MESH_IF  
-     check_rc $?
-  else
-      echo "Adding $MESH_IF to B.A.T.M.A.N. via  /sys/class/ "
-      echo "$BAT_IF" > /sys/class/net/$MESH_IF/batman_adv/mesh_iface 
-       check_rc $?
-  fi
-
-  echo "Starting $BAT_IF"
-  ifconfig $BAT_IF 0.0.0.0 up
-  check_rc $?
-
-  if [ "$BATCTL_FOUND" = "yes" ] ; then
-    echo "Setting B.A.T.M.A.N. Intervall to $BAT_INT "
-    batctl it $BAT_INT
-    check_rc $?
-  else 
-    echo "Setting B.A.T.M.A.N. Intervall via /sys/class/ to $BAT_INT "
-    echo "$BAT_INT"  > /sys/class/net/$BAT_IF/mesh/orig_interval 
-    check_rc $?
-  fi
-
-  if [ "$SET_GENERATED_IPV6" = "yes" ] ; then
-    echo "Generating IPv6 address for $BAT_IF"
-    generate_v6 $BAT_IF $IPV6_GEN_PREFIX
-    check_rc $?
-    IPV6_FIXED="$V6_GEN_RESULT"/"$IPV6_GEN_NETMASK" 
-  fi
-
-  if [ "$SET_IPV6" = "yes" ] ; then
-    echo "Setting up ipv6 address ->$IPV6_FIXED<-  on  $BAT_IF"
-    ifconfig  "$BAT_IF"  add $IPV6_FIXED
-    check_rc $?
-  fi
-
-  if [ "$IPV4_GENERATE" = "yes" ] ; then
-     echo "Generating IPv4 10.x.y.z address for $BAT_IF "
-     generate_ipv4
-  fi
-
-  if [ "$IPV4_LOAD" = "yes" ] ; then
-     load_gen_ipv4 
-  fi
-
-  if [ "$SET_IPV4" = "yes" ] ; then
-    echo "Setting up ipv4 address ->$IPV4_FIXED<-  on  $BAT_IF"
-     ifconfig  "$BAT_IF"  add $IPV4_FIXED netmask $IPV4_SUBNET_MASK
-     check_rc $?
-  fi
-}
-
-mesh_start() {
-  echo "Starting Mesh-IF!" 
-  ifconfig $MESH_IF 0.0.0.0 up
-  check_rc $?
-
-# Extract auto IPV6 adress and remove it from mesh if
-#  AUTO_IPV6=$( ifconfig $MESH_IF | grep "inet6.* " | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//" )
-#  echo "Removing .. $AUTO_IPV6 from $MESH_IF"
-#  ifconfig $MESH_IF inet6 del $AUTO_IPV6
-#  check_rc $? "resetting IPv6 on $MESH_IF"
-
-}
-
-mesh_stop() {
-  echo "Stopping Mesh if!"
-  ifconfig $MESH_IF down
-}
-
-do_wlan_if_down() {
-   echo "Cleaning up interfaces"
-   iw dev $MESH_IF del 
-}
-
-do_batman_down() {
-  if [ "$BATCTL_FOUND" = "yes" ] ; then
-     echo "Remove $MESH_IF from  $BAT_IF "
-     batctl if del $MESH_IF
-  else
-    echo "Remove $MESH_IF from  $BAT_IF via /sys/class/"
-    echo none  > /sys/class/net/$MESH_IF/batman_adv/mesh_iface
-  fi
-}
-
-check_requirements() {
-  lsmod | grep batman >> /dev/null
-  if [ "$?" != "0" ] ; then
-     modprobe  batman-adv
-     check_rc $? "Loading kernel module batman-adv failed.. maybe not installed?"
-  fi
-  batctl if > /dev/null
-  if [ $? != "0" ] ; then 
-    echo "Failed running batctl- maybe not installed? "
-    echo "Try to use  /sys/class/"  
-    BATCTL_FOUND='no'
-  fi
-}
-
-build_mesh() {
-  check_requirements
-  echo "Starting Mesh Network with uci-collect..."
-  [ "$OPENWRT" = "yes" ] &&  echo "Starting Mesh Network with uci-collect..." \
-  	&& uci_get_details
-  modify_MAC
-  do_wlan_if_up
-  mesh_start
-  do_batman_up
-  echo "finished"
-}
-
-destroy_mesh() {
-  echo "Stopping Mesh Network..."
-  mesh_stop
-  do_batman_down
-  do_wlan_if_down
-  echo "finished"
-}
-
-
-openwrt_postinst() {
-  echo "Generating IPv4 ..."
-  generate_ipv4 
-  save_gen_ipv4 
-  echo "Generated $IPV4_FIXED for this box!"
-
-  echo "Backuping /etc/config/network"
-  cp -v  /etc/config/network /etc/config/network_pre_mesh.backup
-  echo "Backuping /etc/config/firewall"
-  cp -v  /etc/config/firewall /etc/config/firewall_pre_mesh.backup
-
-  echo "Do interface $OPENWRT_NETWORK  setup on /etc/config/network"
-  uci set network.$OPENWRT_NETWORK=interface
-  uci set network.$OPENWRT_NETWORK.ipaddr=$IPV4_FIXED
-  uci set network.$OPENWRT_NETWORK.netmask=$IPV4_SUBNET_MASK
-  uci set network.$OPENWRT_NETWORK.proto=static
-  uci set network.$OPENWRT_NETWORK.ifname=$BAT_IF
-  uci commit
-
-  echo "Do firewall configuration /etc/config/firewall"
-
-  #Enable Forward on lan zone. Lan zone is always the first
-  # in MR3020
-  echo " ... enabling forward on lan"
-  uci set firewall.@zone[0].forward=ACCEPT
- 
-  echo " ... inserting new zone $OPENWRT_NETWORK"
-  uci add firewall zone
-  uci set firewall.@zone[-1].name=$OPENWRT_NETWORK
-  uci set firewall.@zone[-1].masq=1
-  uci set firewall.@zone[-1].mtu_fix=1
-  uci set firewall.@zone[-1].input=ACCEPT
-  uci set firewall.@zone[-1].output=ACCEPT
-  uci set firewall.@zone[-1].forward=REJECT
-
-  echo " ... adding new forward-rule"
-  uci add firewall forwarding
-  uci set firewall.@forwarding[-1].src=lan
-  uci set firewall.@forwarding[-1].dest=$OPENWRT_NETWORK
-
-  uci commit
-
-}
-
-openwrt_preremove() {
-   if [ -f /etc/config/network_pre_mesh.backup ] ; then
-      echo "Saving current state of config/network"
-      mv  /etc/config/network /etc/config/network_after_mesh.backup
-      echo "Restoring config/network"
-      mv  /etc/config/network_pre_mesh.backup /etc/config/network
-   fi
-
-   if [ -f /etc/config/firewall_pre_mesh.backup ] ; then
-      echo "Saving current state of config/firewall"
-      mv /etc/config/firewall /etc/config/firewall_after_mesh.backup
-      echo "Restoring config/firewall"
-      mv /etc/config/firewall_pre_mesh.backup /etc/config/firewall
-   fi
-}
-
-## mesh.common END
-
-
-#  ----piece_start_stop Start
-# -- Stuff will be added on Make 
-
-check_config() {
-  if [ "$MESH_CHANNEL" = "0" ] ; then 
-     echo "Please set option MESH_CHANNEL"
-     exit 255
-  elif [ "$SOURCEMAC" =  "$MODMAC"  ] ; then
-     echo "Please set option SOURCEMAC to the MAC Address of you wifi device"
-     ifconfig wlan0 || ifconfig
-     echo "Please set option SOURCEMAC to the MAC Address of you wifi device"
-     echo "   or enter a modified one in MODMAC and set EXCHANGE_MAC=no "
-     exit 255
-  fi
-}
-
-
-#  Start Stop stuff for running in script directly
-if [ "$1" = "start" ] ; then
-  check_config   
-  build_mesh
-elif  [  "$1" = "stop" ] ; then
-  destroy_mesh
-elif [  "$1" = "restart" ] ; then
-  destroy_mesh
-  check_config
-  build_mesh
-elif [ "$1" = "test_gen" ] ; then
-  generate_ipv4
-  echo "Generated IPv4: $IPV4_FIXED"
-else
-  echo "valid options are start|stop|restart"
-  exit 255
-fi
-#  ----piece_start_stop End
-
-
diff --git a/piratebox-mesh_0.2.5_all.ipk b/piratebox-mesh_0.2.5_all.ipk
deleted file mode 100644
index ee2456259426b4e5c1e1fcb348ead41f5fb340cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4656
zcmV-063^`)iwFQ1e;-f)1MS#%Fr00_2k=#5MG(C{N_4C3YKyE+L<yoq^s+h;L`n2$
z(OaTLL|uzjR`0!qC@VUvgb0!#f+gCX=RJSD=gd3j{pURAnKR=v*UU9@U)Rj_yJqhD
zJ9GcwPd$9RpSp|s*m{dP1pxjM;6F)AO8#SpK&8O{JpTg(EG-3qh=ajUX(&`u;?L(0
zaVP`|-~|6Q<@{H^&;GnRCnw;Etxtf%|FG}ht^Ys85l;$W3gyrT5beIPc3T2dbzfHK
zdBFoMz6jK~k-{tB!5>sLIE$*)8>?euc$qalnnKQUUppow`RZr%Y+rUWU~~7A_r}F1
zbjRP6j(Ee2jdep6lI^vOXM(I42Aq*4b>8olUz|<Xy2oe&!$!aPB<syzYU1;_4hP%l
zg8X}#;1LsX>rI!{Z{%=YAiCjnIiYg$68_O0pjbOzX!*wx2_q&apLX`@d%qnvPKbQ+
zc~e-~yJ3T%UUo}XMs!_g?zEigE?;ZMjT*A6+4}pS8l0;0JriKwZ|+Pt_fIQ`KAu@k
z<Vyt>?D+4yz!2a#GS+K4sjBahMSqMa^KxnjQeY7Hx>Kb4q=<GoR{M!XA+V27)K|;A
zh`Yj&$@K?dWdWF)0GtFqh<z2pZ5|{xu39G*`-_=yQ=4Gm7t`}v=@TA9Lv{5bzO1X1
zqX^~52y%}g0Q{VCH>+f+TjPaj*9Yx@&<wCuBC>pYc26Y@t%C_jfG2|0BJ0(`l;3)M
zL@*>PSz}6>>Z$AIr8ScpMWrI_s?j|I9VQ0E^WQKlJ4%i#+Ef!ix<=2#dah=&14cuJ
z^5*diI`U_DRLlA$p1(aLeQt2G{ymMi&I5(2a+uB+0Tw$>-oynfuW7UIxugs$!X_pI
z$KJjj3SF&KcKh8jukG8KB4^bs{ZCO`e5<z((Cl*?q=m;#0{zdnvTT{6|HZHpUnMA)
zg_#2c{_a=y+W#VZTOZrMH2eYoHvgfL5Q+bu{}3sO>-_(}@K5>A>h_F9<CAq=S7Aq?
z-7tN|D}XH4mO~|eELRz%<X0{Xto8%Cd_-&G?%Y)Wy+0=}aZWtE4f6g5(lJQ$D?zp)
z1J5Ax@XDhf!{*FO${o60LcnA1Gym!L#vovWcgKpe5ml8z)hy+E<;xw@K%DRqQ6JHB
zX=u1P4uEYM#OvievU~ZvKhQ??lH<qz+=<&curw44IIg_v(x5%dlfWBDSUR~{!w4u0
zJc}N+>EX{eqcNer`20x$ZVQJl6`XYlq1B_sRSW#x3GJ;$!(U?b4#;L@A_ri8pTE{N
z^UGa1u&?~%`O}{9<s7ajh%tS^5p?kMU4>7IM{)rlC4`qmgogOf);2t`X5xxxf#R4U
zj^tN(m$Jz7#pBNM4{8%Pv!GHsgFAPtpioDQ!plxK2qIW~$JcyLqEE0o40k+vH!6gR
z)Rre@9PwGk{a*a{2L<GQfH|ByNx=kXv;7+DGm;VjVIR;?E6mh_vweZm6HWt1xGljY
zzMks`QItiIeaiLU?NJI{<ys8>QXs=}oYYTsIb)zl89%Kj#0GY}lY4dg<}kFhp`m7W
zD39ntk1kzuNHIqP==hsZOWG~FMcf_Ff^Uy)Sl%Dg&Kr8l@F7mTxS~3nEogw;&?9}h
zOF!UZ#w(Z`OKgwwX5mFomrq~zjV%GiH#fPM*zzdv%7r%>*-@!`=smHkS^oS<$-upn
zG(&N~+a6l7_AyMbEt>h3KCgmxGTW)UwDH-H21KRBj)nJ1#Ls~{u;gyu()f+YTk7~I
z;?qZYKLwjjjIf=S=Op}WX&26$gXwM?i_8Wmj1qTAJ*z&+vLz;;zgE5TMXO=K1=_Y;
zQU$%ebgEb&TN}I)G-xBko-VhM>OIZcaC`MT?M0HNt*Z3xrHzn4KnRsCk}L!hEe9p6
z+0;p9ZhqldbuMM0GzagB8ii!`n=UhABD_#ZS5H+x##fNcAd(B3nq9kN3<oDP_rItX
zA>>3g_di4-SbG~j6Z3e8()X<g1Q$`Q6)&CNfF^)U(t63y9;`7tt{py5bf_Mg)B*pI
z6m_Mf>S>uLi~h+}$hgiay7G-Ec%J>cMjD4`C0qTS0&Q_=ENeJ0GWQ+1uRQ{xD^iDj
zr<?r}BgZV{@fHBJ1R#i+I+VKPRmAiI5eiy%UtHL4CX>N_>wg?+VyNWjwlPAckodlk
z*`=WR*q}Ce;pP(%bD`HySbp64s04qX;Ae(x!aIH~29U$<J#*Kl?I_)1!MNY4_EAac
zxhGXG#gDPF**rvaRc$tu%&4CV=y>V-mUC8Ue*Jbu4-R$KEdL{2z9Jm3gWd^18|Y;`
zHM*nDQ~j=J4yZ9=%~svGJMn}IU&nSAQ-PEtf$`xLOO3#I)T56}7x=dNgsb73e|~aR
z`13=&cjd#e9gbw;|6Gv4Gq#|dT;DjhBo&e`2Ip=KjW}Zm6E0>ZPKOROQ3gFnZZLN}
zxuIa4&?K->;cn5$ivQX9>x_{pTb(N~buH0S)<P5ADww{gef@DX=)KGVQ_RjM;d&;$
zsF&gwTv1Z$5eD0VAKrb2bjlV*l&|TlDO3L>mG)0FrZaegZUc4+0k#U{>-d7?LoqRJ
zDMSp1L=%>Ss{KuWq!IYkdIpcOUjpcePf=31E$Kw<Qx_Ll=aor8TK6nI^i>H$_(z$u
zdodo=D@n<6?!b;e0JqKHPn^wG`V<HfHMa2pLx2??CE0j}XMduOFC#s7ntU#UM`iq(
zO0t)8sHKbj^LpQ7YZ&hJSplmYAKQfp$i#PWpMQB{O4&#?#W=e_K`vPFYXi?=TDCR+
zd%@Spt8EeAL)SHa0l9pJa!^oos6OSkfDvSqvvunsJ%-?qK`ZG)Q}KBz@a_8NvZT>$
z0!F0vt{cgEG1Y~=hYY0-D(4%?-J{x!WHQO2SerA`$~i%Vp~}>I3$%@04S@PAt&i<T
zc#G|bR(vUvQ-G3}e!N!{2T;Cu!?H33wB;(3r)3`~BS-_FTM3JkC|xJ5ZC-@x*j-NX
z+k=e(B*O|@iiXUhKYIHj9i+~zdTWal<5EHTx4hWy^R^ZbRw!^9w`k4oqQeZlD^pNI
zZn*I3Kl-u9sQp}vnMfN4agjscG7Y2gsEW`BRV)T#9UdtCo>k2kXp65ONx{a+{xoDd
zgmmSS^RjG|#{^<3jh*v`ra+;iR!^i7Rut9<fT7X(J=!@BtTv4#z(&<y>@V7^8#2ef
zF6<$#wezgs@21yh`a7k!sWZTS<~zS!H0q*aRSB@}x4MuYnC9?geEHrsIzomsibtJg
z`2DWy{5Wp!JkdgOqI|6G@~i2tE@qS1*t9GChKX4aEt!hWnB&Vs5}vbn$6u9<JS0_N
zShf@Xh^Y`%#q(%*%V8|-I3lgI4c&IWna3M%nXUp6WpGwOoJxr9r+q%CaNY}DSfVwz
z7FiRfw<0Q?2@qMt(a<I;-=viBjFUd5Rjft%r)_?)D$ZJDuDu~aNSfRI{vpK-Zn*Bb
z&vA-P;zRpw3^Gfjf~$Hsi)<hsK+*6=4rswkoN~ZaNxOUs%qD1Au%PC=&gx{GKNAkR
zFKOYDPnpfZ6;1qyc)#pDCtm_V&P4*$_GZaX@$IN?J2Jvd%yaiRBhm~m^@2eMm#Y_j
zyf@Hqx}F|1rI}TBiz(L`?Gc!Jkoe^Q4ZTIR)fH|*&1}o)J-n2ko8?W7O{aOp7E*AD
zqB1V3gj%g@H_nw?xt|f$_lDUNq3YeBt!OQavgWGw5F?pMBO_X<>2`M%Z4CV8TjGV2
zTV3`U37>A=?-W9SLiPn;D8_XH2;R0~9l3q|mN7N!H;UneEP-(r0hFUfcUzq&IS%S#
z;y*w8;%b-Y-a^|7%blOnWSY?|9Ft3{lDDwI25r4<`95=WTx_${c~67RQnn;AanFQA
z)yJ^MTUkD{s?6RYzrPqhGBvGk-JBxH70Pi(l0pCeDy~vh$Tz$7bDJ2LjHG{tvxZX)
zh_ISXIU(f0?)dOZ8UROR{N{fZrg+|CY>(9u$cYtut`15^O5E<1OsTE?z$WA8sEzKg
z<m)0S5t1574qBf~okMvQ4l0R=z~+R1Yj;I@)kcoz_lPxUQ_rOJ-wP>BrJ1>n3SX}m
zM}h2ulJ`%@otRe<huS4uuHgukg7t^(7;FU^DeZ?a$Uho8kRM^_Z#kGEvl|><Z`QJd
zn<7&_y4l2x#IOC5uCzbStL4i^JJ70C9j7llR1sOu1ZNO8F<uddmsdoc*7O9>gxy3w
zQ6>|8l}8x;)B>VYk?Y<amP?I`pRN|EPJZaw6ZG(iF*PrX*=K@v#NN8r?0&oKPG?Fd
zk|$hZ4n2$cSX{|Bh#&2j-<cdwv`JDB@pJapD4vkMougRATX)Cvfy-0=V1hJA1hXwa
zFq39m&YCLEPr8`Eq>-R|tmhqbr*#}mpGWC{{3WX{p;`v*QaoLRt>v(`^<F}e(b3CX
ztpT6$oZ{32jl$a_>vlOS&J{lf$2N19o3f7&ZJrH0rLoZT1!t(l@No1Kxg{j?Q05rk
zd4U}0(2^24?Rgv}Rmj*&eM~=BC&t&<fBPf=C|EILLVr6>r<0c|>7<-mab=BC<{>M4
zM4GBeMVrc=<si#SbJ@VY23fXYq?y63-$N`ge@jygG&9vZ?#s-E1D!P^%^6;pP`&y`
z>pDfY_>EL&9@;M6!_kQNSMn;4RvNxs4zl!UWW3d^g)gp)YJbgJ4;QA|a{Ne2o|@vl
z_vH?3Y;HLhy`115X<RVJe&@(cce?=?d4-<d)B$miQs7ZPwB=(=w;0t~MlKD{XvDT+
zPd~O;oye{_q6$t!oa$-ieF(YL;=gLfrM5r&HIE$tIBHX<?PvG_7Lgn9gXWu4=f-jV
zJ7?iI8l&uWLxauCkQu9zTelHuAfSzX>#dRwn2`P|J2j0E8x428!Gj1D9dl25Y6PRE
z+hgiC!df)zvBcSeQ)_XE*_Jk?F}}x!WHI|%+`rr6)p<gBE`x$yU0ddK_rS`Q*&C6I
z*^s{2MoS;bpGD7zN=gKSnls!5^a=ufz#L?3L-Q><hmCLhy@kdb1D1WTE5xRv(Z#*d
z5kqIb1RFh%*>YYP@t%v+dku;6$B^Yna3lv#I?~CkNf{JqCDM*N#<s5%gGybPKL?Gr
zO)!7hQMb1p&{gI|s*jwHz_c{H9?8JV1i_of=GcyB@YwkeEtBf4$`kij`x~%oqi$Jh
za<U9lpUoL!IxwHx?%RN>cr#<?;K_;u#U~xi%O4~~41b1vZWgmE;NK@LMw>LCS045#
zO+QqJ+?Cud+~Klz%y)tLwhy)NJG>jK>0w?!Cvf`uZG}w9fcmpBVj7Z10uL1;*+`JJ
znw<7?$ETULTfGU9JqU|Pc{k!PD9WoEejZ1zTI)n%%8M7~R=vxS#=D?1&CBMLB$|>p
zURx92D--%Kcy9$}^7`E=2HX`LgxJYkt+mm$AG<+UZL_@H+Bw_{w|KiKt8qagXNdKj
zYi`=VLq}1)YjKBuO3vF*>TS?i9%!1N)pf4r>41;hnxdy0CNA|UK)9O8OwiI@T)Tv&
z(zk37%3rj43(H`pY?H%UBjcMO>!#@>=Jd1aoASNV8aeUfq(C|?=7PPS{@a#wZPKuK
zwWJb)CMI#o=VJIm!X`+YbjGiN#@*lTKAOh+SDsxKB16I{yntu+mX2?G-afMEkHm>_
z{VcmMeT}a4Ll)(&WrN~rL{e^ceL=hR7+Kw;4$!&@hhXE<aPs!?=@V~L+$iVz4E1-r
z8bGUIH+zStJAX4|?F#pDS{<sUcrdw>vBY|p;?4IH(kpl<ym0&wt>(g42R@ZYJb=rb
zXkX&jwz{(?qYULQX!X6np;RV3zS{%I7j#Mh%WovKx&#wtaWVpWLU7<7B-K?zwxCo=
z7kZG`63H6}Bhkwo!yJNXh)f|w{$!|-I49X;&#^(e<wxVPNLnRw7k2(jCM}_OGoqq?
z`i+M5mWcwq-Y-oJx?$W`>djP|#gy3yuDGz`gsc2e3}G3g@KR_k`pHt`zaF9cIBPhw
z{ab+k-~A*0H?eoHbFuXhv2*dT^?vaeo$+t_KYx-0Kp;>_uryd)3Jm#2|3?ZUb>08@
mzaTCOCi}Z<xOVN@wQJX|UAuPe+O=zcz5f8bLt^{@C;$L{_bZ_Q

diff --git a/piratebox-mesh_0.2.5_all_NON_WRT.sh b/piratebox-mesh_0.2.5_all_NON_WRT.sh
deleted file mode 100644
index 926236c..0000000
--- a/piratebox-mesh_0.2.5_all_NON_WRT.sh
+++ /dev/null
@@ -1,448 +0,0 @@
-#!/bin/sh
-
-#------------------------------------ 
-#  Configuration for piratebox-mesh
-#------------------------------------
-
-RADIODEVICE=radio0
-OPENWRT=no
-OPENWRT_NETWORK="meshwork"
-# Interface for normal AP Mode
-AP_IF=wlan0
-# Interface for MESH
-MESH_IF=mesh0
-# Channel
-#  If 0 it will use the same channel as configured 
-#       in /etc/config/wireless -> RADIODEVICE
-MESH_CHANNEL=0
-# Mesh-SSID
-MESH_SSID="PB-Mesh"
-# Needed MTU for B.A.T.M.A.N.
-MTU_NEEDED=1528
-# Change this to 2nd card, if needed
-IW_DEVICE=phy0
-# Source MAC Adress.. If non WRT should be filled
-SOURCEMAC=""
-# Modified MAC
-#   if empty, it will exchange a few letters for itself
-MODMAC=""
-# Needed for 2nd device comming up
-EXCHANGE_MAC="yes"
-
-#Fixed BSSID to avoid cell splitting
-CUSTOM_BSSID="12:CA:FF:EE:BA:BA"
-
-#Disable RTS/CTS
-DISABLE_RTS="yes"
-
-####
-# BATMAN stuff
-BAT_IF=bat0
-# Increase lookup Frequency to 5s
-BAT_INT=5000
-
-#-------------------------------------------
-# SET Ipv6 Stuff
-SET_IPV6="no"
-# Do you want a fixed address?
-IPV6_FIXED=""
-
-####--------
-#  Extracts the fe80 address and adds an choosen prefix
-####
-SET_GENERATED_IPV6="yes"
-#used for mesh if
-IPV6_GEN_PREFIX="fdc0:ffea"
-#Enter without /
-IPV6_GEN_NETMASK="48"
-#---------------------------------------------
-
-#---------------------------------------------
-# IPV4 Stuff
-SET_IPV4="yes"
-# Do you want to choose your IP? 
-IPV4_FIXED=""
-IPV4_SUBNET_MASK="255.0.0.0"
-
-# Generates a 10.x.y.z  IP Adress
-IPV4_GENERATE="no"
-
-#Load from file or openWRT config (if openwrt)
-IPV4_LOAD="yes"
-
-IPV4_IP_SAVE=/etc/mesh_ipv4.cfg
-
-#----- Configuration END
-
-#-------- Common Functiond
-BATCTL_FOUND="yes"
-V6_GEN_RESULT=""
-
-check_rc() {
-  MSG=""
-  if [ -n "$2" ] ; then
-    MSG="Error in $2"
-  else
-    MSG="Failed with RC $1"
-  fi
-  [ "$1" != "0" ] && echo $MSG && exit 255
-}
-
-
-uci_get_details() {
-  #get mac Adress from uci
-  SOURCEMAC=$(uci get wireless.$RADIODEVICE.macaddr)
-  check_rc $? "getting  SourceMac"
-  [[ $MESH_CHANNEL = "0" ]] && MESH_CHANNEL=$( uci get wireless.$RADIODEVICE.channel)
-  check_rc $? "getting Channel"
-
-  if [ "$IPV4_LOAD" = "yes" ] ; then
-     IPV4_FIXED=$(uci get network.$OPENWRT_NETWORK.ipaddr) 
-     check_rc $? "getting  IPv4 from openwrt config"
-  fi
-}
-
-generate_v6() {
-  IF=$1
-  PREFIX="fd00"
-
-  test -n "$2" && PREFIX=$2
-
-  CURRENT_GEN=`ifconfig $IF |
-          grep "inet6 addr: fe80" |
-          sed  -n "s|^.*::\([^/]*\)/.*|\1|p" |
-          tr -d ":"`
-
-  FIXED=`echo ${CURRENT_GEN} | tr -d "\012" | 
-                 sed "s|\(....\)\(....\)\(....\)\(....\)|\1:\2:\3:\4|"`
-
-  echo "Extracted for $IF : $PREFIX::$FIXED "
-  V6_GEN_RESULT="$PREFIX::$FIXED"
-}
-
-
-RANDOM_NUM=0
-random_num() {
-  NUM=$((`</dev/urandom tr -dc 1-9 | head -c3`))
-  [[ "$NUM" >  "254" ]] && NUM=$(($NUM / 7))
-  RANDOM_NUM=$NUM
-}
-
-RANDOM_IP_NUM=0
-random_ip_num() {
-  #Repeat until IP is in range
-  RANDOM_IP_NUM=0
-  RANDOM_NUM=0
-  until  [[  "$RANDOM_NUM" -gt "000" ]] && [[ $RANDOM_NUM -lt "255" ]]
-  do
-     random_num
-     [[ 1 == 2  ]] && echo  "Result random_num $RANDOM_NUM" 
-  done
-  RANDOM_IP_NUM=$RANDOM_NUM
-
-   [[ 1 == 2  ]] &&  echo "result random_ip_num $RANDOM_IP_NUM"
-}
-
-
-generate_ipv4() {
-    # 10.x.y.z
-    x=0
-    y=0
-    z=0
-
-    random_ip_num
-    x=$RANDOM_IP_NUM
-    random_ip_num
-    y=$RANDOM_IP_NUM
-    random_ip_num
-    z=$RANDOM_IP_NUM
-
-    IPV4_FIXED="10.$x.$y.$z"
-} 
-
-modify_MAC() {
-  # Modify MAC for 2nd interface if not set
-  #Change two letters
-  if [ "$MODMAC" = "" ] ;  then
-    MODMAC=$( echo $SOURCEMAC | sed 's/c/a/'  | sed 's/1/2/' )
-    check_rc $?  "sed :( "
-    echo "Found MAC for $RADIODEVICE :  $SOURCEMAC"
-    echo " modified for 2nd Wifi-if  :  $MODMAC"
-  fi
-}
-
-do_wlan_if_up() {
-   echo  "Setting up AdHoc Interface for B.A.T.M.A.N. "
-   iw $IW_DEVICE interface add $MESH_IF type adhoc
-   check_rc $?
-
-   echo "Setting fixed BSSID up"
-   iwconfig $MESH_IF ap $CUSTOM_BSSID
-   check_rc $?
-
-   if [ "$DISABLE_RTS" = "yes" ] ; then
-     echo "Disabling RTS/CTS "
-     iwconfig $MESH_IF rts off
-     check_rc $?
-   fi
-
-  echo "Increasing MTU for $MESH_IF to $MTU_NEEDED"
-  ifconfig $MESH_IF mtu $MTU_NEEDED
-  check_rc $?
-
-  # Only disable, if IPV6 exists on device
-  if [ -e "/proc/sys/net/ipv6/conf/$MESH_IF/disable_ipv6" ] ; then
-	  echo "Disabling IPV6 for $MESH_IF - IF without any configuration!"
-	  echo "1" > /proc/sys/net/ipv6/conf/$MESH_IF/disable_ipv6
-	  check_rc $?
-  fi	  
-
-  if [ "$EXCHANGE_MAC" = "yes" ] ; then
-    echo "Changing $MESH_IF MAC to $MODMAC"
-    ifconfig $MESH_IF hw ether $MODMAC
-    check_rc $?
-  fi
-
-  echo "Setting up Channel $MESH_CHANNEL"
-  iwconfig $MESH_IF channel $MESH_CHANNEL
-  check_rc $?
-
-  echo "Setting SSID for Mesh $MESH_SSID"
-  iwconfig $MESH_IF  essid  $MESH_SSID
-  check_rc $?
-}
-
-
-save_gen_ipv4() {
-     #Save IPv4 Address to tmp-space for later use
-     echo "$IPV4_FIXED" > $IPV4_IP_SAVE
-}
-
-load_gen_ipv4() {
-     IPV4_FIXED=$(cat $IPV4_IP_SAVE)
-}
-
-do_batman_up() {
-  if [ "$BATCTL_FOUND" = "yes" ] ; then
-     echo "Adding $MESH_IF to B.A.T.M.A.N."
-     batctl if add  $MESH_IF  
-     check_rc $?
-  else
-      echo "Adding $MESH_IF to B.A.T.M.A.N. via  /sys/class/ "
-      echo "$BAT_IF" > /sys/class/net/$MESH_IF/batman_adv/mesh_iface 
-       check_rc $?
-  fi
-
-  echo "Starting $BAT_IF"
-  ifconfig $BAT_IF 0.0.0.0 up
-  check_rc $?
-
-  if [ "$BATCTL_FOUND" = "yes" ] ; then
-    echo "Setting B.A.T.M.A.N. Intervall to $BAT_INT "
-    batctl it $BAT_INT
-    check_rc $?
-  else 
-    echo "Setting B.A.T.M.A.N. Intervall via /sys/class/ to $BAT_INT "
-    echo "$BAT_INT"  > /sys/class/net/$BAT_IF/mesh/orig_interval 
-    check_rc $?
-  fi
-
-  if [ "$SET_GENERATED_IPV6" = "yes" ] ; then
-    echo "Generating IPv6 address for $BAT_IF"
-    generate_v6 $BAT_IF $IPV6_GEN_PREFIX
-    check_rc $?
-    IPV6_FIXED="$V6_GEN_RESULT"/"$IPV6_GEN_NETMASK" 
-  fi
-
-  if [ "$SET_IPV6" = "yes" ] ; then
-    echo "Setting up ipv6 address ->$IPV6_FIXED<-  on  $BAT_IF"
-    ifconfig  "$BAT_IF"  add $IPV6_FIXED
-    check_rc $?
-  fi
-
-  if [ "$IPV4_GENERATE" = "yes" ] ; then
-     echo "Generating IPv4 10.x.y.z address for $BAT_IF "
-     generate_ipv4
-  fi
-
-  #Load if not OpenWRt from dataset
-   [ "$OPENWRT" = "yes" ] ||      load_gen_ipv4 
-
-  if [ "$SET_IPV4" = "yes" ] ; then
-    echo "Setting up ipv4 address ->$IPV4_FIXED<-  on  $BAT_IF"
-     ifconfig  "$BAT_IF"  add $IPV4_FIXED netmask $IPV4_SUBNET_MASK
-     check_rc $?
-  fi
-}
-
-mesh_start() {
-  echo "Starting Mesh-IF!" 
-  ifconfig $MESH_IF 0.0.0.0 up
-  check_rc $?
-
-# Extract auto IPV6 adress and remove it from mesh if
-#  AUTO_IPV6=$( ifconfig $MESH_IF | grep "inet6.* " | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//" )
-#  echo "Removing .. $AUTO_IPV6 from $MESH_IF"
-#  ifconfig $MESH_IF inet6 del $AUTO_IPV6
-#  check_rc $? "resetting IPv6 on $MESH_IF"
-
-}
-
-mesh_stop() {
-  echo "Stopping Mesh if!"
-  ifconfig $MESH_IF down
-}
-
-do_wlan_if_down() {
-   echo "Cleaning up interfaces"
-   iw dev $MESH_IF del 
-}
-
-do_batman_down() {
-  if [ "$BATCTL_FOUND" = "yes" ] ; then
-     echo "Remove $MESH_IF from  $BAT_IF "
-     batctl if del $MESH_IF
-  else
-    echo "Remove $MESH_IF from  $BAT_IF via /sys/class/"
-    echo none  > /sys/class/net/$MESH_IF/batman_adv/mesh_iface
-  fi
-}
-
-check_requirements() {
-  lsmod | grep batman >> /dev/null
-  if [ "$?" != "0" ] ; then
-     modprobe  batman-adv
-     check_rc $? "Loading kernel module batman-adv failed.. maybe not installed?"
-  fi
-  batctl if > /dev/null
-  if [ $? != "0" ] ; then 
-    echo "Failed running batctl- maybe not installed? "
-    echo "Try to use  /sys/class/"  
-    BATCTL_FOUND='no'
-  fi
-}
-
-build_mesh() {
-  check_requirements
-  echo "Starting Mesh Network with uci-collect..."
-  [ "$OPENWRT" = "yes" ] &&  echo "Starting Mesh Network with uci-collect..." \
-  	&& uci_get_details
-  modify_MAC
-  do_wlan_if_up
-  mesh_start
-  do_batman_up
-  echo "finished"
-}
-
-destroy_mesh() {
-  echo "Stopping Mesh Network..."
-  mesh_stop
-  do_batman_down
-  do_wlan_if_down
-  echo "finished"
-}
-
-
-openwrt_postinst() {
-  echo "Generating IPv4 ..."
-  generate_ipv4 
-  save_gen_ipv4 
-  echo "Generated $IPV4_FIXED for this box!"
-
-  echo "Backuping /etc/config/network"
-  cp -v  /etc/config/network /etc/config/network_pre_mesh.backup
-  echo "Backuping /etc/config/firewall"
-  cp -v  /etc/config/firewall /etc/config/firewall_pre_mesh.backup
-
-  echo "Do interface $OPENWRT_NETWORK  setup on /etc/config/network"
-  uci set network.$OPENWRT_NETWORK=interface
-  uci set network.$OPENWRT_NETWORK.ipaddr=$IPV4_FIXED
-  uci set network.$OPENWRT_NETWORK.netmask=$IPV4_SUBNET_MASK
-  uci set network.$OPENWRT_NETWORK.proto=static
-  uci set network.$OPENWRT_NETWORK.ifname=$BAT_IF
-  uci commit
-
-  echo "Do firewall configuration /etc/config/firewall"
-
-  #Enable Forward on lan zone. Lan zone is always the first
-  # in MR3020
-  echo " ... enabling forward on lan"
-  uci set firewall.@zone[0].forward=ACCEPT
- 
-  echo " ... inserting new zone $OPENWRT_NETWORK"
-  uci add firewall zone
-  uci set firewall.@zone[-1].name=$OPENWRT_NETWORK
-  uci set firewall.@zone[-1].masq=1
-  uci set firewall.@zone[-1].mtu_fix=1
-  uci set firewall.@zone[-1].input=ACCEPT
-  uci set firewall.@zone[-1].output=ACCEPT
-  uci set firewall.@zone[-1].forward=REJECT
-
-  echo " ... adding new forward-rule"
-  uci add firewall forwarding
-  uci set firewall.@forwarding[-1].src=lan
-  uci set firewall.@forwarding[-1].dest=$OPENWRT_NETWORK
-
-  uci commit
- 
-  echo "Reloading Firewall"
-  /etc/init.d/firewall reload
-
-}
-
-openwrt_preremove() {
-   if [ -f /etc/config/network_pre_mesh.backup ] ; then
-      echo "Saving current state of config/network"
-      mv  /etc/config/network /etc/config/network_after_mesh.backup
-      echo "Restoring config/network"
-      mv  /etc/config/network_pre_mesh.backup /etc/config/network
-   fi
-
-   if [ -f /etc/config/firewall_pre_mesh.backup ] ; then
-      echo "Saving current state of config/firewall"
-      mv /etc/config/firewall /etc/config/firewall_after_mesh.backup
-      echo "Restoring config/firewall"
-      mv /etc/config/firewall_pre_mesh.backup /etc/config/firewall
-   fi
-}
-
-## mesh.common END
-
-
-#  ----piece_start_stop Start
-# -- Stuff will be added on Make 
-
-check_config() {
-  if [ "$MESH_CHANNEL" = "0" ] ; then 
-     echo "Please set option MESH_CHANNEL"
-     exit 255
-  elif [ "$SOURCEMAC" =  "$MODMAC"  ] ; then
-     echo "Please set option SOURCEMAC to the MAC Address of you wifi device"
-     ifconfig wlan0 || ifconfig
-     echo "Please set option SOURCEMAC to the MAC Address of you wifi device"
-     echo "   or enter a modified one in MODMAC and set EXCHANGE_MAC=no "
-     exit 255
-  fi
-}
-
-
-#  Start Stop stuff for running in script directly
-if [ "$1" = "start" ] ; then
-  check_config   
-  build_mesh
-elif  [  "$1" = "stop" ] ; then
-  destroy_mesh
-elif [  "$1" = "restart" ] ; then
-  destroy_mesh
-  check_config
-  build_mesh
-elif [ "$1" = "test_gen" ] ; then
-  generate_ipv4
-  echo "Generated IPv4: $IPV4_FIXED"
-else
-  echo "valid options are start|stop|restart"
-  exit 255
-fi
-#  ----piece_start_stop End
-
-

From 00ce4b011f7e47b19e8ff15847d4f11e07265215 Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Sat, 12 Jul 2014 18:11:46 +0200
Subject: [PATCH 4/4] Adding IPv4 filtering to the bridge interface

---
 Makefile                            |  2 +-
 src/control/control                 |  4 ++--
 src/data/etc/mesh.config            |  2 ++
 src/data/usr/share/mesh/mesh.common | 22 ++++++++++++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8bee79a..087bbe9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = piratebox-mesh
-VERSION = 1.1.1
+VERSION = 1.1.2
 ARCH = all
 IPK = $(NAME)_$(VERSION)_$(ARCH).ipk
 IPKDIR = src
diff --git a/src/control/control b/src/control/control
index 753893d..7171ead 100644
--- a/src/control/control
+++ b/src/control/control
@@ -1,6 +1,6 @@
 Package: piratebox-mesh
-Version: 1.1.1
-Depends: kmod-batman-adv wireless-tools 
+Version: 1.1.2
+Depends: kmod-batman-adv wireless-tools iptables-mod-extra 
 Provides: 
 Source: package/piratebox-mesh
 Section: net
diff --git a/src/data/etc/mesh.config b/src/data/etc/mesh.config
index 000c1a4..4d631e2 100644
--- a/src/data/etc/mesh.config
+++ b/src/data/etc/mesh.config
@@ -82,4 +82,6 @@ IPV4_IP_SAVE=/etc/mesh_ipv4.cfg
 ADD_BRIDGE="yes"
 BRIDGE_NAME="br-lan"
 
+FILTER_IPV4_BRIDGE="yes"
+
 #----- Configuration END
diff --git a/src/data/usr/share/mesh/mesh.common b/src/data/usr/share/mesh/mesh.common
index a5fadd5..3c8b577 100755
--- a/src/data/usr/share/mesh/mesh.common
+++ b/src/data/usr/share/mesh/mesh.common
@@ -131,6 +131,23 @@ do_bridge_remove() {
 }
 
 
+do_bridge_filter() {
+  echo "Add IPv4 filtering on the bridge interface."
+  echo "1" > /proc/sys/net/bridge/bridge-nf-call-iptables 
+  check_rc $?
+  iptables -I INPUT  -m physdev -i "$BRIDGE_NAME"  --physdev-in "$BAT_IF"  -j DROP
+  check_rc $?
+  iptables -I FORWARD  -m physdev -i "$BRIDGE_NAME"  --physdev-in "$BAT_IF"   -j DROP
+  check_rc $?
+}
+
+do_bridge_filter_remove() { 
+  echo "Removing IPv4 filter on the bridge interface."
+  iptables -D INPUT  -m physdev -i "$BRIDGE_NAME"  --physdev-in "$BAT_IF"  -j DROP
+  check_rc $?
+  iptables -D FORWARD  -m physdev -i "$BRIDGE_NAME"  --physdev-in "$BAT_IF"   -j DROP
+  check_rc $?
+}
 
 do_wlan_if_up() {
    echo  "Setting up AdHoc Interface for B.A.T.M.A.N. "
@@ -238,6 +255,8 @@ do_batman_up() {
   echo "Setting up GatewayMode to $BAT_GW"
   batctl gw $BAT_GW 
   check_rc $?
+ 
+  [ "$FILTER_IPV4_BRIDGE" = "yes" ] &&  do_bridge_filter
 }
 
 mesh_start() {
@@ -271,6 +290,9 @@ do_batman_down() {
     echo "Remove $MESH_IF from  $BAT_IF via /sys/class/"
     echo none  > /sys/class/net/$MESH_IF/batman_adv/mesh_iface
   fi
+
+
+  [ "$FILTER_IPV4_BRIDGE" = "yes" ] &&  do_bridge_remove
 }
 
 check_requirements() {