Quellcode durchsuchen

Use wifi for mesh

Bob Mottram vor 9 Jahren
Ursprung
Commit
67e4c6bb48
1 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
  1. 7
    5
      src/freedombone

+ 7
- 5
src/freedombone Datei anzeigen

@@ -5859,7 +5859,7 @@ function configure_firewall {
5859 5859
   iptables -P INPUT DROP
5860 5860
   ip6tables -P INPUT DROP
5861 5861
   iptables -A INPUT -i lo -j ACCEPT
5862
-  iptables -A INPUT -i eth0 -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
5862
+  iptables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
5863 5863
 
5864 5864
   # Make sure incoming tcp connections are SYN packets
5865 5865
   iptables -A INPUT -p tcp ! --syn -m state --state NEW -j DROP
@@ -5951,8 +5951,6 @@ function configure_firewall_for_batman {
5951 5951
   if [[ $ENABLE_BATMAN != "yes" ]]; then
5952 5952
       return
5953 5953
   fi
5954
-  # DHCP
5955
-  iptables -A INPUT -i eth0 -p udp --dport 547 -j ACCEPT
5956 5954
 
5957 5955
   save_firewall_settings
5958 5956
   echo 'configure_firewall_for_batman' >> $COMPLETION_FILE
@@ -6044,7 +6042,7 @@ function configure_firewall_for_ftp {
6044 6042
       # docker does its own firewalling
6045 6043
       return
6046 6044
   fi
6047
-  iptables -I INPUT -i eth0 -p tcp --dport 1024:65535 --sport 20:21 -j ACCEPT
6045
+  iptables -I INPUT -p tcp --dport 1024:65535 --sport 20:21 -j ACCEPT
6048 6046
   save_firewall_settings
6049 6047
   echo 'configure_firewall_for_ftp' >> $COMPLETION_FILE
6050 6048
 }
@@ -9573,7 +9571,11 @@ function install_dlna_server {
9573 9571
       echo "media_dir=V,$USB_MOUNT/Videos" >> /etc/minidlna.conf
9574 9572
   fi
9575 9573
   sed -i 's/#root_container=./root_container=B/g' /etc/minidlna.conf
9576
-  sed -i 's/#network_interface=/network_interface=eth0/g' /etc/minidlna.conf
9574
+  if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
9575
+      sed -i 's/#network_interface=/network_interface=eth0/g' /etc/minidlna.conf
9576
+  else
9577
+      sed -i 's/#network_interface=/network_interface=$WIFI_INTERFACE/g' /etc/minidlna.conf
9578
+  fi
9577 9579
   sed -i 's/#friendly_name=/friendly_name="Freedombone Media"/g' /etc/minidlna.conf
9578 9580
   sed -i 's|#db_dir=/var/cache/minidlna|db_dir=/var/cache/minidlna|g' /etc/minidlna.conf
9579 9581
   sed -i 's/#inotify=yes/inotify=yes/g' /etc/minidlna.conf