chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-event: name event sources used in libraries
[elogind.git]
/
src
/
libsystemd-network
/
sd-dhcp6-client.c
diff --git
a/src/libsystemd-network/sd-dhcp6-client.c
b/src/libsystemd-network/sd-dhcp6-client.c
index 4f60578bc3184707767c2bbec0e7b11d6d2fdb31..342a23141372507b61cb0efa04a32b04088038fd 100644
(file)
--- a/
src/libsystemd-network/sd-dhcp6-client.c
+++ b/
src/libsystemd-network/sd-dhcp6-client.c
@@
-293,7
+293,6
@@
static int client_send_message(sd_dhcp6_client *client) {
break;
case DHCP6_STATE_STOPPED:
break;
case DHCP6_STATE_STOPPED:
- case DHCP6_STATE_RS:
case DHCP6_STATE_BOUND:
return -EINVAL;
}
case DHCP6_STATE_BOUND:
return -EINVAL;
}
@@
-446,7
+445,6
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
break;
case DHCP6_STATE_STOPPED:
break;
case DHCP6_STATE_STOPPED:
- case DHCP6_STATE_RS:
case DHCP6_STATE_BOUND:
return 0;
}
case DHCP6_STATE_BOUND:
return 0;
}
@@
-462,7
+460,7
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
client->retransmit_count++;
client->retransmit_count++;
- r = sd_event_now(client->event,
CLOCK_MONOTONIC
, &time_now);
+ r = sd_event_now(client->event,
clock_boottime_or_monotonic()
, &time_now);
if (r < 0)
goto error;
if (r < 0)
goto error;
@@
-486,7
+484,7
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
client->retransmit_time, 0));
r = sd_event_add_time(client->event, &client->timeout_resend,
client->retransmit_time, 0));
r = sd_event_add_time(client->event, &client->timeout_resend,
-
CLOCK_MONOTONIC
,
+
clock_boottime_or_monotonic()
,
time_now + client->retransmit_time,
10 * USEC_PER_MSEC, client_timeout_resend,
client);
time_now + client->retransmit_time,
10 * USEC_PER_MSEC, client_timeout_resend,
client);
@@
-498,6
+496,11
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
if (r < 0)
goto error;
if (r < 0)
goto error;
+ r = sd_event_source_set_name(client->timeout_resend,
+ "dhcp6-resend-timer");
+ if (r < 0)
+ goto error;
+
if (max_retransmit_duration && !client->timeout_resend_expire) {
log_dhcp6_client(client, "Max retransmission duration %"PRIu64" secs",
if (max_retransmit_duration && !client->timeout_resend_expire) {
log_dhcp6_client(client, "Max retransmission duration %"PRIu64" secs",
@@
-505,7
+508,7
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
r = sd_event_add_time(client->event,
&client->timeout_resend_expire,
r = sd_event_add_time(client->event,
&client->timeout_resend_expire,
-
CLOCK_MONOTONIC
,
+
clock_boottime_or_monotonic()
,
time_now + max_retransmit_duration,
USEC_PER_SEC,
client_timeout_resend_expire, client);
time_now + max_retransmit_duration,
USEC_PER_SEC,
client_timeout_resend_expire, client);
@@
-516,6
+519,11
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
client->event_priority);
if (r < 0)
goto error;
client->event_priority);
if (r < 0)
goto error;
+
+ r = sd_event_source_set_name(client->timeout_resend_expire,
+ "dhcp6-resend-expire-timer");
+ if (r < 0)
+ goto error;
}
error:
}
error:
@@
-709,7
+717,7
@@
static int client_receive_reply(sd_dhcp6_client *client, DHCP6Message *reply,
}
if (client->lease)
}
if (client->lease)
- dhcp6_lease_clear_timers(&client->lease->ia);
+
dhcp6_lease_clear_timers(&client->lease->ia);
client->lease = sd_dhcp6_lease_unref(client->lease);
client->lease = lease;
client->lease = sd_dhcp6_lease_unref(client->lease);
client->lease = lease;
@@
-843,7
+851,6
@@
static int client_receive_message(sd_event_source *s, int fd, uint32_t revents,
break;
case DHCP6_STATE_STOPPED:
break;
case DHCP6_STATE_STOPPED:
- case DHCP6_STATE_RS:
return 0;
}
return 0;
}
@@
-874,7
+881,6
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
switch (state) {
case DHCP6_STATE_STOPPED:
switch (state) {
case DHCP6_STATE_STOPPED:
- case DHCP6_STATE_RS:
case DHCP6_STATE_SOLICITATION:
r = client_ensure_iaid(client);
case DHCP6_STATE_SOLICITATION:
r = client_ensure_iaid(client);
@@
-898,6
+904,11
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
if (r < 0)
return r;
if (r < 0)
return r;
+ r = sd_event_source_set_name(client->receive_message,
+ "dhcp6-receive-message");
+ if (r < 0)
+ return r;
+
client->state = DHCP6_STATE_SOLICITATION;
break;
client->state = DHCP6_STATE_SOLICITATION;
break;
@@
-912,7
+923,7
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
case DHCP6_STATE_BOUND:
case DHCP6_STATE_BOUND:
- r = sd_event_now(client->event,
CLOCK_MONOTONIC
, &time_now);
+ r = sd_event_now(client->event,
clock_boottime_or_monotonic()
, &time_now);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-935,7
+946,7
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
r = sd_event_add_time(client->event,
&client->lease->ia.timeout_t1,
r = sd_event_add_time(client->event,
&client->lease->ia.timeout_t1,
-
CLOCK_MONOTONIC
, time_now + timeout,
+
clock_boottime_or_monotonic()
, time_now + timeout,
10 * USEC_PER_SEC, client_timeout_t1,
client);
if (r < 0)
10 * USEC_PER_SEC, client_timeout_t1,
client);
if (r < 0)
@@
-946,6
+957,11
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
if (r < 0)
return r;
if (r < 0)
return r;
+ r = sd_event_source_set_name(client->lease->ia.timeout_t1,
+ "dhcp6-t1-timeout");
+ if (r < 0)
+ return r;
+
timeout = client_timeout_compute_random(be32toh(client->lease->ia.lifetime_t2) * USEC_PER_SEC);
log_dhcp6_client(client, "T2 expires in %s",
timeout = client_timeout_compute_random(be32toh(client->lease->ia.lifetime_t2) * USEC_PER_SEC);
log_dhcp6_client(client, "T2 expires in %s",
@@
-955,7
+971,7
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
r = sd_event_add_time(client->event,
&client->lease->ia.timeout_t2,
r = sd_event_add_time(client->event,
&client->lease->ia.timeout_t2,
-
CLOCK_MONOTONIC
, time_now + timeout,
+
clock_boottime_or_monotonic()
, time_now + timeout,
10 * USEC_PER_SEC, client_timeout_t2,
client);
if (r < 0)
10 * USEC_PER_SEC, client_timeout_t2,
client);
if (r < 0)
@@
-966,6
+982,11
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
if (r < 0)
return r;
if (r < 0)
return r;
+ r = sd_event_source_set_name(client->lease->ia.timeout_t2,
+ "dhcp6-t2-timeout");
+ if (r < 0)
+ return r;
+
client->state = state;
return 0;
client->state = state;
return 0;
@@
-974,7
+995,7
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
client->transaction_id = random_u32() & htobe32(0x00ffffff);
r = sd_event_add_time(client->event, &client->timeout_resend,
client->transaction_id = random_u32() & htobe32(0x00ffffff);
r = sd_event_add_time(client->event, &client->timeout_resend,
-
CLOCK_MONOTONIC
, 0, 0, client_timeout_resend,
+
clock_boottime_or_monotonic()
, 0, 0, client_timeout_resend,
client);
if (r < 0)
return r;
client);
if (r < 0)
return r;
@@
-984,6
+1005,11
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
if (r < 0)
return r;
if (r < 0)
return r;
+ r = sd_event_source_set_name(client->timeout_resend,
+ "dhcp6-resend-timeout");
+ if (r < 0)
+ return r;
+
return 0;
}
return 0;
}