From: "flichtenheld (Code Review)" Date: Tue, 13 Jan 2026 11:43:07 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <7866a4631d00e2a83c7580865aa1eabdfc8a4cdc-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="s96f/OAisB0="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: socket: Remove old "dynamic remote" feature List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --s96f/OAisB0= 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/+/1468?usp=3Demail to review the following change. Change subject: socket: Remove old "dynamic remote" feature ...................................................................... socket: Remove old "dynamic remote" feature So apparently when using --proto tcp-server --tls-server --remote, AND the remote is not resolvable on startup then we would preserve the remote name and resolve it later on connect. Except that when the remote is not resolvable I never managed to get it to create a listening socket in the first place. Originally I looked into this code because ZeroPath claimed it was broken. I think that report was correct but I think it is much easier to declare this feature dead instead of trying to fix it. It is undocumented and if it is usable then only in very specific circumstances that are hard to figure out. Github: openvpn-private-issues#13 Change-Id: I0141945469dd11340bfb42ec37a3c5f90ed0ff52 Signed-off-by: Frank Lichtenheld --- M src/openvpn/socket.c 1 file changed, 11 insertions(+), 53 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/68/1468/1 diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index e2c5844..093f822 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -867,12 +867,10 @@ static socket_descriptor_t socket_listen_accept(socket_descriptor_t sd, struct link_socket_actual *ac= t, - const char *remote_dynamic, const struct addrinfo *lo= cal, bool do_listen, + const struct addrinfo *local, bool do_listen, bool nowait, volatile int *signal_received) { struct gc_arena gc =3D gc_new(); - /* struct openvpn_sockaddr *remote =3D &act->dest; */ - struct openvpn_sockaddr remote_verify =3D act->dest; socket_descriptor_t new_sd =3D SOCKET_UNDEFINED; CLEAR(*act); @@ -913,31 +911,7 @@ if (socket_defined(new_sd)) { - struct addrinfo *ai =3D NULL; - if (remote_dynamic) - { - openvpn_getaddrinfo(0, remote_dynamic, NULL, 1, NULL, - remote_verify.addr.sa.sa_family, &ai); - } - - if (ai && !addrlist_match(&remote_verify, ai)) - { - msg(M_WARN, "TCP NOTE: Rejected connection attempt from %s= due to --remote setting", - print_link_socket_actual(act, &gc)); - if (openvpn_close_socket(new_sd)) - { - msg(M_ERR, "TCP: close socket failed (new_sd)"); - } - freeaddrinfo(ai); - } - else - { - if (ai) - { - freeaddrinfo(ai); - } - break; - } + break; } management_sleep(1); } @@ -1255,8 +1229,7 @@ } static void -resolve_remote(struct link_socket *sock, int phase, const char **remote_dy= namic, - struct signal_info *sig_info) +resolve_remote(struct link_socket *sock, int phase, struct signal_info *si= g_info) { volatile int *signal_received =3D sig_info ? &sig_info->signal_receive= d : NULL; struct gc_arena gc =3D gc_new(); @@ -1351,10 +1324,6 @@ { msg(M_INFO, "TCP/UDP: Preserving recently used remote address: %s", print_link_socket_actual(&sock->info.lsa->actual, &gc)); - if (remote_dynamic) - { - *remote_dynamic =3D NULL; - } } else { @@ -1516,7 +1485,7 @@ { resolve_bind_local(sock, sock->info.af); } - resolve_remote(sock, 1, NULL, NULL); + resolve_remote(sock, 1, NULL); } } @@ -1577,8 +1546,7 @@ } static void -phase2_tcp_server(struct link_socket *sock, const char *remote_dynamic, - struct signal_info *sig_info) +phase2_tcp_server(struct link_socket *sock, struct signal_info *sig_info) { ASSERT(sig_info); volatile int *signal_received =3D &sig_info->signal_received; @@ -1586,8 +1554,9 @@ { case LS_MODE_DEFAULT: sock->sd =3D - socket_listen_accept(sock->sd, &sock->info.lsa->actual, re= mote_dynamic, - sock->info.lsa->bind_local, true, fal= se, signal_received); + socket_listen_accept(sock->sd, &sock->info.lsa->actual, + sock->info.lsa->bind_local, true, fal= se, + signal_received); break; case LS_MODE_TCP_LISTEN: @@ -1675,7 +1644,7 @@ sock->info.lsa->remote_list =3D NULL; } - resolve_remote(sock, 1, NULL, sig_info); + resolve_remote(sock, 1, sig_info); } #if defined(_WIN32) @@ -1733,7 +1702,6 @@ const struct frame *frame =3D &c->c2.frame; struct signal_info *sig_info =3D c->sig; - const char *remote_dynamic =3D NULL; struct signal_info sig_save =3D { 0 }; ASSERT(sock); @@ -1748,18 +1716,8 @@ /* initialize buffers */ socket_frame_init(frame, sock); - /* - * Pass a remote name to connect/accept so that - * they can test for dynamic IP address changes - * and throw a SIGUSR1 if appropriate. - */ - if (sock->resolve_retry_seconds) - { - remote_dynamic =3D sock->remote_host; - } - /* Second chance to resolv/create socket */ - resolve_remote(sock, 2, &remote_dynamic, sig_info); + resolve_remote(sock, 2, sig_info); /* If a valid remote has been found, create the socket with its addrin= fo */ #if defined(_WIN32) @@ -1809,7 +1767,7 @@ if (sock->info.proto =3D=3D PROTO_TCP_SERVER) { - phase2_tcp_server(sock, remote_dynamic, sig_info); + phase2_tcp_server(sock, sig_info); } else if (sock->info.proto =3D=3D PROTO_TCP_CLIENT) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1468?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: I0141945469dd11340bfb42ec37a3c5f90ed0ff52 Gerrit-Change-Number: 1468 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --s96f/OAisB0= 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

