From: "cron2 (Code Review)" Date: Fri, 18 Jul 2025 15:50:03 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, ralf@...2726..., frank@...2641..., lstipakov@...277..., antonio@...2726... Message-ID: <2638519945322b9f527539cbd4e28277239729d6-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="irU2Sfdkn50="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: dco: Add support for float notifications List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: ralf_lici , plaisthos , flichtenheld , stipa Cc: openvpn-devel --irU2Sfdkn50= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#7) to the change originally created by= ralf_lici. ( http://gerrit.openvpn.net/c/openvpn/+/1084?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2, Code-Review+2 by ordex Change subject: dco: Add support for float notifications ...................................................................... dco: Add support for float notifications When a peer changes its UDP endpoint, the DCO module emits a notification to userpace. The message is parsed and the relevant information are extracted in order to process the floating operation. Note that we preserve IPv4-mapped IPv6 addresses in userspace when receiving a pure IPv4 address from the module, otherwise openvpn wouldn't be able to retrieve the multi_instance using the transport address hash table lookup. It may happen that a netlink notification gets lost, causing us to skip a float step. If the peer then floats back to its previous address, userspace closes the only valid instance while trying to process the float, leading to a segfault. To prevent this, we ignore float attempts to an address already taken by a peer with the same peer ID. Change-Id: I33e9272b4196c7634db2fb33a75ae4261660867f Signed-off-by: Ralf Lici Acked-by: Gert Doering Acked-by: Antonio Quartulli Acked-by: Lev Stipakov Message-Id: <20250718122230.14008-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 210.html Signed-off-by: Gert Doering --- M src/openvpn/dco_linux.c M src/openvpn/dco_linux.h M src/openvpn/dco_win.c M src/openvpn/dco_win.h M src/openvpn/forward.c M src/openvpn/forward.h M src/openvpn/multi.c M src/openvpn/multi.h M src/openvpn/ovpn_dco_linux.h M src/openvpn/ovpn_dco_win.h 10 files changed, 159 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/84/1084/7 diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 22a445a..f04ebfe 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -768,6 +768,44 @@ return ret; } +static bool +ovpn_parse_float_addr(struct nlattr **attrs, struct sockaddr *out) +{ + if (!attrs[OVPN_A_PEER_REMOTE_PORT]) + { + msg(D_DCO, "ovpn-dco: no remote port in PEER_FLOAT_NTF message"); + return false; + } + + if (attrs[OVPN_A_PEER_REMOTE_IPV4]) + { + struct sockaddr_in *addr4 =3D (struct sockaddr_in *)out; + CLEAR(*addr4); + addr4->sin_family =3D AF_INET; + addr4->sin_port =3D nla_get_u16(attrs[OVPN_A_PEER_REMOTE_PORT]); + addr4->sin_addr.s_addr =3D nla_get_u32(attrs[OVPN_A_PEER_REMOTE_IP= V4]); + return true; + } + else if (attrs[OVPN_A_PEER_REMOTE_IPV6] + && nla_len(attrs[OVPN_A_PEER_REMOTE_IPV6]) =3D=3D sizeof(stru= ct in6_addr)) + { + struct sockaddr_in6 *addr6 =3D (struct sockaddr_in6 *)out; + CLEAR(*addr6); + addr6->sin6_family =3D AF_INET6; + addr6->sin6_port =3D nla_get_u16(attrs[OVPN_A_PEER_REMOTE_PORT]); + memcpy(&addr6->sin6_addr, nla_data(attrs[OVPN_A_PEER_REMOTE_IPV6]), + sizeof(addr6->sin6_addr)); + if (attrs[OVPN_A_PEER_REMOTE_IPV6_SCOPE_ID]) + { + addr6->sin6_scope_id =3D nla_get_u32(attrs[OVPN_A_PEER_REMOTE_= IPV6_SCOPE_ID]); + } + return true; + } + + msg(D_DCO, "ovpn-dco: no valid remote IP address in PEER_FLOAT_NTF mes= sage"); + return false; +} + /* This function parses any netlink message sent by ovpn-dco to userspace = */ static int ovpn_handle_msg(struct nl_msg *msg, void *arg) @@ -856,6 +894,45 @@ break; } + case OVPN_CMD_PEER_FLOAT_NTF: + { + if (!attrs[OVPN_A_PEER]) + { + msg(D_DCO, "ovpn-dco: no peer in PEER_FLOAT_NTF message"); + return NL_STOP; + } + + struct nlattr *fp_attrs[OVPN_A_PEER_MAX + 1]; + if (nla_parse_nested(fp_attrs, OVPN_A_PEER_MAX, attrs[OVPN_A_P= EER], + NULL)) + { + msg(D_DCO, "ovpn-dco: can't parse peer in PEER_FLOAT_NTF m= esssage"); + return NL_STOP; + } + + if (!fp_attrs[OVPN_A_PEER_ID]) + { + msg(D_DCO, "ovpn-dco: no peer-id in PEER_FLOAT_NTF message= "); + return NL_STOP; + } + uint32_t peerid =3D nla_get_u32(fp_attrs[OVPN_A_PEER_ID]); + + if (!ovpn_parse_float_addr(fp_attrs, (struct sockaddr *)&dco->= dco_float_peer_ss)) + { + return NL_STOP; + } + + struct gc_arena gc =3D gc_new(); + msg(D_DCO_DEBUG, + "ovpn-dco: received CMD_PEER_FLOAT_NTF, ifindex: %u, peer-= id %u, address: %s", + ifindex, peerid, print_sockaddr((struct sockaddr *)&dco->d= co_float_peer_ss, &gc)); + dco->dco_message_peer_id =3D (int)peerid; + dco->dco_message_type =3D OVPN_CMD_PEER_FLOAT_NTF; + + gc_free(&gc); + break; + } + case OVPN_CMD_KEY_SWAP_NTF: { if (!attrs[OVPN_A_KEYCONF]) diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h index 4e441ec..676b8cd 100644 --- a/src/openvpn/dco_linux.h +++ b/src/openvpn/dco_linux.h @@ -34,6 +34,7 @@ /* Defines to avoid mismatching with other platforms */ #define OVPN_CMD_DEL_PEER OVPN_CMD_PEER_DEL_NTF #define OVPN_CMD_SWAP_KEYS OVPN_CMD_KEY_SWAP_NTF +#define OVPN_CMD_FLOAT_PEER OVPN_CMD_PEER_FLOAT_NTF typedef enum ovpn_key_slot dco_key_slot_t; typedef enum ovpn_cipher_alg dco_cipher_t; @@ -75,6 +76,7 @@ int dco_message_peer_id; int dco_message_key_id; int dco_del_peer_reason; + struct sockaddr_storage dco_float_peer_ss; uint64_t dco_read_bytes; uint64_t dco_write_bytes; } dco_context_t; diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c index 2a13658..83db739 100644 --- a/src/openvpn/dco_win.c +++ b/src/openvpn/dco_win.c @@ -663,6 +663,7 @@ dco->dco_message_peer_id =3D dco->notif_buf.PeerId; dco->dco_message_type =3D dco->notif_buf.Cmd; dco->dco_del_peer_reason =3D dco->notif_buf.DelPeerReason; + dco->dco_float_peer_ss =3D dco->notif_buf.FloatAddress; } else { diff --git a/src/openvpn/dco_win.h b/src/openvpn/dco_win.h index 4513f3f..b9d93fa 100644 --- a/src/openvpn/dco_win.h +++ b/src/openvpn/dco_win.h @@ -52,6 +52,7 @@ int dco_message_peer_id; int dco_message_type; int dco_del_peer_reason; + struct sockaddr_storage dco_float_peer_ss; uint64_t dco_read_bytes; uint64_t dco_write_bytes; diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index a4f260a..dfc6708 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1243,6 +1243,41 @@ perf_pop(); } +void +extract_dco_float_peer_addr(const sa_family_t socket_family, + struct openvpn_sockaddr *out_osaddr, + const struct sockaddr *float_sa) +{ + if (float_sa->sa_family =3D=3D AF_INET) + { + struct sockaddr_in *float4 =3D (struct sockaddr_in *)float_sa; + /* DCO treats IPv4-mapped IPv6 addresses as pure IPv4. However, on= a + * dual-stack socket, we need to preserve the mapping otherwise op= envpn + * will not be able to find the peer by its transport address. + */ + if (socket_family =3D=3D AF_INET6) + { + out_osaddr->addr.in6.sin6_family =3D AF_INET6; + out_osaddr->addr.in6.sin6_port =3D float4->sin_port; + + memset(&out_osaddr->addr.in6.sin6_addr.s6_addr, 0, 10); + out_osaddr->addr.in6.sin6_addr.s6_addr[10] =3D 0xff; + out_osaddr->addr.in6.sin6_addr.s6_addr[11] =3D 0xff; + memcpy(&out_osaddr->addr.in6.sin6_addr.s6_addr[12], + &float4->sin_addr.s_addr, sizeof(in_addr_t)); + } + else + { + memcpy(&out_osaddr->addr.in4, float4, sizeof(struct sockaddr_i= n)); + } + } + else + { + struct sockaddr_in6 *float6 =3D (struct sockaddr_in6 *)float_sa; + memcpy(&out_osaddr->addr.in6, float6, sizeof(struct sockaddr_in6)); + } +} + static void process_incoming_dco(struct context *c) { diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h index 318691f..2818fd1 100644 --- a/src/openvpn/forward.h +++ b/src/openvpn/forward.h @@ -196,6 +196,21 @@ void process_incoming_link_part2(struct context *c, struct link_socket_inf= o *lsi, const uint8_t *orig_buf); /** + * Transfers \c float_sa data extracted from an incoming DCO + * PEER_FLOAT_NTF to \c out_osaddr for later processing. + * + * @param socket_family - The address family of the socket + * @param out_osaddr - openvpn_sockaddr struct that will be filled the new + * address data + * @param float_sa - The sockaddr struct containing the data received from= the + * DCO notification + */ +void +extract_dco_float_peer_addr(sa_family_t socket_family, + struct openvpn_sockaddr *out_osaddr, + const struct sockaddr *float_sa); + +/** * Write a packet to the external network interface. * @ingroup external_multiplexer * diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index a760e07..ead3dd0 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3251,6 +3251,18 @@ goto done; } + /* It doesn't make sense to let a peer float to the address it alr= eady + * has, so we disallow it. This can happen if a DCO netlink notifi= cation + * gets lost and we miss a floating step. + */ + if (m1->peer_id =3D=3D m2->peer_id) + { + msg(M_WARN, "disallowing peer %" PRIu32 " (%s) from floating t= o " + "its own address (%s)", + m1->peer_id, tls_common_name(mi->context.c2.tls_multi, fal= se), + mroute_addr_print(&mi->real, &gc)); + goto done; + } msg(D_MULTI_MEDIUM, "closing instance %s", multi_instance_string(e= x_mi, false, &gc)); multi_close_instance(m, ex_mi, false); } @@ -3384,6 +3396,17 @@ { process_incoming_del_peer(m, mi, dco); } +#if defined(TARGET_LINUX) || defined(TARGET_WIN32) + else if (dco->dco_message_type =3D=3D OVPN_CMD_FLOAT_PEER) + { + ASSERT(mi->context.c2.link_sockets[0]); + extract_dco_float_peer_addr(mi->context.c2.link_sockets[0]->in= fo.af, + &m->top.c2.from.dest, + (struct sockaddr *)&dco->dco_float= _peer_ss); + multi_process_float(m, mi, mi->context.c2.link_sockets[0]); + CLEAR(dco->dco_float_peer_ss); + } +#endif /* if defined(TARGET_LINUX) || defined(TARGET_WIN32) */ else if (dco->dco_message_type =3D=3D OVPN_CMD_SWAP_KEYS) { tls_session_soft_reset(mi->context.c2.tls_multi); diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h index 40f7519..fe9e847 100644 --- a/src/openvpn/multi.h +++ b/src/openvpn/multi.h @@ -322,7 +322,7 @@ /** * Process an incoming DCO message (from kernel space). * - * @param m - The single \c multi_context structur.e + * @param m - The single \c multi_context structure. * * @return * - True, if the message was received correctly. diff --git a/src/openvpn/ovpn_dco_linux.h b/src/openvpn/ovpn_dco_linux.h index 680d152..b3c9ff0 100644 --- a/src/openvpn/ovpn_dco_linux.h +++ b/src/openvpn/ovpn_dco_linux.h @@ -99,6 +99,7 @@ OVPN_CMD_KEY_SWAP, OVPN_CMD_KEY_SWAP_NTF, OVPN_CMD_KEY_DEL, + OVPN_CMD_PEER_FLOAT_NTF, __OVPN_CMD_MAX, OVPN_CMD_MAX =3D (__OVPN_CMD_MAX - 1) diff --git a/src/openvpn/ovpn_dco_win.h b/src/openvpn/ovpn_dco_win.h index 865bb38..dd6b7ce 100644 --- a/src/openvpn/ovpn_dco_win.h +++ b/src/openvpn/ovpn_dco_win.h @@ -149,7 +149,8 @@ typedef enum { OVPN_CMD_DEL_PEER, - OVPN_CMD_SWAP_KEYS + OVPN_CMD_SWAP_KEYS, + OVPN_CMD_FLOAT_PEER } OVPN_NOTIFY_CMD; typedef enum { @@ -164,6 +165,7 @@ OVPN_NOTIFY_CMD Cmd; int PeerId; OVPN_DEL_PEER_REASON DelPeerReason; + struct sockaddr_storage FloatAddress; } OVPN_NOTIFY_EVENT, * POVPN_NOTIFY_EVENT; typedef struct _OVPN_MP_DEL_PEER { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1084?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: I33e9272b4196c7634db2fb33a75ae4261660867f Gerrit-Change-Number: 1084 Gerrit-PatchSet: 7 Gerrit-Owner: ralf_lici Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: ordex Gerrit-Reviewer: plaisthos Gerrit-Reviewer: stipa Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --irU2Sfdkn50= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #7 to the change originally cr= eated by ralf_lici.

