fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 13:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: cleanup reason_to_state() in "nm-dhcp-client.c"

Browse source 
- use NM_IN_STRSET_ASCII_CASE().
- don't use else block after we return.
- don't accept the "iface" argument just for logging. The caller
  can do the logging, if they wish.

(cherry picked from commit 9b9c07530c)
(cherry picked from commit ea7ad68ed2)
This commit is contained in:
Thomas Haller 2022-04-30 21:05:58 +02:00 • committed by Beniamino Galvani
parent e64350bd2b
commit 6c2d34cd4f
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/core/dhcp/nm-dhcp-client.c
View file

@ -154,30 +154,23 @@ NM_UTILS_LOOKUP_STR_DEFINE(nm_dhcp_state_to_string,
NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_UNKNOWN, "unknown"), ); NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_UNKNOWN, "unknown"), );
static NMDhcpState static NMDhcpState
reason_to_state(NMDhcpClient *self, const char *iface, const char *reason) reason_to_state(const char *reason)
{ {
if (g_ascii_strcasecmp(reason, "bound") == 0 || g_ascii_strcasecmp(reason, "bound6") == 0 if (NM_IN_STRSET_ASCII_CASE(reason, "bound", "bound6", "static"))
|| g_ascii_strcasecmp(reason, "static") == 0)
return NM_DHCP_STATE_BOUND; return NM_DHCP_STATE_BOUND;
else if (g_ascii_strcasecmp(reason, "renew") == 0 || g_ascii_strcasecmp(reason, "renew6") == 0 if (NM_IN_STRSET_ASCII_CASE(reason, "renew", "renew6", "reboot", "rebind", "rebind6"))
|| g_ascii_strcasecmp(reason, "reboot") == 0
|| g_ascii_strcasecmp(reason, "rebind") == 0
|| g_ascii_strcasecmp(reason, "rebind6") == 0)
return NM_DHCP_STATE_EXTENDED; return NM_DHCP_STATE_EXTENDED;
else if (g_ascii_strcasecmp(reason, "timeout") == 0) if (NM_IN_STRSET_ASCII_CASE(reason, "timeout"))
return NM_DHCP_STATE_TIMEOUT; return NM_DHCP_STATE_TIMEOUT;
else if (g_ascii_strcasecmp(reason, "nak") == 0 || g_ascii_strcasecmp(reason, "expire") == 0 if (NM_IN_STRSET_ASCII_CASE(reason, "nak", "expire", "expire6"))
|| g_ascii_strcasecmp(reason, "expire6") == 0)
return NM_DHCP_STATE_EXPIRE; return NM_DHCP_STATE_EXPIRE;
else if (g_ascii_strcasecmp(reason, "end") == 0 || g_ascii_strcasecmp(reason, "stop") == 0 if (NM_IN_STRSET_ASCII_CASE(reason, "end", "stop", "stopped"))
|| g_ascii_strcasecmp(reason, "stopped") == 0)
return NM_DHCP_STATE_DONE; return NM_DHCP_STATE_DONE;
else if (g_ascii_strcasecmp(reason, "fail") == 0 || g_ascii_strcasecmp(reason, "abend") == 0) if (NM_IN_STRSET_ASCII_CASE(reason, "fail", "abend"))
return NM_DHCP_STATE_FAIL; return NM_DHCP_STATE_FAIL;
else if (g_ascii_strcasecmp(reason, "preinit") == 0) if (NM_IN_STRSET_ASCII_CASE(reason, "preinit"))
return NM_DHCP_STATE_NOOP; return NM_DHCP_STATE_NOOP;
_LOGD("unmapped DHCP state '%s'", reason);
return NM_DHCP_STATE_UNKNOWN; return NM_DHCP_STATE_UNKNOWN;
} }
@ -922,7 +915,11 @@ nm_dhcp_client_handle_event(gpointer unused,
if (priv->pid != pid) if (priv->pid != pid)
return FALSE; return FALSE;
new_state = reason_to_state(self, priv->config.iface, reason); new_state = reason_to_state(reason);
if (new_state == NM_DHCP_STATE_UNKNOWN)
_LOGD("unmapped DHCP state '%s'", reason);
if (new_state == NM_DHCP_STATE_NOOP) if (new_state == NM_DHCP_STATE_NOOP)
return TRUE; return TRUE;