From: "cron2 (Code Review)" Date: Wed, 23 Jul 2025 16:16:47 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., antonio@...2726... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="f9LH3Gd+Yh4="; 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 --f9LH3Gd+Yh4= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#5) to the change originally created by= ordex. ( http://gerrit.openvpn.net/c/openvpn/+/1099?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 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 Acked-by: Gert Doering Message-Id: <20250723153224.13708-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 298.html Signed-off-by: Gert Doering --- 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/5 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: 5 Gerrit-Owner: ordex Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --f9LH3Gd+Yh4= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #5 to the change originally cr= eated by ordex.

View Change

The following approvals got outdated an= d were removed: Code-Review+2 by cron2

dco_linux: factor out netlink notification code
<= br>ovpn_handle_msg() is soon becoming the main entry point for parsing
*= all* incoming netlink messages. For this reason it is essential
that thi= s function is kept simple and slim.

Move all code parsing netlink mu= lticast notifications to their own
helpers and then invoke them.

= This patch does not introduce any functional change.
It is intended in p= reparation for extending ovpn_handle_msg() to
become a genering netlink = message parser.

Change-Id: I7bbc40b7b66f6e0512cd2cf9791766bcc4970461=
Signed-off-by: Antonio Quartulli <antonio@...2726...>
Acked-by= : Gert Doering <gert@...1296...>
Message-Id: <20250723153224.13= 708-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-deve= l@lists.sourceforge.net/msg32298.html
Signed-off-by: Gert Doering <ge= rt@...1296...>
---
M src/openvpn/dco_linux.c
1 file changed, 16= 1 insertions(+), 120 deletions(-)

git pull ssh://gerrit.openvpn.n=
et:29418/openvpn refs/changes/99/1099/5
diff --git a/src/openvpn/dc=
o_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 w= hich 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;
+ }
+
+ if (ifindex !=3D dco->if= index)
+ {<= br>+ 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;
+ }
+
+ struc= t nlattr *dp_attrs[OVPN_A_PEER_MAX + 1];
+ if (nla_parse_nested(dp_attrs, OVPN_A_PEER_MAX, at= trs[OVPN_A_PEER],
+ = NULL))
+ {
+ = msg(D_DCO, "ovpn-dco: can't parse peer in PEER_DEL_NTF messsag= e");
+ re= turn NL_STOP;
+ }<= /span>
+
+ if (!dp_attrs[OVPN_A_PEER_DEL_REASO= N])
+ {
= + 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_D= EL_NTF message");
+ }
+=
+ 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]);
+<= br>+ msg(D_DCO_DEBUG, "= ovpn-dco: received CMD_PEER_DEL_NTF, ifindex: %d, peer-id %u, reason: %d&qu= ot;,
+ dco->= ;ifindex, peerid, reason);
+ dco->dco_message_peer_id =3D peerid;
+ dco->dco_del_peer_reason =3D reason;<= /span>
+ dco->dco_mess= age_type =3D OVPN_CMD_PEER_DEL_NTF;
+
+ = return NL_OK;
+}

