Explorar el Código

Merge branch 'devel'

Edvinas Valatka hace 9 años
padre
commit
91c3ddc6d5
Se han modificado 3 ficheros con 6 adiciones y 2 borrados
  1. 2 0
      ACCEPT.tcp
  2. 2 0
      ACCEPT.udp
  3. 2 2
      e-router

+ 2 - 0
ACCEPT.tcp

@@ -7,6 +7,8 @@
 4665
 4665
 # syncthing-disco
 # syncthing-disco
 8443
 8443
+# acestream
+8621
 # syncthing
 # syncthing
 22000
 22000
 # syncthing-relay
 # syncthing-relay

+ 2 - 0
ACCEPT.udp

@@ -6,3 +6,5 @@
 4664
 4664
 4662
 4662
 4672
 4672
+# acestream
+8621

+ 2 - 2
e-router

@@ -114,11 +114,11 @@ setup_open() {
     while read -r port ; do
     while read -r port ; do
         [[ "$port" =~ ^[0-9]{1,}$ ]] || continue
         [[ "$port" =~ ^[0-9]{1,}$ ]] || continue
         iptables -A FW-OPEN -p udp -m conntrack --ctstate NEW --ctproto UDP --dport $port -j ACCEPT
         iptables -A FW-OPEN -p udp -m conntrack --ctstate NEW --ctproto UDP --dport $port -j ACCEPT
-    done < $confd/ACCEPT.udp
+    done < $confd/Public.udp
     while read -r port ; do
     while read -r port ; do
         [[ "$port" =~ ^[0-9]{1,}$ ]] || continue
         [[ "$port" =~ ^[0-9]{1,}$ ]] || continue
         iptables -A FW-OPEN -p tcp -m conntrack --ctstate NEW --ctproto TCP --dport $port -j ACCEPT
         iptables -A FW-OPEN -p tcp -m conntrack --ctstate NEW --ctproto TCP --dport $port -j ACCEPT
-    done < $confd/ACCEPT.tcp
+    done < $confd/Public.tcp
     iptables -A INPUT -i ${wan} -p udp -m conntrack --ctstate NEW --ctproto UDP -j FW-OPEN
     iptables -A INPUT -i ${wan} -p udp -m conntrack --ctstate NEW --ctproto UDP -j FW-OPEN
     iptables -A INPUT -i ${wan} -p tcp -m conntrack --ctstate NEW --ctproto TCP -j FW-OPEN
     iptables -A INPUT -i ${wan} -p tcp -m conntrack --ctstate NEW --ctproto TCP -j FW-OPEN
 }
 }