socket: Remove old "dynamic remote&quo=
t; feature

So apparently when using --proto tcp-server --tls-server<= br>--remote, AND the remote is not resolvable on startup
then we would p= reserve the remote name and resolve it
later on connect. Except that whe= n the remote is not
resolvable I never managed to get it to create a
= listening socket in the first place.

Originally I looked into this c= ode because ZeroPath
claimed it was broken. I think that report was
c= orrect but I think it is much easier to declare this
feature dead instea= d of trying to fix it. It is
undocumented and if it is usable then only = in very
specific circumstances that are hard to figure out.

Githu= b: openvpn-private-issues#13
Change-Id: I0141945469dd11340bfb42ec37a3c5f= 90ed0ff52
Signed-off-by: Frank Lichtenheld <frank@...2641...>
-= --
M src/openvpn/socket.c
1 file changed, 11 insertions(+), 53 deleti= ons(-)

git pull ssh://gerrit.openvpn.net:29418/o=
penvpn refs/changes/68/1468/1
diff --git a/src/openvpn/socket.c b/s=
rc/openvpn/socket.c
index e2c5844..093f822 100644--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.= c
@@ -867,12 +867,10 @@

= static socket_descriptor_t
socket_listen_accept(socket_des= criptor_t sd, struct link_socket_actual *act,
- const char *remote_dynamic, co= nst struct addrinfo *local, bool do_listen,
+ const struct addrinfo *local, = bool do_listen,
bool nowait, volatile= int *signal_received)
{
struct gc_ar= ena gc =3D gc_new();
- = /* struct openvpn_sockaddr *remote =3D &act->dest; */
<= span style=3D"color: hsl(0, 100%, 40%);">- struct openvpn_sockaddr remot= e_verify =3D act->dest;
socket_descriptor_t new_sd = =3D SOCKET_UNDEFINED;

CLEAR(*act);
@@ -913,31 +911,7 @@

= if (socket_defined(new_sd))
{
- struct addrinfo *ai =3D NU= LL;
- if (re= mote_dynamic)
- = {
- = openvpn_getaddrinfo(0, remote_dynamic, NULL, 1, NULL,
- remote_= verify.addr.sa.sa_family, &ai);
- }
-
- if = (ai && !addrlist_match(&remote_verify, ai))
- {
- msg(M_WARN, "TCP NOTE: Rejec= ted connection attempt from %s due to --remote setting",
- print_link_sock= et_actual(act, &gc));

- if (openvpn_close_socket(new_sd))
- {
- msg(M_ERR, "TCP: close= socket failed (new_sd)");
- }
- freeaddrinfo(ai);
- }
- else
- {
- = if (ai)
- = {
- = freeaddrinfo(ai);
- }
- break;
- }
+ break;
}
ma= nagement_sleep(1);
}
@@ -1255,8 +1229,= 7 @@
}

