From: "its_Giaan (Code Review)" Date: Tue, 1 Oct 2024 15:30:04 +0000 In-Reply-To: References: Reply-To: gianmarco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., a@...2181... Message-ID: <3358afcb6e7cd3afb837c6237e2fa3a71ea9f1cf-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="x0Vr4hMnXYM="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: allow user to specify 'local' multiple times in config files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --x0Vr4hMnXYM= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, its_Giaan, ordex, plais= thos. its_Giaan has uploaded a new patch set (#3) to the change originally create= d by ordex. ( http://gerrit.openvpn.net/c/openvpn/+/436?usp=3Demail ) The following approvals got outdated and were removed: Code-Review-1 by flichtenheld Change subject: allow user to specify 'local' multiple times in config files ...................................................................... allow user to specify 'local' multiple times in config files It is now possible to specify 'local' multiple times in a server config to let it listen on multiple sockets (address:port) of the same protocol. Change-Id: I4d1c96662c5a8c750d883e3b20adde09529e2764 Signed-off-by: Antonio Quartulli --- M doc/man-sections/link-options.rst M src/openvpn/init.c M src/openvpn/options.c M src/openvpn/options.h M src/openvpn/socket.c 5 files changed, 177 insertions(+), 44 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/436/3 diff --git a/doc/man-sections/link-options.rst b/doc/man-sections/link-opti= ons.rst index ca192c3..05909ca 100644 --- a/doc/man-sections/link-options.rst +++ b/doc/man-sections/link-options.rst @@ -106,10 +106,12 @@ is not reliable. It is recommended to set tun-mtu with enough headroom instead. ---local host - Local host name or IP address for bind. If specified, OpenVPN will bind - to this address only. If unspecified, OpenVPN will bind to all - interfaces. +--local host|* [port] + Local host name or IP address and port for bind. If specified, OpenVPN w= ill bind + to this address. If unspecified, OpenVPN will bind to all interfaces. + '*' can be used as hostname and means 'any host' (OpenVPN will listen on= what + is returned by the OS). Implies --bind. + 0.0.0.0 or :: can be used to specifically open a socket. --lport port Set local TCP/UDP port number or name. Cannot be used together with diff --git a/src/openvpn/init.c b/src/openvpn/init.c index f406c0f..575b4d2 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -742,7 +742,7 @@ init_connection_list(c); - c->c1.link_sockets_num =3D 1; + c->c1.link_sockets_num =3D c->options.ce.local_list->len; do_link_socket_addr_new(c); @@ -3859,8 +3859,8 @@ /* init each socket with its specific port */ link_socket_init_phase1(c->c2.link_sockets[i], - c->options.ce.local, - c->options.ce.local_port, + c->options.ce.local_list->array[i]->local, + c->options.ce.local_list->array[i]->port, c->options.ce.remote, c->options.ce.remote_port, c->c1.dns_cache, @@ -3874,7 +3874,7 @@ #ifdef ENABLE_DEBUG c->options.gremlin, #endif - c->options.ce.bind_local, + c->options.ce.local_list->array[i]->bind_l= ocal, c->options.ce.remote_float, &c->c1.link_socket_addrs[i], c->options.ipchange, @@ -5008,6 +5008,7 @@ if (dest->mode =3D=3D CM_CHILD_UDP) { ASSERT(!dest->c2.link_sockets); + ASSERT(dest->options.ce.local_list); /* inherit buffers */ dest->c2.buffers =3D src->c2.buffers; diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 61f6285..f216456 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -124,7 +124,13 @@ "--version : Show copyright and version information.\n" "\n" "Tunnel Options:\n" - "--local host : Local host name or ip address. Implies --bind.\n" + "--local host|* [port] : Local host name or ip address and port. '*' c= an be used\n" + " as hostname and means 'any host' (openvpn wil= l listen on\n" + " what is returned by the OS). Implies --bind.\= n" + " 0.0.0.0 or :: can be used to specifically ope= n a socket\n" + " listening on any IPv4 or IPv6 address respect= ively.\n" + " The user can specify multiple --local entries= to have\n" + " a server listen on multiple sockets at the sa= me time.\n" "--remote host [port] : Remote host name or ip address.\n" "--remote-random : If multiple --remote options specified, choose one = randomly.\n" "--remote-random-hostname : Add a random string to remote DNS name.\n" @@ -988,8 +994,9 @@ const int i) { setenv_str_i(es, "proto", proto2ascii(e->proto, e->af, false), i); - setenv_str_i(es, "local", e->local, i); - setenv_str_i(es, "local_port", e->local_port, i); + /* expected to be for single socket contexts only */ + setenv_str_i(es, "local", e->local_list->array[0]->local, i); + setenv_str_i(es, "local_port", e->local_list->array[0]->port, i); setenv_str_i(es, "remote", e->remote, i); setenv_str_i(es, "remote_port", e->remote_port, i); @@ -1713,8 +1720,12 @@ show_connection_entry(const struct connection_entry *o) { msg(D_SHOW_PARMS, " proto =3D %s", proto2ascii(o->proto, o->af, false= )); - SHOW_STR(local); - SHOW_STR(local_port); + msg(D_SHOW_PARMS, " Local Sockets:"); + for (int i =3D 0; i < o->local_list->len; i++) + { + msg(D_SHOW_PARMS, " [%s]:%s", o->local_list->array[i]->local, + o->local_list->array[i]->port); + } SHOW_STR(remote); SHOW_STR(remote_port); SHOW_BOOL(remote_float); @@ -2162,6 +2173,37 @@ #endif /* ifdef ENABLE_MANAGEMENT */ +static struct local_list * +alloc_local_list_if_undef(struct connection_entry *ce, struct gc_arena *gc) +{ + if (!ce->local_list) + { + ALLOC_OBJ_CLEAR_GC(ce->local_list, struct local_list, gc); + } + return ce->local_list; +} + +static struct local_entry * +alloc_local_entry(struct connection_entry *ce, const int msglevel, + struct gc_arena *gc) +{ + struct local_list *l =3D alloc_local_list_if_undef(ce, gc); + struct local_entry *e; + + if (l->len >=3D CONNECTION_LIST_SIZE) + { + msg(msglevel, "Maximum number of 'local' options (%d) exceeded", + CONNECTION_LIST_SIZE); + + return NULL; + } + + ALLOC_OBJ_CLEAR_GC(e, struct local_entry, gc); + l->array[l->len++] =3D e; + + return e; +} + static struct connection_list * alloc_connection_list_if_undef(struct options *options) { @@ -2354,6 +2396,15 @@ "--proto tcp-server or --proto tcp-client"); } + /* + * Sanity check on daemon mode + */ + + if (ce->remote && ce->local_list->len > 1) + { + msg(M_USAGE, "multiple --local do not make sense in Client mode"); + } + if (options->lladdr && dev !=3D DEV_TYPE_TAP) { msg(M_USAGE, "--lladdr can only be used in --dev tap mode"); @@ -2379,13 +2430,6 @@ * Sanity check on --local, --remote, and --ifconfig */ - if (proto_is_net(ce->proto) - && string_defined_equal(ce->local, ce->remote) - && string_defined_equal(ce->local_port, ce->remote_port)) - { - msg(M_USAGE, "--remote and --local addresses are the same"); - } - if (string_defined_equal(ce->remote, options->ifconfig_local) || string_defined_equal(ce->remote, options->ifconfig_remote_netma= sk)) { @@ -2394,13 +2438,6 @@ "addresses"); } - if (string_defined_equal(ce->local, options->ifconfig_local) - || string_defined_equal(ce->local, options->ifconfig_remote_netmas= k)) - { - msg(M_USAGE, - "--local addresses must be distinct from --ifconfig addresses"= ); - } - if (string_defined_equal(options->ifconfig_local, options->ifconfig_remote_netmask)) { @@ -2413,12 +2450,6 @@ msg(M_USAGE, "--bind and --nobind can't be used together"); } - if (ce->local && !ce->bind_local) - { - msg(M_USAGE, - "--local and --nobind don't make sense when used together"); - } - if (ce->local_port_defined && !ce->bind_local) { msg(M_USAGE, @@ -2430,6 +2461,29 @@ msg(M_USAGE, "--nobind doesn't make sense unless used with --remot= e"); } + for (int i =3D 0; i < ce->local_list->len; i++) + { + struct local_entry *le =3D ce->local_list->array[i]; + + if (proto_is_net(ce->proto) + && string_defined_equal(le->local, ce->remote) + && string_defined_equal(le->port, ce->remote_port)) + { + msg(M_USAGE, "--remote and a --local addresses are the same"); + } + + if (string_defined_equal(le->local, options->ifconfig_local) + || string_defined_equal(le->local, options->ifconfig_remote_ne= tmask)) + { + msg(M_USAGE, "--local addresses must be distinct from --ifconf= ig addresses"); + } + + if (le->local && !ce->bind_local) + { + msg(M_USAGE, "--local and --nobind don't make sense when used = together"); + } + } + /* * Check for consistency of management options */ @@ -3128,7 +3182,7 @@ } /* an option is present that requires local bind to enabled */ - bool need_bind =3D ce->local || ce->local_port_defined || ce->bind_def= ined; + bool need_bind =3D ce->local_port_defined || ce->bind_defined; /* socks proxy is enabled */ bool uses_socks =3D ce->proto =3D=3D PROTO_UDP && ce->socks_proxy_serv= er; @@ -3141,6 +3195,11 @@ ce->bind_local =3D false; } + if (ce->proto =3D=3D PROTO_UDP && ce->socks_proxy_server && !ce->local= _list && !ce->local_port_defined && !ce->bind_defined) + { + ce->bind_local =3D false; + } + if (!ce->bind_local) { ce->local_port =3D NULL; @@ -3264,6 +3323,16 @@ } } +static void +options_postprocess_mutate_le(struct options *o, struct local_entry *le) +{ + /* use the global port if none is specified */ + if (!le->port) + { + le->port =3D o->ce.local_port; + } +} + #ifdef _WIN32 /* If iservice is in use, we need def1 method for redirect-gateway */ static void @@ -3738,6 +3807,29 @@ options_postprocess_mutate_ce(o, o->connection_list->array[i]); } + if (o->ce.local_list) + { + for (i =3D 0; i < o->ce.local_list->len; i++) + { + options_postprocess_mutate_le(o, o->ce.local_list->array[i]); + } + } + else + { + /* if no 'local' directive was specified, convert the global port + * setting to a listen entry */ + struct local_entry *e =3D alloc_local_entry(&o->ce, M_USAGE, &o->g= c); + ASSERT(e); + e->port =3D o->ce.local_port; + e->bind_local =3D o->connection_list->array[0]->bind_local; + } + + /* use the same listen list for every outgoing connection */ + for (i =3D 0; i < o->connection_list->len; ++i) + { + o->connection_list->array[i]->local_list =3D o->ce.local_list; + } + if (o->tls_server) { /* Check that DH file is specified, or explicitly disabled */ @@ -6140,10 +6232,29 @@ VERIFY_PERMISSION(OPT_P_UP); options->ifconfig_nowarn =3D true; } - else if (streq(p[0], "local") && p[1] && !p[2]) + else if (streq(p[0], "local") && p[1] && !p[3]) { + struct local_entry *e; + VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION); - options->ce.local =3D p[1]; + + e =3D alloc_local_entry(&options->ce, M_USAGE, &options->gc); + ASSERT(e); + + /* '*' is treated as 'ask the system to get some socket', + * therefore force binding on a particular address only when + * actually specified. */ + if (strcmp(p[1], "*") !=3D 0) + { + e->local =3D p[1]; + e->bind_local =3D true; + } + + if (p[2]) + { + e->port =3D p[2]; + e->bind_local =3D true; + } } else if (streq(p[0], "remote-random") && !p[1]) { diff --git a/src/openvpn/options.h b/src/openvpn/options.h index ee39dbb..6942455 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -94,14 +94,21 @@ #error "At least one of OpenSSL or mbed TLS needs to be defined." #endif +struct local_entry +{ + const char *local; + const char *port; + bool bind_local; +}; + struct connection_entry { + struct local_list *local_list; int proto; sa_family_t af; const char *local_port; bool local_port_defined; const char *remote_port; - const char *local; const char *remote; bool remote_float; bool bind_defined; @@ -179,6 +186,12 @@ #define CONNECTION_LIST_SIZE 64 +struct local_list +{ + int len; + struct local_entry *array[CONNECTION_LIST_SIZE]; +}; + struct connection_list { int capacity; diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 8677472..8051a97 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -342,7 +342,6 @@ void do_preresolve(struct context *c) { - int i; struct connection_list *l =3D c->options.connection_list; const unsigned int preresolve_flags =3D GETADDR_RESOLVE |GETADDR_UPDATE_MANAGEMENT_STATE @@ -350,7 +349,7 @@ |GETADDR_FATAL; - for (i =3D 0; i < l->len; ++i) + for (int i =3D 0; i < l->len; ++i) { int status; const char *remote; @@ -416,12 +415,19 @@ } } - if (ce->bind_local) + flags |=3D GETADDR_PASSIVE; + flags &=3D ~GETADDR_RANDOMIZE; + + for (int j =3D 0; j < ce->local_list->len; j++) { - flags |=3D GETADDR_PASSIVE; - flags &=3D ~GETADDR_RANDOMIZE; - status =3D do_preresolve_host(c, ce->local, ce->local_port, - ce->af, flags); + struct local_entry *le =3D ce->local_list->array[j]; + + if (!le->local) + { + continue; + } + + status =3D do_preresolve_host(c, le->local, le->port, ce->af, = flags); if (status !=3D 0) { goto err; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/436?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I4d1c96662c5a8c750d883e3b20adde09529e2764 Gerrit-Change-Number: 436 Gerrit-PatchSet: 3 Gerrit-Owner: ordex Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: its_Giaan Gerrit-Attention: flichtenheld Gerrit-Attention: ordex Gerrit-MessageType: newpatchset --x0Vr4hMnXYM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, its_Giaan, ordex, p= laisthos.

its_Giaan uploaded patch set #3 to the change originall= y created by ordex.

View Change

The following approvals got outdated= and were removed: Code-Review-1 by flichtenheld

allow user to specify 'local' multipl=
e times in config files

It is now possible to specify 'local'= ; multiple times in a server
config to let it listen on multiple sockets= (address:port) of
the same protocol.

Change-Id: I4d1c96662c5a8c7= 50d883e3b20adde09529e2764
Signed-off-by: Antonio Quartulli <a@...2588...= ...>
---
M doc/man-sections/link-options.rst
M src/openvpn/init= .c
M src/openvpn/options.c
M src/openvpn/options.h
M src/openvpn/s= ocket.c
5 files changed, 177 insertions(+), 44 deletions(-)

gi=
t pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/436/3
diff --git a/doc/man-sections/link-options.rst b/doc/man-sections/link-opt= ions.rst
index ca192c3..05909ca 100644
--- = a/doc/man-sections/link-options.rst
+++ b/doc/man-sections/= link-options.rst
@@ -106,10 +106,12 @@
i= s not reliable. It is recommended to set tun-mtu with enough headroom

instead.

---local host
- Local host name or IP ad= dress for bind. If specified, OpenVPN will bind
- to this address only. If unspecified, OpenVPN w= ill bind to all
- inte= rfaces.
+--local host= |* [port]
+ Local ho= st name or IP address and port for bind. If specified, OpenVPN will bind
+ to this address. If = unspecified, OpenVPN will bind to all interfaces.
+ '*' can be used as hostname and mea= ns 'any host' (OpenVPN will listen on what
+ is returned by the OS). Implies --bind.
+ 0.0.0.0 or :: can be= used to specifically open a socket.

--l= port port
Set local TCP/UDP port number or name. Cannot = be used together with
diff --git a/src/openvpn/init.c b/src= /openvpn/init.c
index f406c0f..575b4d2 100644
--- a/src/openvpn/init.c

+++ b/src/openvpn/init.c=
@@ -742,7 +742,7 @@

init_c= onnection_list(c);

- c->c1.link_sockets_num =3D 1;
+ c->c1.link_sockets_num =3D c->o= ptions.ce.local_list->len;

do_lin= k_socket_addr_new(c);

@@ -3859,8 +3859,8 = @@

/* init each socket with its = specific port */
link_socket_init_phase1(c->c2.= link_sockets[i],
- = c->options.ce.local,
- c->options.= ce.local_port,
+ = c->options.ce.local_list->array[i]->loc= al,
+ = c->options.ce.local_list->array[i]->port, c->options.ce.remote, c->options.ce.remote_port,
c->c1.dns_cache,
<= span>@@ -3874,7 +3874,7 @@

#ifdef ENABLE_DEBUG
<= span> c->options.gremlin,

#endif

- = c->options.ce.bind_local,
+ c->options.= ce.local_list->array[i]->bind_local,
= c->options.ce.remote_float,
= &c->c1.link_socket_addrs[i],
= c->options.ipchange,
@@ = -5008,6 +5008,7 @@
if (dest->mode =3D=3D CM_CHILD_U= DP)
{
ASSERT(!dest->c2.lin= k_sockets);
+ = ASSERT(dest->options.ce.local_list);

= /* inherit buffers */
dest->c2.buffers = =3D src->c2.buffers;
diff --git a/src/openvpn/options.c = b/src/openvpn/options.c
index 61f6285..f216456 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/op= tions.c
@@ -124,7 +124,13 @@
"--v= ersion : Show copyright and version information.\n"
"\n"

"Tunnel Options:\n"<= /span>
- "--local host= : Local host name or ip address. Implies --bind.\n"
+ "--local host|* [port] : = Local host name or ip address and port. '*' can be used\n"
+ " = as hostname and means 'any host' (openvpn will listen on= \n"
+ " = what is returned by the OS). Implies --bind.\n"=
+ " = 0.0.0.0 or :: can be used to specifically open a socket\n&qu= ot;
+ " = listening on any IPv4 or IPv6 address respectively.\n&quo= t;
+ " = The user can specify multiple --local entries to have\n&qu= ot;
+ " = a server listen on multiple sockets at the same time.\n&q= uot;
"--remote host [port] : Remote host name or = ip address.\n"
"--remote-random : If multipl= e --remote options specified, choose one randomly.\n"
= "--remote-random-hostname : Add a random string to remote DNS nam= e.\n"
@@ -988,8 +994,9 @@
= const int i)
{
setenv_st= r_i(es, "proto", proto2ascii(e->proto, e->af, false), i);
- setenv_str_i(es, &q= uot;local", e->local, i);
- setenv_str_i(es, "local_port", e->local_port, = i);
+ /* expected = to be for single socket contexts only */
+ setenv_str_i(es, "local", e->local_li= st->array[0]->local, i);
+ setenv_str_i(es, "local_port", e->local_list-&g= t;array[0]->port, i);
setenv_str_i(es, "remote= ", e->remote, i);
setenv_str_i(es, "remot= e_port", e->remote_port, i);

@@ -= 1713,8 +1720,12 @@
show_connection_entry(const struct conn= ection_entry *o)
{
msg(D_SHOW_PARMS, = " proto =3D %s", proto2ascii(o->proto, o->af, false));
- SHOW_STR(local);

- SHOW_STR(local_port);<= /span>
+ msg(D_SHOW_PARMS= , " Local Sockets:");
+ for (int i =3D 0; i < o->local_list->len; i++)
+ {
+ msg(D_SHOW_PARMS, " = [%s]:%s", o->local_list->array[i]->local,
+ o->local_list->array[= i]->port);
+ }<= /span>
SHOW_STR(remote);
SHOW_STR(remote= _port);
SHOW_BOOL(remote_float);
@@ -2= 162,6 +2173,37 @@

#endif /* ifdef ENABLE= _MANAGEMENT */

+static struct local_list *
+alloc_local_list_if_undef(struct connection_entry *ce, = struct gc_arena *gc)
= +{
+ if (!ce->l= ocal_list)
+ {
+ ALLOC_OBJ_CLEAR= _GC(ce->local_list, struct local_list, gc);
+ }
+ return ce->local_list;
+}
+
+static struct = local_entry *
+alloc_= local_entry(struct connection_entry *ce, const int msglevel,
+ struct gc_arena = *gc)

+{
+ struct local_list *l =3D allo= c_local_list_if_undef(ce, gc);

+ struct local_entry *e;
+
+ = if (l->len >=3D CONNECTION_LIST_SIZE)
+ {
+ msg(msglevel, "Maximum number of 'local' = options (%d) exceeded",
+ CONNECTION_LIST_SIZE);
+
+ return NULL;
+ }
+<= br>+ ALLOC_OBJ_CLEAR_GC(e, s= truct local_entry, gc);
+ l->array[l->len++] =3D e;
+
= + return e;
+}
+
stati= c struct connection_list *
alloc_connection_list_if_undef(= struct options *options)
{
@@ -2354,6 +239= 6,15 @@
"--proto tcp-server or --proto tc= p-client");
}

+ /*
+ * Sanity check on daemon mode
+ */

+
+ if (ce->remote && ce->local_list->len > 1)=
+ {
+ msg(M_USAGE, "multip= le --local do not make sense in Client mode");

+ }
+
if (options->lladdr &&= dev !=3D DEV_TYPE_TAP)
{
msg= (M_USAGE, "--lladdr can only be used in --dev tap mode");<= br>@@ -2379,13 +2430,6 @@
* Sanity check on --l= ocal, --remote, and --ifconfig
*/

- if (proto_is_net(ce= ->proto)
- &a= mp;& string_defined_equal(ce->local, ce->remote)
- && string_defined_equa= l(ce->local_port, ce->remote_port))
- {
- msg(M_USAGE, "--remote and --local addresses are the same&= quot;);
- }-
if (stri= ng_defined_equal(ce->remote, options->ifconfig_local)
|| string_defined_equal(ce->remote, options->ifconfig_remot= e_netmask))

{
@@ -2394,13 +2438,6 @@
"addresses");
}<= /span>

- = if (string_defined_equal(ce->local, options->ifconfig_local)- || string_defined_equa= l(ce->local, options->ifconfig_remote_netmask))
- {
- msg(M_USAGE,
- "--local addresses must be distinct from --= ifconfig addresses");
- }
-
= if (string_defined_equal(options->ifconfig_local,
<= span> options->ifconfig_remote_netmask))
{
@@ -2413,12 +2450,6 @@
msg(M_USAGE, "--bind and --nobind can't be used together= ");

}

- if (ce->local && !ce->bind_lo= cal)
- {
<= span style=3D"color: hsl(0, 100%, 40%);">- msg(M_USAGE,

- "--local and --no= bind don't make sense when used together");

- }
-
if (ce->local_port_defined &&a= mp; !ce->bind_local)
{
msg= (M_USAGE,
@@ -2430,6 +2461,29 @@
m= sg(M_USAGE, "--nobind doesn't make sense unless used with --remote= ");
}

+ for (int i =3D 0; i < ce->local_lis= t->len; i++)
+ = {
+ struct loc= al_entry *le =3D ce->local_list->array[i];
+
+ if (proto_is_net(ce->proto)
+ && string_defined_equal(le= ->local, ce->remote)
+ && string_defined_equal(le->port, ce->remo= te_port))
+ {<= /span>
+ msg(M_US= AGE, "--remote and a --local addresses are the same");
= + }
+
+ if (string_defined_equal(le->local, options->= ifconfig_local)
+ = || string_defined_equal(le->local, options->ifconfig_remote_n= etmask))
+ {
+ msg(M_USA= GE, "--local addresses must be distinct from --ifconfig addresses"= ;);
+ }=
+
+ if (le->local && !ce->b= ind_local)
+ {=
+ msg(M_U= SAGE, "--local and --nobind don't make sense when used together&qu= ot;);
+ }
+ }
+
/*
* Check for consistency of management options

= */
@@ -3128,7 +3182,7 @@
}
/* an option is present that requires local b= ind to enabled */
- = bool need_bind =3D ce->local || ce->local_port_defined || ce->bind= _defined;
+ bool n= eed_bind =3D ce->local_port_defined || ce->bind_defined;

/* socks proxy is enabled */
= bool uses_socks =3D ce->proto =3D=3D PROTO_UDP && ce->socks= _proxy_server;
@@ -3141,6 +3195,11 @@
= ce->bind_local =3D false;
}

+ if (ce->proto = =3D=3D PROTO_UDP && ce->socks_proxy_server && !ce->lo= cal_list && !ce->local_port_defined && !ce->bind_defi= ned)
+ {+ ce->bind_local =3D= false;
+ }=
+
if (= !ce->bind_local)
{
ce->= local_port =3D NULL;
@@ -3264,6 +3323,16 @@
}

}

+static void
+options_postprocess_mutate_le(struct options *o, struct lo= cal_entry *le)
+{
+ /* use the global p= ort if none is specified */
+ if (!le->port)
+ {
+ = le->port =3D o->ce.local_port;
+ }
+}
+
= #ifdef _WIN32
/* If iservice is in use, we need def= 1 method for redirect-gateway */
static void
@@ -3738,6 +3807,29 @@

options_postprocess_muta= te_ce(o, o->connection_list->array[i]);
}=

+ if (= o->ce.local_list)
= + {
+ for (= i =3D 0; i < o->ce.local_list->len; i++)
+ {
+ options_postprocess_mutate_le(o, o->ce.l= ocal_list->array[i]);
+ }
+ }=
+ else
= + {
+ /* if no 'local' directive w= as specified, convert the global port
+ * setting to a listen entry */
+ struct local_entry *e =3D all= oc_local_entry(&o->ce, M_USAGE, &o->gc);
+ ASSERT(e);
+ e->port =3D o->ce.local_por= t;
+ e->bin= d_local =3D o->connection_list->array[0]->bind_local;
+ }

+
+ /* use the same listen list for every outgoing connection */<= /span>
+ for (i =3D 0; i = < o->connection_list->len; ++i)
+ {
+ o->connection_list->array[i]->local_list =3D o->= ce.local_list;
+ }=
+
= if (o->tls_server)
{
/*= Check that DH file is specified, or explicitly disabled */
@@ -6140,10 +6232,29 @@

VERIFY_PERMISSION(OPT_P_U= P);
options->ifconfig_nowarn =3D true; }
- els= e if (streq(p[0], "local") && p[1] && !p[2])
+ else if (streq(p[0],= "local") && p[1] && !p[3])
= {
+ struct loc= al_entry *e;
+=
VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION);
- options->ce.loca= l =3D p[1];
+<= br>+ e =3D alloc_local_e= ntry(&options->ce, M_USAGE, &options->gc);
+ ASSERT(e);
+
+ /* '*' is treated as 'ask the system t= o get some socket',
+ * therefore force binding on a particular address only when
+ * actually sp= ecified. */
+ = if (strcmp(p[1], "*") !=3D 0)
+ {
+ e->local =3D p[1];
+ e->bind_local =3D true;
+ }

+
+ if (p[2])
+ {
+ e->bind_local =3D true;
+ }
}<= br> else if (streq(p[0], "remote-random") && !p= [1])
{
diff --git a/src/openvpn/option= s.h b/src/openvpn/options.h
index ee39dbb..6942455 100644
--- a/src/openvpn/options.h
+++ b/src/openvp= n/options.h
@@ -94,14 +94,21 @@
#error &qu= ot;At least one of OpenSSL or mbed TLS needs to be defined." #endif

+struct local_entry
+{
+ co= nst char *local;
+ = const char *port;
+ = bool bind_local;
+= };
+
= struct connection_entry
{
+ struct local_list *local_list;
= int proto;
sa_family_t af;
c= onst char *local_port;
bool local_port_defined;=
const char *remote_port;
- const char *local;
const char *r= emote;
bool remote_float;
bool bi= nd_defined;
@@ -179,6 +186,12 @@
#define CONNECTION_LIST_SIZE 64

+struct local_list
+{
+ int len;
+ struct local_entry *array[CONNECTION_LIST_SIZE];
= +};
+
struct connection_list=
{
int capacity;
diff --git = a/src/openvpn/socket.c b/src/openvpn/socket.c
index 8677472= ..8051a97 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c

@@ -342,7 +342,6 @@
<= span> void

do_preresolve(struct context *c)
{

- int i;=
struct connection_list *l =3D c->options.connection_list;=
const unsigned int preresolve_flags =3D GETADDR_RESOL= VE
|GETADDR_UPDA= TE_MANAGEMENT_STATE
@@ -350,7 +349,7 @@
= |GETADDR_FATAL;


- f= or (i =3D 0; i < l->len; ++i)
+ for (int i =3D 0; i < l->len; ++i)
{

int status;
cons= t char *remote;
@@ -416,12 +415,19 @@
= }
}

- if (ce->bind_local)
<= span style=3D"color: hsl(120, 100%, 40%);">+ flags |=3D GETADDR_PASS= IVE;

+ flags &= amp;=3D ~GETADDR_RANDOMIZE;
+
+ for= (int j =3D 0; j < ce->local_list->len; j++)
= {
- flag= s |=3D GETADDR_PASSIVE;
- flags &=3D ~GETADDR_RANDOMIZE;
- status =3D do_preresolve_host(c, ce-= >local, ce->local_port,
- ce->af, flags);+ struct local_ent= ry *le =3D ce->local_list->array[j];
+
+ if (!le->local)
+ {
+ continue;
+ }
+
+ = status =3D do_preresolve_host(c, le->local, le->port, ce->af, fl= ags);
if (status !=3D 0)
= {
goto err;

To view, visit change 436. To unsubscribe, or for help writing mai= l filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4d1c96662c5a8c750d883e3b20a= dde09529e2764
Gerrit-Change-Number: 436
Gerrit-PatchSet: 3
Gerrit-Owner: ordex <a@...2181...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: its_Giaan <gianmarco@...1665...= 726...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: ordex <a@...2181...> <= /div>
Gerrit-MessageType: newpatchset
--x0Vr4hMnXYM=--