🌴 Sync 2026-10-06 02:20:56

luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/context.uc

@@ -67,6 +67,18 @@ export function build_context(dm, env) {
 	const self_mark = match(proxy_mode, /redirect/)
 		? (dm.infra.self_mark || '100') : null;
 
+	/* The same mark, but resolved for every mode.
+	 *
+	 * In TUN mode self_mark is null (see above), so no outbound carries
+	 * `routing_mark` and sing-box's own sockets carried no mark at all - which
+	 * meant the firewall's TUN output chain could not exempt them, and the
+	 * node-address bypass that exists for tproxy was missing for tun.  A LAN
+	 * client (or the router itself) dialling the node's own address went back
+	 * into the tunnel; measured earlier for tproxy ("wget hangs on the node's
+	 * address"), fixed there, never for tun.  route.default_mark stamps every
+	 * outbound socket with this value, and the TUN chain returns on it. */
+	const tun_self_mark = (dm.infra.self_mark || '100');
+
 	/* proxy-mode-derived ports / TUN params */
 	let redirect_port, tproxy_port, tun_name, tun_addr4, tun_addr6,
 	    tun_mtu, tcpip_stack, endpoint_independent_nat;
@@ -137,6 +149,7 @@ export function build_context(dm, env) {
 		 * and one of them naming a tag the other never declared fails the
 		 * whole config.  Default false - an absent env must not turn into an
 		 * optimistic "assume the file is there". */
+		china_ip4_ready: (env?.china_ip4_ready === true),
 		china_ip6_ready: (env?.china_ip6_ready === true),
 		/* Whether china-domain.json is on disk.  Same one-sided default as
 		 * the field above, for the same reason: it is a filesystem fact the
@@ -170,7 +183,7 @@ export function build_context(dm, env) {
 		 * with no initial_path silently declared as source JSON, and a binary
 		 * .srs fetched from a URL would then fail to parse at startup. */
 		ruleset_formats: (env?.ruleset_formats || {}),
-		self_mark, ntp_server, dns_port, mixed_port,
+		self_mark, tun_self_mark, ntp_server, dns_port, mixed_port,
 		redirect_port, tproxy_port,
 		tun_name, tun_addr4, tun_addr6, tun_mtu,
 		tcpip_stack, endpoint_independent_nat,