|
@@ -368,6 +368,7 @@ EXTERNAL_IP_SERVICES=( \
|
368
|
368
|
'http://httpbin.org/ip')
|
369
|
369
|
|
370
|
370
|
WIFI_CHANNEL=2
|
|
371
|
+WIFI_INTERFACE=wlan0
|
371
|
372
|
|
372
|
373
|
# cjdns settings
|
373
|
374
|
ENABLE_CJDNS="no"
|
|
@@ -750,6 +751,9 @@ function read_configuration {
|
750
|
751
|
fi
|
751
|
752
|
|
752
|
753
|
if [ -f $CONFIGURATION_FILE ]; then
|
|
754
|
+ if grep -q "WIFI_INTERFACE" $CONFIGURATION_FILE; then
|
|
755
|
+ WIFI_INTERFACE=$(grep "WIFI_INTERFACE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
756
|
+ fi
|
753
|
757
|
if grep -q "IRC_PORT" $CONFIGURATION_FILE; then
|
754
|
758
|
IRC_PORT=$(grep "IRC_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
755
|
759
|
fi
|
|
@@ -1161,8 +1165,8 @@ function install_not_on_BBB {
|
1161
|
1165
|
echo '#iface eth1 inet dhcp' >> /etc/network/interfaces
|
1162
|
1166
|
echo '' >> /etc/network/interfaces
|
1163
|
1167
|
echo '# WiFi Example' >> /etc/network/interfaces
|
1164
|
|
- echo '#auto wlan0' >> /etc/network/interfaces
|
1165
|
|
- echo '#iface wlan0 inet dhcp' >> /etc/network/interfaces
|
|
1168
|
+ echo "#auto $WIFI_INTERFACE" >> /etc/network/interfaces
|
|
1169
|
+ echo "#iface $WIFI_INTERFACE inet dhcp" >> /etc/network/interfaces
|
1166
|
1170
|
echo '# wpa-ssid "essid"' >> /etc/network/interfaces
|
1167
|
1171
|
echo '# wpa-psk "password"' >> /etc/network/interfaces
|
1168
|
1172
|
echo '' >> /etc/network/interfaces
|
|
@@ -1728,7 +1732,7 @@ function mesh_babel {
|
1728
|
1732
|
echo ' fi' >> $babel_script
|
1729
|
1733
|
echo 'fi' >> $babel_script
|
1730
|
1734
|
echo '' >> $babel_script
|
1731
|
|
- echo 'IFACE=wlan0' >> $babel_script
|
|
1735
|
+ echo "IFACE=$WIFI_INTERFACE" >> $babel_script
|
1732
|
1736
|
echo 'if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
|
1733
|
1737
|
echo ' IFACE=wlan1' >> $babel_script
|
1734
|
1738
|
echo 'fi' >> $babel_script
|
|
@@ -1821,7 +1825,7 @@ function mesh_batman_bridge {
|
1821
|
1825
|
echo '' >> $batman_script
|
1822
|
1826
|
echo '# Ethernet bridge definition (bridged to bat0)' >> $batman_script
|
1823
|
1827
|
echo 'BRIDGE=br-mesh' >> $batman_script
|
1824
|
|
- echo 'IFACE=wlan0' >> $batman_script
|
|
1828
|
+ echo "IFACE=$WIFI_INTERFACE" >> $batman_script
|
1825
|
1829
|
echo 'EIFACE=eth0' >> $batman_script
|
1826
|
1830
|
echo '' >> $batman_script
|
1827
|
1831
|
echo 'if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
|
|
@@ -5824,8 +5828,8 @@ function configure_firewall_for_batman {
|
5824
|
5828
|
fi
|
5825
|
5829
|
# DHCP
|
5826
|
5830
|
iptables -A INPUT -i eth0 -p udp --dport 547 -j ACCEPT
|
5827
|
|
- iptables -A INPUT -i wlan0 -p udp --dport 5353 -d 224.0.0.251 -j ACCEPT
|
5828
|
|
- ip6tables -A INPUT -i wlan0 -p udp --dport 5353 -j ACCEPT
|
|
5831
|
+ iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport 5353 -d 224.0.0.251 -j ACCEPT
|
|
5832
|
+ ip6tables -A INPUT -i $WIFI_INTERFACE -p udp --dport 5353 -j ACCEPT
|
5829
|
5833
|
|
5830
|
5834
|
save_firewall_settings
|
5831
|
5835
|
echo 'configure_firewall_for_batman' >> $COMPLETION_FILE
|
|
@@ -5838,8 +5842,8 @@ function configure_firewall_for_babel {
|
5838
|
5842
|
if [[ $ENABLE_BABEL != "yes" ]]; then
|
5839
|
5843
|
return
|
5840
|
5844
|
fi
|
5841
|
|
- iptables -A INPUT -i wlan0 -p udp --dport $BABEL_PORT -j ACCEPT
|
5842
|
|
- iptables -A INPUT -i wlan0 -p udp --dport 5353 -d 224.0.0.251 -j ACCEPT
|
|
5845
|
+ iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $BABEL_PORT -j ACCEPT
|
|
5846
|
+ iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport 5353 -d 224.0.0.251 -j ACCEPT
|
5843
|
5847
|
save_firewall_settings
|
5844
|
5848
|
echo 'configure_firewall_for_babel' >> $COMPLETION_FILE
|
5845
|
5849
|
}
|