From: "its_Giaan (Code Review)" Date: Thu, 17 Oct 2024 14:47:28 +0000 In-Reply-To: References: Reply-To: gianmarco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., a@...2181... Message-ID: <3d8274f309d61f115f143e01125a840b718eff07-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="D5ScL6kSYjU="; 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 --D5ScL6kSYjU= 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 (#6) 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 Signed-off-by: Gianmarco De Gregori --- 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, 179 insertions(+), 46 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/436/6 diff --git a/doc/man-sections/link-options.rst b/doc/man-sections/link-opti= ons.rst index ca192c3..d519539 100644 --- a/doc/man-sections/link-options.rst +++ b/doc/man-sections/link-options.rst @@ -106,13 +106,15 @@ 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 spe= cifically + open a socket. --lport port - Set local TCP/UDP port number or name. Cannot be used together with + Set default TCP/UDP port number. Cannot be used together with ``--nobind`` option. --mark value diff --git a/src/openvpn/init.c b/src/openvpn/init.c index b246cce..3b9dc35 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); @@ -4962,6 +4962,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..d8b56ff 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 Client 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 (o->client && !need_bind) + { + 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 connection_entry ce, struct local_ent= ry *le) +{ + /* use the global port if none is specified */ + if (!le->port) + { + le->port =3D 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->ce, 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 2b55021..67c8f06 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,13 +349,13 @@ |GETADDR_FATAL; - for (i =3D 0; i < l->len; ++i) + for (int i =3D 0; i < l->len; ++i) { int status; const char *remote; int flags =3D preresolve_flags; =20 - struct connection_entry *ce =3D c->options.connection_list->array[= i]; + struct connection_entry *ce =3D l->array[i]; if (proto_is_dgram(ce->proto)) { @@ -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; @@ -1863,14 +1869,14 @@ { ASSERT(c->c2.link_sockets[sock_index]); - c->c2.link_sockets[sock_index]->local_host =3D c->options.ce.local; - c->c2.link_sockets[sock_index]->local_port =3D c->options.ce.local_por= t; + c->c2.link_sockets[sock_index]->local_host =3D c->options.ce.local_lis= t->array[sock_index]->local; + c->c2.link_sockets[sock_index]->local_port =3D c->options.ce.local_lis= t->array[sock_index]->port; c->c2.link_sockets[sock_index]->remote_host =3D c->options.ce.remote; c->c2.link_sockets[sock_index]->remote_port =3D c->options.ce.remote_p= ort; c->c2.link_sockets[sock_index]->dns_cache =3D c->c1.dns_cache; c->c2.link_sockets[sock_index]->http_proxy =3D c->c1.http_proxy; c->c2.link_sockets[sock_index]->socks_proxy =3D c->c1.socks_proxy; - c->c2.link_sockets[sock_index]->bind_local =3D c->options.ce.bind_loca= l; + c->c2.link_sockets[sock_index]->bind_local =3D c->options.ce.local_lis= t->array[sock_index]->bind_local; c->c2.link_sockets[sock_index]->resolve_retry_seconds =3D c->options.r= esolve_retry_seconds; c->c2.link_sockets[sock_index]->mtu_discover_type =3D c->options.ce.mt= u_discover_type; -- 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: 6 Gerrit-Owner: ordex Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: its_Giaan Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: its_Giaan Gerrit-Attention: flichtenheld Gerrit-Attention: ordex Gerrit-MessageType: newpatchset --D5ScL6kSYjU= 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 #6 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...= ...>
Signed-off-by: Gianmarco De Gregori <gianmarco@...2726...>=
---
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, 179 insertions(+), 46 deletions(-)

git pull =
ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/436/6
diff -=
-git a/doc/man-sections/link-options.rst b/doc/man-sections/link-options.rs=
t
index ca192c3..d519539 100644
--- a/doc/m= an-sections/link-options.rst
+++ b/doc/man-sections/link-op= tions.rst
@@ -106,13 +106,15 @@
is not r= eliable. It is recommended to set tun-mtu with enough headroom
instead.

---local host
<= span style=3D"color: hsl(0, 100%, 40%);">- Local host name or IP address f= or bind. If specified, OpenVPN will bind
- to this address only. If unspecified, OpenVPN will bin= d to all
- interfaces.=
+--local host|* [por= t]
+ Local host name= or IP address and port for bind. If specified, OpenVPN will bind+ to this address. If unspeci= fied, 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 o= r :: can be used to specifically
+ open a socket.

--lport po= rt
- Set local TCP/UDP= port number or name. Cannot be used together with
+ Set default TCP/UDP port number. Cannot be= used together with
``--nobind`` option.

--mark value
diff --git a/src/openvpn/i= nit.c b/src/openvpn/init.c
index b246cce..3b9dc35 100644

--- a/src/openvpn/init.c
+++ b/src/openvpn/in= it.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);

