From: "ralf_lici (Code Review)" Date: Mon, 14 Jul 2025 09:45:28 +0000 References: Reply-To: ralf@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <5a3c524244bba267ed02f0cc01c9b22a2ab03760-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="mi4O9DtsKJk="; 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 Cc: openvpn-devel --mi4O9DtsKJk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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/+/1084?usp=3Demail to review the following change. 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, 154 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/84/1084/1 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..7a5dfc5 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1243,6 +1243,40 @@ perf_pop(); } +bool +extract_dco_float_peer_addr(const uint32_t peer_id, + 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, we= need + * to preserve the mapping, otherwise openvpn will not be able to = find + * the peer by its trasnport address. + */ + if (out_osaddr->addr.sa.sa_family =3D=3D AF_INET6 + && IN6_IS_ADDR_V4MAPPED(&out_osaddr->addr.in6.sin6_addr)) + { + 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)); + } + return true; + } + else if (float_sa->sa_family =3D=3D AF_INET6) + { + struct sockaddr_in6 *float6 =3D (struct sockaddr_in6 *)float_sa; + memcpy(&out_osaddr->addr.in6, float6, sizeof(struct sockaddr_in6)); + return true; + } + return false; +} + static void process_incoming_dco(struct context *c) { diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h index 318691f..32c8113 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 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 + * + * @return true if \c float_sa has a valid address family, false otherwise + */ +bool +extract_dco_float_peer_addr(uint32_t peer_id, 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..2375c48 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3384,6 +3384,24 @@ { 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) + { + if (extract_dco_float_peer_addr(peer_id, &m->top.c2.from.dest, + (struct sockaddr *)&dco->dco_f= loat_peer_ss)) + { + ASSERT(mi->context.c2.link_sockets[0]); + multi_process_float(m, mi, mi->context.c2.link_sockets[0]); + } + else + { + msg(D_DCO_DEBUG, "Received DCO float message with incorrec= t " + "address family %hu for peer-id %d", + dco->dco_float_peer_ss.ss_family, peer_id); + } + CLEAR(dco->dco_float_peer_ss); + } +#endif /* if defined(TARGET_LINUX) */ 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: 1 Gerrit-Owner: ralf_lici Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --mi4O9DtsKJk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

ralf_lici would like plaisthos and flichtenheld to review this change.

V= iew Change

dco: Add support for float notifications

When a peer = changes its UDP endpoint, the DCO module emits a
notification to userpac= e. The message is parsed and the relevant
information are extracted in o= rder to process the floating operation.

Note that we preserve IPv4-m= apped IPv6 addresses in userspace when
receiving a pure IPv4 address fro= m the module, otherwise openvpn
wouldn't be able to retrieve the mul= ti_instance using the transport
address hash table lookup.

Change= -Id: I33e9272b4196c7634db2fb33a75ae4261660867f
Signed-off-by: Ralf Lici = <ralf@...2726...>
---
M src/openvpn/dco_linux.c
M src/openvp= n/dco_linux.h
M src/openvpn/dco_win.c
M src/openvpn/dco_win.h
M sr= c/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/ov= pn_dco_win.h
10 files changed, 154 insertions(+), 2 deletions(-)

=
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/84/1084/1
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;
}

+stati= c bool
+ovpn_parse_fl= oat_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])
= + {
+ struc= t sockaddr_in *addr4 =3D (struct sockaddr_in *)out;
+ CLEAR(*addr4);
+ addr4->sin_family =3D AF_IN= ET;
+ addr4-&g= t;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]
+ && nla_len(att= rs[OVPN_A_PEER_REMOTE_IPV6]) =3D=3D sizeof(struct in6_addr))

+ {
+ struct sockaddr_in6 *addr6 =3D (struct s= ockaddr_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])
+ {
<= span style=3D"color: hsl(120, 100%, 40%);">+ addr6->sin6_scop= e_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_N= TF message");
+ = 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])
+ = {
+ m= sg(D_DCO, "ovpn-dco: no peer in PEER_FLOAT_NTF message");<= br>+ return NL_S= TOP;
+ }
+
+ struct nlattr *fp_attrs[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_FLOAT_NT= F message");
+ = return NL_STOP;
+ }
+ uint32_t peerid =3D nla_get_u32(fp_attrs[OVPN_A_PEER_ID]);<= /span>
+
+ if (!ovpn_parse_float_addr(= fp_attrs, (struct sockaddr *)&dco->dco_float_peer_ss))
+ {

+ return NL_STOP;<= br>+ }
+

+ struct gc_arena gc =3D gc_new();<= br>+ msg(D_DCO_DEBUG= ,
+ &q= uot;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;
<= span style=3D"color: hsl(120, 100%, 40%);">+ 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])
d= iff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h
index 4e441ec..676b8cd 100644
--- a/src/openvpn/dco_linu= x.h
+++ b/src/openvpn/dco_linux.h
@@ -34,6 = +34,7 @@
/* Defines to avoid mismatching with other platfo= rms */
#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_ke= y_slot dco_key_slot_t;
typedef enum ovpn_cipher_alg dco_ci= pher_t;
@@ -75,6 +76,7 @@
int dco_mess= age_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/d= co_win.c b/src/openvpn/dco_win.c
index 2a13658..83db739 100= 644
--- a/src/openvpn/dco_win.c
+++ b/src/o= penvpn/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.DelPeerReaso= n;
+ dco->d= co_float_peer_ss =3D dco->notif_buf.FloatAddress;
}=
else
{
diff --gi= t a/src/openvpn/dco_win.h b/src/openvpn/dco_win.h
index 451= 3f3f..b9d93fa 100644
--- a/src/openvpn/dco_win.h
= +++ b/src/openvpn/dco_win.h
@@ -52,6 +52,7 @@<= br> int dco_message_peer_id;
int dco_message= _type;
int dco_del_peer_reason;
+ struct sockaddr_storage dco_float_pee= r_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..7a= 5dfc5 100644
--- a/src/openvpn/forward.c
++= + b/src/openvpn/forward.c
@@ -1243,6 +1243,40 @@
= perf_pop();
}

