diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-04-13 10:58:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 10:58:38 +0200 |
| commit | 9d5dac4dce8721eaa14800039d8a31428c072d13 (patch) | |
| tree | 87fc7783d7a2462bf9451c264e7f8aa9e4bdb4d7 | |
| parent | d9235719f204ad7d64b74a01de1fcbb27d45d2cf (diff) | |
| parent | 667ceb9d9dc2d19e3254fdc12acebae9b50ce613 (diff) | |
| download | systemd-9d5dac4dce8721eaa14800039d8a31428c072d13.tar.gz | |
Merge pull request #15411 from ssahani/systemd-issue-15375
sd-network: DHCPv6 - Add NoPrefixAvail to error code
| -rw-r--r-- | src/libsystemd-network/dhcp6-option.c | 4 | ||||
| -rw-r--r-- | src/libsystemd-network/dhcp6-protocol.h | 3 | ||||
| -rw-r--r-- | src/libsystemd-network/sd-dhcp6-client.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c index 9f5352a60d..ed684d44f3 100644 --- a/src/libsystemd-network/dhcp6-option.c +++ b/src/libsystemd-network/dhcp6-option.c @@ -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; } diff --git a/src/libsystemd-network/dhcp6-protocol.h b/src/libsystemd-network/dhcp6-protocol.h index ffae4453ac..19cda9ce45 100644 --- a/src/libsystemd-network/dhcp6-protocol.h +++ b/src/libsystemd-network/dhcp6-protocol.h @@ -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 { diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 3f6caedfdf..1593f0418e 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -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); |