shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

sd-ipv4ll: simplify conflict handling

Browse Source 
Use stop() and start() to drop some pulicate code.
This commit is contained in:
Tom Gundersen 2015-08-21 01:02:59 +02:00
parent b45e4eb679
commit 6af9144f5f
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/libsystemd-network/sd-ipv4ll.c
View File

@ -276,10 +276,19 @@ static int ipv4ll_on_timeout(sd_event_source *s, uint64_t usec, void *userdata)
case IPV4LL_STATE_INIT: case IPV4LL_STATE_INIT:
log_ipv4ll(ll, "PROBE"); log_ipv4ll(ll, "PROBE");
ipv4ll_set_state(ll, IPV4LL_STATE_WAITING_PROBE, true); ipv4ll_set_state(ll, IPV4LL_STATE_WAITING_PROBE, true);
r = ipv4ll_set_next_wakeup(ll, 0, PROBE_WAIT);
if (r < 0) if (ll->conflict >= MAX_CONFLICTS) {
goto out; log_ipv4ll(ll, "MAX_CONFLICTS");
r = ipv4ll_set_next_wakeup(ll, RATE_LIMIT_INTERVAL, PROBE_WAIT);
if (r < 0)
return r;
} else {
r = ipv4ll_set_next_wakeup(ll, 0, PROBE_WAIT);
if (r < 0)
return r;
}
break; break;
case IPV4LL_STATE_WAITING_PROBE: case IPV4LL_STATE_WAITING_PROBE:
@ -354,33 +363,21 @@ static int ipv4ll_on_conflict(sd_ipv4ll *ll) {
log_ipv4ll(ll, "CONFLICT"); log_ipv4ll(ll, "CONFLICT");
ll->conflict++;
ipv4ll_client_notify(ll, IPV4LL_EVENT_CONFLICT); ipv4ll_client_notify(ll, IPV4LL_EVENT_CONFLICT);
ll->claimed_address = 0; sd_ipv4ll_stop(ll);
/* Pick a new address */ /* Pick a new address */
r = ipv4ll_pick_address(ll, &ll->address); r = ipv4ll_pick_address(ll, &ll->address);
if (r < 0) if (r < 0)
return r; return r;
ll->fd = safe_close(ll->fd); r = sd_ipv4ll_start(ll);
r = arp_network_bind_raw_socket(ll->index, ll->address, &ll->mac_addr);
if (r < 0) if (r < 0)
return r; return r;
ll->fd = r;
ll->conflict++;
ll->defend_window = 0;
ipv4ll_set_state(ll, IPV4LL_STATE_WAITING_PROBE, true);
if (ll->conflict >= MAX_CONFLICTS) {
log_ipv4ll(ll, "MAX_CONFLICTS");
ipv4ll_set_next_wakeup(ll, RATE_LIMIT_INTERVAL, PROBE_WAIT);
} else
ipv4ll_set_next_wakeup(ll, 0, PROBE_WAIT);
return 0; return 0;
} }