From: "ralf_lici (Code Review)" Date: Thu, 17 Jul 2025 20:10:04 +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: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="E4LhAL+Z8Vk="; 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 --E4LhAL+Z8Vk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, ordex, plaisthos= , ralf_lici, stipa. Hello cron2, flichtenheld, ordex, plaisthos, stipa,=20 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 (#4). The following approvals got outdated and were removed: Code-Review+2 by ordex, Code-Review-1 by cron2 The change is no longer submittable: Code-Review and checks~ChecksSubmitRul= e are unsatisfied now. 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. 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, 148 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/84/1084/4 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..18d2325 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1243,6 +1243,40 @@ perf_pop(); } +void +extract_dco_float_peer_addr(const uint32_t peer_id, + 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_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)); + out_osaddr->addr.in6.sin6_port =3D float4->sin_port; + } + 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..f835508 100644 --- a/src/openvpn/forward.h +++ b/src/openvpn/forward.h @@ -196,6 +196,22 @@ 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 peer_id - The id of the floating peer. + * @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(uint32_t peer_id, 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..8cb8aee 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3384,6 +3384,18 @@ { 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(peer_id, + 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: 4 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: cron2 Gerrit-Attention: flichtenheld Gerrit-Attention: ordex Gerrit-Attention: ralf_lici Gerrit-Attention: stipa Gerrit-MessageType: newpatchset --E4LhAL+Z8Vk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, flichtenheld, ordex, plais= thos, ralf_lici, stipa.

ralf_lici uploaded patch set #4 to this change.

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

The following approvals got outdated and were removed: Code-Review+2 by ordex, Code-Review-1 by cron2

The change is no longe= r submittable: Code-Review and checks~ChecksSubmitRule are unsatisfied now.=

dco: Add support for float notifications

When a peer changes its UD= P endpoint, the DCO module emits a
notification to userpace. The message= is parsed and the relevant
information are extracted in order to proces= s the floating operation.

Note that we preserve IPv4-mapped IPv6 add= resses in userspace when
receiving a pure IPv4 address from the module, = otherwise openvpn
wouldn't be able to retrieve the multi_instance us= ing the transport
address hash table lookup.

Change-Id: I33e9272b= 4196c7634db2fb33a75ae4261660867f
Signed-off-by: Ralf Lici <ralf@...1664...= 26...>
---
M src/openvpn/dco_linux.c
M src/openvpn/dco_linux.h<= br>M src/openvpn/dco_win.c
M src/openvpn/dco_win.h
M src/openvpn/forw= ard.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.h10 files changed, 148 insertions(+), 2 deletions(-)

git pull ss=
h://gerrit.openvpn.net:29418/openvpn refs/changes/84/1084/4
diff --=
git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
ind= ex 22a445a..f04ebfe 100644
--- a/src/openvpn/dco_linux.c
+++ b/src/openvpn/dco_linux.c
@@ -768,6 +768,= 44 @@
return ret;
}
=
+static bool<= br>+ovpn_parse_float_addr(struc= t nlattr **attrs, struct sockaddr *out)
+{
+ if (!attrs[OVPN_A_PEER_REMOTE_PORT])
+ {
+ msg(D_DCO, "ovpn-dco: no remote port in PEER_FLOAT_NT= F message");
+ = return false;
+= }
+
+ if (attrs[OVPN_A_PEER_REMOTE_= IPV4])

+ {<= br>+ struct sockaddr_in = *addr4 =3D (struct sockaddr_in *)out;
+ CLEAR(*addr4);
+ addr4->sin_family =3D AF_INET;
+ addr4->sin_port =3D n= la_get_u16(attrs[OVPN_A_PEER_REMOTE_PORT]);
+ addr4->sin_addr.s_addr =3D nla_get_u32(a= ttrs[OVPN_A_PEER_REMOTE_IPV4]);
+ return true;
+ }
+ = else if (attrs[OVPN_A_PEER_REMOTE_IPV6]
+ && nla_len(attrs[OVPN_A_PEER_RE= MOTE_IPV6]) =3D=3D sizeof(struct in6_addr))
+ {
+ struct sockaddr_in6 *addr6 =3D (struct sockaddr_in6 *)out= ;
+ CLEAR(*add= r6);
+ addr6-&= gt;sin6_family =3D AF_INET6;
+ addr6->sin6_port =3D nla_get_u16(attrs[OVPN_A_PEER_REMO= TE_PORT]);
+ m= emcpy(&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, &= quot;ovpn-dco: no valid remote IP address in PEER_FLOAT_NTF message");=
+ return false;
+}
+
/* This function pars= es any netlink message sent by ovpn-dco to userspace */
st= atic 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, "ov= pn-dco: no peer in PEER_FLOAT_NTF message");

+ return NL_STOP;
+ }
+
+ struct nlattr *fp_attrs[OVPN_A_PEER_MAX + 1];<= /span>
+ if (nla_= parse_nested(fp_attrs, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER],
+ NU= LL))