View Change

The following approvals got outdate= d and were removed: Code-Review+2 by cron2, Code-Review+2 by ordex

dco: Add support for float n=
otifications

When a peer changes its UDP endpoint, the DCO module em= its a
notification to userpace. The message is parsed and the relevantinformation are extracted in order to process the floating operation.
=
Note that we preserve IPv4-mapped IPv6 addresses in userspace when
r= eceiving a pure IPv4 address from the module, otherwise openvpn
wouldn&#= 39;t be able to retrieve the multi_instance using the transport
address = hash table lookup.

It may happen that a netlink notification gets lo= st, causing us to skip
a float step. If the peer then floats back to its= previous address,
userspace closes the only valid instance while trying= to process the
float, leading to a segfault. To prevent this, we ignore= float attempts
to an address already taken by a peer with the same peer= ID.

Change-Id: I33e9272b4196c7634db2fb33a75ae4261660867f
Signed-= off-by: Ralf Lici <ralf@...2726...>
Acked-by: Gert Doering <ger= t@...1296...>
Acked-by: Antonio Quartulli <antonio@...2726...><= br>Acked-by: Lev Stipakov <lstipakov@...277...>
Message-Id: <20= 250718122230.14008-1-gert@...1296...>
URL: https://www.mail-archive.c= om/openvpn-devel@lists.sourceforge.net/msg32210.html
Signed-off-by: Gert= Doering <gert@...1296...>
---
M src/openvpn/dco_linux.c
M s= rc/openvpn/dco_linux.h
M src/openvpn/dco_win.c
M src/openvpn/dco_win.= h
M src/openvpn/forward.c
M src/openvpn/forward.h
M src/openvpn/mu= lti.c
M src/openvpn/multi.h
M src/openvpn/ovpn_dco_linux.h
M src/o= penvpn/ovpn_dco_win.h
10 files changed, 159 insertions(+), 2 deletions(-= )

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/84=
/1084/7
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linu=
x.c
index 22a445a..f04ebfe 100644
--- a/src= /openvpn/dco_linux.c
+++ b/src/openvpn/dco_linux.c@@ -768,6 +768,44 @@
return ret;
}

