瀏覽代碼

Better vpn function names

Bob Mottram 7 年之前
父節點
當前提交
7e888f5de5
共有 2 個檔案被更改,包括 4 行新增4 行删除
  1. 2
    2
      src/freedombone-app-vpn
  2. 2
    2
      src/freedombone-utils-firewall

+ 2
- 2
src/freedombone-app-vpn 查看文件

126
     if [ -d /etc/openvpn ]; then
126
     if [ -d /etc/openvpn ]; then
127
         rm -rf /etc/openvpn
127
         rm -rf /etc/openvpn
128
     fi
128
     fi
129
-    firewall_deny_forwarding
129
+    firewall_disable_vpn
130
     remove_completion_param install_vpn
130
     remove_completion_param install_vpn
131
 
131
 
132
     # remove any client keys
132
     # remove any client keys
269
 
269
 
270
     create_user_vpn_key $MY_USERNAME
270
     create_user_vpn_key $MY_USERNAME
271
 
271
 
272
-    firewall_allow_forwarding
272
+    firewall_enable_vpn
273
     systemctl openvpn start
273
     systemctl openvpn start
274
 
274
 
275
     APP_INSTALLED=1
275
     APP_INSTALLED=1

+ 2
- 2
src/freedombone-utils-firewall 查看文件

110
     echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
110
     echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
111
 }
111
 }
112
 
112
 
113
-function firewall_deny_forwarding {
113
+function firewall_disable_vpn {
114
     read_config_param EXTERNAL_IPV4_ADDRESS
114
     read_config_param EXTERNAL_IPV4_ADDRESS
115
     if [ ! $EXTERNAL_IPV4_ADDRESS ]; then
115
     if [ ! $EXTERNAL_IPV4_ADDRESS ]; then
116
         return
116
         return
125
     save_firewall_settings
125
     save_firewall_settings
126
 }
126
 }
127
 
127
 
128
-function firewall_allow_forwarding {
128
+function firewall_enable_vpn {
129
     curr_external_ipv4_address=$(get_external_ipv4_address)
129
     curr_external_ipv4_address=$(get_external_ipv4_address)
130
     iptables -A INPUT -i ${FIREWALL_EIFACE} -m state --state NEW -p udp --dport 1194 -j ACCEPT
130
     iptables -A INPUT -i ${FIREWALL_EIFACE} -m state --state NEW -p udp --dport 1194 -j ACCEPT
131
     iptables -A INPUT -i tun+ -j ACCEPT
131
     iptables -A INPUT -i tun+ -j ACCEPT