@@ -4962= ,6 +4962,7 @@
if (dest->mode =3D=3D CM_CHILD_UDP)
{
ASSERT(!dest->c2.link_soc= kets);
+ ASSER= T(dest->options.ce.local_list);

= /* inherit buffers */
dest->c2.buffers =3D s= rc->c2.buffers;
diff --git a/src/openvpn/options.c b/src= /openvpn/options.c
index 61f6285..d8b56ff 100644
= --- a/src/openvpn/options.c
+++ b/src/openvpn/options= .c
@@ -124,7 +124,13 @@
"--versio= n : 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. '*' can be used\n"+ " = as hostname and means 'any host' (openvpn will listen on\n&qu= ot;
+ " = what is returned by the OS). Implies --bind.\n"
+ " = 0.0.0.0 or :: can be used to specifically open a socket\n"
+ " = listening on any IPv4 or IPv6 address respectively.\n"

+ " = The user can specify multiple --local entries to have\n"
+ " = a server listen on multiple sockets at the same time.\n"<= /span>
"--remote host [port] : Remote host name or ip ad= dress.\n"
"--remote-random : If multiple --r= emote options specified, choose one randomly.\n"
= "--remote-random-hostname : Add a random string to remote DNS name.\n&= quot;
@@ -988,8 +994,9 @@
= const int i)
{
setenv_str_i(e= s, "proto", proto2ascii(e->proto, e->af, false), i);=
- setenv_str_i(es, "l= ocal", 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-&g= t;array[0]->local, i);
+ setenv_str_i(es, "local_port", e->local_list->arr= ay[0]->port, i);
setenv_str_i(es, "remote"= ;, e->remote, i);
setenv_str_i(es, "remote_por= t", e->remote_port, i);

@@ -1713,= 8 +1720,12 @@
show_connection_entry(const struct connectio= n_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, &qu= ot; Local Sockets:");
+ for (int i =3D 0; i < o->local_list->len; i++)<= br>+ {
+ msg(D_SHOW_PARMS, " [%s]:= %s", o->local_list->array[i]->local,
+ o->local_list->array[i]-&g= t;port);
+ }
SHOW_STR(remote);
SHOW_STR(remote_port= );
SHOW_BOOL(remote_float);
@@ -2162,6= +2173,37 @@

#endif /* ifdef ENABLE_MANA= GEMENT */

+static struct local_list *
+alloc_local_list_if_undef(struct connection_entry *ce, struc= t gc_arena *gc)
+{
+ if (!ce->local_= list)
+ {+ ALLOC_OBJ_CLEAR_GC(c= e->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)<= /span>
+{
+ struct local_list *l =3D alloc_loc= al_list_if_undef(ce, gc);
+ struct local_entry *e;
+
+ if= (l->len >=3D CONNECTION_LIST_SIZE)
+ {
+ msg(msglevel, "Maximum number of 'local' optio= ns (%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 str= uct connection_list *
alloc_connection_list_if_undef(struc= t options *options)
{
@@ -2354,6 +2396,15 = @@
"--proto tcp-server or --proto tcp-cli= ent");
}

+ /*
+ * Sanity check on Client 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_USA= GE, "--lladdr can only be used in --dev tap mode");
@@ -2379,13 +2430,6 @@

* Sanity check on --local, = --remote, and --ifconfig
*/
<= br>- if (proto_is_net(ce->p= roto)
- &&am= p; 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_de= fined_equal(ce->remote, options->ifconfig_local)
= || string_defined_equal(ce->remote, options->ifconfig_remote_net= mask))
{
@@ -2394,13 +2438,6 @@=
"addresses");
}

- if (s= tring_defined_equal(ce->local, options->ifconfig_local)
- || string_defined_equal(ce-= >local, options->ifconfig_remote_netmask))

- {
- msg(M_USAGE,
- "--local addresses must be distinct from --ifcon= fig addresses");
-= }
-
if (string_defined_equal(options->ifconfig_local,

= options->ifconfig_remote_netmask))<= br> {
@@ -2413,12 +2450,6 @@
= msg(M_USAGE, "--bind and --nobind can't be used together"= ;);
}

- if (ce->local && !ce->bind_local)<= /span>
- {
- msg(M_USAGE,
- "--local and --nobind = don't make sense when used together");
- }
-
if (ce->local_port_defined && !c= e->bind_local)
{
msg(M_USA= GE,
@@ -2430,6 +2461,29 @@
msg(M_U= SAGE, "--nobind doesn't make sense unless used with --remote"= );
}

+ for (int i =3D 0; i < ce->local_list->= len; i++)
+ {
+ struct local_ent= ry *le =3D ce->local_list->array[i];
+
+ if (proto_is_net(ce->proto)
+ && string_defined_equal(le->l= ocal, ce->remote)
= + && string_defined_equal(le->port, ce->remote_por= t))
+ {=
+ msg(M_USAGE, &= quot;--remote and a --local addresses are the same");
+ }
+
+ if (string_defined_equal(le->local, options->ifconf= ig_local)
+ = || string_defined_equal(le->local, options->ifconfig_remote_netmask= ))
+ {<= br>+ msg(M_USAGE, &q= uot;--local addresses must be distinct from --ifconfig addresses");
+ }
+

+ if (le->local && !ce->bind_lo= cal)
+ {
+ msg(M_USAGE, = "--local and --nobind don't make sense when used together");<= /span>
+ }
= + }
+
/*
= * Check for consistency of management options
*/
@@ -3128,7 +3182,7 @@
}

/* an option is present that requires local bind to= enabled */
- bool n= eed_bind =3D ce->local || ce->local_port_defined || ce->bind_defin= ed;
+ bool need_bi= nd =3D ce->local_port_defined || ce->bind_defined;
<= /span>
/* 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;
}
<= br>+ if (o->client &&= amp; !need_bind)
+ = {
+ ce->bi= nd_local =3D false;
+= }
+
if (!ce->bind_local)

{
= ce->local_port =3D NULL;
@@ -3264,6 +3323,16 @@
}
}

+static void
+options_postprocess_mutate_le(struct connectio= n_entry ce, struct local_entry *le)
+{
+ = /* use the global port if none is specified */
+ if (!le->port)
+ {
+ le->port =3D ce.local_port;
+ }
+}
+
#ifdef _WIN32
/* If iservice is in u= se, we need def1 method for redirect-gateway */
static voi= d
@@ -3738,6 +3807,29 @@
options_p= ostprocess_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_l= e(o->ce, o->ce.local_list->array[i]);
+ }
+ }
+ {
+ /* if no '= local' directive was specified, convert the global port
+ * setting to a listen entr= y */

+ struct = local_entry *e =3D alloc_local_entry(&o->ce, M_USAGE, &o->gc)= ;
+ ASSERT(e);=
+ e->port = =3D o->ce.local_port;
+ e->bind_local =3D o->connection_list->array[0]->bi= nd_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]-&= gt;local_list =3D o->ce.local_list;
+ }
+
if (o->tls_server)
{
/* Check that DH file is specified, or explicitly dis= abled */
@@ -6140,10 +6232,29 @@
V= ERIFY_PERMISSION(OPT_P_UP);
options->ifconfig_n= owarn =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 particu= lar address only when
+ * actually specified. */
+ if (strcmp(p[1], "*") !=3D 0)
<= span style=3D"color: hsl(120, 100%, 40%);">+ {

+ e->local =3D p[1];<= br>+ e->bind_loca= l =3D true;
+ = }
+
+ if (p[2])
+ {
+ e->port =3D p[2];
+ e->bind_local =3D tru= e;
+ }<= br> }
else if (streq(p[0], "remote-rand= om") && !p[1])
{
diff --g= it a/src/openvpn/options.h b/src/openvpn/options.h
index ee= 39dbb..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 d= efined."
#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 loc= al_port_defined;
const char *remote_port;
- const char *local;

<= span> const char *remote;

bool remote_float;
bool bind_defined;
@@ -179,6 +186,12 @@

#define CONNECTION_LIST_SIZE 64
<= span>

+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 2b55021..67c8f06 100644
--- a/src/openvpn/s= ocket.c
+++ b/src/openvpn/socket.c
@@ -342,= 7 +342,6 @@
void
do_preresolve(struct con= text *c)
{
- int i;
struct connection_list *l =3D c->o= ptions.connection_list;
const unsigned int preresolve_= flags =3D GETADDR_RESOLVE
= |GETADDR_UPDATE_MANAGEMENT_STATE
@@ -350,13 +349,= 13 @@
|GETADDR_F= ATAL;


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

{
int status;
const char *remote;
int flags= =3D preresolve_flags;

- struct connection_entry *ce =3D c->options.co= nnection_list->array[i];
+ struct connection_entry *ce =3D l->array[i];
<= span>

if (proto_is_dgram(ce->proto)) {
@@ -416,12 +415,19 @@
= }
}

- if (ce->bind_local)+ flags |=3D GETADDR_PA= SSIVE;
+ flags= &=3D ~GETADDR_RANDOMIZE;
+
+ f= or (int j =3D 0; j < ce->local_list->len; j++)
= {
- fl= ags |=3D GETADDR_PASSIVE;
- flags &=3D ~GETADDR_RANDOMIZE;
- status =3D do_preresolve_host(c, c= e->local, ce->local_port,
- ce->af, flags);=
+ struct local_e= ntry *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;
@@ -= 1863,14 +1869,14 @@
{
ASSERT(c->c2= .link_sockets[sock_index]);

- c->c2.link_sockets[sock_index]->local_hos= t =3D c->options.ce.local;
- c->c2.link_sockets[sock_index]->local_port =3D c->opti= ons.ce.local_port;
+ = c->c2.link_sockets[sock_index]->local_host =3D c->options.ce.lo= cal_list->array[sock_index]->local;
+ c->c2.link_sockets[sock_index]->local_port = =3D c->options.ce.local_list->array[sock_index]->port;
<= span> c->c2.link_sockets[sock_index]->remote_host =3D c->optio= ns.ce.remote;

c->c2.link_sockets[sock_index]->re= mote_port =3D c->options.ce.remote_port;
c->c2.l= ink_sockets[sock_index]->dns_cache =3D c->c1.dns_cache;
c->c2.link_sockets[sock_index]->http_proxy =3D c->c1.http_= proxy;

c->c2.link_sockets[sock_index]->socks_pro= xy =3D c->c1.socks_proxy;
- c->c2.link_sockets[sock_index]->bind_local =3D c->optio= ns.ce.bind_local;
+ = c->c2.link_sockets[sock_index]->bind_local =3D c->options.ce.loc= al_list->array[sock_index]->bind_local;
c->c2= .link_sockets[sock_index]->resolve_retry_seconds =3D c->options.resol= ve_retry_seconds;
c->c2.link_sockets[sock_index]-&g= t;mtu_discover_type =3D c->options.ce.mtu_discover_type;


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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4d1c96662c5a8c750d883e3b20a= dde09529e2764
Gerrit-Change-Number: 436
Gerrit-PatchSet: 6
Gerrit-Owner: ordex <a@...2181...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: its_Giaan <gianmarco@...1664...= 26...>
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
--D5ScL6kSYjU=--