diff options
author | Thomas Haller <thaller@redhat.com> | 2019-04-04 10:02:03 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-04-04 10:02:03 +0200 |
commit | 899220485ed7292e622b3181d529fce8314e9d90 (patch) | |
tree | e526fe45dab137265efe6745c200c8892b9e387c | |
parent | 917cd3eb0388d872119667f119b90f3927844d50 (diff) | |
parent | dfc4e47cd2fb92c5e449cefeffb72ce7c6bd9d3d (diff) | |
download | NetworkManager-899220485ed7292e622b3181d529fce8314e9d90.tar.gz |
acd: merge branch 'th/gitlab-ci-fixes'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/103
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 1 | ||||
-rw-r--r-- | shared/c-rbtree/src/c-rbtree.c | 1 | ||||
-rw-r--r-- | shared/n-acd/src/n-acd-probe.c | 1 | ||||
-rw-r--r-- | shared/n-acd/src/util/timer.c | 2 | ||||
-rw-r--r-- | shared/nm-utils/nm-macros-internal.h | 3 | ||||
-rw-r--r-- | src/devices/nm-acd-manager.c | 48 | ||||
-rw-r--r-- | src/devices/nm-acd-manager.h | 7 | ||||
-rw-r--r-- | src/devices/nm-device.c | 8 | ||||
-rw-r--r-- | src/devices/tests/test-acd.c | 26 |
10 files changed, 72 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 207c992552..887ac2db44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,8 @@ stages: .fedora_script: &fedora_script stage: test script: + - date '+%Y%m%d-%H%M%S'; uname -a + - date '+%Y%m%d-%H%M%S'; dnf list --installed - date '+%Y%m%d-%H%M%S'; git clean -fdx ; CI=gitlab BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh - date '+%Y%m%d-%H%M%S'; rm -rf /tmp/nm-docs-html; mv build/INST/share/gtk-doc/html /tmp/nm-docs-html - date '+%Y%m%d-%H%M%S'; git clean -fdx ; CI=gitlab BUILD_TYPE=meson CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index e3293bb7c1..d68f08a89f 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -475,6 +475,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment. %build %if %{with meson} %meson \ + -Db_ndebug=false \ --warnlevel 2 \ %if %{with test} --werror \ diff --git a/shared/c-rbtree/src/c-rbtree.c b/shared/c-rbtree/src/c-rbtree.c index f58db849b6..31d743002b 100644 --- a/shared/c-rbtree/src/c-rbtree.c +++ b/shared/c-rbtree/src/c-rbtree.c @@ -460,6 +460,7 @@ _public_ void c_rbtree_move(CRBTree *to, CRBTree *from) { if (from->root) { t = c_rbnode_pop_root(from->root); assert(t == from); + (void)t; to->root = from->root; from->root = NULL; diff --git a/shared/n-acd/src/n-acd-probe.c b/shared/n-acd/src/n-acd-probe.c index 8c233b56a7..d4da0fd5c7 100644 --- a/shared/n-acd/src/n-acd-probe.c +++ b/shared/n-acd/src/n-acd-probe.c @@ -215,6 +215,7 @@ static void n_acd_probe_unlink(NAcdProbe *probe) { if (n_acd_probe_is_unique(probe)) { r = n_acd_bpf_map_remove(probe->acd->fd_bpf_map, &probe->ip); assert(r >= 0); + (void)r; --probe->acd->n_bpf_map; } c_rbnode_unlink(&probe->ip_node); diff --git a/shared/n-acd/src/util/timer.c b/shared/n-acd/src/util/timer.c index 29627af776..07dbf34eb8 100644 --- a/shared/n-acd/src/util/timer.c +++ b/shared/n-acd/src/util/timer.c @@ -44,6 +44,7 @@ void timer_now(Timer *timer, uint64_t *nowp) { r = clock_gettime(timer->clock, &ts); assert(r >= 0); + (void)r; *nowp = ts.tv_sec * UINT64_C(1000000000) + ts.tv_nsec; } @@ -74,6 +75,7 @@ void timer_rearm(Timer *timer) { }, NULL); assert(r >= 0); + (void)r; timer->scheduled_timeout = time; } diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h index 2f4fd86de7..245bb1d8af 100644 --- a/shared/nm-utils/nm-macros-internal.h +++ b/shared/nm-utils/nm-macros-internal.h @@ -323,6 +323,9 @@ _nm_auto_protect_errno (int *p_saved_errno) NM_AUTO_DEFINE_FCN0 (GSource *, _nm_auto_unref_gsource, g_source_unref); #define nm_auto_unref_gsource nm_auto(_nm_auto_unref_gsource) +NM_AUTO_DEFINE_FCN0 (GMainLoop *, _nm_auto_unref_gmainloop, g_main_loop_unref); +#define nm_auto_unref_gmainloop nm_auto(_nm_auto_unref_gmainloop) + static inline void _nm_auto_freev (gpointer ptr) { 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 758848460a..08c0b798d0 100644 --- a/src/devices/nm-acd-manager.h +++ b/src/devices/nm-acd-manager.h @@ -36,8 +36,11 @@ 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) #endif /* __NM_ACD_MANAGER__ */ 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..8b52ee2c18 100644 --- a/src/devices/tests/test-acd.c +++ b/src/devices/tests/test-acd.c @@ -111,8 +111,8 @@ acd_manager_probe_terminated (NMAcdManager *acd_manager, gpointer user_data) static void test_acd_common (test_fixture *fixture, TestInfo *info) { - NMAcdManager *manager; - GMainLoop *loop; + nm_auto_free_acdmgr NMAcdManager *manager = NULL; + nm_auto_unref_gmainloop GMainLoop *loop = NULL; int i; const guint WAIT_TIME_OPTIMISTIC = 50; guint wait_time; @@ -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; @@ -131,8 +132,10 @@ test_acd_common (test_fixture *fixture, TestInfo *info) wait_time = WAIT_TIME_OPTIMISTIC; again: + nm_clear_pointer (&loop, g_main_loop_unref); loop = g_main_loop_new (NULL, FALSE); + nm_clear_pointer (&manager, nm_acd_manager_free); manager = nm_acd_manager_new (fixture->ifindex0, fixture->hwaddr0, fixture->hwaddr0_len, @@ -148,9 +151,10 @@ 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); for (i = 0; info->addresses[i]; i++) { gboolean val; @@ -164,7 +168,6 @@ again: /* probably we just had a glitch and the system took longer than * expected. Re-verify with a large timeout this time. */ wait_time = 1000; - nm_clear_pointer (&manager, nm_acd_manager_free); goto again; } @@ -172,8 +175,6 @@ again: i, nm_utils_inet4_ntop (info->addresses[i], sbuf), info->expected_result[i] ? "detect no duplicated" : "detect a duplicate"); } - - nm_acd_manager_free (manager); } static void @@ -199,8 +200,9 @@ test_acd_probe_2 (test_fixture *fixture, gconstpointer user_data) static void test_acd_announce (test_fixture *fixture, gconstpointer user_data) { - NMAcdManager *manager; - GMainLoop *loop; + nm_auto_free_acdmgr NMAcdManager *manager = NULL; + nm_auto_unref_gmainloop GMainLoop *loop = NULL; + int r; if (_skip_acd_test ()) return; @@ -216,11 +218,9 @@ test_acd_announce (test_fixture *fixture, gconstpointer user_data) g_assert (nm_acd_manager_add_address (manager, ADDR2)); loop = g_main_loop_new (NULL, FALSE); - nm_acd_manager_announce_addresses (manager); + r = nm_acd_manager_announce_addresses (manager); + g_assert_cmpint (r, ==, 0); g_assert (!nmtst_main_loop_run (loop, 200)); - g_main_loop_unref (loop); - - nm_acd_manager_free (manager); } static void |