+ {
+ msg(D= _DCO, "ovpn-dco: can't parse peer in PEER_FLOAT_NTF messsage"= );
+ r= eturn NL_STOP;
+ = }
+
= + if (!fp_attrs[OVPN= _A_PEER_ID])
+ = {
+ = msg(D_DCO, "ovpn-dco: no peer-id in PEER_FLOAT_NTF message");<= /span>
+ retu= rn NL_STOP;
+ = }
+ ui= nt32_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: rece= ived CMD_PEER_FLOAT_NTF, ifindex: %u, peer-id %u, address: %s",=
+ ifindex, p= eerid, print_sockaddr((struct sockaddr *)&dco->dco_float_peer_ss, &a= mp;gc));
+ = dco->dco_message_peer_id =3D (int)peerid;
+ dco->dco_message_type =3D OVPN_CMD= _PEER_FLOAT_NTF;
+
+ gc_free(&a= mp;gc);
+ = break;
+ }

+
= case OVPN_CMD_KEY_SWAP_NTF:
{
= if (!attrs[OVPN_A_KEYCONF])
diff --git a/src/op= envpn/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 */
<= span> #define OVPN_CMD_DEL_PEER OVPN_CMD_PEER_DEL_NTF
#def= ine OVPN_CMD_SWAP_KEYS OVPN_CMD_KEY_SWAP_NTF
+#define OVPN_CMD_FLOAT_PEER OVPN_CMD_PEER_FLOAT_NT= F

typedef enum ovpn_key_slot dco_key_slo= t_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_pe= er_reason;
+ struc= t sockaddr_storage dco_float_peer_ss;
uint64_t dco_rea= d_bytes;
uint64_t dco_write_bytes;
} = dco_context_t;
diff --git a/src/openvpn/dco_win.c b/src/ope= nvpn/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_mes= sage_peer_id =3D dco->notif_buf.PeerId;
dco->= ;dco_message_type =3D dco->notif_buf.Cmd;
dco-&= gt;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/d= co_win.h b/src/openvpn/dco_win.h
index 4513f3f..b9d93fa 100= 644
--- a/src/openvpn/dco_win.h
+++ b/src/o= penvpn/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;
ui= nt64_t dco_write_bytes;
diff --git a/src/openvpn/forward.c = b/src/openvpn/forward.c
index a4f260a..18d2325 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/fo= rward.c
@@ -1243,6 +1243,40 @@
perf_po= p();
}

