From: "flichtenheld (Code Review)" Date: Mon, 12 Jan 2026 14:19:26 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="ETOleRJ6ObU="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: socks: Replace magic "10" for socks header with macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --ETOleRJ6ObU= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1467?usp=3Demail to review the following change. Change subject: socks: Replace magic "10" for socks header with macro ...................................................................... socks: Replace magic "10" for socks header with macro So that it is easier to check that we indeed have reserved this prior to assuming we have. Github: openvpn-private-issues#4 Change-Id: I0aca7e7d9aa190541f11745cf72193cb6b39540a Signed-off-by: Frank Lichtenheld --- M src/openvpn/init.c M src/openvpn/mtu.c M src/openvpn/mtu.h M src/openvpn/socks.c 4 files changed, 14 insertions(+), 9 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/67/1467/1 diff --git a/src/openvpn/init.c b/src/openvpn/init.c index b690dff..4c23170 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2927,7 +2927,7 @@ headroom +=3D 4; /* socks proxy header */ - headroom +=3D 10; + headroom +=3D SOCKS_UDPv4_HEADROOM; /* compression header and fragment header (part of the encrypted paylo= ad) */ headroom +=3D 1 + 1; diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c index 67ae67f..e5db8ab 100644 --- a/src/openvpn/mtu.c +++ b/src/openvpn/mtu.c @@ -66,11 +66,11 @@ bool tlsmode =3D options->tls_server || options->tls_client; - /* A socks proxy adds 10 byte of extra header to each packet + /* A socks proxy adds extra header to each packet * (we only support Socks with IPv4, this value is different for IPv6)= */ if (options->ce.socks_proxy_server && proto_is_udp(options->ce.proto)) { - header_size +=3D 10; + header_size +=3D SOCKS_UDPv4_HEADROOM; } /* TCP stream based packets have a 16 bit length field */ diff --git a/src/openvpn/mtu.h b/src/openvpn/mtu.h index 29a7d04..ca8109c 100644 --- a/src/openvpn/mtu.h +++ b/src/openvpn/mtu.h @@ -94,6 +94,11 @@ */ #define PAYLOAD_ALIGN 4 +/* + * How many bytes we prepend for a SOCKS UDP proxy. + * This only handles IPv4 right now. + */ +#define SOCKS_UDPv4_HEADROOM 10 /*************************************************************************= */ /** diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c index 1e99c9a..078b4e1 100644 --- a/src/openvpn/socks.c +++ b/src/openvpn/socks.c @@ -434,7 +434,7 @@ } /* - * Remove the 10 byte socks5 header from an incoming + * Remove the socks5 header from an incoming * UDP packet, setting *from to the source address. * * Run after UDP read. @@ -444,7 +444,7 @@ { int atyp; - if (BLEN(buf) < 10) + if (BLEN(buf) < SOCKS_UDPv4_HEADROOM) { goto error; } @@ -471,7 +471,7 @@ } /* - * Add a 10 byte socks header prior to UDP write. + * Add a socks header prior to UDP write. * *to is the destination address. * * Run before UDP write. @@ -481,11 +481,11 @@ socks_process_outgoing_udp(struct buffer *buf, const struct link_socket_ac= tual *to) { /* - * Get a 10 byte subset buffer prepended to buf -- + * Get a subset buffer prepended to buf -- * we expect these bytes will be here because * we always allocate space for these bytes */ - struct buffer head =3D buf_sub(buf, 10, true); + struct buffer head =3D buf_sub(buf, SOCKS_UDPv4_HEADROOM, true); /* crash if not enough headroom in buf */ ASSERT(buf_defined(&head)); @@ -496,5 +496,5 @@ buf_write(&head, &to->dest.addr.in4.sin_addr, sizeof(to->dest.addr.in4= .sin_addr)); buf_write(&head, &to->dest.addr.in4.sin_port, sizeof(to->dest.addr.in4= .sin_port)); - return 10; + return SOCKS_UDPv4_HEADROOM; } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1467?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I0aca7e7d9aa190541f11745cf72193cb6b39540a Gerrit-Change-Number: 1467 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --ETOleRJ6ObU= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

socks: Replace magic "10" for soc=
ks header with macro

So that it is easier to check that we indeedhave reserved this prior to assuming we have.