+static bool
+ovpn= _parse_float_addr(struct nlattr **attrs, struct sockaddr *out)
+{
+ if (!attrs[OVPN_A_PEER_REMOTE_PORT])+ {
+ msg(D_DCO, "ovpn-dco: no rem= ote port in PEER_FLOAT_NTF message");
+ return false;
+ }
+
+ if (= attrs[OVPN_A_PEER_REMOTE_IPV4])
+ {
+ = struct sockaddr_in *addr4 =3D (struct sockaddr_in *)out;
+ CLEAR(*addr4);+ addr4->sin_family = =3D AF_INET;
+ = addr4->sin_port =3D nla_get_u16(attrs[OVPN_A_PEER_REMOTE_PORT]);=
+ addr4->sin_addr= .s_addr =3D nla_get_u32(attrs[OVPN_A_PEER_REMOTE_IPV4]);
+ return true;
+ }
+ else if (attrs[OVPN_A_PEER_REMOTE_IPV6]<= br>+ && nla= _len(attrs[OVPN_A_PEER_REMOTE_IPV6]) =3D=3D sizeof(struct in6_addr))=
+ {
+ struct sockaddr_in6 *addr6 =3D (= struct sockaddr_in6 *)out;
+ CLEAR(*addr6);
+ addr6->sin6_family =3D AF_INET6;
+ addr6->sin6_port =3D nla_get_u= 16(attrs[OVPN_A_PEER_REMOTE_PORT]);
+ memcpy(&addr6->sin6_addr, nla_data(attrs[OVP= N_A_PEER_REMOTE_IPV6]),
+ sizeof(addr6->sin6_addr));
+ if (attrs[OVPN_A_PEER_REMOTE_IPV6_SCOP= E_ID])
+ {

+ addr6->s= in6_scope_id =3D nla_get_u32(attrs[OVPN_A_PEER_REMOTE_IPV6_SCOPE_ID]);
+ }
+ return true;

+ }
+
+ msg(D_DCO, "ovpn-dco: no valid remote IP address in PEER_= FLOAT_NTF message");
+ return false;
+}
+
/* This function parses any netlink message sent by ovpn-dco to userspa= ce */
static int
ovpn_handle_msg(struct n= l_msg *msg, void *arg)
@@ -856,6 +894,45 @@
break;
}
+ case OVPN_CMD_PEER_FL= OAT_NTF:
+ {
+ if (!attr= s[OVPN_A_PEER])
+ = {
+ = msg(D_DCO, "ovpn-dco: no peer in PEER_FLOAT_NTF message");<= /span>
+ retu= rn NL_STOP;
+ = }
+
+ struct nlattr *fp_att= rs[OVPN_A_PEER_MAX + 1];

+ if (nla_parse_nested(fp_attrs, OVPN_A_PEER_MAX, attrs[OVPN= _A_PEER],
+ = NULL))
+ {
+ msg(D_DCO, "ovpn-dco: can't parse peer in PEER= _FLOAT_NTF messsage");
+ return NL_STOP;
+ }
+
+ = if (!fp_attrs[OVPN_A_PEER_ID])
+ {
+ msg(D_DCO, "ovpn-dco: no peer-id in PEER_F= LOAT_NTF message");
+ return NL_STOP;
+ }
+ uint32_t peerid =3D nla_get_u32(fp_attrs[OVPN_A_PEER= _ID]);
+
+ if (!ovpn_parse_floa= t_addr(fp_attrs, (struct sockaddr *)&dco->dco_float_peer_ss))
=
+ {
+ return NL_STOP;<= /span>
+ }=
+
+ struct gc_arena gc =3D gc_new();<= /span>
+ msg(D_DC= O_DEBUG,
+ = "ovpn-dco: received CMD_PEER_FLOAT_NTF, ifindex: %u, peer-id %u, = address: %s",
+ = ifindex, peerid, print_sockaddr((struct sockaddr *)&dco-= >dco_float_peer_ss, &gc));
+ dco->dco_message_peer_id =3D (int)peerid;
+ dco->dco_= message_type =3D OVPN_CMD_PEER_FLOAT_NTF;
+
+ break;
+ }
+
case OVPN_CMD_KEY_SWAP_NTF:
= {
if (!attrs[OVPN_A_KEYCONF])
= diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h=
index 4e441ec..676b8cd 100644
--- a/src/openvpn/d= co_linux.h
+++ b/src/openvpn/dco_linux.h
@@= -34,6 +34,7 @@
/* Defines to avoid mismatching with other= platforms */
#define OVPN_CMD_DEL_PEER OVPN_CMD_PEER_DEL_= NTF
#define OVPN_CMD_SWAP_KEYS OVPN_CMD_KEY_SWAP_NTF

+#define OVPN_CMD_FLOAT_PE= ER OVPN_CMD_PEER_FLOAT_NTF

typedef enum = ovpn_key_slot dco_key_slot_t;
typedef enum ovpn_cipher_alg= dco_cipher_t;
@@ -75,6 +76,7 @@
int d= co_message_peer_id;
int dco_message_key_id;
= int dco_del_peer_reason;
+ struct sockaddr_storage dco_float_peer_ss;
uint64_t dco_read_bytes;
uint64_t dco_write_b= ytes;
} dco_context_t;
diff --git a/src/op= envpn/dco_win.c b/src/openvpn/dco_win.c
index 2a13658..83db= 739 100644
--- a/src/openvpn/dco_win.c
+++ = b/src/openvpn/dco_win.c
@@ -663,6 +663,7 @@
dco->dco_message_peer_id =3D dco->notif_buf.PeerId;<= br> dco->dco_message_type =3D dco->notif_buf.Cmd;
dco->dco_del_peer_reason =3D dco->notif_buf.DelPe= erReason;
+ dc= o->dco_float_peer_ss =3D dco->notif_buf.FloatAddress;
}
else
{
di= ff --git a/src/openvpn/dco_win.h b/src/openvpn/dco_win.h
in= dex 4513f3f..b9d93fa 100644
--- a/src/openvpn/dco_win.h

+++ b/src/openvpn/dco_win.h
@@ -52,6 +52,7 @@<= /span>
int dco_message_peer_id;
int dco_= message_type;
int dco_del_peer_reason;
+ struct sockaddr_storage dco_flo= at_peer_ss;


uint64_t dco_read_bytes;=
uint64_t dco_write_bytes;
diff --git = a/src/openvpn/forward.c b/src/openvpn/forward.c
index a4f26= 0a..dfc6708 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -1243,6 +1243,41 @@
perf_pop();
}
+void
+extract_dco_float_peer_addr(const sa_family_= t socket_family,
+ = struct openvpn_sockaddr *out_osaddr,
+ const= struct sockaddr *float_sa)

