From 802f343d9fac9829f968dc6c0a0270f7e7854b99 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 10 May 2022 10:47:38 +0200 Subject: dhcp: drop NMDhcpState enum It's unused now. --- src/core/dhcp/nm-dhcp-client.c | 72 +++++++++++++++--------------------------- src/core/dhcp/nm-dhcp-client.h | 14 +------- 2 files changed, 26 insertions(+), 60 deletions(-) diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c index 3c0c748725..eed1a89bb7 100644 --- a/src/core/dhcp/nm-dhcp-client.c +++ b/src/core/dhcp/nm-dhcp-client.c @@ -74,18 +74,18 @@ G_STATIC_ASSERT(!(((pid_t) -1) > 0)); /*****************************************************************************/ -NM_UTILS_LOOKUP_STR_DEFINE(nm_dhcp_state_to_string, - NMDhcpState, - NM_UTILS_LOOKUP_DEFAULT(NULL), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_BOUND, "bound"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_DONE, "done"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_EXPIRE, "expire"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_EXTENDED, "extended"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_FAIL, "fail"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_NOOP, "noop"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_TERMINATED, "terminated"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_TIMEOUT, "timeout"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_UNKNOWN, "unknown"), ); +NM_UTILS_LOOKUP_STR_DEFINE(nm_dhcp_client_event_type_to_string, + NMDhcpClientEventType, + NM_UTILS_LOOKUP_DEFAULT_NM_ASSERT(NULL), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_BOUND, "bound"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE, "expire"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED, "extended"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_FAIL, "fail"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED, + "terminated"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT, "timeout"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED, + "unspecified"), ); /*****************************************************************************/ @@ -252,6 +252,7 @@ _nm_dhcp_client_notify(NMDhcpClient *self, GHashTable *options; const int IS_IPv4 = NM_IS_IPv4(priv->config.addr_family); nm_auto_unref_l3cd const NML3ConfigData *l3cd_merged = NULL; + char sbuf1[NM_HASH_OBFUSCATE_PTR_STR_BUF_SIZE]; nm_assert(NM_IN_SET(client_event_type, NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED, @@ -275,6 +276,10 @@ _nm_dhcp_client_notify(NMDhcpClient *self, nm_assert(!l3cd || NM_IS_L3_CONFIG_DATA(l3cd)); nm_assert(!l3cd || nm_l3_config_data_get_dhcp_lease(l3cd, priv->config.addr_family)); + _LOGT("notify: event=%s%s%s", + nm_dhcp_client_event_type_to_string(client_event_type), + NM_PRINT_FMT_QUOTED2(l3cd, "", ", l3cd=", NM_HASH_OBFUSCATE_PTR_STR(l3cd, sbuf1))); + if (l3cd) nm_l3_config_data_seal(l3cd); @@ -890,7 +895,6 @@ nm_dhcp_client_handle_event(gpointer unused, NMDhcpClientPrivate *priv; nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL; NMDhcpClientEventType client_event_type; - NMDhcpState new_state; NMPlatformIP6Address prefix = { 0, }; @@ -976,50 +980,24 @@ nm_dhcp_client_handle_event(gpointer unused, /* Fail if no valid IP config was received */ if (reason_is_bound && !l3cd) { _LOGW("client bound but IP config not received"); - new_state = NM_DHCP_STATE_FAIL; + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_FAIL; } else { if (NM_IN_STRSET_ASCII_CASE(reason, "bound", "bound6", "static")) - new_state = NM_DHCP_STATE_BOUND; + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_BOUND; else if (NM_IN_STRSET_ASCII_CASE(reason, "renew", "renew6", "reboot", "rebind", "rebind6")) - new_state = NM_DHCP_STATE_EXTENDED; + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED; else if (NM_IN_STRSET_ASCII_CASE(reason, "timeout")) - new_state = NM_DHCP_STATE_TIMEOUT; + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT; else if (NM_IN_STRSET_ASCII_CASE(reason, "nak", "expire", "expire6")) - new_state = NM_DHCP_STATE_EXPIRE; + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE; else if (NM_IN_STRSET_ASCII_CASE(reason, "end", "stop", "stopped")) - new_state = NM_DHCP_STATE_DONE; + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED; else if (NM_IN_STRSET_ASCII_CASE(reason, "fail", "abend")) - new_state = NM_DHCP_STATE_FAIL; + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_FAIL; else if (NM_IN_STRSET_ASCII_CASE(reason, "preinit")) return TRUE; else - new_state = NM_DHCP_STATE_UNKNOWN; - } - - switch (new_state) { - case NM_DHCP_STATE_UNKNOWN: - client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED; - break; - case NM_DHCP_STATE_BOUND: - client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_BOUND; - break; - case NM_DHCP_STATE_EXTENDED: - client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED; - break; - case NM_DHCP_STATE_TIMEOUT: - client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT; - break; - case NM_DHCP_STATE_EXPIRE: - client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE; - break; - case NM_DHCP_STATE_FAIL: - client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_FAIL; - break; - case NM_DHCP_STATE_TERMINATED: - case NM_DHCP_STATE_DONE: - case NM_DHCP_STATE_NOOP: - client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED; - break; + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED; } _nm_dhcp_client_notify(self, client_event_type, l3cd); diff --git a/src/core/dhcp/nm-dhcp-client.h b/src/core/dhcp/nm-dhcp-client.h index 95b2868759..7b88ae6b46 100644 --- a/src/core/dhcp/nm-dhcp-client.h +++ b/src/core/dhcp/nm-dhcp-client.h @@ -26,18 +26,6 @@ #define NM_DHCP_CLIENT_NOTIFY "dhcp-notify" -typedef enum { - NM_DHCP_STATE_UNKNOWN = 0, - NM_DHCP_STATE_NOOP, /* state is a non operation for NetworkManager */ - NM_DHCP_STATE_BOUND, /* new lease */ - NM_DHCP_STATE_EXTENDED, /* lease extended */ - NM_DHCP_STATE_TIMEOUT, /* timed out contacting server */ - NM_DHCP_STATE_DONE, /* client reported it's stopping */ - NM_DHCP_STATE_EXPIRE, /* lease expired or NAKed */ - NM_DHCP_STATE_FAIL, /* failed for some reason */ - NM_DHCP_STATE_TERMINATED, /* client is no longer running */ -} NMDhcpState; - typedef enum { NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED, @@ -94,7 +82,7 @@ typedef struct { }; } NMDhcpClientNotifyData; -const char *nm_dhcp_state_to_string(NMDhcpState state); +const char *nm_dhcp_client_event_type_to_string(NMDhcpClientEventType client_event_type); /* FIXME(l3cfg:dhcp:config): nm_dhcp_manager_start_ip[46]() has a gazillion of parameters, * those get passed on as CONSTRUCT_ONLY properties to the NMDhcpClient. Drop -- cgit v1.2.1