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..., gert@...1296..., a@...2181... Message-ID: <3138ff16488e807cbd12cf25696340491fd72666-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="EVi/98O9jik="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: mroute: adapt to new protocol handling and hashing improvements List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , cron2 , flichtenheld Cc: openvpn-devel --EVi/98O9jik= 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/+/765?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by cron2 Change subject: mroute: adapt to new protocol handling and hashing improvem= ents ...................................................................... mroute: adapt to new protocol handling and hashing improvements Repurposing an unused field and renaming it to 'proto' instead of introducing a new field. The hashing now begins at the 'proto' field rather than the 'type' field. Additionally, the changes ensure that the correct protocol is consistently used with virtual addresses ensuring alignment. Change-Id: Ic66eccb5058fe9c0fae64d8e2ca88728068a92ab Signed-off-by: Gianmarco De Gregori --- M src/openvpn/forward.c M src/openvpn/mroute.c M src/openvpn/mroute.h M src/openvpn/mtcp.c M src/openvpn/mudp.c M src/openvpn/multi.c 6 files changed, 27 insertions(+), 12 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/65/765/2 diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index e1edbac..f84a512 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1130,13 +1130,16 @@ decrypt_status =3D openvpn_decrypt(&c->c2.buf, c->c2.buffers->decr= ypt_buf, co, &c->c2.frame, ad_start); - if (!decrypt_status - /* all sockets are of the same type, so just check the first o= ne */ - && link_socket_connection_oriented(c->c2.link_sockets[0])) + for (int i =3D 0; i < c->c1.link_sockets_num; i++) { - /* decryption errors are fatal in TCP mode */ - register_signal(c->sig, SIGUSR1, "decryption-error"); /* SOFT-= SIGUSR1 -- decryption error in TCP mode */ - msg(D_STREAM_ERRORS, "Fatal decryption error (process_incoming= _link), restarting"); + if (!decrypt_status + /* all sockets are of the same type, so just check the fir= st one (not anymore!) */ + && link_socket_connection_oriented(c->c2.link_sockets[i])) + { + /* decryption errors are fatal in TCP mode */ + register_signal(c->sig, SIGUSR1, "decryption-error"); /* S= OFT-SIGUSR1 -- decryption error in TCP mode */ + msg(D_STREAM_ERRORS, "Fatal decryption error (process_inco= ming_link), restarting"); + } } } else diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c index 6c8e8dd..3a0224e 100644 --- a/src/openvpn/mroute.c +++ b/src/openvpn/mroute.c @@ -421,7 +421,6 @@ { buf_printf(&out, ":%d", ntohs(maddr.v4.port)); } - buf_printf(&out, ":%d", maddr.proto); } break; @@ -454,6 +453,7 @@ buf_printf(&out, "UNKNOWN"); break; } + buf_printf(&out, "|%d", maddr.proto); return BSTR(&out); } else diff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h index fd1dbfe..e844c21 100644 --- a/src/openvpn/mroute.h +++ b/src/openvpn/mroute.h @@ -74,9 +74,8 @@ struct mroute_addr { uint8_t len; /* length of address */ - uint8_t unused; - uint8_t type; /* MR_ADDR/MR_WITH flags */ uint8_t proto; + uint8_t type; /* MR_ADDR/MR_WITH flags */ uint8_t netbits; /* number of bits in network part of address, * valid if MR_WITH_NETBITS is set */ union { @@ -221,7 +220,7 @@ mroute_addr_hash_ptr(const struct mroute_addr *a) { /* NOTE: depends on ordering of struct mroute_addr */ - return (uint8_t *) &a->type; + return (uint8_t *) &a->proto; } static inline uint32_t diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 97a6228..5d04c64 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -56,6 +56,7 @@ mi =3D multi_create_instance(m, NULL, sock); if (mi && !proto_is_dgram(sock->info.proto)) { + mi->real.proto =3D sock->info.proto; struct hash_element *he; const uint32_t hv =3D hash_value(hash, &mi->real); struct hash_bucket *bucket =3D hash_bucket(hash, hv); diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 660ea2d..50b4e21 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -193,6 +193,7 @@ struct multi_instance *mi =3D NULL; struct hash *hash =3D m->hash; real.proto =3D sock->info.proto; + m->local.proto =3D real.proto; if (mroute_extract_openvpn_sockaddr(&real, &m->top.c2.from.dest, true) && m->top.c2.buf.len > 0) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index bf98c7f..0d2ad78 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1156,11 +1156,12 @@ */ static struct multi_instance * multi_get_instance_by_virtual_addr(struct multi_context *m, - const struct mroute_addr *addr, + struct mroute_addr *addr, bool cidr_routing) { struct multi_route *route; struct multi_instance *ret =3D NULL; + addr->proto =3D 0; /* check for local address */ if (mroute_addr_equal(addr, &m->local)) @@ -1246,6 +1247,7 @@ CLEAR(remote_si); remote_si.addr.in4.sin_family =3D AF_INET; remote_si.addr.in4.sin_addr.s_addr =3D htonl(a); + addr.proto =3D 0; ASSERT(mroute_extract_openvpn_sockaddr(&addr, &remote_si, false)); if (netbits >=3D 0) @@ -3346,6 +3348,14 @@ bool ret =3D true; bool floated =3D false; + /* + * Since we don't really need the protocol on vaddresses for internal = VPN + * payload packets, make sure we have the same value to void hashing i= nsert + * and search issues. + */ + src.proto =3D 0; + dest.proto =3D src.proto; + if (m->pending) { return true; @@ -3412,7 +3422,6 @@ 0, &c->c2.to_t= un, DEV_TYPE_TU= N); - /* drop packet if extract failed */ if (!(mroute_flags & MROUTE_EXTRACT_SUCCEEDED)) { @@ -3550,6 +3559,8 @@ const int dev_type =3D TUNNEL_TYPE(m->top.c1.tuntap); int16_t vid =3D 0; + src.proto =3D 0; + dest.proto =3D src.proto; #ifdef MULTI_DEBUG_EVENT_LOOP printf("TUN -> TCP/UDP [%d]\n", BLEN(&m->top.c2.buf)); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/765?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: Ic66eccb5058fe9c0fae64d8e2ca88728068a92ab Gerrit-Change-Number: 765 Gerrit-PatchSet: 2 Gerrit-Owner: its_Giaan Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-CC: ordex Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: its_Giaan Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --EVi/98O9jik= 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 #2 to this change.

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

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

mroute: adapt to new protocol handling and hashing i=
mprovements

Repurposing an unused field and renaming it to 'prot= o'
instead of introducing a new field. The hashing now
begins at = the 'proto' field rather than the 'type'
field. Addition= ally, the changes ensure that the
correct protocol is consistently used = with virtual
addresses ensuring alignment.

Change-Id: Ic66eccb505= 8fe9c0fae64d8e2ca88728068a92ab
Signed-off-by: Gianmarco De Gregori <g= ianmarco@...2726...>
---
M src/openvpn/forward.c
M src/openvpn/= mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn= /mudp.c
M src/openvpn/multi.c
6 files changed, 27 insertions(+), 12 d= eletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/=
changes/65/765/2
diff --git a/src/openvpn/forward.c b/src/openvpn/f=
orward.c
index e1edbac..f84a512 100644
--- = a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c<= br>@@ -1130,13 +1130,16 @@
decrypt_status = =3D openvpn_decrypt(&c->c2.buf, c->c2.buffers->decrypt_buf,
co, &c->c2.f= rame, ad_start);

- if (!decrypt_status
- /* all sockets are of the same type, so just= check the first one */
- && link_socket_connection_oriented(c->c2.link_sock= ets[0]))
+ for= (int i =3D 0; i < c->c1.link_sockets_num; i++)
= {
- /* d= ecryption errors are fatal in TCP mode */
- register_signal(c->sig, SIGUSR1, "d= ecryption-error"); /* SOFT-SIGUSR1 -- decryption error in TCP mode */<= /span>
- msg(D_STRE= AM_ERRORS, "Fatal decryption error (process_incoming_link), restarting= ");
+ = if (!decrypt_status
= + /* all sockets are of the same type, so just check the fir= st one (not anymore!) */
+ && link_socket_connection_oriented(c->c2.li= nk_sockets[i]))
+ = {
+ = /* decryption errors are fatal in TCP mode */
+ register_signal(c->sig= , SIGUSR1, "decryption-error"); /* SOFT-SIGUSR1 -- decryption err= or in TCP mode */
+ = msg(D_STREAM_ERRORS, "Fatal decryption error (process_in= coming_link), restarting");
+ }
}
= }
else
diff --git a/src/openvpn/mroute= .c b/src/openvpn/mroute.c
index 6c8e8dd..3a0224e 100644
--- a/src/openvpn/mroute.c
+++ b/src/openvpn/m= route.c
@@ -421,7 +421,6 @@
= {
buf_printf(&out, ":%d&quo= t;, ntohs(maddr.v4.port));
}
- buf_printf(&out= , ":%d", maddr.proto);

}
<= span> break;


@@ -454,6 +453,7= @@
buf_printf(&out, "UNKNOWN&quo= t;);
break;
}
+ buf_printf(&= ;out, "|%d", maddr.proto);
return BSTR(&= amp;out);
}
else
= diff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h
in= dex fd1dbfe..e844c21 100644
--- a/src/openvpn/mroute.h
+++ b/src/openvpn/mroute.h
@@ -74,9 +74,8 @@

struct mroute_addr {
= uint8_t len; /* length of address */
- uint8_t unused;
- uint8_t type; /* MR_ADDR/MR_WITH flags */
<= span> uint8_t proto;

+ uint8_t type; /* MR_ADDR/MR_WITH flags */
u= int8_t netbits; /* number of bits in network part of address,
* valid if MR_WITH_NETBITS is set */

union {

@@ -221,7 +220,7 @@
mrout= e_addr_hash_ptr(const struct mroute_addr *a)
{
<= span> /* NOTE: depends on ordering of struct mroute_addr */

<= span style=3D"color: hsl(0, 100%, 40%);">- return (uint8_t *) &a->= ;type;
+ return (u= int8_t *) &a->proto;
}

= static inline uint32_t
diff --git a/src/openvpn/mtcp= .c b/src/openvpn/mtcp.c
index 97a6228..5d04c64 100644
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.= c
@@ -56,6 +56,7 @@
mi =3D multi_creat= e_instance(m, NULL, sock);
if (mi && !proto_is= _dgram(sock->info.proto))
{
+ mi->real.proto =3D sock->in= fo.proto;
struct hash_element *he;
const uint32_t hv =3D hash_value(hash, &mi->real);
<= br> struct hash_bucket *bucket =3D hash_bucket(hash, hv);
diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.cindex 660ea2d..50b4e21 100644
--- a/src/openvpn/mudp= .c
+++ b/src/openvpn/mudp.c
@@ -193,6 +193,= 7 @@
struct multi_instance *mi =3D NULL;
struct hash *hash =3D m->hash;

real.proto = =3D sock->info.proto;
+ m->local.proto =3D real.proto;

if (mroute_extract_openvpn_sockaddr(&real, &m->top.c2.fro= m.dest, true)
&& m->top.c2.buf.len >= 0)
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c<= /span>
index bf98c7f..0d2ad78 100644
--- a/src/ope= nvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -= 1156,11 +1156,12 @@
*/
static struct mul= ti_instance *
multi_get_instance_by_virtual_addr(struct mu= lti_context *m,
- = const struct mroute_addr *addr,
+ = struct mroute_addr *addr,

= bool cidr_routing)
{
struct multi= _route *route;
struct multi_instance *ret =3D NULL;
+ addr->proto =3D= 0;

/* check for local address */
if (mroute_addr_equal(addr, &m->local))@@ -1246,6 +1247,7 @@
CLEAR(remote_si);<= br> remote_si.addr.in4.sin_family =3D AF_INET;
= remote_si.addr.in4.sin_addr.s_addr =3D htonl(a);
+ addr.proto =3D 0;
= ASSERT(mroute_extract_openvpn_sockaddr(&addr, &remote_si, false))= ;

if (netbits >=3D 0)
<= span>@@ -3346,6 +3348,14 @@

bool ret =3D true;<= br> bool floated =3D false;

+ /*
+ * Since we don't really need the protocol o= n vaddresses for internal VPN
+ * payload packets, make sure we have the same value to void = hashing insert
+ = * and search issues.
= + */
+ src.pro= to =3D 0;
+ dest.p= roto =3D src.proto;
+=
if (m->pending)
{
<= span> return true;

@@ -3412,7 +3422,6 @@
= 0,
= &c->c2.to_tun,
= DEV_TYPE_TUN);
-
/* drop packet if = extract failed */
if (!(mroute_flags &= MROUTE_EXTRACT_SUCCEEDED))
{
@@ -3550,6 +3559,8 @@

const int dev_type =3D T= UNNEL_TYPE(m->top.c1.tuntap);
int16_t vid =3D 0= ;

+= src.proto =3D 0;
+ dest.proto =3D src.proto;

#= ifdef MULTI_DEBUG_EVENT_LOOP
printf("TUN ->= ; TCP/UDP [%d]\n", BLEN(&m->top.c2.buf));

To view, visit change 765. To unsubscribe, or for help writing ma= il filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic66eccb5058fe9c0fae64d8e2ca= 88728068a92ab
Gerrit-Change-Number: 765
Gerrit-PatchSet: 2
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-CC: ordex <a@...2181...>
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
--EVi/98O9jik=--