From: "ralf_lici (Code Review)" Date: Fri, 18 Jul 2025 10:50:37 +0000 In-Reply-To: References: Reply-To: ralf@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277..., antonio@...2726..., gert@...1296... Message-ID: <7cc676344c0ffba522f4b9c9f8c0e66c2d3f1afe-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="SSkm3zcp74E="; 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: plaisthos , flichtenheld , stipa Cc: openvpn-devel --SSkm3zcp74E= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, ordex, plaisthos, ralf_= lici, stipa. Hello cron2, flichtenheld, ordex, plaisthos, stipa, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1084?usp=3Demail to look at the new patch set (#6). 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 --- 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/6 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: 6 Gerrit-Owner: ralf_lici Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: ordex Gerrit-Reviewer: plaisthos Gerrit-Reviewer: stipa Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-Attention: ordex Gerrit-Attention: ralf_lici Gerrit-Attention: stipa Gerrit-MessageType: newpatchset --SSkm3zcp74E= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, ordex, plaisthos, r= alf_lici, stipa.

ralf_lici uploaded patch set #6 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/1084?usp=3Demail">View Chan= ge

dco: Add support for float notifications

When a peer changes = its UDP endpoint, the DCO module emits a
notification to userpace. The m= essage is parsed and the relevant
information are extracted in order to = process the floating operation.

Note that we preserve IPv4-mapped IP= v6 addresses in userspace when
receiving a pure IPv4 address from the mo= dule, otherwise openvpn
wouldn't be able to retrieve the multi_insta= nce 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 t= he only valid instance while trying to process the
float, leading to a s= egfault. To prevent this, we ignore float attempts
to an address already= taken by a peer with the same peer ID.

Change-Id: I33e9272b4196c763= 4db2fb33a75ae4261660867f
Signed-off-by: Ralf Lici <ralf@...2726...>= ;
---
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.cM src/openvpn/forward.h
M src/openvpn/multi.c
M src/openvpn/multi.h<= br>M src/openvpn/ovpn_dco_linux.h
M src/openvpn/ovpn_dco_win.h
10 fil= es changed, 159 insertions(+), 2 deletions(-)

git pull ssh://gerr=
it.openvpn.net:29418/openvpn refs/changes/84/1084/6
diff --git a/sr=
c/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index 22a44= 5a..f04ebfe 100644
--- a/src/openvpn/dco_linux.c
= +++ b/src/openvpn/dco_linux.c
@@ -768,6 +768,44 @@
return ret;
}
<= br>+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 messag= e");
+ re= turn 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[OV= PN_A_PEER_REMOTE_IPV4]);
+ return true;
+ }
+ else= if (attrs[OVPN_A_PEER_REMOTE_IPV6]
+ && nla_len(attrs[OVPN_A_PEER_REMOTE_IP= V6]) =3D=3D sizeof(struct in6_addr))
+ {
+ CLEAR(*addr6);
+ addr6->sin6= _family =3D AF_INET6;
+ addr6->sin6_port =3D nla_get_u16(attrs[OVPN_A_PEER_REMOTE_PORT= ]);
+ memcpy(&= amp;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(att= rs[OVPN_A_PEER_REMOTE_IPV6_SCOPE_ID]);
+ }
+ return true;
+ }
+
+ msg(D_DCO, "ov= pn-dco: no valid remote IP address in PEER_FLOAT_NTF message");=
+ return false;+}
+
/* This function parses any = netlink message sent by ovpn-dco to userspace */
static in= t
ovpn_handle_msg(struct nl_msg *msg, void *arg)@@ -856,6 +894,45 @@
break;
<= span> }


+ case OVPN_CMD_PEER_FLOAT_NTF:
+ {
+ if (!attrs[OVPN_A_PEER])
+ {

+ msg(D_DCO, "ovpn-dc= o: 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_PEER],
+ NULL))<= /span>
+ {=
+ msg(D_DCO,= "ovpn-dco: can't parse peer in PEER_FLOAT_NTF messsage");
+ return= NL_STOP;
+ = }
+
+ if (!fp_attrs[OVPN_A_PE= ER_ID])

+ = {
+ ms= g(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 soc= kaddr *)&dco->dco_float_peer_ss))
+ {
+ return NL_STOP;
+ }
+
+ struct gc_arena gc =3D gc_new();
+ msg(D_DCO_DEBUG,
+ "ovpn-dco: receive= d CMD_PEER_FLOAT_NTF, ifindex: %u, peer-id %u, address: %s",+ ifindex, peer= id, print_sockaddr((struct sockaddr *)&dco->dco_float_peer_ss, &= gc));
+ dc= o->dco_message_peer_id =3D (int)peerid;
+ dco->dco_message_type =3D OVPN_CMD_PE= ER_FLOAT_NTF;
+
+ gc_free(&= gc);
+ bre= ak;
+ }=
+
= case OVPN_CMD_KEY_SWAP_NTF:
{
= if (!attrs[OVPN_A_KEYCONF])
diff --git a/src/openv= pn/dco_linux.h b/src/openvpn/dco_linux.h
index 4e441ec..676= b8cd 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 s= ockaddr_storage dco_float_peer_ss;
uint64_t dco_read_b= ytes;
uint64_t dco_write_bytes;
} dco= _context_t;
diff --git a/src/openvpn/dco_win.c b/src/openvp= n/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_messag= e_peer_id =3D dco->notif_buf.PeerId;
dco->dc= o_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_w= in.h b/src/openvpn/dco_win.h
index 4513f3f..b9d93fa 100644<= /span>
--- a/src/openvpn/dco_win.h
+++ b/src/openv= pn/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/sr= c/openvpn/forward.c
index a4f260a..dfc6708 100644--- a/src/openvpn/forward.c
+++ b/src/openvpn/forwar= d.c
@@ -1243,6 +1243,41 @@
perf_pop();=
}

