From: "stipa (Code Review)" Date: Tue, 28 Jan 2025 13:17:55 +0000 References: Reply-To: lstipakov@...277..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <6222a0f11e804a0dfba1dec768b2c0864dc5ea71-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="yFTpFCl8c4E="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: route.c: change the signature of get_default_gateway() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --yFTpFCl8c4E= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/878?usp=3Demail to review the following change. Change subject: route.c: change the signature of get_default_gateway() ...................................................................... route.c: change the signature of get_default_gateway() As a preparation of an upcoming refactoring of get_default_gateway(), add `dest` parameter to specify destination address to which we are looking the best route. Change-Id: I58735fb24bc4a94c803b7dfcd6de87af0f75522a Signed-off-by: Lev Stipakov --- M src/openvpn/options.c M src/openvpn/route.c M src/openvpn/route.h M src/openvpn/ssl.c M src/openvpn/tun.c 5 files changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/78/878/1 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 4510bea..5a80e6b 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -5866,7 +5866,7 @@ get_ipv6_addr(p[1], &remote, NULL, M_WARN); } net_ctx_init(NULL, &net_ctx); - get_default_gateway(&rgi, &net_ctx); + get_default_gateway(&rgi, 0, &net_ctx); get_default_gateway_ipv6(&rgi6, &remote, &net_ctx); print_default_gateway(M_INFO, &rgi, &rgi6); openvpn_exit(OPENVPN_EXIT_STATUS_GOOD); /* exit point */ diff --git a/src/openvpn/route.c b/src/openvpn/route.c index d17b285..640b0dc 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -655,7 +655,7 @@ rl->spec.flags |=3D RTSA_DEFAULT_METRIC; } - get_default_gateway(&rl->rgi, ctx); + get_default_gateway(&rl->rgi, remote_host, ctx); if (rl->rgi.flags & RGI_ADDR_DEFINED) { setenv_route_addr(es, "net_gateway", rl->rgi.gateway.addr, -1); @@ -2733,7 +2733,7 @@ } void -get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx) +get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvp= n_net_ctx_t *ctx) { struct gc_arena gc =3D gc_new(); @@ -3282,7 +3282,7 @@ #elif defined(TARGET_ANDROID) void -get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx) +get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvp= n_net_ctx_t *ctx) { /* Android, set some pseudo GW, addr is in host byte order, * Determining the default GW on Android 5.0+ is non trivial @@ -3323,7 +3323,7 @@ #elif defined(TARGET_LINUX) void -get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx) +get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvp= n_net_ctx_t *ctx) { struct gc_arena gc =3D gc_new(); int sd =3D -1; @@ -3561,7 +3561,7 @@ #define max(a, b) ((a) > (b) ? (a) : (b)) void -get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx) +get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvp= n_net_ctx_t *ctx) { struct gc_arena gc =3D gc_new(); struct rtmsg m_rtmsg; @@ -3943,7 +3943,7 @@ #elif defined(TARGET_HAIKU) void -get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx) +get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvp= n_net_ctx_t *ctx) { CLEAR(*rgi); @@ -4047,7 +4047,7 @@ * may be disabled by missing items. */ void -get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx) +get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvp= n_net_ctx_t *ctx) { CLEAR(*rgi); } diff --git a/src/openvpn/route.h b/src/openvpn/route.h index 421e7d2..23603bc 100644 --- a/src/openvpn/route.h +++ b/src/openvpn/route.h @@ -328,6 +328,7 @@ bool is_special_addr(const char *addr_str); void get_default_gateway(struct route_gateway_info *rgi, + in_addr_t dest, openvpn_net_ctx_t *ctx); void get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi, diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index e4a7b57..6f78a76 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -1990,7 +1990,7 @@ { /* push mac addr */ struct route_gateway_info rgi; - get_default_gateway(&rgi, session->opt->net_ctx); + get_default_gateway(&rgi, 0, session->opt->net_ctx); if (rgi.flags & RGI_HWADDR_DEFINED) { buf_printf(&out, "IV_HWADDR=3D%s\n", format_hex_ex(rgi.hwa= ddr, 6, 0, 1, ":", &gc)); diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 33830fc..80f5dff 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -671,7 +671,7 @@ struct route_gateway_info rgi; const unsigned int needed =3D (RGI_ADDR_DEFINED|RGI_NETMASK_DEFINED); - get_default_gateway(&rgi, ctx); + get_default_gateway(&rgi, 0, ctx); if ((rgi.flags & needed) =3D=3D needed) { const in_addr_t lan_network =3D rgi.gateway.addr & rgi.gateway.net= mask; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/878?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: I58735fb24bc4a94c803b7dfcd6de87af0f75522a Gerrit-Change-Number: 878 Gerrit-PatchSet: 1 Gerrit-Owner: stipa Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --yFTpFCl8c4E= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

stipa would like plaisthos and flichtenheld to review t= his change.

Vi= ew Change

route.c: change the signature of get_default_gateway()
As a preparation of an upcoming refactoring of
get_default_gateway(), a= dd `dest` parameter to
specify destination address to which we are looki= ng
the best route.

Change-Id: I58735fb24bc4a94c803b7dfcd6de87af0f= 75522a
Signed-off-by: Lev Stipakov <lev@...515...>
---
M src= /openvpn/options.c
M src/openvpn/route.c
M src/openvpn/route.h
M s= rc/openvpn/ssl.c
M src/openvpn/tun.c
5 files changed, 11 insertions(+= ), 10 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvp=
n refs/changes/78/878/1
diff --git a/src/openvpn/options.c b/src/op=
envpn/options.c
index 4510bea..5a80e6b 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c<= /span>
@@ -5866,7 +5866,7 @@
get_ipv6= _addr(p[1], &remote, NULL, M_WARN);
} net_ctx_init(NULL, &net_ctx);
- get_default_gateway(&rgi, &net= _ctx);
+ get_d= efault_gateway(&rgi, 0, &net_ctx);
get_def= ault_gateway_ipv6(&rgi6, &remote, &net_ctx);
= print_default_gateway(M_INFO, &rgi, &rgi6);
= openvpn_exit(OPENVPN_EXIT_STATUS_GOOD); /* exit point */diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index d17b285..640b0dc 100644

