From c9a399d2c6bba951e51382c88547bc9dc38c7256 Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Sat, 5 Jan 2019 19:47:01 +0900
Subject: [PATCH] Update comments Fixed firewalld default zone problem in
 CentOS 7

Signed-off-by: Teddysun <i@teddysun.com>
---
 shadowsocks-all.sh   | 5 +++--
 shadowsocks-go.sh    | 5 +++--
 shadowsocks-libev.sh | 5 +++--
 shadowsocks.sh       | 5 +++--
 shadowsocksR.sh      | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/shadowsocks-all.sh b/shadowsocks-all.sh
index d1c89bc..cf3b34d 100644
--- a/shadowsocks-all.sh
+++ b/shadowsocks-all.sh
@@ -428,8 +428,9 @@ config_firewall(){
     elif centosversion 7; then
         systemctl status firewalld > /dev/null 2>&1
         if [ $? -eq 0 ]; then
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/tcp
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/udp
+            default_zone=$(firewall-cmd --get-default-zone)
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/tcp
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/udp
             firewall-cmd --reload
         else
             echo -e "[${yellow}Warning${plain}] firewalld looks like not running or not installed, please enable port ${shadowsocksport} manually if necessary."
diff --git a/shadowsocks-go.sh b/shadowsocks-go.sh
index 373e11a..b98e682 100644
--- a/shadowsocks-go.sh
+++ b/shadowsocks-go.sh
@@ -305,8 +305,9 @@ firewall_set(){
     elif centosversion 7; then
         systemctl status firewalld > /dev/null 2>&1
         if [ $? -eq 0 ]; then
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/tcp
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/udp
+            default_zone=$(firewall-cmd --get-default-zone)
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/tcp
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/udp
             firewall-cmd --reload
         else
             echo -e "[${yellow}Warning${plain}] firewalld looks like not running or not installed, please enable port ${shadowsocksport} manually if necessary."
diff --git a/shadowsocks-libev.sh b/shadowsocks-libev.sh
index f9ca148..cd610a1 100644
--- a/shadowsocks-libev.sh
+++ b/shadowsocks-libev.sh
@@ -447,8 +447,9 @@ firewall_set(){
     elif centosversion 7; then
         systemctl status firewalld > /dev/null 2>&1
         if [ $? -eq 0 ]; then
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/tcp
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/udp
+            default_zone=$(firewall-cmd --get-default-zone)
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/tcp
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/udp
             firewall-cmd --reload
         else
             echo -e "[${yellow}Warning${plain}] firewalld looks like not running or not installed, please enable port ${shadowsocksport} manually if necessary."
diff --git a/shadowsocks.sh b/shadowsocks.sh
index a31aa6d..9006d31 100644
--- a/shadowsocks.sh
+++ b/shadowsocks.sh
@@ -295,8 +295,9 @@ firewall_set(){
     elif centosversion 7; then
         systemctl status firewalld > /dev/null 2>&1
         if [ $? -eq 0 ]; then
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/tcp
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/udp
+            default_zone=$(firewall-cmd --get-default-zone)
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/tcp
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/udp
             firewall-cmd --reload
         else
             echo -e "[${yellow}Warning${plain}] firewalld looks like not running or not installed, please enable port ${shadowsocksport} manually if necessary."
diff --git a/shadowsocksR.sh b/shadowsocksR.sh
index f1b9661..4a5c9d3 100644
--- a/shadowsocksR.sh
+++ b/shadowsocksR.sh
@@ -367,8 +367,9 @@ firewall_set(){
     elif centosversion 7; then
         systemctl status firewalld > /dev/null 2>&1
         if [ $? -eq 0 ]; then
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/tcp
-            firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/udp
+            default_zone=$(firewall-cmd --get-default-zone)
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/tcp
+            firewall-cmd --permanent --zone=${default_zone} --add-port=${shadowsocksport}/udp
             firewall-cmd --reload
         else
             echo -e "[${yellow}Warning${plain}] firewalld looks like not running or not installed, please enable port ${shadowsocksport} manually if necessary."