+void
+extract_dco_float_peer_addr(const uint32_t peer_id,
+ 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 *)flo= at_sa;
+ /* DC= O treats IPv4-mapped IPv6 addresses as pure IPv4. However, on a
<= span style=3D"color: hsl(120, 100%, 40%);">+ * dual-stack socket, w= e need to preserve the mapping otherwise openvpn

+ * will not be able to find the peer b= y its transport address.
+ */
+ = if (socket_family =3D=3D AF_INET6)
+ {
+ out_osaddr->addr.in6.sin6_family =3D AF_INET6;
+ out_osaddr-= >addr.in6.sin6_addr.s6_addr[10] =3D 0xff;
+ out_osaddr->addr.in6.sin6_addr.s6_a= ddr[11] =3D 0xff;
+ = memcpy(&out_osaddr->addr.in6.sin6_addr.s6_addr[12],=
+ &fl= oat4->sin_addr.s_addr, sizeof(in_addr_t));
+ out_osaddr->addr.in6.sin6_port =3D= float4->sin_port;
+ }
+ = 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..f835508 100= 644
--- a/src/openvpn/forward.h
+++ b/src/o= penvpn/forward.h
@@ -196,6 +196,22 @@
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 peer_id - The id of the floatin= g peer.
+ * @param so= cket_family - The address family of the socket
+ * @param out_osaddr - openvpn_sockaddr struct t= hat will be filled the new
+ * address data
+ * @param float_sa - The sockaddr struct containing the data receiv= ed from the
+ * = DCO notification
+ */=
+void
+extract_dco_float_peer_addr(uint32= _t peer_id, 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..8cb8aee 100644
--- a/src/o= penvpn/multi.c
+++ b/src/openvpn/multi.c
@@= -3384,6 +3384,18 @@
{
= process_incoming_del_peer(m, mi, dco);
}<= br>+#if defined(TARGET_LINUX) |= | defined(TARGET_WIN32)
+ else if (dco->dco_message_type =3D=3D OVPN_CMD_FLOAT_PEER)
+ {
<= span style=3D"color: hsl(120, 100%, 40%);">+ ASSERT(mi->conte= xt.c2.link_sockets[0]);

+ extract_dco_float_peer_addr(peer_id,
+ m= i->context.c2.link_sockets[0]->info.af,
+ &m-&g= t;top.c2.from.dest,
+= (struct sockaddr *)&dco->dco= _float_peer_ss);
+ = multi_process_float(m, mi, mi->context.c2.link_sockets[0]);
+ CLEAR(dco-&= gt;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-&= gt;context.c2.tls_multi);
diff --git a/src/openvpn/multi.h = b/src/openvpn/multi.h
index 40f7519..fe9e847 100644<= br>--- 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_contex= t 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<= br>index 680d152..b3c9ff0 100644
--- a/src/openvpn/ov= pn_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,
<= span style=3D"color: hsl(120, 100%, 40%);">+ OVPN_CMD_PEER_FLOAT_NTF,

__OVPN_CMD_MAX,
OVPN_CMD_M= AX =3D (__OVPN_CMD_MAX - 1)
diff --git a/src/openvpn/ovpn_d= co_win.h b/src/openvpn/ovpn_dco_win.h
index 865bb38..dd6b7c= e 100644
--- a/src/openvpn/ovpn_dco_win.h
+= ++ b/src/openvpn/ovpn_dco_win.h
@@ -149,7 +149,8 @@<= br>
typedef enum {
OVPN_CMD_DE= L_PEER,
- OVPN_CMD_S= WAP_KEYS
+ OVPN_CM= D_SWAP_KEYS,
+ OVP= N_CMD_FLOAT_PEER
} OVPN_NOTIFY_CMD;

typedef enum {
@@ -164,6 +165,7 @@
<= span> OVPN_NOTIFY_CMD Cmd;
int PeerId;
<= span> OVPN_DEL_PEER_REASON DelPeerReason;
+ struct sockaddr_storage FloatAddress;<= br> } OVPN_NOTIFY_EVENT, * POVPN_NOTIFY_EVENT;

typedef struct _OVPN_MP_DEL_PEER {

=

To view, visit change 1084. To unsubscribe, or for help writing mail f= ilters, visit settings.<= /p>

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I33e9272b4196c7634db2fb33a75= ae4261660867f
Gerrit-Change-Number: 1084
Gerrit-PatchSet: 4
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: cron2 <gert@...1296...>= ;
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
--E4LhAL+Z8Vk=--