+void
+ str= uct openvpn_sockaddr *out_osaddr,
+ const struct sockaddr *float_sa)<= /span>
+{
+ if (float_sa->sa_family =3D=3D = AF_INET)
+ {
+ struct sockaddr_i= n *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 other= wise openvpn
+ = * will not be able to find the peer by its transport address.
<= span style=3D"color: hsl(120, 100%, 40%);">+ */

+ if (socket_family =3D=3D AF_INE= T6)
+ {=
+ out_osaddr->= ;addr.in6.sin6_family =3D AF_INET6;
+ out_osaddr->addr.in6.sin6_port =3D float4-&g= t;sin_port;
+<= br>+ memset(&out= _osaddr->addr.in6.sin6_addr.s6_addr, 0, 10);
+ out_osaddr->addr.in6.sin6_addr.s= 6_addr[10] =3D 0xff;
= + out_osaddr->addr.in6.sin6_addr.s6_addr[11] =3D 0xff;=
+ memcpy(&ou= t_osaddr->addr.in6.sin6_addr.s6_addr[12],
+ &float4->sin_addr.s_addr= , sizeof(in_addr_t));
+ }
+ = else
+ {
+ memcpy(&o= ut_osaddr->addr.in4, float4, sizeof(struct sockaddr_in));
+ }

+ }
+ 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(struc= t context *c)
{
diff --git a/src/openvpn/f= orward.h b/src/openvpn/forward.h
index 318691f..2818fd1 100= 644
--- a/src/openvpn/forward.h
+++ b/src/o= penvpn/forward.h
@@ -196,6 +196,21 @@
void= process_incoming_link_part2(struct context *c, struct link_socket_info *ls= i, const uint8_t *orig_buf);

/**<= br>+ * Transfers \c float_sa da= ta extracted from an incoming DCO
+ * PEER_FLOAT_NTF to \c out_osaddr for later processing.
+ *
+ * @param socket_family - The address fam= ily 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_s= a);
+
+/**

* Write a pac= ket to the external network interface.
* @ingroup externa= l_multiplexer
*
diff --git a/src/openvpn/= multi.c b/src/openvpn/multi.c
index a760e07..ead3dd0 100644=
--- a/src/openvpn/multi.c
+++ b/src/openvp= n/multi.c
@@ -3251,6 +3251,18 @@
= goto done;
}

+ /* It doesn't make sense= to let a peer float to the address it already
+ * has, so we disallow it. This can happ= en if a DCO netlink notification
+ * gets lost and we miss a floating step.
+ */

+ if (m1->peer_id =3D=3D m2->= ;peer_id)
+ {<= /span>
+ msg(M_WA= RN, "disallowing peer %" PRIu32 " (%s) from floating to &quo= t;
+ &= quot;its own address (%s)",
+ m1->peer_id, tls_common_name(mi->context= .c2.tls_multi, false),
+ goto done;=
+ }
= msg(D_MULTI_MEDIUM, "closing instance %s", multi_instanc= e_string(ex_mi, false, &gc));
multi_close_inst= ance(m, ex_mi, false);
}
@@ -3384,6 +3= 396,17 @@
{
process_i= ncoming_del_peer(m, mi, dco);
}
+#if defined(TARGET_LINUX) || defined(T= ARGET_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]->inf= o.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_typ= e =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 @@<= /span>
/**
* Process an incoming DCO message (f= rom kernel space).
*
- * @param m - The single \c multi_context struc= tur.e
+ * @param m = - The single \c multi_context structure.
*
* @return
* - True, if the message was rece= ived 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/s= rc/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<= /span>
index 865bb38..dd6b7ce 100644
--- a/src/ope= nvpn/ovpn_dco_win.h
+++ b/src/openvpn/ovpn_dco_win.h=
@@ -149,7 +149,8 @@

typedef en= um {
OVPN_CMD_DEL_PEER,
- OVPN_CMD_SWAP_KEYS
+ OVPN_CMD_SWAP_KEYS,
+ OVPN_CMD_FLOAT_PEER
} OV= PN_NOTIFY_CMD;

typedef enum {
= @@ -164,6 +165,7 @@
OVPN_NOTIFY_CMD Cmd;<= br> int PeerId;
OVPN_DEL_PEER_REASON DelPeer= Reason;
+ struct s= ockaddr_storage FloatAddress;
} OVPN_NOTIFY_EVENT, * POVPN= _NOTIFY_EVENT;

typedef struct _OVPN_MP_D= EL_PEER {

To view, visit change 1084. To un= subscribe, 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: 6
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-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: ordex <antonio@...2726...= >
Gerrit-Attention: ralf_lici <ralf@...2804...= .>
Gerrit-Attention: stipa <lstipakov@...1663...= .>
Gerrit-MessageType: newpatchset
--SSkm3zcp74E=--