From: "its_Giaan (Code Review)" Date: Thu, 19 Jun 2025 16:03:50 +0000 In-Reply-To: References: Reply-To: gianmarco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., gert@...1296... Message-ID: <3b73bdfdcb5fabb2b0853a562829f50705c66939-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="vJyEkrEG3d0="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Route: add support for user defined routing table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --vJyEkrEG3d0= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, its_Giaan, plais= thos. Hello cron2, flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/524?usp=3Demail to look at the new patch set (#9). The following approvals got outdated and were removed: Code-Review-1 by cron2 Change subject: Route: add support for user defined routing table ...................................................................... Route: add support for user defined routing table Add the ability for users to specify a custom routing table where routes should be installed in. As of now routes are always installed in the main routing table of the operating system, however, with the new --route-table option it is possibile to specify the ID of the default routing table to be used by --route(-ipv6). Please note: this feature is currently supported only by Linux/SITNL. Support for other platforms should be added in related backends. Trac #1399 Change-Id: I3e4ebef484d2a04a383a65ede5617ee98bf218a7 Signed-off-by: Gianmarco De Gregori --- M doc/man-sections/vpn-network-options.rst M src/openvpn/helper.c M src/openvpn/init.c M src/openvpn/options.c M src/openvpn/options.h M src/openvpn/route.c M src/openvpn/route.h 7 files changed, 68 insertions(+), 20 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/24/524/9 diff --git a/doc/man-sections/vpn-network-options.rst b/doc/man-sections/vp= n-network-options.rst index 40b8c19..4a64e8d 100644 --- a/doc/man-sections/vpn-network-options.rst +++ b/doc/man-sections/vpn-network-options.rst @@ -389,6 +389,14 @@ Like ``--redirect-gateway``, but omit actually changing the default gate= way. Useful when pushing private subnets. +--route-table id + Specify a default table id for use with --route. + By default, OpenVPN installs routes in the main routing + table of the operating system, but with this option, + a user defined routing table can be used instead. + + (Supported on Linux only, on other platforms this is a no-op). + --route args Add route to routing table after connection is established. Multiple routes can be specified. Routes will be automatically torn down in @@ -463,14 +471,20 @@ Setup IPv6 routing in the system to send the specified IPv6 network into OpenVPN's *tun*. - Valid syntax: + Valid syntaxes: :: - route-ipv6 ipv6addr/bits [gateway] [metric] + route-ipv6 ipv6addr/bits + route-ipv6 ipv6addr/bits gateway + route-ipv6 ipv6addr/bits gateway metric - The gateway parameter is only used for IPv6 routes across *tap* devices, - and if missing, the ``ipv6remote`` field from ``--ifconfig-ipv6`` or - ``--route-ipv6-gateway`` is used. + ``gateway`` + Only used for IPv6 routes across *tap* devices, + and if missing, the ``ipv6remote`` field from ``--ifconfig-ipv6`` = or + ``--route-ipv6-gateway`` is used. + + ``metric`` + default taken from ``--route-metric`` if set, otherwise :code:`0`. --route-gateway arg Specify a default *gateway* for use with ``--route``. diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index 8761826..7cef9db 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -118,7 +118,8 @@ print_in_addr_t(network, 0, &o->gc), print_in_addr_t(netmask, 0, &o->gc), NULL, - NULL); + NULL, + o->route_default_table_id); } static void diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 7d4eb85..77747a2 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1566,7 +1566,7 @@ { add_route_ipv6_to_option_list( options->routes_ipv6, string_alloc(opt_list[i], optio= ns->routes_ipv6->gc), - NULL, NULL ); + NULL, NULL, options->route_defa= ult_table_id); } } diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 3cf8c2a..7e26069 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -213,6 +213,10 @@ " pass --ifconfig parms by environment to scripts.\= n" "--ifconfig-nowarn : Don't warn if the --ifconfig option on this side = of the\n" " connection doesn't match the remote side.\n" +#ifdef TARGET_LINUX + "--route-table table_id : Specify a custom routing table for use with = --route(-ipv6).\n" + " If not specified, the id of the default ro= uting table will be used.\n" +#endif "--route network [netmask] [gateway] [metric] :\n" " Add route to routing table after connection\n" " is established. Multiple routes can be specified.\= n" @@ -829,6 +833,7 @@ o->ce.mssfix =3D 0; o->ce.mssfix_default =3D true; o->ce.mssfix_encap =3D true; + o->route_default_table_id =3D 0; o->route_delay_window =3D 30; o->resolve_retry_seconds =3D RESOLV_RETRY_INFINITE; o->resolve_in_advance =3D false; @@ -1799,6 +1804,7 @@ SHOW_STR(route_script); SHOW_STR(route_default_gateway); SHOW_INT(route_default_metric); + SHOW_INT(route_default_table_id); SHOW_BOOL(route_noexec); SHOW_INT(route_delay); SHOW_INT(route_delay_window); @@ -7064,6 +7070,14 @@ cnol_check_alloc(options); add_client_nat_to_option_list(options->client_nat, p[1], p[2], p[3= ], p[4], msglevel); } + else if (streq(p[0], "route-table") && p[1] && !p[2]) + { +#ifndef ENABLE_SITNL + msg(M_WARN, "NOTE: --route-table is supported only on Linux when S= ITNL is built-in"); +#endif + VERIFY_PERMISSION(OPT_P_ROUTE_TABLE); + options->route_default_table_id =3D positive_atoi(p[1], msglevel); + } else if (streq(p[0], "route") && p[1] && !p[5]) { VERIFY_PERMISSION(OPT_P_ROUTE); @@ -7085,8 +7099,9 @@ msg(msglevel, "route parameter gateway '%s' must be a vali= d address", p[3]); goto err; } + /* p[4] is metric, if specified */ } - add_route_to_option_list(options->routes, p[1], p[2], p[3], p[4]); + add_route_to_option_list(options->routes, p[1], p[2], p[3], p[4], = options->route_default_table_id); } else if (streq(p[0], "route-ipv6") && p[1] && !p[4]) { @@ -7104,9 +7119,9 @@ msg(msglevel, "route-ipv6 parameter gateway '%s' must be a= valid address", p[2]); goto err; } - /* p[3] is metric, if present */ + /* p[3] is metric, if specified */ } - add_route_ipv6_to_option_list(options->routes_ipv6, p[1], p[2], p[= 3]); + add_route_ipv6_to_option_list(options->routes_ipv6, p[1], p[2], p[= 3], options->route_default_table_id); } else if (streq(p[0], "max-routes") && !p[2]) { diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 46ec32b..56e85d7 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -427,6 +427,7 @@ const char *route_predown_script; const char *route_default_gateway; const char *route_ipv6_default_gateway; + int route_default_table_id; int route_default_metric; bool route_noexec; int route_delay; @@ -758,6 +759,7 @@ #define OPT_P_PEER_ID (1<<28) #define OPT_P_INLINE (1<<29) #define OPT_P_PUSH_MTU (1<<30) +#define OPT_P_ROUTE_TABLE (1<<31) #define OPT_P_DEFAULT (~(OPT_P_INSTANCE|OPT_P_PULL_MODE)) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index bd79a28..156262a 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -330,13 +330,11 @@ r->option =3D ro; /* network */ - if (!is_route_parm_defined(ro->network)) { goto fail; } - /* get_special_addr replaces specialaddr with a special ip addr * like gw. getaddrinfo is called to convert a a addrinfo struct */ @@ -442,6 +440,9 @@ r->flags |=3D RT_DEFINED; + /* routing table id */ + r->table_id =3D ro->table_id; + return true; fail: @@ -498,6 +499,9 @@ r6->flags |=3D RT_DEFINED; + /* routing table id */ + r6->table_id =3D r6o->table_id; + return true; fail: @@ -511,7 +515,8 @@ const char *network, const char *netmask, const char *gateway, - const char *metric) + const char *metric, + int table_id) { struct route_option *ro; ALLOC_OBJ_GC(ro, struct route_option, l->gc); @@ -519,6 +524,7 @@ ro->netmask =3D netmask; ro->gateway =3D gateway; ro->metric =3D metric; + ro->table_id =3D table_id; ro->next =3D l->routes; l->routes =3D ro; @@ -528,13 +534,15 @@ add_route_ipv6_to_option_list(struct route_ipv6_option_list *l, const char *prefix, const char *gateway, - const char *metric) + const char *metric, + int table_id) { struct route_ipv6_option *ro; ALLOC_OBJ_GC(ro, struct route_ipv6_option, l->gc); ro->prefix =3D prefix; ro->gateway =3D gateway; ro->metric =3D metric; + ro->table_id =3D table_id; ro->next =3D l->routes_ipv6; l->routes_ipv6 =3D ro; } @@ -1610,9 +1618,10 @@ metric =3D r->metric; } + status =3D RTA_SUCCESS; int ret =3D net_route_v4_add(ctx, &r->network, netmask_to_netbits2(r->= netmask), - &r->gateway, iface, 0, metric); + &r->gateway, iface, r->table_id, metric); if (ret =3D=3D -EEXIST) { msg(D_ROUTE, "NOTE: Linux route add command failed because route e= xists"); @@ -2007,7 +2016,7 @@ status =3D RTA_SUCCESS; int ret =3D net_route_v6_add(ctx, &r6->network, r6->netbits, gateway_needed ? &r6->gateway : NULL, - device, 0, metric); + device, r6->table_id, metric); if (ret =3D=3D -EEXIST) { msg(D_ROUTE, "NOTE: Linux route add command failed because route e= xists"); @@ -2227,7 +2236,7 @@ } if (net_route_v4_del(ctx, &r->network, netmask_to_netbits2(r->netmask), - &r->gateway, NULL, 0, metric) < 0) + &r->gateway, NULL, r->table_id, metric) < 0) { msg(M_WARN, "ERROR: Linux route delete command failed"); } @@ -2452,7 +2461,7 @@ } if (net_route_v6_del(ctx, &r6->network, r6->netbits, - gateway_needed ? &r6->gateway : NULL, device, 0, + gateway_needed ? &r6->gateway : NULL, device, r6-= >table_id, metric) < 0) { msg(M_WARN, "ERROR: Linux route v6 delete command failed"); diff --git a/src/openvpn/route.h b/src/openvpn/route.h index aa3114c..237375c 100644 --- a/src/openvpn/route.h +++ b/src/openvpn/route.h @@ -69,6 +69,7 @@ in_addr_t remote_host; int remote_host_local; /* TLA_x value */ struct route_bypass bypass; + int table_id; int default_metric; }; @@ -77,6 +78,7 @@ const char *network; const char *netmask; const char *gateway; + int table_id; const char *metric; }; @@ -101,6 +103,7 @@ const char *prefix; /* e.g. "2001:db8:1::/64" */ const char *gateway; /* e.g. "2001:db8:0::2" */ const char *metric; /* e.g. "5" */ + int table_id; }; struct route_ipv6_option_list { @@ -119,6 +122,7 @@ in_addr_t network; in_addr_t netmask; in_addr_t gateway; + int table_id; int metric; }; @@ -129,6 +133,7 @@ unsigned int netbits; struct in6_addr gateway; int metric; + int table_id; /* gateway interface */ #ifdef _WIN32 DWORD adapter_index; /* interface or ~0 if undefined */ @@ -290,12 +295,14 @@ const char *network, const char *netmask, const char *gateway, - const char *metric); + const char *metric, + int table_id); void add_route_ipv6_to_option_list(struct route_ipv6_option_list *l, const char *prefix, const char *gateway, - const char *metric); + const char *metric, + int table_id); bool init_route_list(struct route_list *rl, const struct route_option_list *opt, -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/524?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: I3e4ebef484d2a04a383a65ede5617ee98bf218a7 Gerrit-Change-Number: 524 Gerrit-PatchSet: 9 Gerrit-Owner: its_Giaan Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: its_Giaan Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --vJyEkrEG3d0= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

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

its_Giaan uploaded patch set #9 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/524?usp=3Demail">View Chang= e

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

Route: add support for user defined routing table
Add the ability for users to specify a custom
routing table where r= outes should be installed in.
As of now routes are always installed in t= he main
routing table of the operating system, however,
with the new = --route-table option it is possibile
to specify the ID of the default ro= uting table
to be used by --route(-ipv6).

Please note: this featu= re is currently supported
only by Linux/SITNL.
Support for other plat= forms should be added in related backends.

Trac #1399
Change-Id: = I3e4ebef484d2a04a383a65ede5617ee98bf218a7
Signed-off-by: Gianmarco De Gr= egori <gianmarco@...2726...>
---
M doc/man-sections/vpn-network= -options.rst
M src/openvpn/helper.c
M src/openvpn/init.c
M src/ope= nvpn/options.c
M src/openvpn/options.h
M src/openvpn/route.c
M src= /openvpn/route.h
7 files changed, 68 insertions(+), 20 deletions(-)
<= br>
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/24/524/9=
diff --git a/doc/man-sections/vpn-network-options.rst b/doc/man-se=
ctions/vpn-network-options.rst
index 40b8c19..4a64e8d 10064= 4
--- a/doc/man-sections/vpn-network-options.rst
= +++ b/doc/man-sections/vpn-network-options.rst
@@ -38= 9,6 +389,14 @@
Like ``--redirect-gateway``, but omit act= ually changing the default gateway.
Useful when pushing = private subnets.

+--route-table id
+ Specify a default table id for use with --route.
+ By default, OpenVPN installs r= outes in the main routing
+ table of the operating system, but with this option,
+ a user defined routing table can= be used instead.
+
+ (Supported on Linux= only, on other platforms this is a no-op).
+
--route args
A= dd route to routing table after connection is established. Multiple<= br> routes can be specified. Routes will be automatically torn down= in
@@ -463,14 +471,20 @@
Setup IPv6 rou= ting in the system to send the specified IPv6 network into
= OpenVPN's *tun*.

- Valid syntax:
+ Valid syntaxes:
::

- route-ipv6 ipv6add= r/bits [gateway] [metric]
+ route-ipv6 ipv6addr/bits
+ route-ipv6 ipv6addr/bits gateway
+ route-ipv6 ipv6addr/bits gateway met= ric

-= The gateway parameter is only used for IPv6 routes across *tap* devices,<= /span>
- and if missing, the = ``ipv6remote`` field from ``--ifconfig-ipv6`` or
- ``--route-ipv6-gateway`` is used.
+ ``gateway``

+ Only used for IPv6 routes acro= ss *tap* devices,
+ = and if missing, the ``ipv6remote`` field from ``--ifconfig-ipv6`` or<= /span>
+ ``--route-ip= v6-gateway`` is used.
+
+ ``metric``

+ default taken fr= om ``--route-metric`` if set, otherwise :code:`0`.
=
--route-gateway arg
Specify a default *gatewa= y* for use with ``--route``.
diff --git a/src/openvpn/helpe= r.c b/src/openvpn/helper.c
index 8761826..7cef9db 100644

--- a/src/openvpn/helper.c
+++ b/src/openvpn/= helper.c
@@ -118,7 +118,8 @@
= print_in_addr_t(network, 0, &o->gc),
print_in_addr_t(netmask, 0, &o->gc),<= /span>
NULL,
- NULL);<= br>+ = NULL,
+ = o->route_default_table_id);
}
static void
diff --git a/src/ope= nvpn/init.c b/src/openvpn/init.c
index 7d4eb85..77747a2 100= 644
--- a/src/openvpn/init.c
+++ b/src/open= vpn/init.c
@@ -1566,7 +1566,7 @@
{=
add_route_ipv6_to_option_list( options->ro= utes_ipv6,
stri= ng_alloc(opt_list[i], options->routes_ipv6->gc),
- = NULL, NULL );
+ = NULL, NULL, options->route_default= _table_id);
}
}

