From: "its_Giaan (Code Review)" Date: Tue, 24 Sep 2024 06:50:11 +0000 In-Reply-To: References: Reply-To: gianmarco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., gert@...1296... Message-ID: <20a5039ef800261325f8638cdd6e70e300fe87d6-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="lvMihwAoGcg="; 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 , cron2 , flichtenheld Cc: openvpn-devel --lvMihwAoGcg= 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 (#8). 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, 70 insertions(+), 19 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/24/524/8 diff --git a/doc/man-sections/vpn-network-options.rst b/doc/man-sections/vp= n-network-options.rst index 84d4273..9d4235b 100644 --- a/doc/man-sections/vpn-network-options.rst +++ b/doc/man-sections/vpn-network-options.rst @@ -371,6 +371,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 @@ -445,14 +453,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 bbdbc04..2306760 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 83cc670..5db6304 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1546,7 +1546,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 61f6285..4516a58 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -201,6 +201,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" @@ -819,6 +823,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; @@ -1910,6 +1915,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); @@ -7005,6 +7011,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]); + } else if (streq(p[0], "route") && p[1] && !p[5]) { VERIFY_PERMISSION(OPT_P_ROUTE); @@ -7026,8 +7040,10 @@ 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]) { @@ -7045,9 +7061,10 @@ 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 ee39dbb..bc41988 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -413,6 +413,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; @@ -743,6 +744,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 2e584c7..4e8bae4 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -328,7 +328,6 @@ CLEAR(*r); r->option =3D ro; - /* network */ if (!is_route_parm_defined(ro->network)) @@ -442,6 +441,9 @@ r->flags |=3D RT_DEFINED; + /* routing table id */ + r->table_id =3D ro->table_id; + return true; fail: @@ -498,6 +500,9 @@ r6->flags |=3D RT_DEFINED; + /* routing table id */ + r6->table_id =3D r6o->table_id; + return true; fail: @@ -511,7 +516,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 +525,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 +535,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; } @@ -1611,9 +1620,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"); @@ -1994,7 +2004,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"); @@ -2200,7 +2210,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"); } @@ -2413,7 +2423,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 421e7d2..48faada 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 */ @@ -283,12 +288,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: 8 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 --lvMihwAoGcg= 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 #8 to this change.

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

Route: add support for user defined routing table

Add the abil= ity for users to specify a custom
routing table where routes should be i= nstalled in.
As of now routes are always installed in the main
routin= g table of the operating system, however,
with the new --route-table opt= ion it is possibile
to specify the ID of the default routing table
to= be used by --route(-ipv6).

Please note: this feature is currently s= upported
only by Linux/SITNL.
Support for other platforms should be a= dded in related backends.

Trac #1399
Change-Id: I3e4ebef484d2a04a= 383a65ede5617ee98bf218a7
Signed-off-by: Gianmarco De Gregori <gianmar= co@...2726...>
---
M doc/man-sections/vpn-network-options.rst
M= src/openvpn/helper.c
M src/openvpn/init.c
M src/openvpn/options.cM src/openvpn/options.h
M src/openvpn/route.c
M src/openvpn/route.h<= br>7 files changed, 70 insertions(+), 19 deletions(-)

git pull ss=
h://gerrit.openvpn.net:29418/openvpn refs/changes/24/524/8
diff --=
git a/doc/man-sections/vpn-network-options.rst b/doc/man-sections/vpn-netwo=
rk-options.rst
index 84d4273..9d4235b 100644
--- a/doc/man-sections/vpn-network-options.rst
+++ b/doc/= man-sections/vpn-network-options.rst
@@ -371,6 +371,14 @@
Like ``--redirect-gateway``, but omit actually changing t= he default gateway.
Useful when pushing private subnets.=

+-= -route-table id
+ Sp= ecify a default table id for use with --route.
+ By default, OpenVPN installs routes in the mai= n 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 rout= ing table after connection is established. Multiple
rout= es can be specified. Routes will be automatically torn down in
@@ -445,14 +453,20 @@

Setup IPv6 routing in the syst= em 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 pa= rameter is only used for IPv6 routes across *tap* devices,
- and if missing, the ``ipv6remote`` f= ield from ``--ifconfig-ipv6`` or
- ``--route-ipv6-gateway`` is used.
+ ``gateway``
+ Only used for IPv6 routes across *tap* devices= ,
+ and if mis= sing, the ``ipv6remote`` field from ``--ifconfig-ipv6`` or
+ ``--route-ipv6-gateway`` is = used.
+
+ ``metric``
+ default taken from ``--route-met= ric`` if set, otherwise :code:`0`.

--rou= te-gateway arg
Specify a default *gateway* for use with = ``--route``.
diff --git a/src/openvpn/helper.c b/src/openvp= n/helper.c
index bbdbc04..2306760 100644
--= - a/src/openvpn/helper.c
+++ b/src/openvpn/helper.c<= br>@@ -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 83cc670..5db6304 100644
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c<= br>@@ -1546,7 +1546,7 @@
{
= add_route_ipv6_to_option_list( options->routes_ipv6,<= br> string_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/options.c
index 61f6285..4516a58 100644
--- a/src/openvpn/options.= c
+++ b/src/openvpn/options.c
@@ -201,6 +20= 1,10 @@
" pass --ifconfig parm= s by environment to scripts.\n"
"--ifconfig-= nowarn : Don't warn if the --ifconfig option on this side of the\n"= ;
" connection doesn't mat= ch the remote side.\n"
+#ifdef TARGET_LINUX
+ "--route-table table_id : Specify a custom routing table f= or use with --route(-ipv6).\n"
+ " If not 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 connection\n"
" is established. Multiple routes ca= n be specified.\n"
@@ -819,6 +823,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;
@@ -1910,6 +19= 15,7 @@
SHOW_STR(route_script);
S= HOW_STR(route_default_gateway);
SHOW_INT(route_default= _metric);
+ SHOW_I= NT(route_default_table_id);
SHOW_BOOL(route_noexec);
SHOW_INT(route_delay);
SHOW_INT(ro= ute_delay_window);
@@ -7005,6 +7011,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] &&a= mp; !p[2])
+ {

+#ifndef ENABLE_SITNL

+ msg(M_WARN, &q= uot;NOTE: --route-table is supported only on Linux when SITNL is built-in&q= uot;);
+#endif=
+ VERIFY_PERMISSION(= OPT_P_ROUTE_TABLE);
+= options->route_default_table_id =3D positive_atoi(p[1]);<= br>+ }
= else if (streq(p[0], "route") && p[1] && !p[5])
{
VERIFY_PERMISSION(OPT_P_ROUT= E);
@@ -7026,8 +7040,10 @@
= msg(msglevel, "route parameter gateway '%s' must be a valid a= ddress", p[3]);
goto err;
<= span> }

+= /* p[4] is metric, if specified */
}
- add_route_to_op= tion_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") &&= amp; p[1] && !p[4])
{
@@ -7045= ,9 +7061,10 @@
msg(msglevel, "route-i= pv6 parameter gateway '%s' must be a valid address", p[2]);

goto err;
}
- /* p[3] is me= tric, 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->route= s_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 ee39dbb..b= c41988 100644
--- a/src/openvpn/options.h
+= ++ b/src/openvpn/options.h
@@ -413,6 +413,7 @@
const char *route_predown_script;

const char = *route_default_gateway;
const char *route_ipv6_default= _gateway;
+ int ro= ute_default_table_id;
int route_default_metric;=
bool route_noexec;
int route_delay;
@@ -743,6 +744,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 2e58= 4c7..4e8bae4 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c

@@ -328,7 +328,6 @@
=
CLEAR(*r);
r->option = =3D ro;
-
/* network */

