chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: add basic [Link] settings to .network files
[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 fa4f9b5dc2c79572cd094d076dcdf1970c08a672..8537d7cc86434f004f90ea365a343dc3882c6fe7 100644
(file)
--- a/
src/libsystemd-network/sd-dhcp6-client.c
+++ b/
src/libsystemd-network/sd-dhcp6-client.c
@@
-200,19
+200,19
@@
int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du
switch (type) {
case DHCP6_DUID_LLT:
switch (type) {
case DHCP6_DUID_LLT:
- if (duid_len <= sizeof(client->duid.llt))
+ if (duid_len <= sizeof(client->duid.llt)
- 2
)
return -EINVAL;
break;
case DHCP6_DUID_EN:
return -EINVAL;
break;
case DHCP6_DUID_EN:
- if (duid_len != sizeof(client->duid.en))
+ if (duid_len != sizeof(client->duid.en)
- 2
)
return -EINVAL;
break;
case DHCP6_DUID_LL:
return -EINVAL;
break;
case DHCP6_DUID_LL:
- if (duid_len <= sizeof(client->duid.ll))
+ if (duid_len <= sizeof(client->duid.ll)
- 2
)
return -EINVAL;
break;
case DHCP6_DUID_UUID:
return -EINVAL;
break;
case DHCP6_DUID_UUID:
- if (duid_len != sizeof(client->duid.uuid))
+ if (duid_len != sizeof(client->duid.uuid)
- 2
)
return -EINVAL;
break;
default:
return -EINVAL;
break;
default:
@@
-222,7
+222,7
@@
int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du
client->duid.raw.type = htobe16(type);
memcpy(&client->duid.raw.data, duid, duid_len);
client->duid.raw.type = htobe16(type);
memcpy(&client->duid.raw.data, duid, duid_len);
- client->duid_len = duid_len
;
+ client->duid_len = duid_len
+ 2; /* +2 for sizeof(type) */
return 0;
}
return 0;
}
@@
-590,8
+590,7
@@
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");
+ r = sd_event_source_set_description(client->timeout_resend, "dhcp6-resend-timer");
if (r < 0)
goto error;
if (r < 0)
goto error;
@@
-614,8
+613,7
@@
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_expire,
- "dhcp6-resend-expire-timer");
+ r = sd_event_source_set_description(client->timeout_resend_expire, "dhcp6-resend-expire-timer");
if (r < 0)
goto error;
}
if (r < 0)
goto error;
}
@@
-1010,8
+1008,7
@@
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");
+ r = sd_event_source_set_description(client->receive_message, "dhcp6-receive-message");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1059,8
+1056,7
@@
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");
+ r = sd_event_source_set_description(client->lease->ia.timeout_t1, "dhcp6-t1-timeout");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1084,8
+1080,7
@@
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");
+ r = sd_event_source_set_description(client->lease->ia.timeout_t2, "dhcp6-t2-timeout");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1108,8
+1103,7
@@
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");
+ r = sd_event_source_set_description(client->timeout_resend, "dhcp6-resend-timeout");
if (r < 0)
return r;
if (r < 0)
return r;