+
+static int
+ovpn_handle_peer_float_ntf(dco_context_t *dco, str= uct nlattr *attrs[])
= +{
+ if (!ovpn_ifa= ce_check(dco, attrs))
+ {
+ retu= rn 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;
+ }<= br>+
+ if (!fp_attrs[OVPN_A_PEER_ID])
<= span style=3D"color: hsl(120, 100%, 40%);">+ {
+ 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]);<= br>+
+ if (!ovpn_parse_float_addr(fp_attrs, (stru= ct sockaddr *)&dco->dco_float_peer_ss))
+ {
+ return NL_STOP;
+ }
+ struct gc_ar= ena gc =3D gc_new();
= + msg(D_DCO_DEBUG,
+ "ovpn-dco: received CMD_PEER_FLOAT_NTF, 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;<= br>+ dco->dco_message_typ= e =3D OVPN_CMD_PEER_FLOAT_NTF;
+
+ gc_f= ree(&gc);
+
+ return NL_OK;<= br>+}
+
+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 messa= ge");
+ r= eturn NL_STOP;
+ }=
+
+ struct nlattr *dp_attrs[OVPN_A_KEY= CONF_MAX + 1];
+ i= f (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_DC= O_DEBUG, "ovpn-dco: received CMD_KEY_SWAP_NTF, ifindex: %d, peer-id %u= , key-id: %d",
+= dco->ifindex, peer_id, key_id);
+ dco->dco_message_peer_id =3D peer_id;<= br>+ 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 t= o 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 i= nstances
- */
- if (!attrs[OVPN_A_IFIND= EX])
- {
<= span style=3D"color: hsl(0, 100%, 40%);">- msg(D_DCO, "ovpn-dco= : Received message without ifindex");

- return NL_STOP;
- }
-
- uint32_t i= findex =3D nla_get_u32(attrs[OVPN_A_IFINDEX]);
- if (ifindex !=3D dco->ifindex)
- {

- msg(D_DCO_DEBUG,
- "ovpn-dco: ignoring message (t= ype=3D%d) for foreign ifindex %d",
- gnlh->cmd, ifindex);
- return NL_STOP;
- }
-
/* based on the message type, we pa= rse the subobject contained in the
* message, that st= ores the type-specific attributes.
*
= @@ -1008,116 +1148,17 @@
{
ca= se OVPN_CMD_PEER_DEL_NTF:
{
- if (!attrs[OVPN_A_PEER])=
- {
- msg(D_DCO, "ovp= n-dco: no peer in PEER_DEL_NTF message");

- return NL_STOP;
- }
-
- struct nlattr *dp_attrs[OVPN_A_PEER_MAX + 1];
<= span style=3D"color: hsl(0, 100%, 40%);">- if (nla_parse_nested(= dp_attrs, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER],

- NULL))
= - {
- msg(D_DCO, "ovpn-dc= o: 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, "ov= pn-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 C= MD_PEER_DEL_NTF, ifindex: %d, peer-id %u, reason: %d",
- ifindex, peerid, reas= on);
- dco-&= gt;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 p= eer 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= 9;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_fl= oat_addr(fp_attrs, (struct sockaddr *)&dco->dco_float_peer_ss))
- {
- return NL_STOP;
- }
= -
- struct gc_arena gc =3D gc_new();- msg(D_DCO_DEBUG,
- "o= vpn-dco: received CMD_PEER_FLOAT_NTF, ifindex: %u, peer-id %u, address: %s&= quot;,
- = 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 O= VPN_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 n= lattr *dp_attrs[OVPN_A_KEYCONF_MAX + 1];
- if (nla_parse_nested(dp_attrs, OVPN_A_KEYCON= F_MAX,
- = attrs[OVPN_A_KEYCONF], NULL))
- {
- msg(D_DCO, "ovpn-dco: can't pars= e keyconf in KEY_SWAP_NTF message");
- return NL_STOP;
- }
- if (!dp_attrs[OVPN_A_KEYCONF_PEER_ID])<= /span>
- {- msg(D_DCO, &qu= ot;ovpn-dco: no peer-id in KEY_SWAP_NTF message");
- return NL_STOP;- }
- if (!dp_attrs[OVPN_A_KEYCON= F_KEY_ID])
- = {
- msg= (D_DCO, "ovpn-dco: no key-id in KEY_SWAP_NTF message");- return NL_STOP;=
- }<= br>-
- int key_id =3D nla_get_u16(dp_attrs[OV= PN_A_KEYCONF_KEY_ID]);
= - unsigned int peer_id =3D nla_get_u32(dp_attrs[OVPN_A_KEYCONF_P= EER_ID]);
-
<= span style=3D"color: hsl(0, 100%, 40%);">- msg(D_DCO_DEBUG, &quo= t;ovpn-dco: received CMD_KEY_SWAP_NTF, ifindex: %d, peer-id %u, key-id: %d&= quot;,

- = 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_n= tf(dco, attrs);
}

default:

To view, visit change 1099<= /a>. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I7bbc40b7b66f6e0512cd2cf9791= 766bcc4970461
Gerrit-Change-Number: 1099
Gerrit-PatchSet: 5
Gerrit-Owner: ordex <antonio@...2726...>=
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--f9LH3Gd+Yh4=--