-B: the TLS ClientHello split at the SNI, which -s is taken for splice

tlspr splits the ClientHello it passes in the middle of the server name
(SNI) when the service has s_option, set by -s. In builds with splice()
(Linux, the default there) -s is splice for every service but UDP ones
and admin, so the split was never made, and the How-To's SNI break did
nothing on Linux.

-B sets it whatever the build: for TCP services but admin, where
s_option has a meaning of its own. -s still does it where it is not
splice. The How-To, 3proxy.cfg(5) and tlspr(8) give -B.

Fixes #1283

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

doc/html/howtoe.html

@@ -646,13 +646,13 @@ see <a href="#DNSPR">How to set up a DNS proxy (dnspr)</a>.
 <br>tlspr can be used as a parent with the "tls" type to implement SNI splitting for DPI bypass (similar to NoDPI/GoodByeDPI).
 The client sends the first part of the TLS ClientHello, tlspr splits it at the SNI extension and sends it in two TCP packets,
 which can bypass some DPI systems that look for blocked hostnames in TLS handshakes.
-<br>To enable SNI break, use <code>parent ... tls 0.0.0.0 0</code> and the <code>-s</code> option on the listening service with TCP_NODELAY:
+<br>To enable SNI break, use <code>parent ... tls 0.0.0.0 0</code> and the <code>-B</code> option on the listening service with TCP_NODELAY:
 </p><pre>
 auth iponly
 allow *
 parent 1000 tls 0.0.0.0 0
 allow *
-proxy -s -i127.0.0.1 -ocTCP_NODELAY -osTCP_NODELAY -p1443
+proxy -B -i127.0.0.1 -ocTCP_NODELAY -osTCP_NODELAY -p1443
 </pre>
 <p>
 TCP_NODELAY is required to prevent the kernel from merging the split packets.

doc/html/howtor.html

@@ -654,13 +654,13 @@ iptables -t nat -A PREROUTING -p tcp -m multiport --dports 443,993,465 -j REDIRE
 <br>tlspr может использоваться как родительский прокси типа "tls" для реализации SNI-фрагментации (аналог NoDPI/GoodByeDPI).
 Клиент отправляет первую часть TLS ClientHello, tlspr разбивает его на расширении SNI и отправляет двумя TCP-пакетами,
 что позволяет обойти некоторые DPI-системы, ищущие заблокированные имена хостов в TLS-рукопожатиях.
-<br>Для включения SNI break используйте <code>parent ... tls 0.0.0.0 0</code> и опцию <code>-s</code> на слушающем сервисе с TCP_NODELAY:
+<br>Для включения SNI break используйте <code>parent ... tls 0.0.0.0 0</code> и опцию <code>-B</code> на слушающем сервисе с TCP_NODELAY:
 </p><pre>
 auth iponly
 allow *
 parent 1000 tls 0.0.0.0 0
 allow *
-proxy -s -i127.0.0.1 -ocTCP_NODELAY -osTCP_NODELAY -p1443
+proxy -B -i127.0.0.1 -ocTCP_NODELAY -osTCP_NODELAY -p1443
 </pre>
 <p>
 TCP_NODELAY необходим, чтобы ядро не объединяло разделенные пакеты.

man/3proxy.cfg.5

@@ -190,6 +190,13 @@ any protocol-specific data.
 .B -g(\fIGRACE_TRAFF\fB,\fIGRACE_NUM\fB,\fIGRACE_DELAY\fR)
 delay GRACE_DELAY milliseconds before polling if average polling size is below GRACE_TRAFF bytes and GRACE_NUM read operations in a single direction are detected within 1 second. Useful to minimize polling
 .br
+.B -B
+(for TCP services) split the TLS ClientHello across two TCP segments in the
+middle of the server name (SNI) when it is passed through tlspr, as with
+\fBparent ... tls 0.0.0.0 0\fR: some DPI systems looking for blocked host names
+do not reassemble it. Use with \fB-ocTCP_NODELAY -osTCP_NODELAY\fR, or the kernel
+may join the segments again. In builds without splice() \fB-s\fR does the same.
+.br
 .B -s
  (for admin) secure, allow only secure operations, currently only traffic counters
 view without ability to reset.

