浏览代码

Tidying the batman script

Bob Mottram 7 年前
父节点
当前提交
a5d2b6a69e
共有 1 个文件被更改,包括 9 次插入14 次删除
  1. 9
    14
      src/freedombone-mesh-batman

+ 9
- 14
src/freedombone-mesh-batman 查看文件

205
         fi
205
         fi
206
         echo -n "${octet}"
206
         echo -n "${octet}"
207
     done
207
     done
208
-    echo ''
209
 }
208
 }
210
 
209
 
211
 function start {
210
 function start {
230
 
229
 
231
     ifconfig $IFACE down
230
     ifconfig $IFACE down
232
     ifconfig $IFACE mtu 1532
231
     ifconfig $IFACE mtu 1532
233
-    ifconfig $IFACE hw ether $(assign_peer_address)
232
+    peeraddr=$(assign_peer_address)
233
+    ifconfig $IFACE hw ether $peeraddr
234
+    echo $"$IFACE assigned MAC address $peeraddr"
234
     iwconfig $IFACE enc off
235
     iwconfig $IFACE enc off
235
     iwconfig $IFACE mode ad-hoc essid $WIFI_SSID channel $CHANNEL
236
     iwconfig $IFACE mode ad-hoc essid $WIFI_SSID channel $CHANNEL
236
     sleep 1
237
     sleep 1
242
     avahi-autoipd --force-bind --daemonize --wait $IFACE
243
     avahi-autoipd --force-bind --daemonize --wait $IFACE
243
     ifconfig bat0 up promisc
244
     ifconfig bat0 up promisc
244
 
245
 
245
-    #Use persistent HWAddr
246
-    ether_new=$(ifconfig eth0 | grep HWaddr | sed -e "s/.*HWaddr //")
247
-    if [ ! -f /var/lib/mesh-node/bat0 ]; then
248
-        mkdir /var/lib/mesh-node
249
-        echo "${ether_new}" > /var/lib/mesh-node/bat0
250
-    else
251
-        ether=$(cat /var/lib/mesh-node/bat0)
252
-        ifconfig bat0 hw ether ${ether}
253
-    fi
254
-
255
     if [ "$EIFACE" ] ; then
246
     if [ "$EIFACE" ] ; then
247
+        echo $'Trying ethernet bridge to the internet'
256
         brctl addbr $BRIDGE
248
         brctl addbr $BRIDGE
257
         brctl addif $BRIDGE bat0
249
         brctl addif $BRIDGE bat0
258
         brctl addif $BRIDGE $EIFACE
250
         brctl addif $BRIDGE $EIFACE
261
         ifconfig $EIFACE up promisc
253
         ifconfig $EIFACE up promisc
262
         ifconfig $BRIDGE up
254
         ifconfig $BRIDGE up
263
         dhclient $BRIDGE
255
         dhclient $BRIDGE
256
+        echo $'End of ethernet bridge'
264
     fi
257
     fi
265
 
258
 
266
     hotspot_enabled=
259
     hotspot_enabled=
271
                 HOTSPOT_NAME=$"${WIFI_SSID}-hotspot"
264
                 HOTSPOT_NAME=$"${WIFI_SSID}-hotspot"
272
                 ifconfig $IFACE_SECONDARY down
265
                 ifconfig $IFACE_SECONDARY down
273
                 ifconfig $IFACE_SECONDARY mtu 1500
266
                 ifconfig $IFACE_SECONDARY mtu 1500
274
-                ifconfig $IFACE_SECONDARY hw ether $(assign_peer_address)
267
+                peeraddr=$(assign_peer_address)
268
+                ifconfig $IFACE_SECONDARY hw ether $peeraddr
269
+                echo $"Secondary wifi adaptor $IFACE_SECONDARY assigned to MAC address $peeraddr"
275
                 iwconfig $IFACE_SECONDARY enc open
270
                 iwconfig $IFACE_SECONDARY enc open
276
                 iwconfig $IFACE_SECONDARY mode managed essid $HOTSPOT_NAME channel ${HOTSPOT_CHANNEL}
271
                 iwconfig $IFACE_SECONDARY mode managed essid $HOTSPOT_NAME channel ${HOTSPOT_CHANNEL}
277
                 iwconfig $IFACE_SECONDARY ap $CELLID
272
                 iwconfig $IFACE_SECONDARY ap $CELLID
338
     iptables -A INPUT -p tcp --dport 8942 -j ACCEPT
333
     iptables -A INPUT -p tcp --dport 8942 -j ACCEPT
339
     iptables -A INPUT -p udp --dport 8942 -j ACCEPT
334
     iptables -A INPUT -p udp --dport 8942 -j ACCEPT
340
 
335
 
341
-    iptables -t nat -A POSTROUTING -o $EIFACE -j MASQUERADE
336
+    iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o $EIFACE -j MASQUERADE
342
     iptables -A FORWARD -i $EIFACE -o $IFACE -j ACCEPT -m state --state RELATED,ESTABLISHED
337
     iptables -A FORWARD -i $EIFACE -o $IFACE -j ACCEPT -m state --state RELATED,ESTABLISHED
343
     iptables -A FORWARD -i $IFACE -o $EIFACE -j ACCEPT
338
     iptables -A FORWARD -i $IFACE -o $EIFACE -j ACCEPT
344
 
339