Bypass changes

shadowsocks-libev/files/shadowsocks-libev.init

@@ -307,17 +307,21 @@ start_service() {
 	for cfgtype in ss_local ss_redir ss_server ss_tunnel; do
 		config_foreach ss_xxx "$cfgtype" "$cfgtype"
 	done
-	ss_rules
-	ss_rules6
+	rules_up
+	#ss_rules
+	#ss_rules6
+	[ -f /etc/init.d/omr-bypass ] && /etc/init.d/omr-bypass restart
 	# Add rule to match traffic marked by firewall for bypass
 	ip rule add prio 1 fwmark 0x539 lookup 991337 > /dev/null 2>&1
 }
 
 stop_service() {
-	local bin="$ss_bindir/ss-rules"
-	[ -x "$bin" ] && "$bin" -f
-	local bin6="$ss_bindir/ss-rules6"
-	[ -x "$bin6" ] && "$bin6" -f
+	#local bin="$ss_bindir/ss-rules"
+	#[ -x "$bin" ] && "$bin" -f
+	#local bin6="$ss_bindir/ss-rules6"
+	#[ -x "$bin6" ] && "$bin6" -f
+	rules_down
+	[ -f /etc/init.d/omr-bypass ] && /etc/init.d/omr-bypass restart
 	rm -rf "$ss_confdir"
 }
 

shadowsocks-libev/files/ss-rules

@@ -192,6 +192,7 @@ ss_rules_iptchains_init_tcp() {
 		-A ss_rules_local_out -m set --match-set ss_rules_dst_bypass dst -j RETURN
 		-A ss_rules_local_out -m set --match-set ss_rules_dst_bypass_all dst -j RETURN
 		-A ss_rules_local_out -m set --match-set ss_rules_dst_bypass_ dst -j RETURN
+		-A ss_rules_local_out -m mark --mark 0x539 -j RETURN
 		-A ss_rules_local_out -p tcp $o_ipt_extra -j $local_target -m comment --comment "local_default: $o_local_default"
 		COMMIT
 	EOF
@@ -250,6 +251,7 @@ ss_rules_iptchains_init_() {
 		-A ss_rules_pre_src -m set --match-set ss_rules_dst_bypass_all dst -j MARK --set-mark 0x539
 		-A ss_rules_pre_src -m set --match-set ss_rules_dst_bypass_all dst -j RETURN
 		-A ss_rules_pre_src -m set --match-set ss_rules_dst_bypass dst -j RETURN
+		-A ss_rules_pre_src -m mark --mark 0x539 -j RETURN
 		-A ss_rules_dst -m set --match-set ss_rules_dst_bypass_all dst -j RETURN
 		-A ss_rules_dst -m set --match-set ss_rules_dst_bypass dst -j RETURN
 		-A ss_rules_pre_src -p $proto $o_ipt_extra -j ss_rules_src

shadowsocks-libev/files/ss-rules.defaults

@@ -9,12 +9,12 @@ uci get "$s" >/dev/null || {
 		commit firewall
 	EOF
 }
-s=firewall.ss_rules6
-uci get "$s" >/dev/null || {
-	uci batch <<-EOF
-		set $s=include
-		set $s.path=/etc/firewall.ss-rules6
-		set $s.reload=1
-		commit firewall
-	EOF
-}
+#s=firewall.ss_rules6
+#uci get "$s" >/dev/null || {
+#	uci batch <<-EOF
+#		set $s=include
+#		set $s.path=/etc/firewall.ss-rules6
+#		set $s.reload=1
+#		commit firewall
+#	EOF
+#}