修复单端口多用户无法设置不进行中转 by 老虎兔儿

GregTechnology · May 21, 2018 · 5d9822a · 5d9822a
1 parent c2c8985
commit 5d9822a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/db_transfer.py b/db_transfer.py
@@ -640,7 +640,7 @@ def del_server_out_of_bound_safe(self, last_rows, rows):
                         if has_higher_priority:
                             continue
 
-                        if self.relay_rule_list[id]['dist_ip'] == '0.0.0.0':
+                        if self.relay_rule_list[id]['dist_ip'] == '0.0.0.0' and row['is_multi_user'] == 0:
                             continue
 
                         temp_relay_rules[id] = self.relay_rule_list[id]
@@ -711,7 +711,7 @@ def del_server_out_of_bound_safe(self, last_rows, rows):
                                 continue
 
                             if self.relay_rule_list[id][
-                                    'dist_ip'] == '0.0.0.0':
+                                    'dist_ip'] == '0.0.0.0' and row['is_multi_user'] == 0:
                                 continue
 
                             temp_relay_rules[id] = self.relay_rule_list[id]

diff --git a/shadowsocks/tcprelay.py b/shadowsocks/tcprelay.py
@@ -600,6 +600,9 @@ def _get_mu_relay_host(self, ogn_data):
                         continue
 
                 if has_higher_priority:
+                    continue
+
+				if self._relay_rules[id]['dist_ip'] == '0.0.0.0':
                     continue
 
                 if self._relay_rules[id]['port'] == 0:

diff --git a/shadowsocks/udprelay.py b/shadowsocks/udprelay.py
@@ -398,6 +398,9 @@ def _get_mu_relay_host(self, ogn_data, uid):
                         continue
 
                 if has_higher_priority:
+                    continue
+
+				if self._relay_rules[id]['dist_ip'] == '0.0.0.0':
                     continue
 
                 if self._relay_rules[id]['port'] == 0:

diff --git a/web_transfer.py b/web_transfer.py
@@ -430,7 +430,7 @@ def del_server_out_of_bound_safe(self, last_rows, rows):
                         if has_higher_priority:
                             continue
 
-                        if self.relay_rule_list[id]['dist_ip'] == '0.0.0.0':
+                        if self.relay_rule_list[id]['dist_ip'] == '0.0.0.0' and row['is_multi_user'] == 0:
                             continue
 
                         temp_relay_rules[id] = self.relay_rule_list[id]
@@ -499,7 +499,7 @@ def del_server_out_of_bound_safe(self, last_rows, rows):
                                 continue
 
                             if self.relay_rule_list[id][
-                                    'dist_ip'] == '0.0.0.0':
+                                    'dist_ip'] == '0.0.0.0' and row['is_multi_user'] == 0:
                                 continue
 
                             temp_relay_rules[id] = self.relay_rule_list[id]