Change in openvpn[master]: mroute/management: fix unitialized variable (UNINIT)
A message that is not in the archive (sent off-list or not yet received): gerrit.1738072669000.I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1@...2715...
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/+/880?usp=email
to review the following change.
Change subject: mroute/management: fix unitialized variable (UNINIT)
......................................................................
mroute/management: fix unitialized variable (UNINIT)
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Fix this by passing the proto along with
IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
---
M Changes.rst
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
7 files changed, 37 insertions(+), 10 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/880/1
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
src/openvpn/manage.c +10 -6
@@ -544,13 +544,15 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status;
@@ -558,21 +560,23 @@if (status) {const int port =atoi (p2); +const int proto = (streq (p3,"tcp" )) ?PROTO_TCP_SERVER :ascii2proto (p3); +if (port >0 && port <65536 ) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d:%s killed" , n_killed,print_in_addr_t (addr,0 , &gc), - port); + port, p3); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%d:%s not found" ,print_in_addr_t (addr,0 , &gc), - port); + port, p3); } }else
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if ((maddr.type &MR_WITH_PROTO )) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, its_Giaan, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: fix unitialized variable (UNINIT)
......................................................................
Patch Set 1: Code-Review-1
(3 comments)
Patchset:
PS1:
close. Please extend doc/management-notes.txt with the new syntax as well.
File src/openvpn/manage.c:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/89921c64_ce4843fe :
PS1, Line 573: port, p3);
not sure we should use p3 here (what if a user sends 'foo'?).
Also, proto traditionall gets printed in front ("tcp:10.0.0.3:1194") so we shouldn't start printing it at the end here...
File src/openvpn/mroute.c:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/75d367d4_1b83c9e4 :
PS1, Line 441: if ((maddr.type & MR_WITH_PROTO))
double (()) braces...
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 28 Jan 2025 14:15:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: cron2, flichtenheld, its_Giaan, plaisthos.
ordex has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: fix unitialized variable (UNINIT)
......................................................................
Patch Set 1:
(1 comment)
File src/openvpn/manage.c:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/387f5a9f_83884c97 :
PS1, Line 573: port, p3);
Quoted 1 line
not sure we should use
p3here (what if a user sends 'foo'?). […]
passing 'foo' will lead to ascii2proto() returning -1, which in turn will lead to "no client found", so we won't hit this print
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 28 Jan 2025 14:22:23 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, its_Giaan, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review-1 by cron2
Change subject: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
mroute/management: fix uninitialized variable (UNINIT)
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Fix this by passing the proto along with
IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
---
M Changes.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 42 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/880/2
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +3 -2
@@ -205,8 +205,9 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill 1.2.3.4:4000:tcp -- kill the client instance having a + source address, port and proto of + 1.2.3.4:4000:tcp Use the "status" command to see which clients are connected.
src/openvpn/manage.c +12 -6
@@ -544,13 +544,15 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status;
@@ -558,26 +560,30 @@if (status) {const int port =atoi (p2); -if (port >0 && port <65536 ) +const int proto = (streq (p3,"tcp" )) ?PROTO_TCP_SERVER :ascii2proto (p3); + +if ((port >0 && port <65536 ) && (proto >0 && proto <PROTO_N )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p2, p3); } }else
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [S] Change in openvpn[master]: mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, ordex, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
Patch Set 1:
(2 comments)
File src/openvpn/manage.c:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/3db554a6_f8736f38 :
PS1, Line 573: port, p3);
Quoted 1 line
passing 'foo' will lead to
ascii2proto()returning -1, which in turn will lead to "no client found", […]
Done
File src/openvpn/mroute.c:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/9c991771_22e29971 :
PS1, Line 441: if ((maddr.type & MR_WITH_PROTO))
Quoted 1 line
double
(())braces...
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Tue, 28 Jan 2025 15:07:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Comment-In-Reply-To: ordex <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveAttention is currently required from: flichtenheld, its_Giaan, ordex, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
Patch Set 2: Code-Review-1
(3 comments)
Patchset:
PS2:
close :-)
File doc/management-notes.txt:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/5aaed102_183dab88 :
PS2, Line 211:
Thanks for this. I overlooked this in v1, though - I think we should have protocol at the start tcp:1.2.3.4:4000, as this is really the "most common way", and since we *print* the addresses that way now this would be more logical.
Sorry for not spotting this earlier.
Also, we might mention "this isn't working for IPv6-connected clients (yet), kill by CN or CID instead".
File src/openvpn/manage.c:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/898e15ca_959b2a49 :
PS2, Line 564:
As discussed in the management-notes.txt comment, I am convinced that it's more logical to do protocol first, so p1 -> protocol, p2 -> IP, p3 -> port then. Sorry again.
We do the msg() in that format already ;-)
Besides this, the new version & error handling look acceptable (we discussed getting rid of ascii2proto() and just checking for "udp" or "tcp" here, but it does not make much of a difference).
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Wed, 29 Jan 2025 09:40:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, its_Giaan, ordex, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review-1 by cron2
Change subject: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
mroute/management: fix uninitialized variable (UNINIT)
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Fix this by passing the proto along with
IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
---
M Changes.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 51 insertions(+), 18 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/880/3
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +6 -2
@@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected.
src/openvpn/manage.c +18 -12
@@ -544,58 +544,64 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status; -const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p1,0 , &status,NULL ); +const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p2,0 , &status,NULL );if (status) { -const int port =atoi (p2); -if (port >0 && port <65536 ) +const int port =atoi (p3); +const int proto = (streq (p1,"tcp" )) ?PROTO_TCP_SERVER :ascii2proto (p1); + +if ((port >0 && port <65536 ) && (proto >0 && proto <PROTO_N )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p3, p1); } }else { -msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p1); +msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p2); } }else if (strlen (p1)) {/* common name specified */ - n_killed = (*man->persist.callback.kill_by_cn)(man->persist.callback.arg, p1); + n_killed = (*man->persist.callback.kill_by_cn)(man->persist.callback.arg, p2);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: common name '%s' found, %d client(s) killed" , p1, n_killed); +msg (M_CLIENT ,"SUCCESS: common name '%s' found, %d client(s) killed" , p2, n_killed); }else { -msg (M_CLIENT ,"ERROR: common name '%s' not found" , p1); +msg (M_CLIENT ,"ERROR: common name '%s' not found" , p2); } }else
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, ordex, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
Patch Set 3:
(2 comments)
File doc/management-notes.txt:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/57449c07_d0fa58b7 :
PS2, Line 211:
Quoted 1 line
Thanks for this. […]
Done
File src/openvpn/manage.c:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/22c82121_32db8a43 :
PS2, Line 564:
Quoted 1 line
As discussed in the management-notes. […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Wed, 29 Jan 2025 10:01:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveAttention is currently required from: flichtenheld, its_Giaan, ordex, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
Patch Set 3: Code-Review-1
(4 comments)
Patchset:
PS3:
too much enthusiasm
File src/openvpn/manage.c:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/a30bd653_c1d4c73d :
PS3, Line 597: n_killed = (*man->persist.callback.kill_by_cn)(man->persist.callback.arg, p2);
Ah, no, not that one :-) for CN we only have p1
http://gerrit.openvpn.net/c/openvpn/+/880/comment/47dd9eb5_409a4c6d :
PS3, Line 600: msg(M_CLIENT, "SUCCESS: common name '%s' found, %d client(s) killed", p2, n_killed);
too enthusiastic
http://gerrit.openvpn.net/c/openvpn/+/880/comment/986c2548_b64f20f8 :
PS3, Line 604: msg(M_CLIENT, "ERROR: common name '%s' not found", p2);
and here
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Wed, 29 Jan 2025 10:07:39 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, its_Giaan, ordex, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review-1 by cron2
Change subject: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
mroute/management: fix uninitialized variable (UNINIT)
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Fix this by passing the proto along with
IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
---
M Changes.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 49 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/880/4
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +6 -2
@@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected.
src/openvpn/manage.c +16 -9
@@ -544,45 +544,52 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status; -const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p1,0 , &status,NULL ); +const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p2,0 , &status,NULL );if (status) { -const int port =atoi (p2); -if (port >0 && port <65536 ) +const int port =atoi (p3); +const int proto = (streq (p1,"tcp" )) ?PROTO_TCP_SERVER : + (streq (p1,"udp" )) ?PROTO_UDP :PROTO_NONE ; + +if ((port >0 && port <65536 ) && (proto !=PROTO_NONE )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p3, p1); } }else { -msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p1); +msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p2); } }else if (strlen (p1))
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 4
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, ordex, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
Patch Set 4:
(3 comments)
File src/openvpn/manage.c:
http://gerrit.openvpn.net/c/openvpn/+/880/comment/1917e810_8df15a58 :
PS3, Line 597: n_killed = (*man->persist.callback.kill_by_cn)(man->persist.callback.arg, p2);
Quoted 1 line
Ah, no, not that one :-) for CN we only have p1
Done
http://gerrit.openvpn.net/c/openvpn/+/880/comment/76fd57cc_1aede7fa :
PS3, Line 600: msg(M_CLIENT, "SUCCESS: common name '%s' found, %d client(s) killed", p2, n_killed);
Quoted 1 line
too enthusiastic
Done
http://gerrit.openvpn.net/c/openvpn/+/880/comment/1f0de4eb_2449a9e2 :
PS3, Line 604: msg(M_CLIENT, "ERROR: common name '%s' not found", p2);
Quoted 1 line
and here
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 4
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Wed, 29 Jan 2025 10:54:35 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveAttention is currently required from: flichtenheld, its_Giaan, ordex, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
Patch Set 4: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 4
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Wed, 29 Jan 2025 11:10:17 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v4 1/1 mroute/management: fix uninitialized variable (UNINIT)
In reply to a message not in the archiveFrom: Gianmarco De Gregori <[email protected]...>
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Fix this by passing the proto along with
IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/880
This mail reflects revision 4 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +6 -2
@@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected.
src/openvpn/manage.c +16 -9
@@ -544,45 +544,52 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status; -const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p1,0 , &status,NULL ); +const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p2,0 , &status,NULL );if (status) { -const int port =atoi (p2); -if (port >0 && port <65536 ) +const int port =atoi (p3); +const int proto = (streq (p1,"tcp" )) ?PROTO_TCP_SERVER : + (streq (p1,"udp" )) ?PROTO_UDP :PROTO_NONE ; + +if ((port >0 && port <65536 ) && (proto !=PROTO_NONE )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p3, p1); } }else { -msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p1); +msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p2); } }else if (strlen (p1))
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: repair mgmt client-kill for mroute with proto
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, its_Giaan, ordex, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
to look at the new patch set (#5).
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: mroute/management: repair mgmt client-kill for mroute with proto
......................................................................
mroute/management: repair mgmt client-kill for mroute with proto
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Due to changes at the mroute structure
which now includes the protocol, the mgmt
iface client-kill-by-addr feature has been
updated to include this new value along
with IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
---
M Changes.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 49 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/880/5
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +6 -2
@@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected.
src/openvpn/manage.c +16 -9
@@ -544,45 +544,52 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status; -const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p1,0 , &status,NULL ); +const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p2,0 , &status,NULL );if (status) { -const int port =atoi (p2); -if (port >0 && port <65536 ) +const int port =atoi (p3); +const int proto = (streq (p1,"tcp" )) ?PROTO_TCP_SERVER : + (streq (p1,"udp" )) ?PROTO_UDP :PROTO_NONE ; + +if ((port >0 && port <65536 ) && (proto !=PROTO_NONE )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p3, p1); } }else { -msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p1); +msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p2); } }else if (strlen (p1))
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 5
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: repair mgmt client-kill for mroute with proto
In reply to a message not in the archiveAttention is currently required from: flichtenheld, its_Giaan, ordex, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: repair mgmt client-kill for mroute with proto
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 5
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Wed, 29 Jan 2025 11:41:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v5 1/1 mroute/management: repair mgmt client-kill for mroute with proto
In reply to a message not in the archiveFrom: Gianmarco De Gregori <[email protected]...>
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Due to changes at the mroute structure
which now includes the protocol, the mgmt
iface client-kill-by-addr feature has been
updated to include this new value along
with IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/880
This mail reflects revision 5 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +6 -2
@@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected.
src/openvpn/manage.c +16 -9
@@ -544,45 +544,52 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status; -const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p1,0 , &status,NULL ); +const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p2,0 , &status,NULL );if (status) { -const int port =atoi (p2); -if (port >0 && port <65536 ) +const int port =atoi (p3); +const int proto = (streq (p1,"tcp" )) ?PROTO_TCP_SERVER : + (streq (p1,"udp" )) ?PROTO_UDP :PROTO_NONE ; + +if ((port >0 && port <65536 ) && (proto !=PROTO_NONE )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_INET , true),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p3, p1); } }else { -msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p1); +msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p2); } }else if (strlen (p1))
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: repair mgmt client-kill for mroute with proto
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, its_Giaan, ordex, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
to look at the new patch set (#6).
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: mroute/management: repair mgmt client-kill for mroute with proto
......................................................................
mroute/management: repair mgmt client-kill for mroute with proto
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Due to changes at the mroute structure
which now includes the protocol, the mgmt
iface client-kill-by-addr feature has been
updated to include this new value along
with IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
---
M Changes.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 49 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/880/6
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +6 -2
@@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected.
src/openvpn/manage.c +16 -9
@@ -544,45 +544,52 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status; -const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p1,0 , &status,NULL ); +const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p2,0 , &status,NULL );if (status) { -const int port =atoi (p2); -if (port >0 && port <65536 ) +const int port =atoi (p3); +const int proto = (streq (p1,"tcp" )) ?PROTO_TCP_SERVER : + (streq (p1,"udp" )) ?PROTO_UDP :PROTO_NONE ; + +if ((port >0 && port <65536 ) && (proto !=PROTO_NONE )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_UNSPEC , false),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_UNSPEC , false),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p3, p1); } }else { -msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p1); +msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p2); } }else if (strlen (p1))
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 6
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: repair mgmt client-kill for mroute with proto
In reply to a message not in the archiveAttention is currently required from: flichtenheld, its_Giaan, ordex, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: repair mgmt client-kill for mroute with proto
......................................................................
Patch Set 6: Code-Review+2
(1 comment)
Patchset:
PS6:
I keep +2'ing this...
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 6
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Wed, 29 Jan 2025 16:15:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v6 1/1 mroute/management: repair mgmt client-kill for mroute with proto
In reply to a message not in the archiveFrom: Gianmarco De Gregori <[email protected]...>
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Due to changes at the mroute structure
which now includes the protocol, the mgmt
iface client-kill-by-addr feature has been
updated to include this new value along
with IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/880
This mail reflects revision 6 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +6 -2
@@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected.
src/openvpn/manage.c +16 -9
@@ -544,45 +544,52 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status; -const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p1,0 , &status,NULL ); +const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p2,0 , &status,NULL );if (status) { -const int port =atoi (p2); -if (port >0 && port <65536 ) +const int port =atoi (p3); +const int proto = (streq (p1,"tcp" )) ?PROTO_TCP_SERVER : + (streq (p1,"udp" )) ?PROTO_UDP :PROTO_NONE ; + +if ((port >0 && port <65536 ) && (proto !=PROTO_NONE )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_UNSPEC , false),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_UNSPEC , false),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p3, p1); } }else { -msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p1); +msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p2); } }else if (strlen (p1))
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
[Openvpn-devel] [PATCH applied] Re: mroute/management: repair mgmt client-kill for mroute with proto
This is somewhat of a cleanup-repair-broken-API patch, and it took us a few rounds to get this in a nice shape. commit dda93f304 adds a "proto" field to the mroute hashing & comparison to disambiguate udp and tcp connects, and that promptly broke the "kill $ip:$port" management command (not matching at all, and Coverity complaining about "proto" being uninitialized there). Change that API command to do "kill $proto:$ip:$port" now, and adjust the documentation(!).
NOTE: this is still broken for IPv6, as only IPv4 addresses are parsed - and this has been broken since IPv6 transport has been introduced - so I guess nobody is really using it...
Your patch has been applied to the master branch.
commit 10a82b1f2fe3cf295a4a44dac1f61fdf750c172a
Author: Gianmarco De Gregori Date: Wed Jan 29 17:16:08 2025 +0100
mroute/management: repair mgmt client-kill for mroute with proto
Signed-off-by: Gianmarco De Gregori <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30716.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: repair mgmt client-kill for mroute with proto
In reply to a message not in the archivecron2 has uploaded a new patch set (#7) to the change originally created by its_Giaan. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: mroute/management: repair mgmt client-kill for mroute with proto
......................................................................
mroute/management: repair mgmt client-kill for mroute with proto
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Due to changes at the mroute structure
which now includes the protocol, the mgmt
iface client-kill-by-addr feature has been
updated to include this new value along
with IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30716.html
---
M Changes.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 49 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/880/7
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +6 -2
@@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected.
src/openvpn/manage.c +16 -9
@@ -544,45 +544,52 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status; -const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p1,0 , &status,NULL ); +const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p2,0 , &status,NULL );if (status) { -const int port =atoi (p2); -if (port >0 && port <65536 ) +const int port =atoi (p3); +const int proto = (streq (p1,"tcp" )) ?PROTO_TCP_SERVER : + (streq (p1,"udp" )) ?PROTO_UDP :PROTO_NONE ; + +if ((port >0 && port <65536 ) && (proto !=PROTO_NONE )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_UNSPEC , false),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_UNSPEC , false),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p3, p1); } }else { -msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p1); +msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p2); } }else if (strlen (p1))
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 7
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: mroute/management: repair mgmt client-kill for mroute with proto
In reply to a message not in the archivecron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/880?usp=email )
Change subject: mroute/management: repair mgmt client-kill for mroute with proto
......................................................................
mroute/management: repair mgmt client-kill for mroute with proto
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Due to changes at the mroute structure
which now includes the protocol, the mgmt
iface client-kill-by-addr feature has been
updated to include this new value along
with IP:port.
While at it, changed themroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses whenMR_WITH_PORT is not specified.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30716.html
---
M Changes.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 49 insertions(+), 15 deletions(-)
Changes.rst +3 -0
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
doc/management-notes.txt +6 -2
@@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected.
src/openvpn/manage.c +16 -9
@@ -544,45 +544,52 @@struct buffer buf;char p1[128 ];char p2[128 ]; +char p3[128 ];int n_killed;buf_set_read (&buf, (uint8_t *) victim,strlen (victim) +1 );buf_parse (&buf,':' , p1,sizeof (p1));buf_parse (&buf,':' , p2,sizeof (p2)); +buf_parse (&buf,':' , p3,sizeof (p3)); -if (strlen (p1) &&strlen (p2)) +if (strlen (p1) &&strlen (p2) &&strlen (p3)) {/* IP:port specified */ bool status; -const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p1,0 , &status,NULL ); +const in_addr_t addr =getaddr (GETADDR_HOST_ORDER |GETADDR_MSG_VIRT_OUT , p2,0 , &status,NULL );if (status) { -const int port =atoi (p2); -if (port >0 && port <65536 ) +const int port =atoi (p3); +const int proto = (streq (p1,"tcp" )) ?PROTO_TCP_SERVER : + (streq (p1,"udp" )) ?PROTO_UDP :PROTO_NONE ; + +if ((port >0 && port <65536 ) && (proto !=PROTO_NONE )) { - n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port); + n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto);if (n_killed >0 ) { -msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%d killed" , +msg (M_CLIENT ,"SUCCESS: %d client(s) at address %s:%s:%d killed" , n_killed, +proto2ascii (proto,AF_UNSPEC , false),print_in_addr_t (addr,0 , &gc), port); }else { -msg (M_CLIENT ,"ERROR: client at address %s:%d not found" , +msg (M_CLIENT ,"ERROR: client at address %s:%s:%d not found" , +proto2ascii (proto,AF_UNSPEC , false),print_in_addr_t (addr,0 , &gc), port); } }else { -msg (M_CLIENT ,"ERROR: port number is out of range: %s" , p2); +msg (M_CLIENT ,"ERROR: port number or protocol out of range: %s %s" , p3, p1); } }else { -msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p1); +msg (M_CLIENT ,"ERROR: error parsing IP address: %s" , p2); } }else if (strlen (p1))
src/openvpn/manage.h +1 -1
@@ -180,7 +180,7 @@void (*status) (void *arg,const int version,struct status_output *so);void (*show_net) (void *arg,const int msglevel);int (*kill_by_cn) (void *arg,const char *common_name); -int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port); +int (*kill_by_addr) (void *arg,const in_addr_t addr,const int port,const int proto);void (*delete_event) (void *arg,event_t event);int (*n_clients) (void *arg);bool (*send_cc_message) (void *arg,const char *message,const char *parameter);
src/openvpn/mroute.c +16 -1
@@ -276,6 +276,10 @@ addr->len =6 ; addr->v4.addr = osaddr->addr.in4.sin_addr.s_addr; addr->v4.port = osaddr->addr.in4.sin_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -295,6 +299,10 @@ addr->len =18 ; addr->v6.addr = osaddr->addr.in6.sin6_addr; addr->v6.port = osaddr->addr.in6.sin6_port; +if (addr->proto !=PROTO_NONE ) + { + addr->type |=MR_WITH_PROTO ; + } }else {
@@ -403,6 +411,10 @@ {buf_printf (&out,"ARP/" ); } +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET , false)); + }buf_printf (&out,"%s" ,print_in_addr_t (ntohl (maddr.v4.addr), (flags &MAPF_IA_EMPTY_IF_UNDEF ) ?IA_EMPTY_IF_UNDEF :0 , gc));if (maddr.type &MR_WITH_NETBITS )
@@ -426,6 +438,10 @@case MR_ADDR_IPV6 : { +if (maddr.type &MR_WITH_PROTO ) + { +buf_printf (&out,"%s:" ,proto2ascii (maddr.proto,AF_INET6 , false)); + }if (IN6_IS_ADDR_V4MAPPED ( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@buf_printf (&out,"UNKNOWN" );break ; } -buf_printf (&out,"|%d" , maddr.proto);return BSTR (&out); }else
src/openvpn/mroute.h +3 -0
@@ -72,6 +72,9 @@/* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 +struct mroute_addr {uint8_t len;/* length of address */ uint8_t proto;
src/openvpn/mtcp.c +1 -0
@@ -111,6 +111,7 @@ASSERT (mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET || mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest.addr.sa.sa_family ==AF_INET6 ); + mi->real.proto = mi->context.c2.link_sockets[0 ]->info.proto;if (!mroute_extract_openvpn_sockaddr (&mi->real, &mi->context.c2.link_sockets[0 ]->info.lsa->actual.dest, true))
src/openvpn/multi.c +3 -2
@@ -794,7 +794,6 @@ { goto err; } - mi->real.proto = ls->info.proto;generate_prefix (mi); }
@@ -3942,7 +3941,8 @@ }static int -management_callback_kill_by_addr (void *arg,const in_addr_t addr,const int port) +management_callback_kill_by_addr (void *arg,const in_addr_t addr, +const int port,const int proto) {struct multi_context *m = (struct multi_context *) arg;struct hash_iterator hi;
@@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =htons (port);if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { + maddr.proto = proto;hash_iterator_init (m->iter, &hi);while ((he =hash_iterator_next (&hi))) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 7
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: ordex <[email protected]...>
Gerrit-MessageType: merged