--- a/src/openvpn/route.c<= /span>
+++ b/src/openvpn/route.c
@@ -655,7 +655,7 = @@
rl->spec.flags |=3D RTSA_DEFAULT_METRIC;

}

- get_default_gateway(&rl->rgi, ctx);
+ get_default_gateway(&rl-= >rgi, remote_host, ctx);
if (rl->rgi.flags &= RGI_ADDR_DEFINED)
{
setenv_r= oute_addr(es, "net_gateway", rl->rgi.gateway.addr, -1);=
@@ -2733,7 +2733,7 @@
}
=
void
-get_de= fault_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx)
+get_default_gateway(struc= t route_gateway_info *rgi, in_addr_t dest, openvpn_net_ctx_t *ctx) {
struct gc_arena gc =3D gc_new();
=
@@ -3282,7 +3282,7 @@
#elif define= d(TARGET_ANDROID)

void
-get_default_gateway(struct route_gatewa= y_info *rgi, openvpn_net_ctx_t *ctx)
+get_default_gateway(struct route_gateway_info *rgi, in_add= r_t dest, openvpn_net_ctx_t *ctx)
{
/= * Android, set some pseudo GW, addr is in host byte order,
= * Determining the default GW on Android 5.0+ is non trivial@@ -3323,7 +3323,7 @@
#elif defined(TARGET_LINUX)

void
-get_default_gateway(struct route_gateway_info *rgi, openvp= n_net_ctx_t *ctx)
+ge= t_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvpn_n= et_ctx_t *ctx)
{
struct gc_arena gc = =3D gc_new();
int sd =3D -1;
@@ -3561,= 7 +3561,7 @@
#define max(a, b) ((a) > (b) ? (a) : (b))<= /span>

void
-get_default_gateway(struct route_gateway_info *rgi, openv= pn_net_ctx_t *ctx)
+g= et_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvpn_= net_ctx_t *ctx)
{
struct gc_arena gc = =3D gc_new();
struct rtmsg m_rtmsg;
@@= -3943,7 +3943,7 @@
#elif defined(TARGET_HAIKU)
=
void
-get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx= _t *ctx)
+get_default= _gateway(struct route_gateway_info *rgi, in_addr_t dest, openvpn_net_ctx_t = *ctx)
{
CLEAR(*rgi);
=
@@ -4047,7 +4047,7 @@
* may be disabled= by missing items.
*/
void
-get_default_gateway(struct route_ga= teway_info *rgi, openvpn_net_ctx_t *ctx)

+get_default_gateway(struct route_gateway_info *rgi, in= _addr_t dest, openvpn_net_ctx_t *ctx)
{
= CLEAR(*rgi);
}
diff --git a/src/openvpn= /route.h b/src/openvpn/route.h
index 421e7d2..23603bc 10064= 4
--- a/src/openvpn/route.h
+++ b/src/openv= pn/route.h
@@ -328,6 +328,7 @@
bool is_spe= cial_addr(const char *addr_str);

void ge= t_default_gateway(struct route_gateway_info *rgi,
+ in_addr_t dest,
openvpn_net_ctx_t *ctx);

void get_default_gateway_ipv6(struct route_ipv6_gate= way_info *rgi,
diff --git a/src/openvpn/ssl.c b/src/openvpn= /ssl.c
index e4a7b57..6f78a76 100644
--- a/= src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@= @ -1990,7 +1990,7 @@
{
= /* push mac addr */
struct route_gateway_inf= o rgi;
- get= _default_gateway(&rgi, session->opt->net_ctx);
+ get_default_gateway(&r= gi, 0, session->opt->net_ctx);
if (rgi.f= lags & RGI_HWADDR_DEFINED)
{
buf_printf(&out, "IV_HWADDR=3D%s\n", form= at_hex_ex(rgi.hwaddr, 6, 0, 1, ":", &gc));

di= ff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 3383= 0fc..80f5dff 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c

@@ -671,7 +671,7 @@
struct route_gateway_info rgi;
const unsigned i= nt needed =3D (RGI_ADDR_DEFINED|RGI_NETMASK_DEFINED);

- get_default_gateway(&= amp;rgi, ctx);
+ g= et_default_gateway(&rgi, 0, ctx);
if ((rgi.flags &= amp; needed) =3D=3D needed)
{
= const in_addr_t lan_network =3D rgi.gateway.addr & rgi.gateway.netmask= ;

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I58735fb24bc4a94c803b7dfcd6d= e87af0f75522a
Gerrit-Change-Number: 878
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <lstipakov@...277...>= ;
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: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--yFTpFCl8c4E=--