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

glib-aux: move nm_utils_route_type{2str,_by_name}() to libnm-glib-aux

Browse source
This commit is contained in:
Thomas Haller 2021-03-04 12:53:48 +01:00
parent af0cfc559b
commit 8755538e04
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
4 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/libnm-core-aux-intern/nm-libnm-core-utils.c
View file

@ -276,34 +276,6 @@ nm_client_permission_result_to_string(NMClientPermissionResult permission)
return NULL;
}
NM_UTILS_STRING_TABLE_LOOKUP_DEFINE(
nm_utils_route_type_by_name,
guint8,
{ nm_assert(name); },
{ return RTN_UNSPEC; },
{"blackhole", RTN_BLACKHOLE},
{"broadcast", RTN_BROADCAST},
{"local", RTN_LOCAL},
{"multicast", RTN_MULTICAST},
{"nat", RTN_NAT},
{"prohibit", RTN_PROHIBIT},
{"throw", RTN_THROW},
{"unicast", RTN_UNICAST},
{"unreachable", RTN_UNREACHABLE}, );
NM_UTILS_ENUM2STR_DEFINE(nm_utils_route_type2str,
guint8,
NM_UTILS_ENUM2STR(RTN_BLACKHOLE, "blackhole"),
NM_UTILS_ENUM2STR(RTN_BROADCAST, "broadcast"),
NM_UTILS_ENUM2STR(RTN_LOCAL, "local"),
NM_UTILS_ENUM2STR(RTN_MULTICAST, "multicast"),
NM_UTILS_ENUM2STR(RTN_NAT, "nat"),
NM_UTILS_ENUM2STR(RTN_PROHIBIT, "prohibit"),
NM_UTILS_ENUM2STR(RTN_THROW, "throw"),
NM_UTILS_ENUM2STR(RTN_UNICAST, "unicast"),
NM_UTILS_ENUM2STR(RTN_UNREACHABLE, "unreachable"),
NM_UTILS_ENUM2STR(RTN_UNSPEC, "unspecified"), );
gboolean
nm_utils_validate_dhcp4_vendor_class_id(const char *vci, GError **error)
{

4
src/libnm-core-aux-intern/nm-libnm-core-utils.h
View file

@ -146,10 +146,6 @@ NMClientPermission nm_auth_permission_from_string(const char *str);
NMClientPermissionResult nm_client_permission_result_from_string(const char *nm);
const char * nm_client_permission_result_to_string(NMClientPermissionResult permission);
guint8 nm_utils_route_type_by_name(const char *name);
const char *nm_utils_route_type2str(guint8 val, char *buf, gsize len);
gboolean nm_utils_validate_dhcp4_vendor_class_id(const char *vci, GError **error);
/*****************************************************************************/

31
src/libnm-glib-aux/nm-shared-utils.c
View file

@ -15,6 +15,7 @@
#include <glib-unix.h>
#include <net/if.h>
#include <net/ethernet.h>
#include <linux/rtnetlink.h>
#include "nm-errno.h"
#include "nm-str-buf.h"
@ -6071,3 +6072,33 @@ NM_ASSERT_VALID_PATH_COMPONENT(const char *name)
NM_PRINT_FMT_QUOTED(name, "\"", name, "\"", "(null)"));
g_assert_not_reached();
}
/*****************************************************************************/
NM_UTILS_STRING_TABLE_LOOKUP_DEFINE(
nm_utils_route_type_by_name,
guint8,
{ nm_assert(name); },
{ return RTN_UNSPEC; },
{"blackhole", RTN_BLACKHOLE},
{"broadcast", RTN_BROADCAST},
{"local", RTN_LOCAL},
{"multicast", RTN_MULTICAST},
{"nat", RTN_NAT},
{"prohibit", RTN_PROHIBIT},
{"throw", RTN_THROW},
{"unicast", RTN_UNICAST},
{"unreachable", RTN_UNREACHABLE}, );
NM_UTILS_ENUM2STR_DEFINE(nm_utils_route_type2str,
guint8,
NM_UTILS_ENUM2STR(RTN_BLACKHOLE, "blackhole"),
NM_UTILS_ENUM2STR(RTN_BROADCAST, "broadcast"),
NM_UTILS_ENUM2STR(RTN_LOCAL, "local"),
NM_UTILS_ENUM2STR(RTN_MULTICAST, "multicast"),
NM_UTILS_ENUM2STR(RTN_NAT, "nat"),
NM_UTILS_ENUM2STR(RTN_PROHIBIT, "prohibit"),
NM_UTILS_ENUM2STR(RTN_THROW, "throw"),
NM_UTILS_ENUM2STR(RTN_UNICAST, "unicast"),
NM_UTILS_ENUM2STR(RTN_UNREACHABLE, "unreachable"),
NM_UTILS_ENUM2STR(RTN_UNSPEC, "unspecified"), );

6
src/libnm-glib-aux/nm-shared-utils.h
View file

@ -2744,4 +2744,10 @@ gboolean nm_utils_sysctl_ip_conf_is_path(int addr_family,
const char *ifname,
const char *property);
/*****************************************************************************/
guint8 nm_utils_route_type_by_name(const char *name);
const char *nm_utils_route_type2str(guint8 val, char *buf, gsize len);
#endif /* __NM_SHARED_UTILS_H__ */