summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-05-23 17:52:08 +0200
committerLennart Poettering <lennart@poettering.net>2016-05-26 15:34:42 +0200
commitd246e77a4343ff8a0266fc7dd5a7de5c524f9e44 (patch)
tree649221da270fa0a1c2760947ea8dc855019b2be3
parent4dbf7b3a9330482b21685e57d3098a67693e2956 (diff)
ipv4acd: rename ipv4acd_stop() → ipv4acd_reset()
This is much less confusing, since there's also sd_ipv4acd_stop(), which was idfferent from ipv4acd_stop(). After renaming it, let's also use the funciton when destroying ipv4acd objects, as the code is pretty much the same for that.
-rw-r--r--src/libsystemd-network/sd-ipv4acd.c94
1 files changed, 43 insertions, 51 deletions
diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
index 7393be45f5..163d0f9199 100644
--- a/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/libsystemd-network/sd-ipv4acd.c
@@ -34,6 +34,7 @@
#include "list.h"
#include "random-util.h"
#include "siphash24.h"
+#include "string-util.h"
#include "util.h"
/* Constants from the RFC */
@@ -90,6 +91,29 @@ struct sd_ipv4acd {
void* userdata;
};
+static void ipv4acd_set_state(sd_ipv4acd *ll, IPv4ACDState st, bool reset_counter) {
+ assert(ll);
+ assert(st < _IPV4ACD_STATE_MAX);
+
+ if (st == ll->state && !reset_counter)
+ ll->n_iteration++;
+ else {
+ ll->state = st;
+ ll->n_iteration = 0;
+ }
+}
+
+static void ipv4acd_reset(sd_ipv4acd *ll) {
+ assert(ll);
+
+ ll->timer_event_source = sd_event_source_unref(ll->timer_event_source);
+ ll->receive_message_event_source = sd_event_source_unref(ll->receive_message_event_source);
+
+ ll->fd = safe_close(ll->fd);
+
+ ipv4acd_set_state(ll, IPV4ACD_STATE_INIT, true);
+}
+
sd_ipv4acd *sd_ipv4acd_ref(sd_ipv4acd *ll) {
if (!ll)
return NULL;
@@ -110,11 +134,7 @@ sd_ipv4acd *sd_ipv4acd_unref(sd_ipv4acd *ll) {
if (ll->n_ref > 0)
return NULL;
- ll->timer_event_source = sd_event_source_unref(ll->timer_event_source);
- ll->receive_message_event_source = sd_event_source_unref(ll->receive_message_event_source);
-
- ll->fd = safe_close(ll->fd);
-
+ ipv4acd_reset(ll);
sd_ipv4acd_detach_event(ll);
free(ll);
@@ -142,18 +162,6 @@ int sd_ipv4acd_new(sd_ipv4acd **ret) {
return 0;
}
-static void ipv4acd_set_state(sd_ipv4acd *ll, IPv4ACDState st, bool reset_counter) {
- assert(ll);
- assert(st < _IPV4ACD_STATE_MAX);
-
- if (st == ll->state && !reset_counter)
- ll->n_iteration++;
- else {
- ll->state = st;
- ll->n_iteration = 0;
- }
-}
-
static void ipv4acd_client_notify(sd_ipv4acd *ll, int event) {
assert(ll);
@@ -163,23 +171,13 @@ static void ipv4acd_client_notify(sd_ipv4acd *ll, int event) {
ll->callback(ll, event, ll->userdata);
}
-static void ipv4acd_stop(sd_ipv4acd *ll) {
- assert(ll);
-
- ll->timer_event_source = sd_event_source_unref(ll->timer_event_source);
+int sd_ipv4acd_stop(sd_ipv4acd *ll) {
+ assert_return(ll, -EINVAL);
- ll->receive_message_event_source = sd_event_source_unref(ll->receive_message_event_source);
- ll->fd = safe_close(ll->fd);
+ ipv4acd_reset(ll);
log_ipv4acd(ll, "STOPPED");
- ipv4acd_set_state(ll, IPV4ACD_STATE_INIT, true);
-}
-
-int sd_ipv4acd_stop(sd_ipv4acd *ll) {
- assert_return(ll, -EINVAL);
-
- ipv4acd_stop(ll);
ipv4acd_client_notify(ll, SD_IPV4ACD_EVENT_STOP);
return 0;
@@ -272,9 +270,8 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata)
_cleanup_free_ char *address = NULL;
union in_addr_union addr = { .in.s_addr = ll->address };
- r = in_addr_to_string(AF_INET, &addr, &address);
- if (r >= 0)
- log_ipv4acd(ll, "Probing %s", address);
+ (void) in_addr_to_string(AF_INET, &addr, &address);
+ log_ipv4acd(ll, "Probing %s", strna(address));
}
if (ll->n_iteration < PROBE_NUM - 2) {
@@ -337,18 +334,15 @@ out:
static void ipv4acd_on_conflict(sd_ipv4acd *ll) {
_cleanup_free_ char *address = NULL;
union in_addr_union addr = { .in.s_addr = ll->address };
- int r;
assert(ll);
ll->n_conflict++;
- r = in_addr_to_string(AF_INET, &addr, &address);
- if (r >= 0)
- log_ipv4acd(ll, "Conflict on %s (%u)", address, ll->n_conflict);
-
- ipv4acd_stop(ll);
+ (void) in_addr_to_string(AF_INET, &addr, &address);
+ log_ipv4acd(ll, "Conflict on %s (%u)", strna(address), ll->n_conflict);
+ ipv4acd_reset(ll);
ipv4acd_client_notify(ll, SD_IPV4ACD_EVENT_CONFLICT);
}
@@ -505,33 +499,31 @@ int sd_ipv4acd_start(sd_ipv4acd *ll) {
assert_return(!ether_addr_is_null(&ll->mac_addr), -EINVAL);
assert_return(ll->state == IPV4ACD_STATE_INIT, -EBUSY);
- ll->defend_window = 0;
-
r = arp_network_bind_raw_socket(ll->ifindex, ll->address, &ll->mac_addr);
if (r < 0)
- goto out;
+ return r;
- ll->fd = safe_close(ll->fd);
+ safe_close(ll->fd);
ll->fd = r;
+ ll->defend_window = 0;
r = sd_event_add_io(ll->event, &ll->receive_message_event_source, ll->fd, EPOLLIN, ipv4acd_on_packet, ll);
if (r < 0)
- goto out;
+ goto fail;
r = sd_event_source_set_priority(ll->receive_message_event_source, ll->event_priority);
if (r < 0)
- goto out;
+ goto fail;
(void) sd_event_source_set_description(ll->receive_message_event_source, "ipv4acd-receive-message");
r = ipv4acd_set_next_wakeup(ll, 0, 0);
if (r < 0)
- goto out;
-out:
- if (r < 0) {
- ipv4acd_stop(ll);
- return r;
- }
+ goto fail;
return 0;
+
+fail:
+ ipv4acd_reset(ll);
+ return r;
}