From: "ordex (Code Review)" Date: Wed, 23 Jul 2025 12:48:52 +0000 In-Reply-To: References: Reply-To: antonio@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <487a3a89b9c8a67d248b4faf52562bd701d1b664-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="cpdrXtKqRtM="; charset=UTF-8 Subject: [Openvpn-devel] [L] Change in openvpn[master]: dco_linux: factor out netlink notification code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --cpdrXtKqRtM= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1099?usp=3Demail to look at the new patch set (#4). Change subject: dco_linux: factor out netlink notification code ...................................................................... dco_linux: factor out netlink notification code ovpn_handle_msg() is soon becoming the main entry point for parsing *all* incoming netlink messages. For this reason it is essential that this function is kept simple and slim. Move all code parsing netlink multicast notifications to their own helpers and then invoke them. This patch does not introduce any functional change. It is intended in preparation for extending ovpn_handle_msg() to become a genering netlink message parser. Change-Id: I7bbc40b7b66f6e0512cd2cf9791766bcc4970461 Signed-off-by: Antonio Quartulli --- M src/openvpn/dco_linux.c 1 file changed, 161 insertions(+), 120 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/99/1099/4 diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index ec6efaa..7c639d9 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -956,6 +956,164 @@ return NL_OK; } +static bool +ovpn_iface_check(dco_context_t *dco, struct nlattr *attrs[]) +{ + /* we must know which interface this message is referring to in order = to + * avoid mixing messages for other instances + */ + if (!attrs[OVPN_A_IFINDEX]) + { + msg(D_DCO, "ovpn-dco: Received message without ifindex"); + return false; + } + + uint32_t ifindex =3D nla_get_u32(attrs[OVPN_A_IFINDEX]); + if (ifindex !=3D dco->ifindex) + { + msg(D_DCO_DEBUG, + "ovpn-dco: ignoring message for foreign ifindex %d", ifindex); + return false; + } + + return true; +} + +static int +ovpn_handle_peer_del_ntf(dco_context_t *dco, struct nlattr *attrs[]) +{ + if (!ovpn_iface_check(dco, attrs)) + { + return NL_STOP; + } + + if (!attrs[OVPN_A_PEER]) + { + msg(D_DCO, "ovpn-dco: no peer in PEER_DEL_NTF message"); + return NL_STOP; + } + + struct nlattr *dp_attrs[OVPN_A_PEER_MAX + 1]; + if (nla_parse_nested(dp_attrs, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER], + NULL)) + { + msg(D_DCO, "ovpn-dco: can't parse peer in PEER_DEL_NTF messsage"); + return NL_STOP; + } + + if (!dp_attrs[OVPN_A_PEER_DEL_REASON]) + { + msg(D_DCO, "ovpn-dco: no reason in PEER_DEL_NTF message"); + return NL_STOP; + } + if (!dp_attrs[OVPN_A_PEER_ID]) + { + msg(D_DCO, "ovpn-dco: no peer-id in PEER_DEL_NTF message"); + return NL_STOP; + } + + int reason =3D nla_get_u32(dp_attrs[OVPN_A_PEER_DEL_REASON]); + unsigned int peerid =3D nla_get_u32(dp_attrs[OVPN_A_PEER_ID]); + + msg(D_DCO_DEBUG, "ovpn-dco: received CMD_PEER_DEL_NTF, ifindex: %d, pe= er-id %u, reason: %d", + dco->ifindex, peerid, reason); + dco->dco_message_peer_id =3D peerid; + dco->dco_del_peer_reason =3D reason; + dco->dco_message_type =3D OVPN_CMD_PEER_DEL_NTF; + + return NL_OK; +} + +static int +ovpn_handle_peer_float_ntf(dco_context_t *dco, struct nlattr *attrs[]) +{ + if (!ovpn_iface_check(dco, attrs)) + { + return NL_STOP; + } + + 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_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_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_floa= t_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, a= ddress: %s", + dco->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; + + gc_free(&gc); + + return NL_OK; +} + +static int +ovpn_handle_key_swap_ntf(dco_context_t *dco, struct nlattr *attrs[]) +{ + if (!ovpn_iface_check(dco, attrs)) + { + return NL_STOP; + } + + if (!attrs[OVPN_A_KEYCONF]) + { + msg(D_DCO, "ovpn-dco: no keyconf in KEY_SWAP_NTF message"); + return NL_STOP; + } + + struct nlattr *dp_attrs[OVPN_A_KEYCONF_MAX + 1]; + if (nla_parse_nested(dp_attrs, OVPN_A_KEYCONF_MAX, + attrs[OVPN_A_KEYCONF], NULL)) + { + msg(D_DCO, "ovpn-dco: can't parse keyconf in KEY_SWAP_NTF message"= ); + return NL_STOP; + } + if (!dp_attrs[OVPN_A_KEYCONF_PEER_ID]) + { + msg(D_DCO, "ovpn-dco: no peer-id in KEY_SWAP_NTF message"); + return NL_STOP; + } + if (!dp_attrs[OVPN_A_KEYCONF_KEY_ID]) + { + msg(D_DCO, "ovpn-dco: no key-id in KEY_SWAP_NTF message"); + return NL_STOP; + } + + int key_id =3D nla_get_u16(dp_attrs[OVPN_A_KEYCONF_KEY_ID]); + unsigned int peer_id =3D nla_get_u32(dp_attrs[OVPN_A_KEYCONF_PEER_ID]); + + msg(D_DCO_DEBUG, "ovpn-dco: received CMD_KEY_SWAP_NTF, ifindex: %d, pe= er-id %u, key-id: %d", + dco->ifindex, peer_id, key_id); + dco->dco_message_peer_id =3D peer_id; + dco->dco_message_key_id =3D key_id; + dco->dco_message_type =3D OVPN_CMD_KEY_SWAP_NTF; + + return NL_OK; +} + /* This function parses any netlink message sent by ovpn-dco to userspace = */ static int ovpn_handle_msg(struct nl_msg *msg, void *arg) @@ -979,24 +1137,6 @@ return NL_STOP; } - /* we must know which interface this message is referring to in order = to - * avoid mixing messages for other instances - */ - if (!attrs[OVPN_A_IFINDEX]) - { - msg(D_DCO, "ovpn-dco: Received message without ifindex"); - return NL_STOP; - } - - uint32_t ifindex =3D nla_get_u32(attrs[OVPN_A_IFINDEX]); - if (ifindex !=3D dco->ifindex) - { - msg(D_DCO_DEBUG, - "ovpn-dco: ignoring message (type=3D%d) for foreign ifindex %d= ", - gnlh->cmd, ifindex); - return NL_STOP; - } - /* based on the message type, we parse the subobject contained in the * message, that stores the type-specific attributes. * @@ -1008,116 +1148,17 @@ { case OVPN_CMD_PEER_DEL_NTF: { - if (!attrs[OVPN_A_PEER]) - { - msg(D_DCO, "ovpn-dco: no peer in PEER_DEL_NTF message"); - return NL_STOP; - } - - struct nlattr *dp_attrs[OVPN_A_PEER_MAX + 1]; - if (nla_parse_nested(dp_attrs, OVPN_A_PEER_MAX, attrs[OVPN_A_P= EER], - NULL)) - { - msg(D_DCO, "ovpn-dco: can't parse peer in PEER_DEL_NTF mes= ssage"); - return NL_STOP; - } - - if (!dp_attrs[OVPN_A_PEER_DEL_REASON]) - { - msg(D_DCO, "ovpn-dco: no reason in PEER_DEL_NTF message"); - return NL_STOP; - } - if (!dp_attrs[OVPN_A_PEER_ID]) - { - msg(D_DCO, "ovpn-dco: no peer-id in PEER_DEL_NTF message"); - return NL_STOP; - } - - int reason =3D nla_get_u32(dp_attrs[OVPN_A_PEER_DEL_REASON]); - unsigned int peerid =3D nla_get_u32(dp_attrs[OVPN_A_PEER_ID]); - - msg(D_DCO_DEBUG, "ovpn-dco: received CMD_PEER_DEL_NTF, ifindex= : %d, peer-id %u, reason: %d", - ifindex, peerid, reason); - dco->dco_message_peer_id =3D peerid; - dco->dco_del_peer_reason =3D reason; - dco->dco_message_type =3D OVPN_CMD_PEER_DEL_NTF; - break; + return ovpn_handle_peer_del_ntf(dco, attrs); } 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; + return ovpn_handle_peer_float_ntf(dco, attrs); } case OVPN_CMD_KEY_SWAP_NTF: { - if (!attrs[OVPN_A_KEYCONF]) - { - msg(D_DCO, "ovpn-dco: no keyconf in KEY_SWAP_NTF message"); - return NL_STOP; - } - - struct nlattr *dp_attrs[OVPN_A_KEYCONF_MAX + 1]; - if (nla_parse_nested(dp_attrs, OVPN_A_KEYCONF_MAX, - attrs[OVPN_A_KEYCONF], NULL)) - { - msg(D_DCO, "ovpn-dco: can't parse keyconf in KEY_SWAP_NTF = message"); - return NL_STOP; - } - if (!dp_attrs[OVPN_A_KEYCONF_PEER_ID]) - { - msg(D_DCO, "ovpn-dco: no peer-id in KEY_SWAP_NTF message"); - return NL_STOP; - } - if (!dp_attrs[OVPN_A_KEYCONF_KEY_ID]) - { - msg(D_DCO, "ovpn-dco: no key-id in KEY_SWAP_NTF message"); - return NL_STOP; - } - - int key_id =3D nla_get_u16(dp_attrs[OVPN_A_KEYCONF_KEY_ID]); - unsigned int peer_id =3D nla_get_u32(dp_attrs[OVPN_A_KEYCONF_P= EER_ID]); - - msg(D_DCO_DEBUG, "ovpn-dco: received CMD_KEY_SWAP_NTF, ifindex= : %d, peer-id %u, key-id: %d", - ifindex, peer_id, key_id); - dco->dco_message_peer_id =3D peer_id; - dco->dco_message_key_id =3D key_id; - dco->dco_message_type =3D OVPN_CMD_KEY_SWAP_NTF; - break; + return ovpn_handle_key_swap_ntf(dco, attrs); } default: -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1099?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: I7bbc40b7b66f6e0512cd2cf9791766bcc4970461 Gerrit-Change-Number: 1099 Gerrit-PatchSet: 4 Gerrit-Owner: ordex Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --cpdrXtKqRtM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

ordex uploaded patch set #4 to this change.

View Change

dco_linux: factor out netlink notification code

ovpn_handle_msg()= is soon becoming the main entry point for parsing
*all* incoming netlin= k messages. For this reason it is essential
that this function is kept s= imple and slim.

Move all code parsing netlink multicast notification= s to their own
helpers and then invoke them.

This patch does not = introduce any functional change.
It is intended in preparation for exten= ding ovpn_handle_msg() to
become a genering netlink message parser.
<= br>Change-Id: I7bbc40b7b66f6e0512cd2cf9791766bcc4970461
Signed-off-by: A= ntonio Quartulli <antonio@...2726...>
---
M src/openvpn/dco_lin= ux.c
1 file changed, 161 insertions(+), 120 deletions(-)

git p= ull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/99/1099/4d= iff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index ec6efaa..7c639d9 100644
--- a/src/openvpn/dco_linu= x.c
+++ b/src/openvpn/dco_linux.c
@@ -956,6= +956,164 @@
return NL_OK;
}
+static boo= l
+ovpn_iface_check(d= co_context_t *dco, struct nlattr *attrs[])
+{
+ /* we must know which interface this message is referring to in or= der to
+ * avoid = mixing messages for other instances
+ */
+ if (!attrs[OVPN_A_IFINDEX])
+ {
+ msg(D_DCO, "ovpn-dco: Received message without ifindex"= );
+ return fa= lse;
+ }+
+ uint32_t ifindex =3D nla_get_u32(attrs[OVPN_= A_IFINDEX]);
+ if = (ifindex !=3D dco->ifindex)
+ {
+ = msg(D_DCO_DEBUG,
+ "ovpn-dco: ignoring message for foreign ifindex %d"= , ifindex);
+ = return false;
+ }<= /span>
+
+ return true;
+}
+
+sta= tic int
+ovpn_handle_= peer_del_ntf(dco_context_t *dco, struct nlattr *attrs[])
+{
+ if (!ovpn_iface_check(dco, attrs))
+ {
+ return NL_STOP;
+ }
+
+ i= f (!attrs[OVPN_A_PEER])
+ {
+ ms= g(D_DCO, "ovpn-dco: no peer in PEER_DEL_NTF message");
= + return NL_STOP;=
+ }
+
+ struct nlattr *dp_attrs[OVPN_A_PEER_MAX + 1];+ if (nla_parse_nested(dp_a= ttrs, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER],
+ NULL))
+ {
+ msg(D_DCO, "ovpn-dco: can't parse pee= r in PEER_DEL_NTF messsage");
+ return NL_STOP;
+ }
+
+ if (!dp_at= trs[OVPN_A_PEER_DEL_REASON])
+ {
+ = msg(D_DCO, "ovpn-dco: no reason in PEER_DEL_NTF message");

+ return NL_STOP;=
+ }
+ if (!dp_attrs[OVPN_A_PEER_ID]= )
+ {
+ msg(D_DCO, "ovpn-dc= o: no peer-id in PEER_DEL_NTF message");
+ return NL_STOP;
+ }
+
+ = int reason =3D nla_get_u32(dp_attrs[OVPN_A_PEER_DEL_REASON]);
+ unsigned int peerid =3D nla_= get_u32(dp_attrs[OVPN_A_PEER_ID]);
+
+ = msg(D_DCO_DEBUG, "ovpn-dco: received CMD_PEER_DEL_NTF, ifindex: %d, pe= er-id %u, reason: %d",
+ dco->ifindex, peerid, reason);
+ dco->dco_message_peer_id =3D peerid;
+ dco->dco_del_p= eer_reason =3D reason;
+
+ return NL_OK;
+}
+=
+static int+ovpn_handle_peer_float_ntf(d= co_context_t *dco, struct nlattr *attrs[])
+{
+ if (!ovpn_iface_check(dco, attrs))
+ {
+ return NL_STOP;
+ }
+=
+ 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_PEER],
+ NULL))
+ {
+ msg(D_DCO, "ovpn-dco: can't parse peer in PEER_F= LOAT_NTF messsage");
+ return NL_STOP;
+ }
+