diff --git a/src/openvpn/options.c b/src/openvpn/optio= ns.c
index 3cf8c2a..7e26069 100644
--- a/sr= c/openvpn/options.c
+++ b/src/openvpn/options.c
<= span>@@ -213,6 +213,10 @@
" pa= ss --ifconfig parms by environment to scripts.\n"
= "--ifconfig-nowarn : Don't warn if the --ifconfig option on this = side of the\n"
" connecti= on doesn't match the remote side.\n"
+#ifdef TARGET_LINUX
+ "--route-table table_id : Specify a cust= om routing table for use with --route(-ipv6).\n"
+ " If n= ot specified, the id of the default routing table will be used.\n"

+#endif
= "--route network [netmask] [gateway] [metric] :\n" " Add route to routing table after connec= tion\n"
" is established. = Multiple routes can be specified.\n"
@@ -829,6 +833,7 = @@
o->ce.mssfix =3D 0;
o->c= e.mssfix_default =3D true;
o->ce.mssfix_encap =3D t= rue;
+ o->route= _default_table_id =3D 0;
o->route_delay_window =3D = 30;
o->resolve_retry_seconds =3D RESOLV_RETRY_INFIN= ITE;
o->resolve_in_advance =3D false;
@@ -1799,6 +1804,7 @@
SHOW_STR(route_script);

