浏览代码

More obvious variable name

Bob Mottram 7 年前
父节点
当前提交
71add55175
共有 1 个文件被更改,包括 6 次插入5 次删除
  1. 6
    5
      src/freedombone-utils-firewall

+ 6
- 5
src/freedombone-utils-firewall 查看文件

33
 FIREWALL_CONFIG=$HOME/${PROJECT_NAME}-firewall.cfg
33
 FIREWALL_CONFIG=$HOME/${PROJECT_NAME}-firewall.cfg
34
 FIREWALL_DOMAINS=$HOME/${PROJECT_NAME}-firewall-domains.cfg
34
 FIREWALL_DOMAINS=$HOME/${PROJECT_NAME}-firewall-domains.cfg
35
 FIREWALL_EIFACE=eth0
35
 FIREWALL_EIFACE=eth0
36
+EXTERNAL_IPV4_ADDRESS=
36
 
37
 
37
 function save_firewall_settings {
38
 function save_firewall_settings {
38
     iptables-save > /etc/firewall.conf
39
     iptables-save > /etc/firewall.conf
110
 }
111
 }
111
 
112
 
112
 function firewall_deny_forwarding {
113
 function firewall_deny_forwarding {
113
-    read_config_param CURRENT_IPV4_ADDRESS
114
-    if [ ! $CURRENT_IPV4_ADDRESS ]; then
114
+    read_config_param EXTERNAL_IPV4_ADDRESS
115
+    if [ ! $EXTERNAL_IPV4_ADDRESS ]; then
115
         return
116
         return
116
     fi
117
     fi
117
     iptables -D INPUT -i ${FIREWALL_EIFACE} -m state --state NEW -p udp --dport 1194 -j ACCEPT
118
     iptables -D INPUT -i ${FIREWALL_EIFACE} -m state --state NEW -p udp --dport 1194 -j ACCEPT
119
     iptables -D FORWARD -i tun+ -j ACCEPT
120
     iptables -D FORWARD -i tun+ -j ACCEPT
120
     iptables -D FORWARD -i tun+ -o ${FIREWALL_EIFACE} -m state --state RELATED,ESTABLISHED -j ACCEPT
121
     iptables -D FORWARD -i tun+ -o ${FIREWALL_EIFACE} -m state --state RELATED,ESTABLISHED -j ACCEPT
121
     iptables -D FORWARD -i ${FIREWALL_EIFACE} -o tun+ -m state --state RELATED,ESTABLISHED -j ACCEPT
122
     iptables -D FORWARD -i ${FIREWALL_EIFACE} -o tun+ -m state --state RELATED,ESTABLISHED -j ACCEPT
122
-    iptables -t nat -D POSTROUTING -s ${CURRENT_IPV4_ADDRESS}/24 -o ${FIREWALL_EIFACE} -j MASQUERADE
123
+    iptables -t nat -D POSTROUTING -s ${EXTERNAL_IPV4_ADDRESS}/24 -o ${FIREWALL_EIFACE} -j MASQUERADE
123
     iptables -D OUTPUT -o tun+ -j ACCEPT
124
     iptables -D OUTPUT -o tun+ -j ACCEPT
124
     save_firewall_settings
125
     save_firewall_settings
125
 }
126
 }
126
 
127
 
127
 function firewall_allow_forwarding {
128
 function firewall_allow_forwarding {
128
-    curr_ipv4_address=$(get_ipv4_address)
129
+    curr_ipv4_address=$(get_external_ipv4_address)
129
     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
130
     iptables -A INPUT -i tun+ -j ACCEPT
131
     iptables -A INPUT -i tun+ -j ACCEPT
131
     iptables -A FORWARD -i tun+ -j ACCEPT
132
     iptables -A FORWARD -i tun+ -j ACCEPT
133
     iptables -A FORWARD -i ${FIREWALL_EIFACE} -o tun+ -m state --state RELATED,ESTABLISHED -j ACCEPT
134
     iptables -A FORWARD -i ${FIREWALL_EIFACE} -o tun+ -m state --state RELATED,ESTABLISHED -j ACCEPT
134
     iptables -t nat -A POSTROUTING -s ${curr_ipv4_address}/24 -o ${FIREWALL_EIFACE} -j MASQUERADE
135
     iptables -t nat -A POSTROUTING -s ${curr_ipv4_address}/24 -o ${FIREWALL_EIFACE} -j MASQUERADE
135
     iptables -A OUTPUT -o tun+ -j ACCEPT
136
     iptables -A OUTPUT -o tun+ -j ACCEPT
136
-    write_config_param CURRENT_IPV4_ADDRESS "$curr_ipv4_address"
137
+    write_config_param EXTERNAL_IPV4_ADDRESS "$curr_external_ipv4_address"
137
     save_firewall_settings
138
     save_firewall_settings
138
 }
139
 }
139
 
140