diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-12-22 19:59:12 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-12-22 21:12:25 +0100 |
| commit | 9bf3b53533cdc9b95c921b71da755401f223f765 (patch) | |
| tree | 812e99b25cc09f5d5d3b130d25a02754283ff7a7 /src/libsystemd-dhcp/dhcp-client.c | |
| parent | 14f862a508ee64466fa8b3f036797d472f4d03ed (diff) | |
shared: switch our hash table implementation over to SipHash
SipHash appears to be the new gold standard for hashing smaller strings
for hashtables these days, so let's make use of it.
Diffstat (limited to 'src/libsystemd-dhcp/dhcp-client.c')
| -rw-r--r-- | src/libsystemd-dhcp/dhcp-client.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libsystemd-dhcp/dhcp-client.c b/src/libsystemd-dhcp/dhcp-client.c index 68a7328348..9f7a826211 100644 --- 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; - break; case DHCP_STATE_INIT: @@ -558,7 +557,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, break; } - next_timeout += (random_u() & 0x1fffff); + next_timeout += (random_u32() & 0x1fffff); 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 + - + (random_u() & 0x1fffff); + + (random_u32() & 0x1fffff); } static int client_set_lease_timeouts(sd_dhcp_client *client, uint64_t usec) @@ -1065,7 +1064,7 @@ int sd_dhcp_client_start(sd_dhcp_client *client) assert_return(client->state == DHCP_STATE_INIT || client->state == DHCP_STATE_INIT_REBOOT, -EBUSY); - client->xid = random_u(); + client->xid = random_u32(); r = dhcp_network_bind_raw_socket(client->index, &client->link); |