SHOW_STR(route_default_gateway);
SHOW_= INT(route_default_metric);
+ SHOW_INT(route_default_table_id);
SHOW_BOOL= (route_noexec);
SHOW_INT(route_delay);
SHOW_INT(route_delay_window);
@@ -7064,6 +7070,14 @@<= /span>
cnol_check_alloc(options);
= add_client_nat_to_option_list(options->client_nat, p[1], p[2], p[3], p= [4], msglevel);
}
+ else if (streq(p[0], "route-table") &&= amp; p[1] && !p[2])
+ {
+#ifnde= f ENABLE_SITNL
+ = msg(M_WARN, "NOTE: --route-table is supported only on Linux when SI= TNL is built-in");
+#endif
+ V= ERIFY_PERMISSION(OPT_P_ROUTE_TABLE);
+ options->route_default_table_id =3D positive_at= oi(p[1], msglevel);
+= }
else if (streq(p[0], "route") &&am= p; p[1] && !p[5])
{
V= ERIFY_PERMISSION(OPT_P_ROUTE);
@@ -7085,8 +7099,9 @@=
msg(msglevel, "route parameter gateway '= ;%s' must be a valid address", p[3]);
= goto err;
}
+ /* p[4] is metric, if specified */
}
+ add_ro= ute_to_option_list(options->routes, p[1], p[2], p[3], p[4], options->= route_default_table_id);
}
else i= f (streq(p[0], "route-ipv6") && p[1] && !p[4])
{
@@ -7104,9 +7119,9 @@
= msg(msglevel, "route-ipv6 parameter gateway '%s&#= 39; must be a valid address", p[2]);
= goto err;
}
- /* p[3] is metric, if present */
<= span style=3D"color: hsl(120, 100%, 40%);">+ /* p[3] is metric, = if specified */

}
- add_route_ipv6_to_option_list(options->rout= es_ipv6, p[1], p[2], p[3]);
+ add_route_ipv6_to_option_list(options->routes_ipv6, p[1]= , p[2], p[3], options->route_default_table_id);
}
else if (streq(p[0], "max-routes") &&= !p[2])
{
diff --git a/src/openvpn/opt= ions.h b/src/openvpn/options.h
index 46ec32b..56e85d7 10064= 4
--- a/src/openvpn/options.h
+++ b/src/ope= nvpn/options.h
@@ -427,6 +427,7 @@
con= st char *route_predown_script;
const char *route_defau= lt_gateway;
const char *route_ipv6_default_gateway;
+ int route_default_= table_id;
int route_default_metric;
= bool route_noexec;
int route_delay;
@@ -758,6 +759,7 @@

#define OPT_P_PEER_ID (1<&= lt;28)
#define OPT_P_INLINE (1<<29)<= br> #define OPT_P_PUSH_MTU (1<<30)
+#define OPT_P_ROUTE_TABLE (1<<3= 1)

#define OPT_P_DEFAULT (~(OPT_P_INST= ANCE|OPT_P_PULL_MODE))

diff --git a/src/o= penvpn/route.c b/src/openvpn/route.c
index bd79a28..156262a= 100644
--- a/src/openvpn/route.c
+++ b/src= /openvpn/route.c
@@ -330,13 +330,11 @@
= r->option =3D ro;

/* network */<= /span>
-
= if (!is_route_parm_defined(ro->network))
{ goto fail;
}
=
-
/* get= _special_addr replaces specialaddr with a special ip addr
= * like gw. getaddrinfo is called to convert a a addrinfo struct */

@@ -442,6 +440,9 @@
=
r->flags |=3D RT_DEFINED;

+ /* routing table id */
=
+ r->table_id =3D ro-= >table_id;
+

return true;

fail:
@@ -498,6 +499,9 @@

r6-&g= t;flags |=3D RT_DEFINED;

+ /* routing table id */
+ r6->table_id =3D r6o->table_id;
+
r= eturn true;

fail:
@@ -51= 1,7 +515,8 @@
const char *network= ,
const char *netmask,
= const char *gateway,
- const char *metric= )
+ = const char *metric,
+ int table_id)
{
= struct route_option *ro;
ALLOC_OBJ_GC(ro, s= truct route_option, l->gc);
@@ -519,6 +524,7 @@ ro->netmask =3D netmask;
ro->gatewa= y =3D gateway;
ro->metric =3D metric;
+ ro->table_id =3D table_id;=

ro->next =3D l->routes;
l-= >routes =3D ro;

@@ -528,13 +534,15 @@<= /span>
add_route_ipv6_to_option_list(struct route_ipv6_option_lis= t *l,
const char *prefix,
const char *gateway,- c= onst char *metric)
+ = const char *metric,
+ int table_id)
{
struct route_ipv6_option *ro;<= br> ALLOC_OBJ_GC(ro, struct route_ipv6_option, l->gc);<= br> ro->prefix =3D prefix;
ro->gateway= =3D gateway;
ro->metric =3D metric;
+ ro->table_id =3D table_id;<= /span>
ro->next =3D l->routes_ipv6;
= l->routes_ipv6 =3D ro;
}
@@ -1610,9 += 1618,10 @@
metric =3D r->metric;
}


