diff options
author | Thomas Haller <thaller@redhat.com> | 2019-04-02 17:44:07 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-04-04 09:56:19 +0200 |
commit | e90f4c31b0ed2605bcf8702c82f501040677892b (patch) | |
tree | 67656732d266a78cd03f778e8d7340593b7fdb2f | |
parent | b761064fd84510df2a6e454be6a4aa541a3d9855 (diff) | |
download | NetworkManager-e90f4c31b0ed2605bcf8702c82f501040677892b.tar.gz |
acd: return error code from nm_acd_manager_start_probe()
... and nm_acd_manager_announce_addresses().
The test will need more information to know why it may fail.
Return a NetworkManager error code, instead of a boolean.
-rw-r--r-- | src/devices/nm-acd-manager.c | 48 | ||||
-rw-r--r-- | src/devices/nm-acd-manager.h | 4 | ||||
-rw-r--r-- | src/devices/nm-device.c | 8 | ||||
-rw-r--r-- | src/devices/tests/test-acd.c | 4 |
4 files changed, 49 insertions, 15 deletions
diff --git a/src/devices/nm-acd-manager.c b/src/devices/nm-acd-manager.c index a8f7a63a14..f437ce3a84 100644 --- a/src/devices/nm-acd-manager.c +++ b/src/devices/nm-acd-manager.c @@ -113,6 +113,30 @@ acd_error_to_string (int error) g_return_val_if_reached (NULL); } +static int +acd_error_to_nmerr (int error, gboolean always_fail) +{ + if (error < 0) + return -nm_errno_native (error); + + if (always_fail) { + if (NM_IN_SET (error, N_ACD_E_PREEMPTED, + N_ACD_E_INVALID_ARGUMENT)) + return -NME_UNSPEC; + g_return_val_if_reached (-NME_UNSPEC); + } + + /* so, @error is either zero (indicating success) or one + * of the special status codes like N_ACD_E_*. In both cases, + * return the positive value here. */ + if (NM_IN_SET (error, _N_ACD_E_SUCCESS, + N_ACD_E_PREEMPTED, + N_ACD_E_INVALID_ARGUMENT)) + return error; + + g_return_val_if_reached (error); +} + /*****************************************************************************/ /** @@ -291,9 +315,9 @@ acd_init (NMAcdManager *self) * Start probing IP addresses for duplicates; when the probe terminates a * PROBE_TERMINATED signal is emitted. * - * Returns: %TRUE if at least one probe could be started, %FALSE otherwise + * Returns: 0 on success or a negative NetworkManager error code (NME_*). */ -gboolean +int nm_acd_manager_start_probe (NMAcdManager *self, guint timeout) { GHashTableIter iter; @@ -309,7 +333,7 @@ nm_acd_manager_start_probe (NMAcdManager *self, guint timeout) _LOGW ("couldn't init ACD for probing on interface '%s': %s", nm_platform_link_get_name (NM_PLATFORM_GET, self->ifindex), acd_error_to_string (r)); - return FALSE; + return acd_error_to_nmerr (r, TRUE); } self->completed = 0; @@ -325,7 +349,7 @@ nm_acd_manager_start_probe (NMAcdManager *self, guint timeout) self->channel = g_io_channel_unix_new (fd); self->event_id = g_io_add_watch (self->channel, G_IO_IN, acd_event, self); - return success; + return success ? 0 : -NME_UNSPEC; } /** @@ -357,20 +381,23 @@ nm_acd_manager_check_address (NMAcdManager *self, in_addr_t address) * @self: a #NMAcdManager * * Start announcing addresses. + * + * Returns: a negative NetworkManager error number or zero on success. */ -void +int nm_acd_manager_announce_addresses (NMAcdManager *self) { GHashTableIter iter; AddressInfo *info; int r; + gboolean success = TRUE; r = acd_init (self); if (r) { _LOGW ("couldn't init ACD for announcing addresses on interface '%s': %s", nm_platform_link_get_name (NM_PLATFORM_GET, self->ifindex), acd_error_to_string (r)); - return; + return acd_error_to_nmerr (r, TRUE); } if (self->state == STATE_INIT) { @@ -378,8 +405,10 @@ nm_acd_manager_announce_addresses (NMAcdManager *self) * start a fake probe with zero timeout and then perform * the announcement. */ g_hash_table_iter_init (&iter, self->addresses); - while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &info)) - acd_probe_add (self, info, 0); + while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &info)) { + if (!acd_probe_add (self, info, 0)) + success = FALSE; + } self->state = STATE_ANNOUNCING; } else if (self->state == STATE_ANNOUNCING) { char sbuf[NM_UTILS_INET_ADDRSTRLEN]; @@ -394,10 +423,13 @@ nm_acd_manager_announce_addresses (NMAcdManager *self) nm_utils_inet4_ntop (info->address, sbuf), nm_platform_link_get_name (NM_PLATFORM_GET, self->ifindex), acd_error_to_string (r)); + success = FALSE; } else _LOGD ("announcing address %s", nm_utils_inet4_ntop (info->address, sbuf)); } } + + return success ? 0 : -NME_UNSPEC; } static void diff --git a/src/devices/nm-acd-manager.h b/src/devices/nm-acd-manager.h index 8376ba48e3..08c0b798d0 100644 --- a/src/devices/nm-acd-manager.h +++ b/src/devices/nm-acd-manager.h @@ -36,9 +36,9 @@ NMAcdManager *nm_acd_manager_new (int ifindex, void nm_acd_manager_free (NMAcdManager *self); gboolean nm_acd_manager_add_address (NMAcdManager *self, in_addr_t address); -gboolean nm_acd_manager_start_probe (NMAcdManager *self, guint timeout); +int nm_acd_manager_start_probe (NMAcdManager *self, guint timeout); gboolean nm_acd_manager_check_address (NMAcdManager *self, in_addr_t address); -void nm_acd_manager_announce_addresses (NMAcdManager *self); +int nm_acd_manager_announce_addresses (NMAcdManager *self); NM_AUTO_DEFINE_FCN0 (NMAcdManager *, _nm_auto_free_acdmgr, nm_acd_manager_free); #define nm_auto_free_acdmgr nm_auto (_nm_auto_free_acdmgr) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 2618432d43..925c1b5252 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6843,7 +6843,8 @@ ipv4_dad_start (NMDevice *self, NMIP4Config **configs, AcdCallback cb) NMDedupMultiIter ipconf_iter; AcdData *data; guint timeout; - gboolean ret, addr_found; + gboolean addr_found; + int r; const guint8 *hwaddr_arr; size_t length; guint i; @@ -6897,9 +6898,8 @@ ipv4_dad_start (NMDevice *self, NMIP4Config **configs, AcdCallback cb) nm_acd_manager_add_address (acd_manager, address->address); } - ret = nm_acd_manager_start_probe (acd_manager, timeout); - - if (!ret) { + r = nm_acd_manager_start_probe (acd_manager, timeout); + if (r < 0) { _LOGW (LOGD_DEVICE, "acd probe failed"); /* DAD could not be started, signal success */ diff --git a/src/devices/tests/test-acd.c b/src/devices/tests/test-acd.c index aff71825e8..0f56a0effc 100644 --- a/src/devices/tests/test-acd.c +++ b/src/devices/tests/test-acd.c @@ -120,6 +120,7 @@ test_acd_common (test_fixture *fixture, TestInfo *info) .probe_terminated_callback = acd_manager_probe_terminated, .user_data_destroy = (GDestroyNotify) g_main_loop_unref, }; + int r; if (_skip_acd_test ()) return; @@ -148,7 +149,8 @@ again: 24, 0, 3600, 1800, 0, NULL); } - g_assert (nm_acd_manager_start_probe (manager, wait_time)); + r = nm_acd_manager_start_probe (manager, wait_time); + g_assert_cmpint (r, ==, 0); g_assert (nmtst_main_loop_run (loop, 2000)); g_main_loop_unref (loop); |