chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Print kdbus path when opening fails
[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 8fdbbfe3201e62d4da0b4f37fc8884feb4f39798..c6c82eb349161ec4d856b0648c968045e73a343d 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;
}
@@
-387,7
+386,7
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
void *userdata) {
int r = 0;
sd_dhcp6_client *client = userdata;
void *userdata) {
int r = 0;
sd_dhcp6_client *client = userdata;
- usec_t time_now, init_retransmit_time
, max_retransmit_time
;
+ usec_t time_now, init_retransmit_time
= 0, max_retransmit_time = 0
;
usec_t max_retransmit_duration = 0;
uint8_t max_retransmit_count = 0;
char time_string[FORMAT_TIMESPAN_MAX];
usec_t max_retransmit_duration = 0;
uint8_t max_retransmit_count = 0;
char time_string[FORMAT_TIMESPAN_MAX];
@@
-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);
@@
-505,7
+503,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);
@@
-708,7
+706,8
@@
static int client_receive_reply(sd_dhcp6_client *client, DHCP6Message *reply,
return 0;
}
return 0;
}
- dhcp6_lease_clear_timers(&client->lease->ia);
+ if (client->lease)
+ 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;
@@
-842,7
+841,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;
}
@@
-873,7
+871,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);
@@
-911,7
+908,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;
@@
-934,7
+931,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)
@@
-954,7
+951,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)
@@
-973,7
+970,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;