From: "its_Giaan (Code Review)"
Date: Wed, 29 Jan 2025 10:01:17 +0000
In-Reply-To:
References:
Reply-To: gianmarco@...2726..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...,
gert@...1296..., a@...2181...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="jvrKN6uxOdw="; charset=UTF-8
Subject: [Openvpn-devel] [M] Change in openvpn[master]: mroute/management:
fix uninitialized variable (UNINIT)
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , cron2 , flichtenheld
Cc: openvpn-devel
--jvrKN6uxOdw=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention 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=3Demail
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 the
mroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses when
MR_WITH_PORT is not specified.
Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Signed-off-by: Gianmarco De Gregori
---
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
diff --git a/Changes.rst b/Changes.rst
index 16ae6fc..d01816b 100644
--- a/Changes.rst
+++ b/Changes.rst
@@ -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
diff --git a/doc/management-notes.txt b/doc/management-notes.txt
index b55135a..f1d2930 100644
--- a/doc/management-notes.txt
+++ b/doc/management-notes.txt
@@ -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.
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 0c77f85..d15e622 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -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 =3D getaddr(GETADDR_HOST_ORDER|GETADDR_MS=
G_VIRT_OUT, p1, 0, &status, NULL);
+ const in_addr_t addr =3D getaddr(GETADDR_HOST_ORDER|GETADDR_MS=
G_VIRT_OUT, p2, 0, &status, NULL);
if (status)
{
- const int port =3D atoi(p2);
- if (port > 0 && port < 65536)
+ const int port =3D atoi(p3);
+ const int proto =3D (streq(p1, "tcp")) ? PROTO_TCP_SERVER =
: ascii2proto(p1);
+
+ if ((port > 0 && port < 65536) && (proto > 0 && proto < PR=
OTO_N))
{
- n_killed =3D (*man->persist.callback.kill_by_addr)(man=
->persist.callback.arg, addr, port);
+ n_killed =3D (*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 n=
ot 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 r=
ange: %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 =3D (*man->persist.callback.kill_by_cn)(man->persist.=
callback.arg, p1);
+ n_killed =3D (*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
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h
index f501543..02ceb82 100644
--- a/src/openvpn/manage.h
+++ b/src/openvpn/manage.h
@@ -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 *p=
arameter);
diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c
index 74923cf..24b9543 100644
--- a/src/openvpn/mroute.c
+++ b/src/openvpn/mroute.c
@@ -276,6 +276,10 @@
addr->len =3D 6;
addr->v4.addr =3D osaddr->addr.in4.sin_addr.s_addr;
addr->v4.port =3D osaddr->addr.in4.sin_port;
+ if (addr->proto !=3D PROTO_NONE)
+ {
+ addr->type |=3D MR_WITH_PROTO;
+ }
}
else
{
@@ -295,6 +299,10 @@
addr->len =3D 18;
addr->v6.addr =3D osaddr->addr.in6.sin6_addr;
addr->v6.port =3D osaddr->addr.in6.sin6_port;
+ if (addr->proto !=3D PROTO_NONE)
+ {
+ addr->type |=3D 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_IN=
ET, false));
+ }
buf_printf(&out, "%s", print_in_addr_t(ntohl(maddr.v4.addr=
),
(flags & MAPF_IA_EM=
PTY_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_IN=
ET6, false));
+ }
if (IN6_IS_ADDR_V4MAPPED( &maddr.v6.addr ) )
{
buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv=
6.addr,
@@ -454,7 +470,6 @@
buf_printf(&out, "UNKNOWN");
break;
}
- buf_printf(&out, "|%d", maddr.proto);
return BSTR(&out);
}
else
diff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h
index 2659695..fbe102a 100644
--- a/src/openvpn/mroute.h
+++ b/src/openvpn/mroute.h
@@ -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;
diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 62ed044..9a8b1cb 100644
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -111,6 +111,7 @@
ASSERT(mi->context.c2.link_sockets[0]->info.lsa->actual.dest.addr.sa.s=
a_family =3D=3D AF_INET
|| mi->context.c2.link_sockets[0]->info.lsa->actual.dest.addr.s=
a.sa_family =3D=3D AF_INET6
);
+ mi->real.proto =3D 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))
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 9c8c014..b0e1941 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -794,7 +794,6 @@
{
goto err;
}
- mi->real.proto =3D 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 in=
t port)
+management_callback_kill_by_addr(void *arg, const in_addr_t addr,
+ const int port, const int proto)
{
struct multi_context *m =3D (struct multi_context *) arg;
struct hash_iterator hi;
@@ -3957,6 +3957,7 @@
saddr.addr.in4.sin_port =3D htons(port);
if (mroute_extract_openvpn_sockaddr(&maddr, &saddr, true))
{
+ maddr.proto =3D proto;
hash_iterator_init(m->iter, &hi);
while ((he =3D hash_iterator_next(&hi)))
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan
Gerrit-Reviewer: cron2
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-CC: ordex
Gerrit-Attention: plaisthos
Gerrit-Attention: cron2
Gerrit-Attention: its_Giaan
Gerrit-Attention: flichtenheld
Gerrit-Attention: ordex
Gerrit-MessageType: newpatchset
--jvrKN6uxOdw=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, its_Giaan, o=
rdex, plaisthos.
its_Giaan uploaded patch set #3 to this change.
<=
a href=3D"http://gerrit.openvpn.net/c/openvpn/+/880?usp=3Demail">View Chang=
e
The following approvals got outdated and were removed:
Code-Review-1 by cron2
mroute/management: fix uninitialized variable (UNINI=
T)
Fix issue reported by Coverity:
CID 1641564: Uninitialized var=
iables (UNINIT)
Using unitialized value "maddr.proto" when
=
calling "mroute_addr_equal()".
Fix this by passing the pro=
to along with
IP:port.
While at it, changed the
mroute_addr_pr=
int_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses when
MR_WITH_PORT is not specified.=
Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Signed-off-=
by: Gianmarco De Gregori <gianmarco@...2726...>
---
M Changes.r=
st
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/open=
vpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 51 insertions(+), 1=
8 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn re=
fs/changes/80/880/3
diff --git a/Changes.rst b/Changes.rstindex 16ae6fc..d01816b 100644
--- a/Changes.rst
+++ b/Changes.rst
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as thi=
s almost
always results in a non-working connection.
+- The=
"kill" by addr management command now requires also the protocol=
+ as string e.g. &q=
uot;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
diff --git a/doc/management-notes.txt b/doc/manage=
ment-notes.txt
index b55135a..f1d2930 100644
--- a/doc/management-notes.txt
+++ b/doc/management-notes=
.txt
@@ -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 cli=
ent 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
+<=
/span>
+ Note that kill by =
address won't work for IPv6-connected
+ clients yet, so rely on kill by CN or CID instead.<=
/span>
Use the "status" command to se=
e which clients are connected.
diff --git=
a/src/openvpn/manage.c b/src/openvpn/manage.c
index 0c77f8=
5..d15e622 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -544,58 +544,64 @@ struct buffer buf;
char p1[128];<=
/span>
char p2[128];
+ char p3[128];
int n_kil=
led;
buf_set_read(&buf, (uin=
t8_t *) victim, strlen(victim) + 1);
buf_parse(&am=
p;buf, ':', p1, sizeof(p1));
buf_parse(&am=
p;buf, ':', p2, sizeof(p2));
+ buf_parse(&buf, ':', p3, sizeof(p3));<=
/span>
- =
if (strlen(p1) && strlen(p2))
+ if (strlen(p1) && strlen(p2) &&am=
p; strlen(p3))
{
/* I=
P:port specified */
bool status;
- const in_addr_t addr =
=3D getaddr(GETADDR_HOST_ORDER|GETADDR_MSG_VIRT_OUT, p1, 0, &status, NU=
LL);
+ con=
st in_addr_t addr =3D getaddr(GETADDR_HOST_ORDER|GETADDR_MSG_VIRT_OUT, p2, =
0, &status, NULL);
if (status)
<=
span> {
- =
const int port =3D atoi(p2);
- if (port > 0 && port < 6=
5536)
+ =
const int port =3D atoi(p3);
+ const int proto =3D (streq(p1, "tcp"))=
? PROTO_TCP_SERVER : ascii2proto(p1);
+
+=
if ((port > 0 && port < 65536) && (pr=
oto > 0 && proto < PROTO_N))
=
{
- =
n_killed =3D (*man->persist.callback.kill_by_addr)(man->persist.call=
back.arg, addr, port);
+ n_killed =3D (*man->persist.callback.kill_by_addr=
)(man->persist.callback.arg, addr, port, proto);
=
if (n_killed > 0)
{=
span>
- =
msg(M_CLIENT, "SUCCESS: %d client(s) at address %s:%d killed",=
span>
+ =
msg(M_CLIENT, "SUCCESS: %d client(s) at address %s:%s:%d killed&quo=
t;,
n_killed,
+ proto2as=
cii(proto, AF_INET, true),
pri=
nt_in_addr_t(addr, 0, &gc),
=
port);
}
=
else
{
- msg(M_CLIENT, "=
;ERROR: client at address %s:%d not found",
+ msg(M_CLIENT, "ER=
ROR: client at address %s:%s:%d not found",
+ proto2ascii(proto,=
AF_INET, true),
print_in_addr=
_t(addr, 0, &gc),
port);=
span>
}
}
else
{
- msg(M_=
CLIENT, "ERROR: port number is out of range: %s", p2);
=
+ msg(M_CLIE=
NT, "ERROR: port number or protocol out of range: %s %s", p3, p1)=
;
}
}<=
br> else
{
- msg(M_CLIENT, "ERR=
OR: error parsing IP address: %s", p1);
+ msg(M_CLIENT, "ERROR: error p=
arsing IP address: %s", p2);
}
=
}
else if (strlen(p1))
{
/* common name specified */
- n_killed =3D =
(*man->persist.callback.kill_by_cn)(man->persist.callback.arg, p1);=
span>
+ n_killed =
=3D (*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_CLIE=
NT, "ERROR: common name '%s' not found", p2);
<=
span> }
}
els=
e
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h<=
/span>
index f501543..02ceb82 100644
--- a/src/ope=
nvpn/manage.h
+++ b/src/openvpn/manage.h
@@=
-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) (vo=
id *arg, const char *common_name);
- int (*kill_by_addr) (void *arg, const in_addr_t addr, cons=
t int port);
+ int=
(*kill_by_addr) (void *arg, const in_addr_t addr, const int port, const in=
t proto);
void (*delete_event) (void *arg, event_t eve=
nt);
int (*n_clients) (void *arg);
=
bool (*send_cc_message) (void *arg, const char *message, const char *para=
meter);
diff --git a/src/openvpn/mroute.c b/src/openvpn/mro=
ute.c
index 74923cf..24b9543 100644
--- a/s=
rc/openvpn/mroute.c
+++ b/src/openvpn/mroute.c
@@ -276,6 +276,10 @@
addr->len =3D =
6;
addr->v4.addr =3D osaddr->addr.in=
4.sin_addr.s_addr;
addr->v4.port =3D os=
addr->addr.in4.sin_port;
+ if (addr->proto !=3D PROTO_NONE)
+ {
+ addr->type |=
=3D MR_WITH_PROTO;
+ =
}
}
=
else
{
@@ -295,6 +299,10 @@<=
/span>
addr->len =3D 18;
=
addr->v6.addr =3D osaddr->addr.in6.sin6_addr;
<=
span> addr->v6.port =3D osaddr->addr.in6.sin6_port;=
span>
+ if (a=
ddr->proto !=3D PROTO_NONE)
+ {
+ addr->type |=3D MR_WITH_PROTO;
+ }
}
else
=
{
@@ -403,6 +411,10 @@
=
{
buf_printf(&out, "ARP/&qu=
ot;);
}
+ if (maddr.type & MR_WITH_PROTO)
+ {
+ buf_=
printf(&out, "%s:", proto2ascii(maddr.proto, AF_INET, false))=
;
+ }<=
/span>
buf_printf(&out, "%s", print=
_in_addr_t(ntohl(maddr.v4.addr),
=
(flags & MAPF_IA_EMPTY_IF_UNDEF) ? IA_EMP=
TY_IF_UNDEF : 0, gc));
if (maddr.type &=
; MR_WITH_NETBITS)
@@ -426,6 +438,10 @@
=
span>
case MR_ADDR_IPV6:
=
{
+ i=
f (maddr.type & MR_WITH_PROTO)
+ {
+ buf_printf(&out, "%s:", prot=
o2ascii(maddr.proto, AF_INET6, false));
+ }
if (=
IN6_IS_ADDR_V4MAPPED( &maddr.v6.addr ) )
=
{
buf_printf(&out, "%s&quo=
t;, print_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6=
@@
buf_printf(&out, "UNKNOWN&quo=
t;);
break;
}
- buf_printf(&o=
ut, "|%d", maddr.proto);
return BSTR(&am=
p;out);
}
else
di=
ff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h
inde=
x 2659695..fbe102a 100644
--- a/src/openvpn/mroute.h=
+++ b/src/openvpn/mroute.h
@@ -72,6 +72,9 @@
/* Indicates than IPv4 addr was extracted from ARP packet */=
span>
#define MR_ARP 16
+/* Address type mask indi=
cating that proto # is part of address */
+#define MR_WITH_PROTO 32
+
struct mroute_addr =
{
uint8_t len; /* length of address */
uint8_t proto;
diff --git a/src/openvpn/mtcp.c b/s=
rc/openvpn/mtcp.c
index 62ed044..9a8b1cb 100644
<=
span>--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -111,6 +111,7 @@
ASSERT(mi->context.=
c2.link_sockets[0]->info.lsa->actual.dest.addr.sa.sa_family =3D=3D AF=
_INET
|| mi->context.c2.link_sockets[0]->=
info.lsa->actual.dest.addr.sa.sa_family =3D=3D AF_INET6
=
);
+ m=
i->real.proto =3D 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))
diff --git a/src/ope=
nvpn/multi.c b/src/openvpn/multi.c
index 9c8c014..b0e1941 1=
00644
--- a/src/openvpn/multi.c
+++ b/src/o=
penvpn/multi.c
@@ -794,7 +794,6 @@
=
{
goto err;
}=
- mi->real.proto =
=3D ls->info.proto;
generate_prefix(mi);=
}
@@ -3942,7 +3941,8 @@
}
static int
-management_callback_kill_by_addr(v=
oid *arg, const in_addr_t addr, const int port)
+management_callback_kill_by_addr(void *arg, con=
st in_addr_t addr,
+ =
const int port, const int proto)
=
{
struct multi_context *m =3D (struct multi_con=
text *) arg;
struct hash_iterator hi;
=
@@ -3957,6 +3957,7 @@
saddr.addr.in4.sin_port =3D hton=
s(port);
if (mroute_extract_openvpn_sockaddr(&madd=
r, &saddr, true))
{
+ maddr.proto =3D proto;
=
hash_iterator_init(m->iter, &hi);
whi=
le ((he =3D hash_iterator_next(&hi)))
{=
To view, visit change 880. To unsubscribe, or for =
help writing mail filters, visit settings.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd31=
78eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan <gianmarco@...2786...=
..>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...=
1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-CC: ordex <a@...2181...>
Gerrit-Attention: plaisthos <arne-openvpn@...220...=
..1227...>
Gerrit-Attention: cron2 <gert@...1296...>=
;
Gerrit-Attention: its_Giaan <gianmarco@...1665...=
726...>
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-Attention: ordex <a@...2181...> <=
/div>
Gerrit-MessageType: newpatchset
--jvrKN6uxOdw=--