From: "ralf_lici (Code Review)" Date: Thu, 17 Jul 2025 21:08:05 +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="CNvsjHhzl4A="; 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 --CNvsjHhzl4A= 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 (#5). 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, 150 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/84/1084/5 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..2ef9c2b0 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1243,6 +1243,42 @@ 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_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..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: 5 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 --CNvsjHhzl4A= 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 #5 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.

Change-Id: I33= e9272b4196c7634db2fb33a75ae4261660867f
Signed-off-by: Ralf Lici <ralf= @...2726...>
---
M src/openvpn/dco_linux.c
M src/openvpn/dco_li= nux.h
M src/openvpn/dco_win.c
M src/openvpn/dco_win.h
M src/openvp= n/forward.c
M src/openvpn/forward.h
M src/openvpn/multi.c
M src/op= envpn/multi.h
M src/openvpn/ovpn_dco_linux.h
M src/openvpn/ovpn_dco_w= in.h
10 files changed, 150 insertions(+), 2 deletions(-)

git p= ull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/84/1084/5d= iff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index 22a445a..f04ebfe 100644
--- a/src/openvpn/dco_linu= x.c
+++ b/src/openvpn/dco_linux.c
@@ -768,6= +768,44 @@
return ret;
}
<= span>
+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_FL= OAT_NTF message");
+ return false;
+ }
+<= br>+ if (attrs[OVPN_A_PEER_R= EMOTE_IPV4])
+ {
+ struct sockad= dr_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]
+ && nla_len(attrs[OVPN_A_P= EER_REMOTE_IPV6]) =3D=3D sizeof(struct in6_addr))
+ {
+ struct sockaddr_in6 *addr6 =3D (struct sockaddr_in6= *)out;
+ CLEA= R(*addr6);
+ a= ddr6->sin6_family =3D AF_INET6;
+ addr6->sin6_port =3D nla_get_u16(attrs[OVPN_A_PEE= R_REMOTE_PORT]);
+ = memcpy(&addr6->sin6_addr, nla_data(attrs[OVPN_A_PEER_REMOTE_IPV= 6]),
+ = sizeof(addr6->sin6_addr));
+ if (attrs[OVPN_A_PEER_REMOTE_IPV6_SCOPE_ID])
+ {

+ addr6->sin6_scope_id =3D n= la_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;
+}
<= span style=3D"color: hsl(120, 100%, 40%);">+

/* This funct= ion parses any netlink message sent by ovpn-dco to userspace */
<= span> static int
ovpn_handle_msg(struct nl_msg *msg, void = *arg)
@@ -856,6 +894,45 @@
bre= ak;
}

+ case OVPN_CMD_PEER_FLOAT_NTF:+ {
+ if (!attrs[OVPN_A_PEER])
+ {<= br>+ msg(D_DCO, = "ovpn-dco: no peer in PEER_FLOAT_NTF message");
+ return NL_STOP;
+ }
<= span style=3D"color: hsl(120, 100%, 40%);">+

+ struct nlattr *fp_attrs[OVPN_A_PEER_MA= X + 1];
+ = if (nla_parse_nested(fp_attrs, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER],<= br>+ = NULL))
+ = {
+ = msg(D_DCO, "ovpn-dco: can't parse peer in PEER_FLOAT_NTF messsa= ge");
+ = return NL_STOP;
+
+ if (!fp_at= trs[OVPN_A_PEER_ID])
= + {
+ = msg(D_DCO, "ovpn-dco: no peer-id in PEER_FLOAT_NTF message&= quot;);
+ = 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&quo= t;,
+ = ifindex, peerid, print_sockaddr((struct sockaddr *)&dco->dco_float_p= eer_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
ind= ex 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_P= EER_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_pe= er_id;
int dco_message_key_id;
in= t dco_del_peer_reason;
+ dco->dco_flo= at_peer_ss =3D dco->notif_buf.FloatAddress;
}
else
{
diff --git a/sr= c/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..2ef9c2b0 = 100644
--- a/src/openvpn/forward.c
+++ b/sr= c/openvpn/forward.c
@@ -1243,6 +1243,42 @@
= perf_pop();
}

+void
+extract_dco_float_peer_addr(const uint32_t peer_id,
+ = const sa_family_t socket_family,
+ struct openvpn_sockaddr *out_o= saddr,
+ = const struct sockaddr *float_sa)
+{
+ if (float_sa->sa_family =3D=3D AF_INET)
+ {
+ struct sockaddr_in *float4 =3D (struct socka= ddr_in *)float_sa;
+ = /* DCO treats IPv4-mapped IPv6 addresses as pure IPv4. However, on a=
+ * dual-sta= ck socket, we need to preserve the mapping otherwise openvpn
+ * will not be able to fin= d 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-&= gt;addr.in6.sin6_addr.s6_addr[11] =3D 0xff;
+ memcpy(&out_osaddr->addr.in6.sin= 6_addr.s6_addr[12],
+= &float4->sin_addr.s_addr, sizeof(in_addr_t));

+ }
+ else
+ {
+ memcpy(&out_osaddr->addr.in4, f= loat4, sizeof(struct sockaddr_in));
+ }
+ }
+ else=
+ {
+ struct sockaddr_in6 *floa= t6 =3D (struct sockaddr_in6 *)float_sa;
+ memcpy(&out_osaddr->addr.in6, float6, si= zeof(struct sockaddr_in6));
+ }
+}
+
static= void
process_incoming_dco(struct context *c)
{

diff --git a/src/openvpn/forward.h b/src/openvpn/for= ward.h
index 318691f..f835508 100644
--- a/= src/openvpn/forward.h
+++ b/src/openvpn/forward.h@@ -196,6 +196,22 @@
void process_incoming_link_par= t2(struct context *c, struct link_socket_info *lsi, const uint8_t *orig_buf= );

/**
+ * Transfers \c float_sa data extracted from an incom= ing DCO
+ * PEER_FLOA= T_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 dat= a
+ * @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 so= cket_family,
+ = struct openvpn_sockaddr *out_osaddr,
+ const str= uct 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 a7= 60e07..8cb8aee 100644
--- a/src/openvpn/multi.c
<= span>+++ b/src/openvpn/multi.c
@@ -3384,6 +3384,18 @@

{
process_incoming_del_pee= r(m, mi, dco);
}
+#if defined(TARGET_LINUX) || defined(TARGET_WIN32)
+ else if (dco-&= gt;dco_message_type =3D=3D OVPN_CMD_FLOAT_PEER)
+ {
+ ASSERT(mi->context.c2.link_sockets[0]);
+ extract_dc= o_float_peer_addr(peer_id,
+ mi->context.c2.link_socke= ts[0]->info.af,
+ = &m->top.c2.from.dest,<= br>+ = (struct sockaddr *)&dco->dco_float_peer_ss);
= + multi_process_floa= t(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_co= ntext structur.e
+ * = @param m - The single \c multi_context structure.
*

* @return
* - True, if the messa= ge was received correctly.
diff --git a/src/openvpn/ovpn_dc= o_linux.h b/src/openvpn/ovpn_dco_linux.h
index 680d152..b3c= 9ff0 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_w= in.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 C= md;
int PeerId;
OVPN_DEL_PEER_REA= SON DelPeerReason;
+ = struct sockaddr_storage FloatAddress;
} OVPN_NOTIFY_EVE= NT, * POVPN_NOTIFY_EVENT;

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: 5
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
--CNvsjHhzl4A=--