+ if (!fp_attrs[OVPN_= A_PEER_ID])
+ {
+ msg(D_DCO, &qu= ot;ovpn-dco: no peer-id in PEER_FLOAT_NTF message");
+ return NL_STOP;
+ }

+ uint32_t peerid =3D nla_get_u32(fp_attrs[OV= PN_A_PEER_ID]);
+
+ if (!ovpn_parse_flo= at_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_NT= F, ifindex: %u, peer-id %u, address: %s",
+ dco->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;
+
+ gc_free(&gc);
+
+ = return NL_OK;
+}
+
+static int
+ovpn_handle_key_swap_ntf(dco_context_t *dco, stru= ct nlattr *attrs[])
+= {
+ if (!ovpn_ifac= e_check(dco, attrs))
= + {
+ retur= n NL_STOP;
+ }
+
+ if (!attrs[OVPN_A_KEYCONF])+ {
+ msg(D_DCO, "ovpn-dco: no key= conf in KEY_SWAP_NTF message");
+ return NL_STOP;
+ }
+
+ struct n= lattr *dp_attrs[OVPN_A_KEYCONF_MAX + 1];
+ if (nla_parse_nested(dp_attrs, OVPN_A_KEYCONF_MAX,=
+ = attrs[OVPN_A_KEYCONF], NULL))
+ {
+ msg(D_DCO, "ovpn-dco: can't parse keyconf in KEY_SWAP_NT= F message");
+ = return NL_STOP;
+ }
+ if (!dp_= attrs[OVPN_A_KEYCONF_PEER_ID])
+ {
+ = msg(D_DCO, "ovpn-dco: no peer-id in KEY_SWAP_NTF message");<= /span>
+ return NL_ST= OP;
+ }
= + if (!dp_attrs[OVPN_A_KEYCO= NF_KEY_ID])
+ {
+ msg(D_DCO, &qu= ot;ovpn-dco: no key-id in KEY_SWAP_NTF message");
+ return NL_STOP;
+ }
+
+ int key_id =3D nla_get_u16(dp_attrs[OVPN_A_KEYCONF_KEY_ID]);
+ unsigned int peer_id= =3D nla_get_u32(dp_attrs[OVPN_A_KEYCONF_PEER_ID]);
+
+ msg(D_DCO_DEBUG, "ovpn-dco: received CMD_KEY_SWAP_N= TF, ifindex: %d, peer-id %u, key-id: %d",
+ dco->ifindex, peer_id, key_id);
+ dco->dco_message_p= eer_id =3D peer_id;
+= dco->dco_message_key_id =3D key_id;
+ dco->dco_message_type =3D OVPN_CMD_KEY_SWAP_N= TF;
+
+ return NL_OK;

+}
+
/* This function parses any netlink m= essage sent by ovpn-dco to userspace */
static int<= br> ovpn_handle_msg(struct nl_msg *msg, void *arg)
@@= -979,24 +1137,6 @@
return NL_STOP;
}


- /* we must know which interface this message is referring to in or= der to
- * avoid mi= xing messages for other instances
- */
- = if (!attrs[OVPN_A_IFINDEX])
- {
- = msg(D_DCO, "ovpn-dco: Received message without ifindex");<= br>- return NL_STOP;
- }
-
- uint32_t ifindex =3D nla_get_u32(attrs[OVPN_A_IFINDEX]);
- if (ifindex !=3D dco-= >ifindex)
- {
- msg(D_DCO_DEBUG,<= /span>
- "ovpn= -dco: ignoring message (type=3D%d) for foreign ifindex %d",
= - gnlh->cmd, ifinde= x);
- return NL_= STOP;
- }
= -
/* based o= n the message type, we parse the subobject contained in the
* message, that stores the type-specific attributes.

*

@@ -1008,116 +1148,17 @@
{
case OVPN_CMD_PEER_DEL_NTF:
= {
- if (!at= trs[OVPN_A_PEER])
- = {
- = msg(D_DCO, "ovpn-dco: no peer in PEER_DEL_NTF message");
- return NL_= STOP;
- }
-
- struct nlattr *dp_attrs[OVPN_A_= PEER_MAX + 1];
- = if (nla_parse_nested(dp_attrs, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER],
- = NULL))
- = {
- = msg(D_DCO, "ovpn-dco: can't parse peer in PEER_DEL_NTF messsage&= quot;);
- = return NL_STOP;
- = }
-
<= span style=3D"color: hsl(0, 100%, 40%);">- if (!dp_attrs[OVPN_A_= PEER_DEL_REASON])

- = {
- = msg(D_DCO, "ovpn-dco: no reason in PEER_DEL_NTF message");
- return N= L_STOP;
- }<= /span>
- if (!dp_at= trs[OVPN_A_PEER_ID])
- = {
- = msg(D_DCO, "ovpn-dco: no peer-id in PEER_DEL_NTF message")= ;
- retu= rn NL_STOP;
- = }
-
- int reason =3D nla_get_u32(= dp_attrs[OVPN_A_PEER_DEL_REASON]);
- unsigned int peerid =3D nla_get_u32(dp_attrs[OVPN_= A_PEER_ID]);
-- msg(D_DCO_DEBUG, &= quot;ovpn-dco: received CMD_PEER_DEL_NTF, ifindex: %d, peer-id %u, reason: = %d",
- = ifindex, peerid, reason);
- dco->dco_message_peer_id =3D peerid;
- dco->dco_del_peer_reas= on =3D reason;

- = dco->dco_message_type =3D OVPN_CMD_PEER_DEL_NTF;
- break;
+ return ovpn_handle_peer_del_n= tf(dco, attrs);
}

case OVPN_CMD_PEER_FLOAT_NTF:

{<= br>- if (!attrs[OVPN_A= _PEER])
- {<= /span>
- 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 (n= la_parse_nested(fp_attrs, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER],
- N= ULL))

- {
- msg(D_DC= O, "ovpn-dco: can't parse peer in PEER_FLOAT_NTF messsage");<= /span>
- return= NL_STOP;
- = }
-
- if (!fp_attrs[OVPN_A_PEER_ID]= )
- {=
- msg(D_DCO, &= quot;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->d= co_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, p= eer-id %u, address: %s",
- ifindex, peerid, print_sockaddr((struct sockaddr *)= &dco->dco_float_peer_ss, &gc));
- dco->dco_message_peer_id =3D (int)peeri= d;
- dco->= ;dco_message_type =3D OVPN_CMD_PEER_FLOAT_NTF;
-
- gc_free(&gc);
- break;
+ return ovpn_handle_peer_float_ntf(dco, attrs);
}

case OVPN_= CMD_KEY_SWAP_NTF:
{
- if (!attrs[OVPN_A_KEYCONF])
- {

- msg(D_DCO, "ovpn-dco:= no keyconf in KEY_SWAP_NTF message");
- return NL_STOP;
- }
-
- if (nla_parse_nested(= dp_attrs, OVPN_A_KEYCONF_MAX,
- attrs[OVPN_A_KEYCONF], NULL))
- {
- msg(D_DCO, "o= vpn-dco: can't parse keyconf in KEY_SWAP_NTF message");

= - return NL_STOP;<= /span>
- }- if (!dp_attrs[OVPN= _A_KEYCONF_PEER_ID])
- = {
- = msg(D_DCO, "ovpn-dco: no peer-id in KEY_SWAP_NTF message")= ;
- retu= rn NL_STOP;
- = }
- if (!d= p_attrs[OVPN_A_KEYCONF_KEY_ID])
- {
- msg(D_DCO, "ovpn-dco: no key-id in KEY_SWAP_NTF mess= age");
- = return NL_STOP;
-= }
-<= br>- int key_id =3D nl= a_get_u16(dp_attrs[OVPN_A_KEYCONF_KEY_ID]);
- unsigned int peer_id =3D nla_get_u32(dp_a= ttrs[OVPN_A_KEYCONF_PEER_ID]);
-
- = msg(D_DCO_DEBUG, "ovpn-dco: received CMD_KEY_SWAP_NTF, ifindex: %d, pe= er-id %u, key-id: %d",
- ifindex, peer_id, key_id);
- dco->dco_message_peer_id =3D peer= _id;
- dco-&= gt;dco_message_key_id =3D key_id;
- dco->dco_message_type =3D OVPN_CMD_KEY_SWAP_NTF;=
- break;
+ return ovp= n_handle_key_swap_ntf(dco, attrs);
}

default:

= To view, visit change 1099. To unsubscribe, or for help writing mail filters, v= isit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I7bbc40b7b66f6e0512cd2cf9791= 766bcc4970461
Gerrit-Change-Number: 1099
Gerrit-PatchSet: 4
Gerrit-Owner: ordex <antonio@...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: newpatchset
--cpdrXtKqRtM=--