man/tlspr.8

@@ -76,8 +76,8 @@ destination_port. Port to establish outgoing connections. Required unless the Tr
 .B -c
 TLS_CHECK_LEVEL. 0 (default) - allow non-TLS traffic to pass, 1 - require TLS, only check client HELLO packet, 2 - require TLS, check both client and server HELLO, 3 - require TLS, check that the server sends a certificate (not compatible with TLS 1.3), 4 - require mutual TLS, check that the server sends a certificate request and the client sends a certificate (not compatible with TLS 1.3)
 .TP
-.B -s
-Split the TLS Client HELLO packet across multiple TCP segments to make SNI-based DPI detection harder. An optional numeric value can follow (e.g. \fB-s1\fR) to control the splitting behaviour.
+.B -B
+Split the TLS Client HELLO packet across two TCP segments, in the middle of the SNI, to make SNI-based DPI detection harder. In builds without splice() \fB-s\fR does the same; with splice() (Linux) \fB-s\fR is splice, see \fB3proxy.cfg\fR(5).
 .TP
 .B -Ximap | -Xpop3 | -Xsmtp
 STARTTLS mode for the given protocol. The proxy speaks the plaintext protocol

src/common.c

@@ -799,6 +799,22 @@ int doconnect(struct clientparam * param){
 	param->srv->so._setsockopt(param->sostate, param->remsock, SOL_SOCKET, SO_LINGER, (char *)&lg, sizeof(lg));
 #endif
 	if(extbindtodevice(param, param->remsock)) return 12;
+#ifdef IP_BIND_ADDRESS_NO_PORT
+	/* A port the kernel chooses is chosen by connect(), for the pair with
+	   the destination: one in use towards another destination, or closing
+	   from an earlier connection, does as well. bind() would take one of
+	   its own, and with many connections find none left, or search long
+	   for it. */
+	if((param->operation >= 256 || (param->operation & CONNECT) || param->redirected)
+# ifdef WITH_UN
+	    && *SAFAMILY(&param->sinsl) != AF_UNIX
+# endif
+	    ){
+		int one = 1;
+
+		param->srv->so._setsockopt(param->sostate, param->remsock, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, (char *)&one, sizeof(one));
+	}
+#endif
 #ifdef WITH_UN
 	if(*SAFAMILY(&param->sinsl) != AF_UNIX)
 #endif

src/proxymain.c

@@ -364,6 +364,8 @@ int MODULEMAINFUNC (int argc, char** argv){
 	"    association: 1 - log, 2 - authorize, 3 - both (default), 0 (same as -U) -\n"
 	"    neither. The first destination is always authorized and logged\n"
 #endif
+	" -B split the TLS ClientHello passed through tlspr at the SNI (DPI bypass),\n"
+	"    with -ocTCP_NODELAY -osTCP_NODELAY\n"
 	"-g(GRACE_TRAFF,GRACE_NUM,GRACE_DELAY) - delay GRACE_DELAY milliseconds before polling if average polling size below  GRACE_TRAFF bytes and GRACE_NUM read operations in single directions are detected within 1 second to minimize polling\n"
 	" -fFORMAT logging format (see documentation)\n"
 	" -l log to stderr\n"
@@ -639,6 +641,13 @@ int MODULEMAINFUNC (int argc, char** argv){
 		case 'U':
 			srv.udpauth = *(argv[i]+2)? atoi(argv[i]+2) : 0;
 			break;
+		case 'B':
+			/* the TLS ClientHello split at the SNI (tlspr), which -s is
+			   where -s is not splice; s_option means something else
+			   for these */
+			if(!isudp && srv.service != S_ADMIN)
+				srv.s_option = 1 + atoi(argv[i]+2);
+			break;
 		case 's':
 #ifdef WITHSPLICE
 			if(isudp || srv.service == S_ADMIN)