From e3f9967e9c20b592d369b224749d11617d1bf157 Mon Sep 17 00:00:00 2001
From: Jan Huwald <jh@sotun.de>
Date: Tue, 6 Mar 2012 09:02:52 +0000
Subject: add start_ip & end_ip to mesh dhcp config

Otherwise the DHCP server allways serves X.X.0.2 - X.X.1.0

(via 2603713eb66680ccdb03e7409a5f2ec152534849)

diff --git a/files/common/etc/fsm/inetable/trans/queen.enter b/files/common/etc/fsm/inetable/trans/queen.enter
index a2a3ebf..9753a81 100755
--- a/files/common/etc/fsm/inetable/trans/queen.enter
+++ b/files/common/etc/fsm/inetable/trans/queen.enter
@@ -26,8 +26,11 @@ if [ -z "$oct3" ]; then
     # TODO: log warning about IPv4 addr space exhaustion
 fi
 [ -n "$oct3" ]
-gwip=$(ipcalc.sh "$(uci get cloud.cur.net_mesh)" $(($oct3 * 256 + 1)) 1 \
-     | grep ^START | cut -f2 -d=)
+net_mesh=$(uci get cloud.cur.net_mesh)
+gwip=$(      ipcalc.sh $net_mesh $(($oct3 * 256 + 1))   1 | grep ^START | cut -f2 -d=)
+dhcp_start=$(ipcalc.sh $net_mesh $(($oct3 * 256 + 2))   1 | grep ^START | cut -f2 -d=)
+dhcp_end=$(  ipcalc.sh $net_mesh $(($oct3 * 256 + 254)) 1 | grep ^START | cut -f2 -d=)
+
 p2ptbl update $gwiptbl $oct3 "queen\t$NodeId" br-mesh
 
 # activate gw mode
@@ -43,6 +46,8 @@ set dhcp.mesh.start=2
 set dhcp.mesh.limit=254
 set dhcp.mesh.leasetime=$DHCPLeaseTime
 set dhcp.mesh.interface=mesh
+set dhcp.mesh.start_ip=$dhcp_start
+set dhcp.mesh.end_ip=$dhcp_end
 " | uci batch
 /etc/init.d/dnsmasq restart
 
-- 
cgit v0.10.1