mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-06 16:21:50 +00:00
acd: adapt NM code and build options
Adapt the nm-acd-manager.c code to the new API and also tweak build options to the new project structure.
This commit is contained in:
parent
88072c6621
commit
d9a4b59c18
12
Makefile.am
12
Makefile.am
|
@ -1365,18 +1365,26 @@ shared_libcrbtree_la_SOURCES = \
|
|||
|
||||
noinst_LTLIBRARIES += shared/libnacd.la
|
||||
|
||||
shared_libnacd_la_CFLAGS = -std=gnu99
|
||||
shared_libnacd_la_CFLAGS = $(AM_CFLAGS) -std=c11 -Wno-pointer-arith -Wno-vla
|
||||
shared_libnacd_la_LIBADD = shared/libcrbtree.la
|
||||
|
||||
shared_libnacd_la_CPPFLAGS = \
|
||||
-D_GNU_SOURCE \
|
||||
$(CODE_COVERAGE_CFLAGS) \
|
||||
$(SANITIZER_LIB_CFLAGS) \
|
||||
-I$(srcdir)/shared/c-list/src \
|
||||
-I$(srcdir)/shared/c-siphash/src \
|
||||
-I$(srcdir)/shared/c-rbtree/src \
|
||||
$(NULL)
|
||||
|
||||
shared_libnacd_la_SOURCES = \
|
||||
shared/n-acd/src/n-acd.c \
|
||||
shared/n-acd/src/n-acd.h
|
||||
shared/n-acd/src/n-acd.h \
|
||||
shared/n-acd/src/n-acd-bpf.c \
|
||||
shared/n-acd/src/n-acd-private.h \
|
||||
shared/n-acd/src/n-acd-probe.c \
|
||||
shared/n-acd/src/util/timer.c \
|
||||
shared/n-acd/src/util/timer.h
|
||||
|
||||
EXTRA_DIST += shared/c-list/src/c-list.h
|
||||
|
||||
|
|
|
@ -25,12 +25,28 @@ shared_c_rbtree_dep = declare_dependency(
|
|||
|
||||
shared_n_acd = static_library(
|
||||
'n-acd',
|
||||
sources: 'n-acd/src/n-acd.c',
|
||||
sources: files('n-acd/src/n-acd.c',
|
||||
'n-acd/src/n-acd.h',
|
||||
'n-acd/src/n-acd-bpf.c',
|
||||
'n-acd/src/n-acd-private.h',
|
||||
'n-acd/src/n-acd-probe.c',
|
||||
'n-acd/src/util/timer.c',
|
||||
'n-acd/src/util/timer.h'),
|
||||
c_args: [
|
||||
'-D_GNU_SOURCE',
|
||||
'-std=c11',
|
||||
'-Wno-pointer-arith',
|
||||
'-Wno-vla',
|
||||
],
|
||||
include_directories: [
|
||||
include_directories('c-siphash/src'),
|
||||
include_directories('c-list/src'),
|
||||
include_directories('c-rbtree/src'),
|
||||
],
|
||||
dependencies: [
|
||||
shared_c_siphash_dep,
|
||||
shared_c_rbtree_dep
|
||||
],
|
||||
dependencies: shared_c_siphash_dep,
|
||||
)
|
||||
|
||||
shared_n_acd_dep = declare_dependency(
|
||||
|
|
|
@ -39,10 +39,7 @@ typedef enum {
|
|||
typedef struct {
|
||||
in_addr_t address;
|
||||
gboolean duplicate;
|
||||
NMAcdManager *manager;
|
||||
NAcd *acd;
|
||||
GIOChannel *channel;
|
||||
guint event_id;
|
||||
NAcdProbe *probe;
|
||||
} AddressInfo;
|
||||
|
||||
enum {
|
||||
|
@ -58,6 +55,9 @@ typedef struct {
|
|||
State state;
|
||||
GHashTable *addresses;
|
||||
guint completed;
|
||||
NAcd *acd;
|
||||
GIOChannel *channel;
|
||||
guint event_id;
|
||||
} NMAcdManagerPrivate;
|
||||
|
||||
struct _NMAcdManager {
|
||||
|
@ -114,29 +114,22 @@ _acd_event_to_string (unsigned int event)
|
|||
#define acd_event_to_string(event) NM_UTILS_LOOKUP_STR (_acd_event_to_string, event)
|
||||
|
||||
static const char *
|
||||
_acd_error_to_string (int error)
|
||||
acd_error_to_string (int error)
|
||||
{
|
||||
if (error < 0)
|
||||
return strerror(-error);
|
||||
return g_strerror (-error);
|
||||
|
||||
switch (error) {
|
||||
case _N_ACD_E_SUCCESS:
|
||||
return "success";
|
||||
case N_ACD_E_DONE:
|
||||
return "no more events (engine running)";
|
||||
case N_ACD_E_STOPPED:
|
||||
return "no more events (engine stopped)";
|
||||
case N_ACD_E_PREEMPTED:
|
||||
return "preempted";
|
||||
case N_ACD_E_INVALID_ARGUMENT:
|
||||
return "invalid argument";
|
||||
case N_ACD_E_BUSY:
|
||||
return "busy";
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#define acd_error_to_string(error) NM_UTILS_LOOKUP_STR (_acd_error_to_string, error)
|
||||
g_return_val_if_reached (NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
@ -164,7 +157,6 @@ nm_acd_manager_add_address (NMAcdManager *self, in_addr_t address)
|
|||
|
||||
info = g_slice_new0 (AddressInfo);
|
||||
info->address = address;
|
||||
info->manager = self;
|
||||
|
||||
g_hash_table_insert (priv->addresses, GUINT_TO_POINTER (address), info);
|
||||
|
||||
|
@ -174,23 +166,25 @@ nm_acd_manager_add_address (NMAcdManager *self, in_addr_t address)
|
|||
static gboolean
|
||||
acd_event (GIOChannel *source, GIOCondition condition, gpointer data)
|
||||
{
|
||||
AddressInfo *info = data;
|
||||
NMAcdManager *self = info->manager;
|
||||
NMAcdManager *self = data;
|
||||
NMAcdManagerPrivate *priv = NM_ACD_MANAGER_GET_PRIVATE (self);
|
||||
NAcdEvent *event;
|
||||
AddressInfo *info;
|
||||
char address_str[INET_ADDRSTRLEN];
|
||||
gs_free char *hwaddr_str = NULL;
|
||||
int r;
|
||||
|
||||
if ( n_acd_dispatch (info->acd)
|
||||
|| n_acd_pop_event (info->acd, &event))
|
||||
if (n_acd_dispatch (priv->acd))
|
||||
return G_SOURCE_CONTINUE;
|
||||
|
||||
while (!n_acd_pop_event (priv->acd, &event) && event) {
|
||||
switch (event->event) {
|
||||
case N_ACD_EVENT_READY:
|
||||
n_acd_probe_get_userdata (event->ready.probe, (void **) &info);
|
||||
info->duplicate = FALSE;
|
||||
if (priv->state == STATE_ANNOUNCING) {
|
||||
r = n_acd_announce (info->acd, N_ACD_DEFEND_ONCE);
|
||||
/* fake probe ended, start announcing */
|
||||
r = n_acd_probe_announce (info->probe, N_ACD_DEFEND_ONCE);
|
||||
if (r) {
|
||||
_LOGW ("couldn't announce address %s on interface '%s': %s",
|
||||
nm_utils_inet4_ntop (info->address, address_str),
|
||||
|
@ -203,25 +197,26 @@ acd_event (GIOChannel *source, GIOCondition condition, gpointer data)
|
|||
}
|
||||
break;
|
||||
case N_ACD_EVENT_USED:
|
||||
n_acd_probe_get_userdata (event->used.probe, (void **) &info);
|
||||
info->duplicate = TRUE;
|
||||
break;
|
||||
case N_ACD_EVENT_DEFENDED:
|
||||
n_acd_probe_get_userdata (event->defended.probe, (void **) &info);
|
||||
_LOGD ("defended address %s from host %s",
|
||||
nm_utils_inet4_ntop (info->address, address_str),
|
||||
(hwaddr_str = nm_utils_hwaddr_ntoa (event->defended.sender,
|
||||
event->defended.n_sender)));
|
||||
break;
|
||||
return G_SOURCE_CONTINUE;
|
||||
case N_ACD_EVENT_CONFLICT:
|
||||
n_acd_probe_get_userdata (event->conflict.probe, (void **) &info);
|
||||
_LOGW ("conflict for address %s detected with host %s on interface '%s'",
|
||||
nm_utils_inet4_ntop (info->address, address_str),
|
||||
(hwaddr_str = nm_utils_hwaddr_ntoa (event->defended.sender,
|
||||
event->defended.n_sender)),
|
||||
nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex));
|
||||
break;
|
||||
return G_SOURCE_CONTINUE;
|
||||
default:
|
||||
_LOGD ("event '%s' for address %s",
|
||||
acd_event_to_string (event->event),
|
||||
nm_utils_inet4_ntop (info->address, address_str));
|
||||
_LOGD ("unhandled event '%s'", acd_event_to_string (event->event));
|
||||
return G_SOURCE_CONTINUE;
|
||||
}
|
||||
|
||||
|
@ -230,59 +225,71 @@ acd_event (GIOChannel *source, GIOCondition condition, gpointer data)
|
|||
priv->state = STATE_PROBE_DONE;
|
||||
g_signal_emit (self, signals[PROBE_TERMINATED], 0);
|
||||
}
|
||||
}
|
||||
|
||||
return G_SOURCE_CONTINUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
acd_probe_start (NMAcdManager *self,
|
||||
acd_probe_add (NMAcdManager *self,
|
||||
AddressInfo *info,
|
||||
guint64 timeout)
|
||||
{
|
||||
NMAcdManagerPrivate *priv = NM_ACD_MANAGER_GET_PRIVATE (self);
|
||||
NAcdConfig *config;
|
||||
int r, fd;
|
||||
NAcdProbeConfig *probe_config;
|
||||
int r;
|
||||
|
||||
r = n_acd_new (&info->acd);
|
||||
r = n_acd_probe_config_new (&probe_config);
|
||||
if (r) {
|
||||
_LOGW ("could not create ACD for %s on interface '%s': %s",
|
||||
_LOGW ("could not create probe config for %s on interface '%s': %s",
|
||||
nm_utils_inet4_ntop (info->address, NULL),
|
||||
nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex),
|
||||
acd_error_to_string (r));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
n_acd_get_fd (info->acd, &fd);
|
||||
info->channel = g_io_channel_unix_new (fd);
|
||||
info->event_id = g_io_add_watch (info->channel, G_IO_IN, acd_event, info);
|
||||
n_acd_probe_config_set_ip (probe_config, (struct in_addr) { info->address });
|
||||
n_acd_probe_config_set_timeout (probe_config, timeout);
|
||||
|
||||
config = &(NAcdConfig) {
|
||||
.ifindex = priv->ifindex,
|
||||
.mac = priv->hwaddr,
|
||||
.n_mac = ETH_ALEN,
|
||||
.ip = info->address,
|
||||
.timeout_msec = timeout,
|
||||
.transport = N_ACD_TRANSPORT_ETHERNET,
|
||||
};
|
||||
|
||||
r = n_acd_start (info->acd, config);
|
||||
r = n_acd_probe (priv->acd, &info->probe, probe_config);
|
||||
if (r) {
|
||||
_LOGW ("could not start probe for %s on interface '%s': %s",
|
||||
nm_utils_inet4_ntop (info->address, NULL),
|
||||
nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex),
|
||||
acd_error_to_string (r));
|
||||
n_acd_probe_config_free (probe_config);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (timeout) {
|
||||
_LOGD ("started probe for %s with timeout %llu",
|
||||
nm_utils_inet4_ntop (info->address, NULL),
|
||||
(unsigned long long) timeout);
|
||||
}
|
||||
n_acd_probe_set_userdata (info->probe, info);
|
||||
n_acd_probe_config_free (probe_config);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static int
|
||||
acd_init (NMAcdManager *self)
|
||||
{
|
||||
NMAcdManagerPrivate *priv = NM_ACD_MANAGER_GET_PRIVATE (self);
|
||||
NAcdConfig *config;
|
||||
int r;
|
||||
|
||||
if (priv->acd)
|
||||
return 0;
|
||||
|
||||
r = n_acd_config_new (&config);
|
||||
if (r)
|
||||
return r;
|
||||
|
||||
n_acd_config_set_ifindex (config, priv->ifindex);
|
||||
n_acd_config_set_transport (config, N_ACD_TRANSPORT_ETHERNET);
|
||||
n_acd_config_set_mac (config, priv->hwaddr, ETH_ALEN);
|
||||
|
||||
r = n_acd_new (&priv->acd, config);
|
||||
n_acd_config_free (config);
|
||||
return r;
|
||||
}
|
||||
|
||||
/**
|
||||
* nm_acd_manager_start_probe:
|
||||
* @self: a #NMAcdManager
|
||||
|
@ -301,20 +308,33 @@ nm_acd_manager_start_probe (NMAcdManager *self, guint timeout)
|
|||
GHashTableIter iter;
|
||||
AddressInfo *info;
|
||||
gboolean success = FALSE;
|
||||
int fd, r;
|
||||
|
||||
g_return_val_if_fail (NM_IS_ACD_MANAGER (self), FALSE);
|
||||
priv = NM_ACD_MANAGER_GET_PRIVATE (self);
|
||||
g_return_val_if_fail (priv->state == STATE_INIT, FALSE);
|
||||
|
||||
r = acd_init (self);
|
||||
if (r) {
|
||||
_LOGW ("couldn't init ACD for probing on interface '%s': %s",
|
||||
nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex),
|
||||
acd_error_to_string (r));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
priv->completed = 0;
|
||||
|
||||
g_hash_table_iter_init (&iter, priv->addresses);
|
||||
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &info))
|
||||
success |= acd_probe_start (self, info, timeout);
|
||||
success |= acd_probe_add (self, info, timeout);
|
||||
|
||||
if (success)
|
||||
priv->state = STATE_PROBING;
|
||||
|
||||
n_acd_get_fd (priv->acd, &fd);
|
||||
priv->channel = g_io_channel_unix_new (fd);
|
||||
priv->event_id = g_io_add_watch (priv->channel, G_IO_IN, acd_event, self);
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
|
@ -393,26 +413,29 @@ nm_acd_manager_announce_addresses (NMAcdManager *self)
|
|||
AddressInfo *info;
|
||||
int r;
|
||||
|
||||
r = acd_init (self);
|
||||
if (r) {
|
||||
_LOGW ("couldn't init ACD for announcing address %s on interface '%s': %s",
|
||||
nm_utils_inet4_ntop (info->address, NULL),
|
||||
nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex),
|
||||
acd_error_to_string (r));
|
||||
return;
|
||||
}
|
||||
|
||||
if (priv->state == STATE_INIT) {
|
||||
/* n-acd can't announce without probing, therefore let's
|
||||
* start a fake probe with zero timeout and then perform
|
||||
* the announce. */
|
||||
priv->state = STATE_ANNOUNCING;
|
||||
* the announcement. */
|
||||
g_hash_table_iter_init (&iter, priv->addresses);
|
||||
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &info)) {
|
||||
if (!acd_probe_start (self, info, 0)) {
|
||||
_LOGW ("couldn't announce address %s on interface '%s'",
|
||||
nm_utils_inet4_ntop (info->address, NULL),
|
||||
nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex));
|
||||
}
|
||||
}
|
||||
} else if (priv->state == STATE_PROBE_DONE) {
|
||||
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &info))
|
||||
acd_probe_add (self, info, 0);
|
||||
priv->state = STATE_ANNOUNCING;
|
||||
} else if (priv->state == STATE_ANNOUNCING) {
|
||||
g_hash_table_iter_init (&iter, priv->addresses);
|
||||
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &info)) {
|
||||
if (info->duplicate)
|
||||
continue;
|
||||
r = n_acd_announce (info->acd, N_ACD_DEFEND_ONCE);
|
||||
r = n_acd_probe_announce (info->probe, N_ACD_DEFEND_ONCE);
|
||||
if (r) {
|
||||
_LOGW ("couldn't announce address %s on interface '%s': %s",
|
||||
nm_utils_inet4_ntop (info->address, NULL),
|
||||
|
@ -421,8 +444,7 @@ nm_acd_manager_announce_addresses (NMAcdManager *self)
|
|||
} else
|
||||
_LOGD ("announcing address %s", nm_utils_inet4_ntop (info->address, NULL));
|
||||
}
|
||||
} else
|
||||
nm_assert_not_reached ();
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -430,9 +452,7 @@ destroy_address_info (gpointer data)
|
|||
{
|
||||
AddressInfo *info = (AddressInfo *) data;
|
||||
|
||||
g_clear_pointer (&info->channel, g_io_channel_unref);
|
||||
g_clear_pointer (&info->acd, n_acd_free);
|
||||
nm_clear_g_source (&info->event_id);
|
||||
n_acd_probe_free (info->probe);
|
||||
|
||||
g_slice_free (AddressInfo, info);
|
||||
}
|
||||
|
@ -450,11 +470,12 @@ nm_acd_manager_init (NMAcdManager *self)
|
|||
}
|
||||
|
||||
NMAcdManager *
|
||||
nm_acd_manager_new (int ifindex, const guint8 *hwaddr, size_t hwaddr_len)
|
||||
nm_acd_manager_new (int ifindex, const guint8 *hwaddr, guint hwaddr_len)
|
||||
{
|
||||
NMAcdManager *self;
|
||||
NMAcdManagerPrivate *priv;
|
||||
|
||||
g_return_val_if_fail (ifindex > 0, NULL);
|
||||
g_return_val_if_fail (hwaddr, NULL);
|
||||
g_return_val_if_fail (hwaddr_len == ETH_ALEN, NULL);
|
||||
|
||||
|
@ -473,6 +494,9 @@ dispose (GObject *object)
|
|||
NMAcdManagerPrivate *priv = NM_ACD_MANAGER_GET_PRIVATE (self);
|
||||
|
||||
g_clear_pointer (&priv->addresses, g_hash_table_destroy);
|
||||
g_clear_pointer (&priv->channel, g_io_channel_unref);
|
||||
nm_clear_g_source (&priv->event_id);
|
||||
nm_clear_pointer (&priv->acd, n_acd_unref);
|
||||
|
||||
G_OBJECT_CLASS (nm_acd_manager_parent_class)->dispose (object);
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ typedef struct _NMAcdManagerClass NMAcdManagerClass;
|
|||
|
||||
GType nm_acd_manager_get_type (void);
|
||||
|
||||
NMAcdManager *nm_acd_manager_new (int ifindex, const guint8 *hwaddr, size_t hwaddr_len);
|
||||
NMAcdManager *nm_acd_manager_new (int ifindex, const guint8 *hwaddr, guint hwaddr_len);
|
||||
void nm_acd_manager_destroy (NMAcdManager *self);
|
||||
gboolean nm_acd_manager_add_address (NMAcdManager *self, in_addr_t address);
|
||||
gboolean nm_acd_manager_start_probe (NMAcdManager *self, guint timeout);
|
||||
|
|
Loading…
Reference in a new issue