+{
+ if (fl= oat_sa->sa_family =3D=3D AF_INET)
+ {
+ /* DCO treats= IPv4-mapped IPv6 addresses as pure IPv4. However, on a
+ * dual-stack socket, we need t= o preserve the mapping otherwise openvpn
+ * will not be able to find the peer by its tr= ansport address.
+ = */
+ if = (socket_family =3D=3D AF_INET6)
+ {
+ out_osaddr->addr.in6.sin6_family =3D AF_INET6;
<= span style=3D"color: hsl(120, 100%, 40%);">+ out_osaddr->addr= .in6.sin6_port =3D float4->sin_port;
+
= + memset(&out_osaddr->addr.in6.sin6_addr.s6_addr, 0, 10);=
+ out_osa= ddr->addr.in6.sin6_addr.s6_addr[10] =3D 0xff;
+ out_osaddr->addr.in6.sin6_addr.= s6_addr[11] =3D 0xff;
+ memcpy(&out_osaddr->addr.in6.sin6_addr.s6_addr[12],

+ &am= p;float4->sin_addr.s_addr, sizeof(in_addr_t));
+ }
+ else
+ {
+ = }
+ }
= + else
+ {
+ struct sockaddr_in6 *float6 =3D (struct sockadd= r_in6 *)float_sa;
+ = memcpy(&out_osaddr->addr.in6, float6, sizeof(struct sockaddr_i= n6));
+ }+}
+
static void
= process_incoming_dco(struct context *c)
{
diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h
index 318691f..2818fd1 100644
--- a/src/openvpn/forward.h<= /span>
+++ b/src/openvpn/forward.h
@@ -196,6 +196,= 21 @@
void process_incoming_link_part2(struct context *c, = struct link_socket_info *lsi, const uint8_t *orig_buf);

/**
+= * Transfers \c float_sa data extracted from an incoming DCO
+ * PEER_FLOAT_NTF to \c out_osaddr= for later processing.

+ * @param sock= et_family - The address family of the socket
+ * @param out_osaddr - openvpn_sockaddr struct tha= t will be filled the new
+ * address data
+ * @param float_sa - The sockaddr struct containing the data received= from the
+ * DC= O notification
+ */
+void
+extract_dco_float_peer_addr(sa_famil= y_t socket_family,
+ = struct openvpn_sockaddr *out_osaddr,
<= span style=3D"color: hsl(120, 100%, 40%);">+ con= st struct sockaddr *float_sa);

+
+/**
* Write a packet to the external network interface. * @ingroup external_multiplexer
*
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c

in= dex a760e07..ead3dd0 100644
--- a/src/openvpn/multi.c

+++ b/src/openvpn/multi.c
@@ -3251,6 +3251,18 @@=
goto done;
}<= br>
+ /= * It doesn't make sense to let a peer float to the address it already
+ * has, so we= disallow it. This can happen if a DCO netlink notification
+ * gets lost and we miss a = floating step.

+ = */
+ if (m= 1->peer_id =3D=3D m2->peer_id)
+ {
+ msg(M_WARN, "disallowing peer %" PRIu32 "= (%s) from floating to "
+ "its own address (%s)",
+ m1->peer_id, tls= _common_name(mi->context.c2.tls_multi, false),
+ mroute_addr_print(&mi->= ;real, &gc));
+ = goto done;
= + }
msg(D_MULTI_MEDIUM, "closing insta= nce %s", multi_instance_string(ex_mi, false, &gc));
multi_close_instance(m, ex_mi, false);
}
@@ -3384,6 +3396,17 @@
{
<= span> process_incoming_del_peer(m, mi, dco);

= }
+#if defined= (TARGET_LINUX) || defined(TARGET_WIN32)
+ else if (dco->dco_message_type =3D=3D OVPN_C= MD_FLOAT_PEER)
+ = {
+ ASS= ERT(mi->context.c2.link_sockets[0]);
+ extract_dco_float_peer_addr(mi->context.= c2.link_sockets[0]->info.af,
+ &m->top.c2.from.= dest,
+ = (struct sockaddr *)&dco->dco_float_peer_ss= );
+ multi= _process_float(m, mi, mi->context.c2.link_sockets[0]);
+ CLEAR(dco->dco_float_p= eer_ss);
+ }
+#endif /* if defined(= TARGET_LINUX) || defined(TARGET_WIN32) */
else if = (dco->dco_message_type =3D=3D OVPN_CMD_SWAP_KEYS)
= {
tls_session_soft_reset(mi->context.c2.= tls_multi);
diff --git a/src/openvpn/multi.h b/src/openvpn/= multi.h
index 40f7519..fe9e847 100644
--- a= /src/openvpn/multi.h
+++ b/src/openvpn/multi.h
@@ -322,7 +322,7 @@

/**
* Process an= incoming DCO message (from kernel space).
*
- * @param m - The singl= e \c multi_context structur.e
+ * @param m - The single \c multi_context structure.
*
* @return
* - True,= if the message was received correctly.
diff --git a/src/op= envpn/ovpn_dco_linux.h b/src/openvpn/ovpn_dco_linux.h
index= 680d152..b3c9ff0 100644
--- a/src/openvpn/ovpn_dco_linux.h=
+++ b/src/openvpn/ovpn_dco_linux.h
@@ -99,= 6 +99,7 @@
OVPN_CMD_KEY_SWAP,
OVPN_CMD_= KEY_SWAP_NTF,
OVPN_CMD_KEY_DEL,
+ OVPN_CMD_PEER_FLOAT_NTF,

__OVPN_CMD_MAX,
OVPN_CMD_MAX =3D (__OVPN= _CMD_MAX - 1)
diff --git a/src/openvpn/ovpn_dco_win.h b/src= /openvpn/ovpn_dco_win.h
index 865bb38..dd6b7ce 100644

--- a/src/openvpn/ovpn_dco_win.h
+++ b/src/openv= pn/ovpn_dco_win.h
@@ -149,7 +149,8 @@

typedef enum {
OVPN_CMD_DEL_PEER,=
- OVPN_CMD_SWAP_KEYS
+ OVPN_CMD_SWAP_KEYS,
+ OVPN_CMD_FLOAT_PE= ER
} OVPN_NOTIFY_CMD;

t= ypedef enum {
@@ -164,6 +165,7 @@
OVPN= _NOTIFY_CMD Cmd;
int PeerId;
OVPN= _DEL_PEER_REASON DelPeerReason;
+ struct sockaddr_storage FloatAddress;
} OV= PN_NOTIFY_EVENT, * POVPN_NOTIFY_EVENT;

t= ypedef struct _OVPN_MP_DEL_PEER {

To vi= ew, visit change 1084. To unsubscribe, or for help writing mail filters, visit = settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I33e9272b4196c7634db2fb33a75= ae4261660867f
Gerrit-Change-Number: 1084
Gerrit-PatchSet: 7
Gerrit-Owner: ralf_lici <ralf@...2726...>= ;
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: ordex <antonio@...2726...&= gt;
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: stipa <lstipakov@...277...= >
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--irU2Sfdkn50=--