+
status =3D RTA_SUCCESS;
i= nt ret =3D net_route_v4_add(ctx, &r->network, netmask_to_netbits2(r-= >netmask),
- = &r->gateway, iface, 0, metric);
+ &a= mp;r->gateway, iface, r->table_id, metric);

if (= ret =3D=3D -EEXIST)
{
msg(D_R= OUTE, "NOTE: Linux route add command failed because route exists"= );
@@ -2007,7 +2016,7 @@
status =3D RT= A_SUCCESS;
int ret =3D net_route_v6_add(ctx, &r6-&= gt;network, r6->netbits,
= gateway_needed ? &r6->gateway : NULL,
- device, 0, metric);<= /span>
+ = device, r6->table_id, metric);
if (ret = =3D=3D -EEXIST)
{
msg(D_ROUTE= , "NOTE: Linux route add command failed because route exists");
@@ -2227,7 +2236,7 @@
}

if (net_route_v4_del(ctx, &r->network, netma= sk_to_netbits2(r->netmask),
- &r->gateway, NULL, 0, metric) <= 0)
+ = &r->gateway, NULL, r->table_id, metric) < 0) {
msg(M_WARN, "ERROR: Linux rout= e delete command failed");
}
@@ -= 2452,7 +2461,7 @@
}

= if (net_route_v6_del(ctx, &r6->network, r6->netbits,<= br>- gate= way_needed ? &r6->gateway : NULL, device, 0,
+ gateway_needed ?= &r6->gateway : NULL, device, r6->table_id,
= metric) < 0)
{
msg(M_WARN, "ERROR: Linux route v6 delete command failed&quo= t;);

diff --git a/src/openvpn/route.h b/src/openvpn/route.h=
index aa3114c..237375c 100644
--- a/src/op= envpn/route.h
+++ b/src/openvpn/route.h
@@ = -69,6 +69,7 @@
in_addr_t remote_host;
= int remote_host_local; /* TLA_x value */
struct r= oute_bypass bypass;
+= int table_id;
int default_metric;
= };

@@ -77,6 +78,7 @@
= const char *network;
const char *netmask;
= const char *gateway;
+ int table_id;
const char *metric;
};

