dhcp6: coding style fixes
This commit is contained in:
parent
9de8a4259e
commit
3ae01632f2
|
@ -685,7 +685,6 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
|
|||
usec_t max_retransmit_duration = 0;
|
||||
uint8_t max_retransmit_count = 0;
|
||||
char time_string[FORMAT_TIMESPAN_MAX];
|
||||
uint32_t expire = 0;
|
||||
|
||||
assert(s);
|
||||
assert(client);
|
||||
|
@ -734,8 +733,9 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
|
|||
max_retransmit_time = DHCP6_REB_MAX_RT;
|
||||
|
||||
if (event_source_is_enabled(client->timeout_resend_expire) <= 0) {
|
||||
r = dhcp6_lease_ia_rebind_expire(&client->lease->ia,
|
||||
&expire);
|
||||
uint32_t expire = 0;
|
||||
|
||||
r = dhcp6_lease_ia_rebind_expire(&client->lease->ia, &expire);
|
||||
if (r < 0) {
|
||||
client_stop(client, r);
|
||||
return 0;
|
||||
|
@ -750,7 +750,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (max_retransmit_count &&
|
||||
if (max_retransmit_count > 0 &&
|
||||
client->retransmit_count >= max_retransmit_count) {
|
||||
client_stop(client, SD_DHCP6_CLIENT_EVENT_RETRANS_MAX);
|
||||
return 0;
|
||||
|
@ -764,7 +764,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
|
|||
if (r >= 0)
|
||||
client->retransmit_count++;
|
||||
|
||||
if (!client->retransmit_time) {
|
||||
if (client->retransmit_time == 0) {
|
||||
client->retransmit_time =
|
||||
client_timeout_compute_random(init_retransmit_time);
|
||||
|
||||
|
@ -772,7 +772,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
|
|||
client->retransmit_time += init_retransmit_time / 10;
|
||||
|
||||
} else {
|
||||
if (max_retransmit_time &&
|
||||
if (max_retransmit_time > 0 &&
|
||||
client->retransmit_time > max_retransmit_time / 2)
|
||||
client->retransmit_time = client_timeout_compute_random(max_retransmit_time);
|
||||
else
|
||||
|
@ -790,7 +790,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
|
|||
if (r < 0)
|
||||
goto error;
|
||||
|
||||
if (max_retransmit_duration && event_source_is_enabled(client->timeout_resend_expire) <= 0) {
|
||||
if (max_retransmit_duration > 0 && event_source_is_enabled(client->timeout_resend_expire) <= 0) {
|
||||
|
||||
log_dhcp6_client(client, "Max retransmission duration %"PRIu64" secs",
|
||||
max_retransmit_duration / USEC_PER_SEC);
|
||||
|
|
Loading…
Reference in a new issue