Github: openvpn-priva= te-issues#4
Change-Id: I0aca7e7d9aa190541f11745cf72193cb6b39540a
Sign= ed-off-by: Frank Lichtenheld <frank@...2641...>
---
M src/openv= pn/init.c
M src/openvpn/mtu.c
M src/openvpn/mtu.h
M src/openvpn/so= cks.c
4 files changed, 14 insertions(+), 9 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/67/= 1467/1
diff --git a/src/openvpn/init.c b/src/openvpn/init.c<=
br>index b690dff..4c23170 100644
--- a/src/openvpn/in= it.c
+++ b/src/openvpn/init.c
@@ -2927,7 +2= 927,7 @@
headroom +=3D 4;

= /* socks proxy header */
- headroom +=3D 10;
+ headroom +=3D SOCKS_UDPv4_HEADROOM;

/* compression header and fragment header (part of the = encrypted payload) */
headroom +=3D 1 + 1;
<= span>diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c

ind= ex 67ae67f..e5db8ab 100644
--- a/src/openvpn/mtu.c+++ b/src/openvpn/mtu.c
@@ -66,11 +66,11 @@<= br>
bool tlsmode =3D options->tls_server || = options->tls_client;

- /* A socks proxy adds 10 byte of extra header to ea= ch packet
+ /* A s= ocks proxy adds extra header to each packet
* (we onl= y support Socks with IPv4, this value is different for IPv6) */
<= span> if (options->ce.socks_proxy_server && proto_is_udp(opt= ions->ce.proto))
{
- header_size +=3D 10;
+ header_size +=3D SOCKS_UDPv4_HEADROOM= ;
}

/* TCP stre= am based packets have a 16 bit length field */
diff --git a= /src/openvpn/mtu.h b/src/openvpn/mtu.h
index 29a7d04..ca810= 9c 100644
--- a/src/openvpn/mtu.h
+++ b/src= /openvpn/mtu.h
@@ -94,6 +94,11 @@
*/
#define PAYLOAD_ALIGN 4

+/*
+ * How many bytes we prepend for a SOCKS UDP proxy.
+ * This only handles IPv4= right now.
+ */
+#define SOCKS_UDPv4_HEAD= ROOM 10

/*******************************= *******************************************/
/**diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c
index 1e99c9a..078b4e1 100644

--- a/src/openvpn/socks.c<= /span>
+++ b/src/openvpn/socks.c
@@ -434,7 +434,7 = @@
}

/*
- * Remove the 10 byte socks5 header f= rom an incoming

+ * R= emove the socks5 header from an incoming
* UDP packet, se= tting *from to the source address.
*
* = Run after UDP read.
@@ -444,7 +444,7 @@
{<= /span>
int atyp;

- if (BLEN(buf) < 10)
+ if (BLEN(buf) < SOCKS_UDPv4_HEADRO= OM)
{
goto error;
<= span> }

@@ -471,7 +471,7 @@
}
/*
- * Add a 10 byte socks header prior to UDP write.
+ * Add a socks header prior to UDP wr= ite.
* *to is the destination address.
= *
* Run before UDP write.
@@ -481,11 +481= ,11 @@
socks_process_outgoing_udp(struct buffer *buf, cons= t struct link_socket_actual *to)
{
/*=
- * Get a 10 byte = subset buffer prepended to buf --
+ * Get a subset buffer prepended to buf --
* we expect these bytes will be here because

= * we always allocate space for these bytes
*/<= br>- struct buffer head =3D bu= f_sub(buf, 10, true);
+ struct buffer head =3D buf_sub(buf, SOCKS_UDPv4_HEADROOM, true);

/* crash if not enough headroom in buf *= /
ASSERT(buf_defined(&head));
@@ -= 496,5 +496,5 @@
buf_write(&head, &to->dest.= addr.in4.sin_addr, sizeof(to->dest.addr.in4.sin_addr));
= buf_write(&head, &to->dest.addr.in4.sin_port, sizeof(to->= ;dest.addr.in4.sin_port));

- return 10;
+ return SOCKS_UDPv4_HEADROOM;
}

To view, visit change 1467. To unsubscribe, or f= or help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I0aca7e7d9aa190541f11745cf72= 193cb6b39540a
Gerrit-Change-Number: 1467
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --ETOleRJ6ObU=--