if (!is_route_= parm_defined(ro->network))
@@ -442,6 +441,9 @@
r->flags |=3D RT_DEFINED;
=
+ /* routing tab= le id */
+ r->t= able_id =3D ro->table_id;
+
return true;

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

<= span> r6->flags |=3D RT_DEFINED;

+ /* routing table id */
= + r6->table_id =3D r6o-&g= t;table_id;
+<= br> return true;

fail:<= br>@@ -511,7 +516,8 @@
cons= t char *network,
const char *netm= ask,
const char *gateway,<= br>- cons= t char *metric)
+ = const char *metric,
+ int table_id)
{
struct route_option *ro;
ALLO= C_OBJ_GC(ro, struct route_option, l->gc);
@@ -519,6 +525= ,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 +535,15 @@
add_route_ipv6_to_option_list(struct route_i= pv6_option_list *l,
const ch= ar *prefix,
const char *gate= way,
- = const char *metric)
+ const char *metric,
+ in= t table_id)
{
struct route_ipv6_optio= n *ro;
ALLOC_OBJ_GC(ro, struct route_ipv6_option, l-&g= t;gc);
ro->prefix =3D prefix;
= ro->gateway =3D gateway;
ro->metric =3D metric;<= /span>
+ ro->table_id = =3D table_id;
ro->next =3D l->routes_ipv6;

l->routes_ipv6 =3D ro;
}
@@ -1611,9 +1620,10 @@
metric =3D r->metric;<= /span>
}

+
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);
<= span> if (ret =3D=3D -EEXIST)

{
= msg(D_ROUTE, "NOTE: Linux route add command failed because rout= e exists");
@@ -1994,7 +2004,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 exi= sts");
@@ -2200,7 +2210,7 @@
}

if (net_route_v4_del(ctx, &r->n= etwork, netmask_to_netbits2(r->netmask),
- &r->gateway, NULL, 0,= metric) < 0)
+ = &r->gateway, NULL, r->table_id, metric) <= ; 0)
{
msg(M_WARN, "ERRO= R: Linux route delete command failed");
}<= br>@@ -2413,7 +2423,7 @@
}

if (net_route_v6_del(ctx, &r6->network, r6->net= bits,
- = gateway_needed ? &r6->gateway : NULL, device, 0,
= + gatew= ay_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/open= vpn/route.h
index 421e7d2..48faada 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 *m= etric;
};

@@ -101,6 +103= ,7 @@
const char *prefix; /* e.g. "2001:d= b8: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 @@<= /span>
in_addr_t network;
in_addr_t netm= ask;
in_addr_t gateway;
+ int table_id;
int metric;=
};

@@ -129,6 +133,7 @@<= /span>
unsigned int netbits;
struct in6_= addr gateway;
int metric;
+ int table_id;
/* gatewa= y interface */
#ifdef _WIN32
DWORD ad= apter_index; /* interface or ~0 if undefined */
@@ -= 283,12 +288,14 @@
const char= *network,
const char *netma= sk,
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);
<= span style=3D"color: hsl(120, 100%, 40%);">+ = const char *metric,

+ int table_id);

bool init_route_list(struct route_list *rl,
= const struct route_option_list *opt,
<= /span>

To view, visit change 524. To unsubscribe, or for help writin= g mail filters, visit settin= gs.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3e4ebef484d2a04a383a65ede56= 17ee98bf218a7
Gerrit-Change-Number: 524
Gerrit-PatchSet: 8
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
--lvMihwAoGcg=--