static void
-resolve_remote(struct link= _socket *sock, int phase, const char **remote_dynamic,
- struct signal_info *sig_inf= o)
+resolve_remote(st= ruct link_socket *sock, int phase, struct signal_info *sig_info)
= {
volatile int *signal_received =3D sig_info ? = &sig_info->signal_received : NULL;
struct gc_ar= ena gc =3D gc_new();
@@ -1351,10 +1324,6 @@
{

msg(M_INFO, "TCP/UDP: Preserving rece= ntly used remote address: %s",
print_link= _socket_actual(&sock->info.lsa->actual, &gc));
- if (remote_dynamic)- {
- *remote_dynamic =3D NULL;

- }
= }
else
{
@@ = -1516,7 +1485,7 @@
{
= resolve_bind_local(sock, sock->info.af);
}
- resolve_remote(soc= k, 1, NULL, NULL);
+ = resolve_remote(sock, 1, NULL);
}
}


@@ -1577,8 +1546,7 @@
}

static void
-phase2_tcp_server(struct link_socket *sock,= const char *remote_dynamic,
- struct signal_info *sig_info)
+phase2_tcp_server(struct link_socket *so= ck, struct signal_info *sig_info)
{
A= SSERT(sig_info);
volatile int *signal_received =3D &am= p;sig_info->signal_received;
@@ -1586,8 +1554,9 @@
{
case LS_MODE_DEFAULT:
= sock->sd =3D
- socket_listen_accept(sock->sd, &sock-&g= t;info.lsa->actual, remote_dynamic,
- sock->info.lsa->= ;bind_local, true, false, signal_received);
+ socket_listen_accept(sock->sd, &= amp;sock->info.lsa->actual,
+ sock->info.lsa->bi= nd_local, true, false,
- resolve_= remote(sock, 1, NULL, sig_info);
+ resolve_remote(sock, 1, sig_info);
}


#if defined(_WIN32)
@@ -1733= ,7 +1702,6 @@
const struct frame *frame =3D &c->= ;c2.frame;
struct signal_info *sig_info =3D c->sig;=

- = const char *remote_dynamic =3D NULL;
struct signal_in= fo sig_save =3D { 0 };

ASSERT(sock);=
@@ -1748,18 +1716,8 @@
/* initialize = buffers */
socket_frame_init(frame, sock);
<= span>
- /*- * Pass a remote name to c= onnect/accept so that
-= * they can test for dynamic IP address changes
- * and throw a SIGUSR1 if appropriate.<= /span>
- */
- if (sock->resolve_retry_secon= ds)

- {
- remote_dynamic =3D sock-&g= t;remote_host;
- }
-
/= * Second chance to resolv/create socket */
- resolve_remote(sock, 2, &remote_dynamic, sig_i= nfo);
+ resolve_re= mote(sock, 2, sig_info);

/* If a val= id remote has been found, create the socket with its addrinfo */
= #if defined(_WIN32)
@@ -1809,7 +1767,7 @@
=
if (sock->info.proto =3D=3D PROTO_TCP_SERVE= R)
{
- phase2_tcp_server(sock, remote_dynamic, sig_info);
+ phase2_tcp_server(sock, = sig_info);

}
else if (sock->in= fo.proto =3D=3D PROTO_TCP_CLIENT)
{

To view, visit change 1468. To unsubscribe, or for help writi= ng mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I0141945469dd11340bfb42ec37a= 3c5f90ed0ff52
Gerrit-Change-Number: 1468
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...>
= --s96f/OAisB0=--