소스 검색

Configurable wifi interface

Bob Mottram 9 년 전
부모
커밋
c37f537d39
1개의 변경된 파일12개의 추가작업 그리고 8개의 파일을 삭제
  1. 12
    8
      src/freedombone

+ 12
- 8
src/freedombone 파일 보기

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