colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netlink: refactor error numbers from netlink

Browse Source 
Originally, these were error numbers from libnl3. These error numbers
are separate from errno, which is unfortunate, because sometimes we
care about the native errno returned from kernel.

Now, refactor them so that the error numbers are in the shared realm
of errno, but failures from kernel or underlying API are still returned
via their native errno.

- NLE_INVAL doesn't exist anymore. Passing invalid arguments to a function
  is commonly a bug. g_return_*(NLE_BUG) is the right answer to that.

- NLE_NOMEM and NLE_AGAIN is replaced by their errno counterparts.

- drop several error numbers. If nobody cares about these numbers,
  there is no reason to have a specific error number for them.
  NLE_UNSPEC is sufficient.
This commit is contained in:
Thomas Haller
2018-02-16 15:03:42 +01:00
parent f3a0f60e9a
commit b6f31a2d22
4 changed files with 119 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/platform/nm-linux-platform.c
View File

@@ -80,10 +80,6 @@ enum {
#define VLAN_FLAG_MVRP 0x8
/* nm-internal error codes for libnl. Make sure they don't overlap. */
#define _NLE_NM_NOBUFS 500
#define _NLE_MSG_TRUNC 501
/*****************************************************************************/
#define IFQDISCSIZ 32
@@ -6496,19 +6492,19 @@ continue_reading:
if (!handle_events)
goto continue_reading;
}
n = -_NLE_MSG_TRUNC;
n = -NLE_USER_MSG_TRUNC;
break;
}
case -ENOBUFS:
n = -_NLE_NM_NOBUFS;
n = -NLE_USER_NOBUFS;
break;
case -NLE_NOMEM:
case -ENOMEM:
if (errno == ENOBUFS) {
/* we are very much interested in a overrun of the receive buffer.
* nl_recv() maps all kinds of errors to NLE_NOMEM, so check also
* nl_recv() maps all kinds of errors to ENOMEM, so check also
* for errno explicitly. And if so, hack our own return code to signal
* the overrun. */
n = -_NLE_NM_NOBUFS;
n = -NLE_USER_NOBUFS;
}
break;
}
@@ -6526,7 +6522,7 @@ continue_reading:
msg = nlmsg_convert (hdr);
if (!msg) {
err = -NLE_NOMEM;
err = -ENOMEM;
goto out;
}
@@ -6686,19 +6682,19 @@ event_handler_read_netlink (NMPlatform *platform, gboolean wait_for_acks)
if (nle < 0) {
switch (nle) {
case -NLE_AGAIN:
case -EAGAIN:
goto after_read;
case -NLE_DUMP_INTR:
_LOGD ("netlink: read: uncritical failure to retrieve incoming events: %s (%d)", nl_geterror (nle), nle);
break;
case -_NLE_MSG_TRUNC:
case -_NLE_NM_NOBUFS:
case -NLE_USER_MSG_TRUNC:
case -NLE_USER_NOBUFS:
_LOGI ("netlink: read: %s. Need to resynchronize platform cache",
({
const char *_reason = "unknown";
switch (nle) {
case -_NLE_MSG_TRUNC: _reason = "message truncated"; break;
case -_NLE_NM_NOBUFS: _reason = "too many netlink events"; break;
case -NLE_USER_MSG_TRUNC: _reason = "message truncated"; break;
case -NLE_USER_NOBUFS: _reason = "too many netlink events"; break;
}
_reason;
}));