浏览代码

Allow ping and ipv6 for the mesh variant

Bob Mottram 10 年前
父节点
当前提交
9ce7e1ab70
共有 1 个文件被更改,包括 10 次插入8 次删除
  1. 10
    8
      src/freedombone

+ 10
- 8
src/freedombone 查看文件

@@ -1681,7 +1681,7 @@ function mesh_batman_bridge {
1681 1681
   apt-get -y install avahi-utils avahi-autoipd wireless-tools
1682 1682
 
1683 1683
   install_vpn_tunnel
1684
-  
1684
+
1685 1685
   modprobe batman-adv
1686 1686
   [ $? -ne 0 ] && echo "B.A.T.M.A.N module not available" && exit 76482
1687 1687
   if ! grep -q "batman_adv" /etc/modules; then
@@ -5746,13 +5746,15 @@ function configure_internet_protocol {
5746 5746
   sed -i "s/#net.ipv4.conf.all.rp_filter=1/net.ipv4.conf.all.rp_filter=1/g" /etc/sysctl.conf
5747 5747
   sed -i "s/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=0/g" /etc/sysctl.conf
5748 5748
   sed -i "s/#net.ipv6.conf.all.forwarding=1/net.ipv6.conf.all.forwarding=0/g" /etc/sysctl.conf
5749
-  echo '# ignore pings' >> /etc/sysctl.conf
5750
-  echo 'net.ipv4.icmp_echo_ignore_all = 1' >> /etc/sysctl.conf
5751
-  echo 'net.ipv6.icmp_echo_ignore_all = 1' >> /etc/sysctl.conf
5752
-  echo '# disable ipv6' >> /etc/sysctl.conf
5753
-  echo 'net.ipv6.conf.all.disable_ipv6 = 1' >> /etc/sysctl.conf
5754
-  echo 'net.ipv4.tcp_synack_retries = 2' >> /etc/sysctl.conf
5755
-  echo 'net.ipv4.tcp_syn_retries = 1' >> /etc/sysctl.conf
5749
+  if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
5750
+      echo '# ignore pings' >> /etc/sysctl.conf
5751
+      echo 'net.ipv4.icmp_echo_ignore_all = 1' >> /etc/sysctl.conf
5752
+      echo 'net.ipv6.icmp_echo_ignore_all = 1' >> /etc/sysctl.conf
5753
+      echo '# disable ipv6' >> /etc/sysctl.conf
5754
+      echo 'net.ipv6.conf.all.disable_ipv6 = 1' >> /etc/sysctl.conf
5755
+      echo 'net.ipv4.tcp_synack_retries = 2' >> /etc/sysctl.conf
5756
+      echo 'net.ipv4.tcp_syn_retries = 1' >> /etc/sysctl.conf
5757
+  fi
5756 5758
   echo '# keepalive' >> /etc/sysctl.conf
5757 5759
   echo 'net.ipv4.tcp_keepalive_probes = 9' >> /etc/sysctl.conf
5758 5760
   echo 'net.ipv4.tcp_keepalive_intvl = 75' >> /etc/sysctl.conf