Changeset 8

Timestamp:

08/26/09 16:30:10 (3 years ago)

Author:

marek

Message:

* adding batman patch for incoming interface based routing * move static IP to br-ap:adm alias interface to run dhcp on the bridge interface * intergrate nodogsplash config * deactivate fixed mcast rate

Files:

• Makefile (modified) (2 diffs)
• packages/robin-ng/files/etc/crontabs/root (modified) (1 diff)
• packages/robin-ng/files/etc/init.d/first_boot (modified) (3 diffs)
• packages/robin-ng/files/sbin/check_inet.sh (modified) (2 diffs)
• patches/batman-adv-incoming-if-based-routing.patch (added)

Makefile

@@ -28 +28 @@
 PATCHES_PATH = patches
 
-BATMAN_VERSION = 1341
+BATMAN_VERSION = 1343
 
 PACKAGE_LIST = utils/bash net/batman-advanced net/dhcp utils/lsof net/nodogsplash net/tcpdump net/mii-tool
 
 
-all: owrt_checkout owrt_config build_robin
+all: owrt_checkout owrt_patches owrt_config build_robin
 
 owrt_checkout:
         svn co -r $(OWRT_DIST_SVN_REV) svn://svn.openwrt.org/$(OWRT_DIST_SVN_PATH) $(OWRT_DIST_LOCAL_PATH)
         svn co -r $(OWRT_PKG_SVN_REV) svn://svn.openwrt.org/$(OWRT_PKG_SVN_PATH) $(OWRT_PKG_LOCAL_PATH)
+        touch $@
+
+owrt_patches:
         cd $(OWRT_PKG_LOCAL_PATH) && patch -p0 < ../$(PATCHES_PATH)/nodogsplash-init-script.patch
+        cp $(PATCHES_PATH)/batman-adv-incoming-if-based-routing.patch $(OWRT_PKG_LOCAL_PATH)/net/batman-advanced/patches/
         touch $@
 
@@ -57 +61 @@
 distclean:
         rm -rf owrt_checkout $(OWRT_DIST_LOCAL_PATH) $(OWRT_PKG_LOCAL_PATH)
-        rm -rf owrt_config
+        rm -rf owrt_patches owrt_config
 

packages/robin-ng/files/etc/crontabs/root

@@ -2 +2 @@
 0-59/2 * * * * /sbin/check_inet.sh
 0-59/2 * * * * /sbin/hw_watchdog.sh
+0-59/5 * * * * /sbin/dashboard_checkin.sh

packages/robin-ng/files/etc/init.d/first_boot

@@ -5 +5 @@
 NET_CONF="$CONFIG_DIR/network"
 WIFI_CONF="$CONFIG_DIR/wireless"
+NODOG_CONF="/etc/nodogsplash/nodogsplash.conf"
 
 
@@ -25 +26 @@
         option bssid 02:CA:FE:CA:CA:40
         option encryption none
-        option mcast_rate 5500
+#        option mcast_rate 5500
         option wmm 1
 
@@ -48 +49 @@
         option 'ifname' 'ap0'
         option 'type' 'bridge'
-        option 'proto' 'static'" >> $NET_CONF
+        option 'proto' 'dhcp'" >> $NET_CONF
+fi
+
+if [ -z "`grep 'GatewayInterface.*br-ap' $NODOG_CONF 2>/dev/null`" ]
+   then
+      echo "
+FirewallRuleSet preauthenticated-users {
+    FirewallRule allow
+}
+FirewallRuleSet authenticated-users {
+    FirewallRule allow
+}
+FirewallRuleSet users-to-router {
+    FirewallRule allow udp port 53
+    FirewallRule allow tcp port 53
+    FirewallRule allow udp port 67
+    FirewallRule allow tcp port 20
+    FirewallRule allow tcp port 21
+    FirewallRule allow tcp port 22
+    FirewallRule allow tcp port 23
+    FirewallRule allow tcp port 80
+    FirewallRule allow tcp port 443
+}
+GatewayName robin
+ClientIdleTimeout 40
+ClientForceTimeout 40
+AuthenticateImmediately 1
+TrafficControl 1
+DownloadLimit 500
+UploadLimit 100
+GatewayInterface br-ap" > $NODOG_CONF
 fi
 
 uci set batman-adv-kernelland.general.interface="mesh0"
 uci commit
-
-sed -i 's/^GatewayInterface.*$/GatewayInterface eth0/' /etc/nodogsplash/nodogsplash.conf
 
 /etc/init.d/dhcpd disable

packages/robin-ng/files/sbin/check_inet.sh

@@ -14 +14 @@
    then
       ifconfig br-ap 192.168.150.1 netmask 255.255.255.0
-      grep nameserver /etc/resolv.conf | awk -F' ' '{ print "option domain-name-servers " $2 ";" }' > /etc/dhcpd.name-servers
+      grep nameserver /etc/resolv.conf | awk -F' ' '{print "option domain-name-servers " $2 ";"}' > /etc/dhcpd.name-servers
 
       /etc/init.d/dhcpd start
@@ -24 +24 @@
 fi
 
+# we have another udhcpc running on the ap / mesh bridge interface
+UDHCP_PID=`ps ax | grep udhcpc | grep $LAN_IF | awk -F' ' '{print $1}'`
+kill $UDHCP_PID
 
-killall udhcpc
 MAC="`ifconfig $LAN_IF | grep HWaddr | awk -F':' '{print "0x"$5,"0x"$6,"0x"$7}'`"
-ifconfig br-ap `printf "5.%i.%i.%i" $MAC`
+ifconfig br-ap:adm `printf "5.%i.%i.%i" $MAC`
 
 # another batman on the ethernet line detected - bonding mode