@@ -101,6 +103,7 @@
const char *prefix; /* e.g. "2001:db8:1::/64&q= uot; */
const char *gateway; /* e.g. "2001= :db8:0::2" */
const char *metric; /* e.g.= "5" */
+ = int table_id;
};

stru= ct route_ipv6_option_list {
@@ -119,6 +122,7 @@
<= span> in_addr_t network;

in_addr_t netmask;=
in_addr_t gateway;
+ int table_id;
int metric;
= };

@@ -129,6 +133,7 @@
<= span> unsigned int netbits;

struct in6_addr gatewa= y;
int metric;
+ int table_id;
/* gateway interface= */
#ifdef _WIN32
DWORD adapter_index= ; /* interface or ~0 if undefined */
@@ -290,12 +295= ,14 @@
const char *network,<= /span>
const char *netmask,<= br> const char *gateway,
- const = char *metric);

+ = const char *metric,
+ int table_id);

void add_route_ipv6_to_option_list(struct rou= te_ipv6_option_list *l,
= const char *prefix,
co= nst char *gateway,
- = const char *metric);
+ const = char *metric,
+ = int table_id);

bool init_route_list(struct route_list *rl,

= const struct route_option_list *opt,

=

To view, visit change 524. To unsubscribe, or for help writing mail fil= ters, visit settings.

<= meta itemprop=3D"name" content=3D"View Change"/>
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3e4ebef484d2a04a383a65ede56= 17ee98bf218a7
Gerrit-Change-Number: 524
Gerrit-PatchSet: 9
Gerrit-Owner: its_Giaan <gianmarco@...2786...= ..>
Gerrit-Reviewer: cron2 <gert@...1296...>=
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: cron2 <gert@...1296...>= ;
Gerrit-Attention: its_Giaan <gianmarco@...1665...= 726...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--vJyEkrEG3d0=--