+bool

+extract_dco_float_peer_addr(const uint32_t peer_id= ,
+ = struct openvpn_sockaddr *out_osaddr,
+ const struct sockadd= r *float_sa)
+{
+ if (float_sa->sa_f= amily =3D=3D AF_INET)
+ {
+ stru= ct sockaddr_in *float4 =3D (struct sockaddr_in *)float_sa;
+ /* DCO treats IPv4-mapped IP= v6 addresses as pure IPv4. However, we need
+ * to preserve the mapping, otherwise openv= pn will not be able to find
+ * the peer by its trasnport address.
+ */
+ if (out_osaddr->addr.sa.sa_family =3D= =3D AF_INET6
+ = && IN6_IS_ADDR_V4MAPPED(&out_osaddr->addr.in6.sin6_addr= ))
+ {<= br>+ 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, f= loat4, sizeof(struct sockaddr_in));
+ }
+ return true;
+ }
+ els= e if (float_sa->sa_family =3D=3D AF_INET6)
+ {
+ struct sockaddr_in6 *float6 =3D (struct sockaddr_in6 *)= float_sa;
+ me= mcpy(&out_osaddr->addr.in6, float6, sizeof(struct sockaddr_in6));

+ return true;
+ }
+ return false;

+}
+
static void
process_= incoming_dco(struct context *c)
{
diff --g= it a/src/openvpn/forward.h b/src/openvpn/forward.h
index 31= 8691f..32c8113 100644
--- a/src/openvpn/forward.h+++ b/src/openvpn/forward.h
@@ -196,6 +196,22 @@
void process_incoming_link_part2(struct context *c, struct li= nk_socket_info *lsi, const uint8_t *orig_buf);

= /**
+ * Transf= ers \c float_sa data extracted from an incoming DCO
+ * PEER_FLOAT_NTF to \c out_osaddr for la= ter processing.
+ *
+ * @param peer_id - T= he id of the floating peer.
+ * @param out_osaddr - openvpn_sockaddr struct that will be filled = the new
+ * addr= ess data
+ * @param f= loat_sa - The sockaddr struct containing the data received from the<= br>+ * DCO notification

+ *
+ * @return true if \c float_sa has a va= lid address family, false otherwise
+ */
+= bool
+extract_dco_flo= at_peer_addr(uint32_t peer_id, struct openvpn_sockaddr *out_osaddr,<= br>+ = const struct sockaddr *float_sa);
+
+/**<= /span>
* 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..2375c48 100644

--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -3384,6 +3384,2= 4 @@
{
process_incomi= ng_del_peer(m, mi, dco);
}
+#if defined(TARGET_LINUX) || defined(TARG= ET_WIN32)
+ el= se if (dco->dco_message_type =3D=3D OVPN_CMD_FLOAT_PEER)
+ {

+ if (extract_dco_float_peer_addr(p= eer_id, &m->top.c2.from.dest,
+ (struct sockad= dr *)&dco->dco_float_peer_ss))
+ {
+ ASSERT(mi->context.c2.link_sockets[0]);
+ multi_pr= ocess_float(m, mi, mi->context.c2.link_sockets[0]);
+ }
+ else
+ {
+ msg(D_DCO_DEBUG, "Received DCO flo= at message with incorrect "
+ "address family %hu for peer-id %d&qu= ot;,
+ = dco->dco_float_peer_ss.ss_family, peer_id);
+ }
+ CLEAR(dco->dco_float_peer_ss);
+ }
<= span style=3D"color: hsl(120, 100%, 40%);">+#endif /* if defined(TARGET_LIN= UX) */

else if (dco->dco_message_type =3D=3D OV= PN_CMD_SWAP_KEYS)
{
t= ls_session_soft_reset(mi->context.c2.tls_multi);
diff --= git a/src/openvpn/multi.h b/src/openvpn/multi.h
index 40f75= 19..fe9e847 100644
--- a/src/openvpn/multi.h
+++ b/src/openvpn/multi.h

@@ -322,7 +322,7 @@
<= span> /**

* 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 correc= tly.
diff --git a/src/openvpn/ovpn_dco_linux.h b/src/openvp= n/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_C= MD_KEY_SWAP,
OVPN_CMD_KEY_SWAP_NTF,
OVP= N_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/openvpn/ovpn_d= co_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_C= MD;

typedef enum {
@@ -1= 64,6 +165,7 @@
OVPN_NOTIFY_CMD Cmd;
= int PeerId;
OVPN_DEL_PEER_REASON DelPeerReason;
+ struct sockaddr_sto= rage FloatAddress;
} OVPN_NOTIFY_EVENT, * POVPN_NOTIFY_EVE= NT;

typedef struct _OVPN_MP_DEL_PEER {

To view, 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: 1
Gerrit-Owner: ralf_lici <ralf@...2726...>= ;
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--mi4O9DtsKJk=--