chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: switch our hash table implementation over to SipHash
[elogind.git]
/
src
/
libsystemd-dhcp
/
dhcp-client.c
diff --git
a/src/libsystemd-dhcp/dhcp-client.c
b/src/libsystemd-dhcp/dhcp-client.c
index a8b9354d6ed827423c10621e7ef68ca15e6eecdb..9f7a826211d2a3b79fa54f3a4690f77e0b7ffd15 100644
(file)
--- a/
src/libsystemd-dhcp/dhcp-client.c
+++ b/
src/libsystemd-dhcp/dhcp-client.c
@@
-540,7
+540,6
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
time_left = 60;
next_timeout = usec + time_left * USEC_PER_SEC;
time_left = 60;
next_timeout = usec + time_left * USEC_PER_SEC;
-
break;
case DHCP_STATE_INIT:
break;
case DHCP_STATE_INIT:
@@
-558,7
+557,7
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
break;
}
break;
}
- next_timeout += (random_u() & 0x1fffff);
+ next_timeout += (random_u
32
() & 0x1fffff);
err = sd_event_add_monotonic(client->event, next_timeout,
10 * USEC_PER_MSEC,
err = sd_event_add_monotonic(client->event, next_timeout,
10 * USEC_PER_MSEC,
@@
-894,7
+893,7
@@
static uint64_t client_compute_timeout(uint64_t request_sent,
uint32_t lifetime)
{
return request_sent + (lifetime - 3) * USEC_PER_SEC +
uint32_t lifetime)
{
return request_sent + (lifetime - 3) * USEC_PER_SEC +
- + (random_u() & 0x1fffff);
+ + (random_u
32
() & 0x1fffff);
}
static int client_set_lease_timeouts(sd_dhcp_client *client, uint64_t usec)
}
static int client_set_lease_timeouts(sd_dhcp_client *client, uint64_t usec)
@@
-1061,11
+1060,11
@@
int sd_dhcp_client_start(sd_dhcp_client *client)
int r;
assert_return(client, -EINVAL);
int r;
assert_return(client, -EINVAL);
- assert_return(client->index >
=
0, -EINVAL);
+ assert_return(client->index > 0, -EINVAL);
assert_return(client->state == DHCP_STATE_INIT ||
client->state == DHCP_STATE_INIT_REBOOT, -EBUSY);
assert_return(client->state == DHCP_STATE_INIT ||
client->state == DHCP_STATE_INIT_REBOOT, -EBUSY);
- client->xid = random_u();
+ client->xid = random_u
32
();
r = dhcp_network_bind_raw_socket(client->index, &client->link);
r = dhcp_network_bind_raw_socket(client->index, &client->link);