From 7a0f1895d3ea8ee18dd33ed08e4a2188f7f836b6 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 12 Apr 2020 14:14:52 +0200 Subject: [PATCH 1/2] sd-network: DHCPv6 - Add NoPrefixAvail to error code --- src/libsystemd-network/dhcp6-protocol.h | 3 ++- src/libsystemd-network/sd-dhcp6-client.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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); From 667ceb9d9dc2d19e3254fdc12acebae9b50ce613 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Mon, 13 Apr 2020 05:04:22 +0200 Subject: [PATCH 2/2] sd-network: DHCP6 - Use readable error status rather than numeric value in the log message --- src/libsystemd-network/dhcp6-option.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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; }