fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-28 14:40:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

arping: slightly simplify logging

Browse source 
Don't return an error from nm_arping_manager_start_probe() since it is
currently useless and the arping-manager already prints the failure
reason. Also, drop a log print from add_address().
This commit is contained in:
Beniamino Galvani 2018-03-31 11:14:18 +02:00
parent 9f79ae685d
commit ac8618c78f
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/devices/nm-arping-manager.c
View file

@ -159,10 +159,8 @@ nm_arping_manager_add_address (NMArpingManager *self, in_addr_t address)
priv = NM_ARPING_MANAGER_GET_PRIVATE (self);
g_return_val_if_fail (priv->state == STATE_INIT, FALSE);
if (g_hash_table_lookup (priv->addresses, GUINT_TO_POINTER (address))) {
_LOGD ("address already exists");
if (g_hash_table_lookup (priv->addresses, GUINT_TO_POINTER (address)))
return FALSE;
}
info = g_slice_new0 (AddressInfo);
info->address = address;
@ -279,7 +277,7 @@ acd_probe_start (NMArpingManager *self,
* Returns: %TRUE if at least one probe could be started, %FALSE otherwise
*/
gboolean
nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **error)
nm_arping_manager_start_probe (NMArpingManager *self, guint timeout)
{
NMArpingManagerPrivate *priv;
GHashTableIter iter;
@ -288,8 +286,6 @@ nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **er
gboolean success = FALSE;
g_return_val_if_fail (NM_IS_ARPING_MANAGER (self), FALSE);
g_return_val_if_fail (!error || !*error, FALSE);
priv = NM_ARPING_MANAGER_GET_PRIVATE (self);
g_return_val_if_fail (priv->state == STATE_INIT, FALSE);
@ -301,9 +297,6 @@ nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **er
if (success)
priv->state = STATE_PROBING;
else
g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
"could not start probing");
return success;
}

2
src/devices/nm-arping-manager.h
View file

@ -35,7 +35,7 @@ GType nm_arping_manager_get_type (void);
NMArpingManager *nm_arping_manager_new (int ifindex, const guint8 *hwaddr, size_t hwaddr_len);
void nm_arping_manager_destroy (NMArpingManager *self);
gboolean nm_arping_manager_add_address (NMArpingManager *self, in_addr_t address);
gboolean nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **error);
gboolean nm_arping_manager_start_probe (NMArpingManager *self, guint timeout);
gboolean nm_arping_manager_check_address (NMArpingManager *self, in_addr_t address);
void nm_arping_manager_announce_addresses (NMArpingManager *self);
void nm_arping_manager_reset (NMArpingManager *self);

5
src/devices/nm-device.c
View file

@ -6126,7 +6126,6 @@ ipv4_dad_start (NMDevice *self, NMIP4Config **configs, ArpingCallback cb)
gboolean ret, addr_found;
const guint8 *hwaddr_arr;
size_t length;
GError *error = NULL;
guint i;
g_return_if_fail (NM_IS_DEVICE (self));
@ -6181,10 +6180,10 @@ ipv4_dad_start (NMDevice *self, NMIP4Config **configs, ArpingCallback cb)
G_CALLBACK (arping_manager_probe_terminated), data,
arping_data_destroy, 0);
ret = nm_arping_manager_start_probe (arping_manager, timeout, &error);
ret = nm_arping_manager_start_probe (arping_manager, timeout);
if (!ret) {
_LOGW (LOGD_DEVICE, "arping probe failed: %s", error->message);
_LOGW (LOGD_DEVICE, "arping probe failed");
/* DAD could not be started, signal success */
cb (self, configs, TRUE);

2
src/devices/tests/test-arping.c
View file

@ -97,7 +97,7 @@ again:
loop = g_main_loop_new (NULL, FALSE);
signal_id = g_signal_connect (manager, NM_ARPING_MANAGER_PROBE_TERMINATED,
G_CALLBACK (arping_manager_probe_terminated), loop);
g_assert (nm_arping_manager_start_probe (manager, wait_time, NULL));
g_assert (nm_arping_manager_start_probe (manager, wait_time));
g_assert (nmtst_main_loop_run (loop, 2000));
g_signal_handler_disconnect (manager, signal_id);
g_main_loop_unref (loop);