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/+/1096?usp=email
to review the following change.
Change subject: dco_linux: use M_FATAL instead of M_ERR in netlink error code
paths
......................................................................
dco_linux: use M_FATAL instead of M_ERR in netlink error code paths
Netlink code doesn't set errno upon error (with the exception of
any *alloc() function which probably inherits the errno=ENOMEM
from the underlying malloc call), therefore we should not print
error messages with M_ERR, but rather rely on M_FATAL.
M_ERR is equivalent to M_FATAL with the addition of appending
": $errno" to the error string.
Since errno is not meaningful in this context, we can just opt
for the less confusing M_FATAL.
Change-Id: Ifc442b4426c02de7282d0f69629e8a10b679c589
Signed-off-by: Antonio Quartulli <anto...@mandelbit.com>
---
M src/openvpn/dco_linux.c
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/1096/1
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index 58051f5..13506a1 100644
--- a/src/openvpn/dco_linux.c
+++ b/src/openvpn/dco_linux.c
@@ -114,7 +114,7 @@
struct nl_msg *nl_msg = nlmsg_alloc();
if (!nl_msg)
{
- msg(M_ERR, "cannot allocate netlink message");
+ msg(M_FATAL, "cannot allocate netlink message");
return NULL;
}
@@ -140,7 +140,7 @@
break;
case -NLE_NOMEM:
- msg(M_ERR, "%s: netlink out of memory error", prefix);
+ msg(M_FATAL, "%s: netlink out of memory error", prefix);
break;
case -NLE_AGAIN:
@@ -148,7 +148,7 @@
break;
case -NLE_NODEV:
- msg(M_ERR, "%s: netlink reports device not found:", prefix);
+ msg(M_FATAL, "%s: netlink reports device not found:", prefix);
break;
case -NLE_OBJ_NOTFOUND:
@@ -387,19 +387,19 @@
static void
ovpn_dco_init_netlink(dco_context_t *dco)
{
- dco->ovpn_dco_id = resolve_ovpn_netlink_id(M_ERR);
+ dco->ovpn_dco_id = resolve_ovpn_netlink_id(M_FATAL);
dco->nl_sock = nl_socket_alloc();
if (!dco->nl_sock)
{
- msg(M_ERR, "Cannot create netlink socket");
+ msg(M_FATAL, "Cannot create netlink socket");
}
int ret = genl_connect(dco->nl_sock);
if (ret)
{
- msg(M_ERR, "Cannot connect to generic netlink: %s",
+ msg(M_FATAL, "Cannot connect to generic netlink: %s",
nl_geterror(ret));
}
@@ -415,7 +415,7 @@
dco->nl_cb = nl_cb_alloc(NL_CB_DEFAULT);
if (!dco->nl_cb)
{
- msg(M_ERR, "failed to allocate netlink callback");
+ msg(M_FATAL, "failed to allocate netlink callback");
}
nl_socket_set_cb(dco->nl_sock, dco->nl_cb);
@@ -484,7 +484,7 @@
if (dco->ovpn_dco_mcast_id < 0)
{
- msg(M_ERR, "cannot get mcast group: %s",
nl_geterror(dco->ovpn_dco_mcast_id));
+ msg(M_FATAL, "cannot get mcast group: %s",
nl_geterror(dco->ovpn_dco_mcast_id));
}
/* Register for ovpn-dco specific multicast messages that the kernel may
@@ -493,7 +493,7 @@
int ret = nl_socket_add_membership(dco->nl_sock, dco->ovpn_dco_mcast_id);
if (ret)
{
- msg(M_ERR, "%s: failed to join groups: %d", __func__, ret);
+ msg(M_FATAL, "%s: failed to join groups: %d", __func__, ret);
}
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1096?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ifc442b4426c02de7282d0f69629e8a10b679c589
Gerrit-Change-Number: 1096
Gerrit-PatchSet: 1
Gerrit-Owner: ordex <anto...@mandelbit.com>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
