picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15411 from ssahani/systemd-issue-15375 

sd-network: DHCPv6 - Add NoPrefixAvail to error code
This commit is contained in:
Lennart Poettering 2020-04-13 10:58:38 +02:00 committed by GitHub
parent d9235719f2 667ceb9d9d
commit 9d5dac4dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd-network/dhcp6-option.c
View File

@ -464,8 +464,8 @@ int dhcp6_option_parse_ia(DHCP6Option *iaoption, DHCP6IA *ia) {
if (status < 0)
return status;
if (status > 0) {
log_dhcp6_client(client, "IA status %d",
status);
log_dhcp6_client(client, "IA status %s",
dhcp6_message_status_to_string(status));
return -EINVAL;
}

3
src/libsystemd-network/dhcp6-protocol.h
View File

@ -89,7 +89,8 @@ enum {
DHCP6_STATUS_NO_BINDING = 3,
DHCP6_STATUS_NOT_ON_LINK = 4,
DHCP6_STATUS_USE_MULTICAST = 5,
_DHCP6_STATUS_MAX = 6,
DHCP6_STATUS_NO_PREFIX_AVAIL = 6,
_DHCP6_STATUS_MAX = 7,
};
enum {

1
src/libsystemd-network/sd-dhcp6-client.c
View File

@ -112,6 +112,7 @@ const char * dhcp6_message_status_table[_DHCP6_STATUS_MAX] = {
[DHCP6_STATUS_NO_BINDING] = "Binding unavailable",
[DHCP6_STATUS_NOT_ON_LINK] = "Not on link",
[DHCP6_STATUS_USE_MULTICAST] = "Use multicast",
[DHCP6_STATUS_NO_PREFIX_AVAIL] = "No prefix available",
};
DEFINE_STRING_TABLE_LOOKUP(dhcp6_message_status, int);