From c333f062ddcba9b35330647bf6cbd0a07f2d786e Mon Sep 17 00:00:00 2001
From: Michael Biebl
-gboolean
+gboolean
nm_utils_is_empty_ssid ()
@@ -57,7 +57,7 @@
-gboolean
+gboolean
nm_utils_same_ssid ()
@@ -73,7 +73,7 @@
-gboolean
+gboolean
nm_utils_security_valid ()
@@ -81,7 +81,7 @@
-gboolean
+gboolean
nm_utils_ap_mode_security_valid ()
@@ -89,7 +89,7 @@
-gboolean
+gboolean
nm_utils_wep_key_valid ()
@@ -97,7 +97,7 @@
-gboolean
+gboolean
nm_utils_wpa_psk_valid ()
@@ -105,7 +105,7 @@
-gboolean
+gboolean
nm_utils_is_json_object ()
@@ -113,7 +113,7 @@
-GVariant *
+GVariant *
nm_utils_ip4_dns_to_variant ()
@@ -129,7 +129,7 @@
-GVariant *
+GVariant *
nm_utils_ip4_addresses_to_variant ()
@@ -137,7 +137,7 @@
-GPtrArray *
+GPtrArray *
nm_utils_ip4_addresses_from_variant ()
@@ -145,7 +145,7 @@
-GVariant *
+GVariant *
nm_utils_ip4_routes_to_variant ()
@@ -153,7 +153,7 @@
-GPtrArray *
+GPtrArray *
nm_utils_ip4_routes_from_variant ()
@@ -161,7 +161,7 @@
-guint32
+guint32
nm_utils_ip4_netmask_to_prefix ()
@@ -169,7 +169,7 @@
-guint32
+guint32
nm_utils_ip4_prefix_to_netmask ()
@@ -177,7 +177,7 @@
-guint32
+guint32
nm_utils_ip4_get_default_prefix ()
@@ -185,7 +185,7 @@
-GVariant *
+GVariant *
nm_utils_ip6_dns_to_variant ()
@@ -201,7 +201,7 @@
-GVariant *
+GVariant *
nm_utils_ip6_addresses_to_variant ()
@@ -209,7 +209,7 @@
-GPtrArray *
+GPtrArray *
nm_utils_ip6_addresses_from_variant ()
@@ -217,7 +217,7 @@
-GVariant *
+GVariant *
nm_utils_ip6_routes_to_variant ()
@@ -225,7 +225,7 @@
-GPtrArray *
+GPtrArray *
nm_utils_ip6_routes_from_variant ()
@@ -233,7 +233,7 @@
-GVariant *
+GVariant *
nm_utils_ip_addresses_to_variant ()
@@ -241,7 +241,7 @@
-GPtrArray *
+GPtrArray *
nm_utils_ip_addresses_from_variant ()
@@ -249,7 +249,7 @@
-GVariant *
+GVariant *
nm_utils_ip_routes_to_variant ()
@@ -257,7 +257,7 @@
-GPtrArray *
+GPtrArray *
nm_utils_ip_routes_from_variant ()
@@ -273,7 +273,7 @@
-gboolean
+gboolean
nm_utils_file_is_certificate ()
@@ -281,7 +281,7 @@
-gboolean
+gboolean
nm_utils_file_is_private_key ()
@@ -289,7 +289,7 @@
-gboolean
+gboolean
nm_utils_file_is_pkcs12 ()
@@ -297,7 +297,7 @@
-gboolean
+gboolean
(*NMUtilsFileSearchInPathsPredicate) ()
@@ -305,7 +305,7 @@
-gboolean
+gboolean
(*NMUtilsCheckFilePredicate) ()
@@ -320,7 +320,7 @@
-guint32
+guint32
nm_utils_wifi_freq_to_channel ()
@@ -328,7 +328,7 @@
-guint32
+guint32
nm_utils_wifi_channel_to_freq ()
@@ -336,7 +336,7 @@
-guint32
+guint32
nm_utils_wifi_find_next_channel ()
@@ -344,21 +344,21 @@
-gboolean
+gboolean
nm_utils_wifi_is_channel_valid ()
-
const guint *
+ const guint *
nm_utils_wifi_2ghz_freqs ()
-
const guint *
+ const guint *
nm_utils_wifi_5ghz_freqs ()
@@ -373,7 +373,7 @@
-gsize
+gsize
nm_utils_hwaddr_len ()
@@ -389,7 +389,7 @@
-GByteArray *
+GByteArray *
nm_utils_hwaddr_atoba ()
@@ -397,7 +397,7 @@
-guint8 *
+guint8 *
nm_utils_hwaddr_aton ()
@@ -405,7 +405,7 @@
-gboolean
+gboolean
nm_utils_hwaddr_valid ()
@@ -421,7 +421,7 @@
-gboolean
+gboolean
nm_utils_hwaddr_matches ()
@@ -437,7 +437,7 @@
-GBytes *
+GBytes *
nm_utils_hexstr2bin ()
@@ -445,7 +445,7 @@
-gboolean
+gboolean
nm_utils_iface_valid_name ()
@@ -453,7 +453,7 @@
-gboolean
+gboolean
nm_utils_is_valid_iface_name ()
@@ -461,7 +461,7 @@
-gboolean
+gboolean
nm_utils_is_uuid ()
@@ -483,7 +483,7 @@
-gboolean
+gboolean
nm_utils_ipaddr_valid ()
@@ -491,7 +491,7 @@
-gboolean
+gboolean
nm_utils_check_virtual_device_compatibility ()
@@ -522,7 +522,7 @@
-gboolean
+gboolean
nm_utils_enum_from_str ()
@@ -537,12 +537,28 @@
+
-guint
+guint
nm_utils_version ()
+
+
+GHashTable *
+
+
+nm_utils_parse_variant_attributes ()
+
+
+
@@ -567,6 +583,10 @@
+char *
+
+
+nm_utils_format_variant_attributes ()
+
+NM_UTILS_INET_ADDRSTRLEN
+
+
+NMVariantAttributeSpec
+
@@ -575,7 +595,7 @@
@@ -588,9 +608,9 @@ access points and devices, among other things.struct
stat
gboolean -nm_utils_is_empty_ssid (+const guint8 *ssid, -gsize len);
gboolean +nm_utils_is_empty_ssid (const guint8 *ssid, +gsize len);
Different manufacturers use different mechanisms for not broadcasting the AP's SSID. This function attempts to detect blank/empty SSIDs using a number of known SSID-cloaking methods.
@@ -619,15 +639,15 @@ number of known SSID-cloaking methods. TRUE if the SSID is "empty", FALSE if it is not
TRUE if the SSID is "empty", FALSE if it is not
const char * -nm_utils_escape_ssid (+nm_utils_escape_ssid (const guint8 *ssid, -gsize len);
const guint8 *ssid,
+ gsize len);
This function does a quick printable character conversion of the SSID, simply replacing embedded NULLs and non-printable characters with the hexadecimal representation of that character. Intended for debugging only, should not @@ -664,12 +684,12 @@ and will be overwritten by subsequent calls to this function
gboolean -nm_utils_same_ssid (+const guint8 *ssid1, -gsize len1, -const guint8 *ssid2, -gsize len2, -gboolean ignore_trailing_null);
gboolean +nm_utils_same_ssid (const guint8 *ssid1, +gsize len1, +const guint8 *ssid2, +gsize len2, +gboolean ignore_trailing_null);
Earlier versions of the Linux kernel added a NULL byte to the end of the SSID to enable easy printing of the SSID on the console or in a terminal, but this behavior was problematic (SSIDs are simply byte arrays, not strings) @@ -709,7 +729,7 @@ NULLs, even though that is functionally pointless.
ignore_trailing_null
TRUE to ignore one trailing NULL byte
TRUE to ignore one trailing NULL byte
char * -nm_utils_ssid_to_utf8 (+nm_utils_ssid_to_utf8 (const guint8 *ssid, -gsize len);
const guint8 *ssid,
+ gsize len);
Wi-Fi SSIDs are byte arrays, they are _not_ strings. Thus, an SSID may contain embedded NULLs and other unprintable characters. Often it is useful to print the SSID out for debugging purposes, but that should be the @@ -771,19 +791,19 @@ _only_.
gboolean +gboolean nm_utils_security_valid (@@ -848,15 +868,15 @@ e.g. (NMUtilsSecurityType type,NMDeviceWifiCapabilities wifi_caps, -gboolean have_ap, -gboolean adhoc, +gboolean have_ap, +gboolean adhoc,NM80211ApFlags ap_flags,NM80211ApSecurityFlags ap_wpa,NM80211ApSecurityFlags ap_rsn);Returns
-
TRUEif the device capabilities and AP capabilties intersect and are ++,
TRUEif the device capabilities and AP capabilties intersect and are compatible with the desiredtype-,FALSEif they are notFALSEif they are not
gboolean +gboolean nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,NMDeviceWifiCapabilities wifi_caps);Given a set of device capabilities, and a desired security type to check @@ -888,15 +908,15 @@ e.g.
gboolean +gboolean nm_utils_wep_key_valid (const char *key,NMWepKeyType wep_type);Checks if
key@@ -925,14 +945,14 @@ nm_utils_wep_key_valid (const cha
gboolean +gboolean nm_utils_wpa_psk_valid (const char *psk);Checks if
@@ -953,16 +973,16 @@ nm_utils_wpa_psk_valid (pskis a valid WPA PSKconst cha
gboolean +gboolean nm_utils_is_json_object (+const char *str, -GError **error);GError **error);
value |
-a GVariant of type 'au' |
+a GVariant of type 'au' |
a NULL-terminated array of IP address strings.
a NULL-terminated array of IP address strings.
[transfer full][type utf8]
GVariant * -nm_utils_ip4_addresses_to_variant (GPtrArray *addresses, +GVariant * +nm_utils_ip4_addresses_to_variant (-GPtrArray *addresses,const char *gateway);Utility function to convert a GPtrArray of NMIPAddress objects representing -IPv4 addresses into a GVariant of type 'aau' representing an array of +
Utility function to convert a GPtrArray of NMIPAddress objects representing +IPv4 addresses into a GVariant of type 'aau' representing an array of NetworkManager IPv4 addresses (which are tuples of address, prefix, and gateway). The "gateway" field of the first address will get the value of
+ (if non-gateway- (if non-NULL). In all of the other addresses, that field will be 0.NULL). In all of the other addresses, that field will be 0.Parameters
@@ -1087,7 +1107,7 @@ gateway). The "gateway" field of the first address will get the value of
@@ -1095,12 +1115,12 @@ gateway). The "gateway" field of the first address will get the value ofReturns
-a new floating GVariant representing
addresses+a new floating GVariant representing
addresses.[transfer none]
nm_utils_ip4_addresses_from_variant ()
-GPtrArray * -nm_utils_ip4_addresses_from_variant (GVariant *value, +GPtrArray * +nm_utils_ip4_addresses_from_variant (-GVariant *value,char **out_gateway);Utility function to convert a GVariant of type 'aau' representing a list of +
Utility function to convert a GVariant of type 'aau' representing a list of NetworkManager IPv4 addresses (which are tuples of address, prefix, and -gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field of +gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field of the first address (if set) will be returned in
@@ -1115,7 +1135,7 @@ of the other addresses are ignored.out_gateway; the "gateway" fields of the other addresses are ignored.- value
+ a GVariant of type 'aau'
a GVariant of type 'aau'
@@ -1129,17 +1149,17 @@ of the other addresses are ignored. Returns
a newly allocated -GPtrArray of NMIPAddress objects.
+GPtrArray of NMIPAddress objects.[transfer full][element-type NMIPAddress]
nm_utils_ip4_routes_to_variant ()
-GVariant * -nm_utils_ip4_routes_to_variant (-GPtrArray *routes);Utility function to convert a GPtrArray of NMIPRoute objects representing -IPv4 routes into a GVariant of type 'aau' representing an array of +
GVariant * +nm_utils_ip4_routes_to_variant (+GPtrArray *routes);Utility function to convert a GPtrArray of NMIPRoute objects representing +IPv4 routes into a GVariant of type 'aau' representing an array of NetworkManager IPv4 routes (which are tuples of route, prefix, next hop, and metric).
@@ -1159,7 +1179,7 @@ metric).@@ -1167,11 +1187,11 @@ metric).Returns
-a new floating GVariant representing
routes+a new floating GVariant representing
routes.[transfer none]
nm_utils_ip4_routes_from_variant ()
-GPtrArray * -nm_utils_ip4_routes_from_variant (-GVariant *value);Utility function to convert a GVariant of type 'aau' representing an array +
GPtrArray * +nm_utils_ip4_routes_from_variant (+GVariant *value);Utility function to convert a GVariant of type 'aau' representing an array of NetworkManager IPv4 routes (which are tuples of route, prefix, next hop, -and metric) into a GPtrArray of NMIPRoute objects.
+and metric) into a GPtrArray of NMIPRoute objects.
nm_utils_ip4_netmask_to_prefix ()
-guint32 -nm_utils_ip4_netmask_to_prefix (+guint32 netmask);guint32 +nm_utils_ip4_netmask_to_prefix (guint32 netmask);Parameters
@@ -1222,8 +1242,8 @@ nm_utils_ip4_netmask_to_prefix (
nm_utils_ip4_prefix_to_netmask ()
-guint32 -nm_utils_ip4_prefix_to_netmask (+guint32 prefix);guint32 +nm_utils_ip4_prefix_to_netmask (guint32 prefix);Parameters
@@ -1247,8 +1267,8 @@ nm_utils_ip4_prefix_to_netmask (
nm_utils_ip4_get_default_prefix ()
-guint32 -nm_utils_ip4_get_default_prefix (+guint32 ip);guint32 +nm_utils_ip4_get_default_prefix (guint32 ip);When the Internet was originally set up, various ranges of IP addresses were segmented into three network classes: A, B, and C. This function will return a prefix that is associated with the IP address specified defining where it @@ -1276,9 +1296,9 @@ falls in the predefined classes.
nm_utils_ip6_dns_to_variant ()
-GVariant * +GVariant * nm_utils_ip6_dns_to_variant (-char **dns);Utility function to convert an array of IP address strings int a GVariant of +
Utility function to convert an array of IP address strings int a GVariant of type 'aay' representing an array of IPv6 addresses.
@@ -1306,8 +1326,8 @@ type 'aay' representing an array of IPv6 addresses.Returns
-a new floating GVariant representing
dns+a new floating GVariant representing
dns.[transfer none]
nm_utils_ip6_dns_from_variant ()
char ** -nm_utils_ip6_dns_from_variant (-GVariant *value);Utility function to convert a GVariant of type 'aay' representing a list of +nm_utils_ip6_dns_from_variant (
GVariant *value); +Utility function to convert a GVariant of type 'aay' representing a list of IPv6 addresses into an array of IP address strings.
Parameters
@@ -1319,29 +1339,29 @@ IPv6 addresses into an array of IP address strings.- value
+ a GVariant of type 'aay'
a GVariant of type 'aay'
Returns
-a
+NULL-terminated array of IP address strings.a
NULL-terminated array of IP address strings.[transfer full][type utf8]
nm_utils_ip6_addresses_to_variant ()
-GVariant * -nm_utils_ip6_addresses_to_variant (GPtrArray *addresses, +GVariant * +nm_utils_ip6_addresses_to_variant (-GPtrArray *addresses,const char *gateway);Utility function to convert a GPtrArray of NMIPAddress objects representing -IPv6 addresses into a GVariant of type 'a(ayuay)' representing an array of +
Utility function to convert a GPtrArray of NMIPAddress objects representing +IPv6 addresses into a GVariant of type 'a(ayuay)' representing an array of NetworkManager IPv6 addresses (which are tuples of address, prefix, and gateway). The "gateway" field of the first address will get the value of
gateway- (if non-NULL). In all of the other addresses, that field will be + (if non-NULL). In all of the other addresses, that field will be all 0s.@@ -1375,12 +1395,12 @@ all 0s.Returns
-a new floating GVariant representing
addresses+a new floating GVariant representing
addresses.[transfer none]
nm_utils_ip6_addresses_from_variant ()
-GPtrArray * -nm_utils_ip6_addresses_from_variant (GVariant *value, +GPtrArray * +nm_utils_ip6_addresses_from_variant (-GVariant *value,char **out_gateway);Utility function to convert a GVariant of type 'a(ayuay)' representing a +
Utility function to convert a GVariant of type 'a(ayuay)' representing a list of NetworkManager IPv6 addresses (which are tuples of address, prefix, -and gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field +and gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field of the first address (if set) will be returned in
@@ -1395,7 +1415,7 @@ fields of the other addresses are ignored.out_gateway; the "gateway" fields of the other addresses are ignored.- value
+ a GVariant of type 'a(ayuay)'
a GVariant of type 'a(ayuay)'
@@ -1409,17 +1429,17 @@ fields of the other addresses are ignored. Returns
a newly allocated -GPtrArray of NMIPAddress objects.
+GPtrArray of NMIPAddress objects.[transfer full][element-type NMIPAddress]
nm_utils_ip6_routes_to_variant ()
-GVariant * -nm_utils_ip6_routes_to_variant (-GPtrArray *routes);Utility function to convert a GPtrArray of NMIPRoute objects representing -IPv6 routes into a GVariant of type 'a(ayuayu)' representing an array of +
GVariant * +nm_utils_ip6_routes_to_variant (+GPtrArray *routes);Utility function to convert a GPtrArray of NMIPRoute objects representing +IPv6 routes into a GVariant of type 'a(ayuayu)' representing an array of NetworkManager IPv6 routes (which are tuples of route, prefix, next hop, and metric).
@@ -1439,7 +1459,7 @@ metric).@@ -1447,11 +1467,11 @@ metric).Returns
-a new floating GVariant representing
routes+a new floating GVariant representing
routes.[transfer none]
nm_utils_ip6_routes_from_variant ()
-GPtrArray * -nm_utils_ip6_routes_from_variant (-GVariant *value);Utility function to convert a GVariant of type 'a(ayuayu)' representing an +
GPtrArray * +nm_utils_ip6_routes_from_variant (+GVariant *value);Utility function to convert a GVariant of type 'a(ayuayu)' representing an array of NetworkManager IPv6 routes (which are tuples of route, prefix, next -hop, and metric) into a GPtrArray of NMIPRoute objects.
+hop, and metric) into a GPtrArray of NMIPRoute objects.Parameters
@@ -1470,17 +1490,17 @@ hop, and metric) into a@@ -1462,7 +1482,7 @@ hop, and metric) into a
value
-+ GVariant of type 'a(ayuayu)'
GVariant of type 'a(ayuayu)'
Returns
a newly allocated -GPtrArray of NMIPRoute objects.
+GPtrArray of NMIPRoute objects.[transfer full][element-type NMIPRoute]
nm_utils_ip_addresses_to_variant ()
-GVariant * -nm_utils_ip_addresses_to_variant (-GPtrArray *addresses);Utility function to convert a GPtrArray of NMIPAddress objects representing -IPv4 or IPv6 addresses into a GVariant of type 'aa{sv}' representing an +
GVariant * +nm_utils_ip_addresses_to_variant (+GPtrArray *addresses);Utility function to convert a GPtrArray of NMIPAddress objects representing +IPv4 or IPv6 addresses into a GVariant of type 'aa{sv}' representing an array of new-style NetworkManager IP addresses. All addresses will include "address" (an IP address string), and "prefix" (a uint). Some addresses may include additional attributes.
@@ -1501,7 +1521,7 @@ include additional attributes.@@ -1509,12 +1529,12 @@ include additional attributes.Returns
-a new floating GVariant representing
addresses+a new floating GVariant representing
addresses.[transfer none]
nm_utils_ip_addresses_from_variant ()
-GPtrArray * -nm_utils_ip_addresses_from_variant (GVariant *value, +GPtrArray * +nm_utils_ip_addresses_from_variant (-GVariant *value,int family);Utility function to convert a GVariant representing a list of new-style +
Utility function to convert a GVariant representing a list of new-style NetworkManager IPv4 or IPv6 addresses (as described in the documentation for -
nm_utils_ip_addresses_to_variant()) into a GPtrArray of NMIPAddress +nm_utils_ip_addresses_to_variant()) into a GPtrArray of NMIPAddress objects.Parameters
@@ -1527,7 +1547,7 @@ objects.- value
+ a GVariant of type 'aa{sv}'
a GVariant of type 'aa{sv}'
@@ -1541,17 +1561,17 @@ objects. Returns
a newly allocated -GPtrArray of NMIPAddress objects.
+GPtrArray of NMIPAddress objects.[transfer full][element-type NMIPAddress]
nm_utils_ip_routes_to_variant ()
-GVariant * -nm_utils_ip_routes_to_variant (-GPtrArray *routes);Utility function to convert a GPtrArray of NMIPRoute objects representing -IPv4 or IPv6 routes into a GVariant of type 'aa{sv}' representing an array +
GVariant * +nm_utils_ip_routes_to_variant (+GPtrArray *routes);Utility function to convert a GPtrArray of NMIPRoute objects representing +IPv4 or IPv6 routes into a GVariant of type 'aa{sv}' representing an array of new-style NetworkManager IP routes (which are tuples of destination, prefix, next hop, metric, and additional attributes).
@@ -1571,7 +1591,7 @@ prefix, next hop, metric, and additional attributes).@@ -1579,12 +1599,12 @@ prefix, next hop, metric, and additional attributes).Returns
-a new floating GVariant representing
routes+a new floating GVariant representing
routes.[transfer none]
nm_utils_ip_routes_from_variant ()
-GPtrArray * -nm_utils_ip_routes_from_variant (GVariant *value, +GPtrArray * +nm_utils_ip_routes_from_variant (-GVariant *value,int family);Utility function to convert a GVariant representing a list of new-style +
Utility function to convert a GVariant representing a list of new-style NetworkManager IPv4 or IPv6 addresses (which are tuples of destination, -prefix, next hop, metric, and additional attributes) into a GPtrArray of +prefix, next hop, metric, and additional attributes) into a GPtrArray of NMIPRoute objects.
@@ -1611,7 +1631,7 @@ prefix, next hop, metric, and additional attributes) into a Returns
a newly allocated -GPtrArray of NMIPRoute objects.
+GPtrArray of NMIPRoute objects.[transfer full][element-type NMIPRoute]
@@ -1623,13 +1643,13 @@ nm_utils_uuid_generate (voidReturns
a newly allocated UUID suitable for use as the NMSettingConnection -object's “id”: property. Should be freed with
+object's “id”: property. Should be freed withg_free()g_free()
nm_utils_file_is_certificate ()
-gboolean +gboolean nm_utils_file_is_certificate (const char *filename);Tests if
filenamehas a valid extension for an X.509 certificate file @@ -1652,15 +1672,15 @@ recognized by NetworkManager.Returns
-+
TRUEif the file is a certificate,FALSEif it is not
TRUEif the file is a certificate,FALSEif it is not
nm_utils_file_is_private_key ()
-gboolean +gboolean nm_utils_file_is_private_key (+const char *filename, -gboolean *out_encrypted);gboolean *out_encrypted);Tests if
filenamehas a valid extension for an X.509 private key file (".der", ".key", ".pem", or ".p12"), and contains a private key in a format @@ -1689,13 +1709,13 @@ recognized by NetworkManager.Returns
-+
TRUEif the file is a private key,FALSEif it is not
TRUEif the file is a private key,FALSEif it is not
nm_utils_file_is_pkcs12 ()
-gboolean +gboolean nm_utils_file_is_pkcs12 (const char *filename);Tests if
@@ -1716,24 +1736,24 @@ nm_utils_file_is_pkcs12 (filenameis a PKCS#12 file.const chReturns
-+
TRUEif the file is PKCS#12,FALSEif it is not
TRUEif the file is PKCS#12,FALSEif it is not
NMUtilsFileSearchInPathsPredicate ()
-gboolean +gboolean (*NMUtilsFileSearchInPathsPredicate) (+const char *filename, -gpointer user_data);gpointer user_data);
NMUtilsCheckFilePredicate ()
-gboolean +gboolean (*NMUtilsCheckFilePredicate) (+const char *filename,const struct stat *stat, -gpointer user_data, -GError **error);gpointer user_data, +GError **error);
@@ -1742,10 +1762,10 @@ nm_utils_file_is_pkcs12 (const ch nm_utils_file_search_in_paths (const char *progname,const char *try_first,const char *const *paths, -GFileTest file_test_flags, +GFileTest file_test_flags,NMUtilsFileSearchInPathsPredicate predicate, -gpointer user_data, -GError **error); +gpointer user_data, +GError **error);Searches for a
@@ -1772,16 +1792,16 @@ It is silently ignored if it is empty or not an absolute path.prognamefile in a list of searchpaths.- paths
a
NULLterminated list of search paths. -Can be empty orNULL, in which case onlytry_first+a
NULLterminated list of search paths. +Can be empty orNULL, in which case onlytry_firstis checked.[allow-none] - file_test_flags
the flags passed to
g_file_test()when searching ++. Set it to 0 to skip the the flags passed to
g_file_test()when searching forprogname-. Set it to 0 to skip theg_file_test().g_file_test().@@ -1802,7 +1822,7 @@ function. @@ -1810,7 +1830,7 @@ function. - error
+ on failure, set a "not found" error
G_IO_ERRORG_IO_ERROR_NOT_FOUND.on failure, set a "not found" error
G_IO_ERRORG_IO_ERROR_NOT_FOUND.[allow-none] Returns
-the full path to the helper, if found, or
NULLif not found. +the full path to the helper, if found, or
NULLif not found. The returned string is not owned by the caller, but later invocations of the function might overwrite it.[transfer none]
@@ -1819,8 +1839,8 @@ invocations of the function might overwrite it.
nm_utils_wifi_freq_to_channel ()
-guint32 -nm_utils_wifi_freq_to_channel (+guint32 freq);guint32 +nm_utils_wifi_freq_to_channel (guint32 freq);Utility function to translate a Wi-Fi frequency to its corresponding channel.
Parameters
@@ -1845,8 +1865,8 @@ nm_utils_wifi_freq_to_channel (nm_utils_wifi_channel_to_freq ()
-guint32 -nm_utils_wifi_channel_to_freq (guint32 channel, +guint32 +nm_utils_wifi_channel_to_freq (guint32 channel,const char *band);Utility function to translate a Wi-Fi channel to its corresponding frequency.
@@ -1881,8 +1901,8 @@ is invalid
nm_utils_wifi_find_next_channel ()
-guint32 -nm_utils_wifi_find_next_channel (guint32 channel, +guint32 +nm_utils_wifi_find_next_channel (guint32 channel,int direction,char *band);Utility function to find out next/previous Wi-Fi channel for a channel.
@@ -1921,8 +1941,8 @@ nm_utils_wifi_find_next_channel (nm_utils_wifi_is_channel_valid ()
-gboolean -nm_utils_wifi_is_channel_valid (guint32 channel, +gboolean +nm_utils_wifi_is_channel_valid (guint32 channel,const char *band);Utility function to verify Wi-Fi channel validity.
nm_utils_wifi_2ghz_freqs ()
-const guint * +const guint * nm_utils_wifi_2ghz_freqs (void);Utility function to return 2.4 GHz Wi-Fi frequencies (802.11bg band).
@@ -1967,7 +1987,7 @@ nm_utils_wifi_2ghz_freqs (voidnm_utils_wifi_5ghz_freqs ()
-const guint * +const guint * nm_utils_wifi_5ghz_freqs (void);Utility function to return 5 GHz Wi-Fi frequencies (802.11a band).
@@ -1980,7 +2000,7 @@ nm_utils_wifi_5ghz_freqs (voidnm_utils_wifi_strength_bars ()
const char * -nm_utils_wifi_strength_bars (+nm_utils_wifi_strength_bars (guint8 strength);guint8 strength);Converts
strengthinto a 4-character-wide graphical representation of strength suitable for printing to stdout. If the current locale and terminal @@ -2009,7 +2029,7 @@ support it, this will use unicode graphics characters to represent
nm_utils_hwaddr_len ()
-gsize +gsize nm_utils_hwaddr_len (int type);Returns the length in octets of a hardware address of type
@@ -2040,8 +2060,8 @@ nm_utils_hwaddr_len (type.int tnm_utils_hwaddr_ntoa ()
char * -nm_utils_hwaddr_ntoa (+nm_utils_hwaddr_ntoa (gconstpointer addr, -gsize length);gconstpointer addr, +gsize length);Converts
addrto textual form.@@ -2077,12 +2097,12 @@ nm_utils_hwaddr_ntoa (nm_utils_hwaddr_atoba ()
-GByteArray * +GByteArray * nm_utils_hwaddr_atoba (+const char *asc, -gsize length);gsize length);Parses
+ and converts it to binary form in a GByteArray. See +asc- and converts it to binary form in a GByteArray. See -nm_utils_hwaddr_aton()if you don't want a GByteArray.nm_utils_hwaddr_aton()if you don't want a GByteArray.Parameters
@@ -2107,7 +2127,7 @@ nm_utils_hwaddr_atoba (
const charReturns
-a new GByteArray, or
NULLifasc+a new GByteArray, or
NULLifasccouldn't be parsed.[transfer full]
@@ -2116,10 +2136,10 @@ be parsed.
nm_utils_hwaddr_aton ()
-guint8 * +guint8 * nm_utils_hwaddr_aton (+const char *asc, -gpointer buffer, -gsize length);gpointer buffer, +gsize length);Parses
ascand converts it to binary form inbuffer. @@ -2156,7 +2176,7 @@ the size of the buffer in bytes.Returns
@@ -2165,9 +2185,9 @@ or would be shorter or longer than
buffer-, orNULLifasc+, orNULLifasccouldn't be parsed or would be shorter or longer thanlength.length
@@ -2207,7 +2227,7 @@ of the indicated length,nm_utils_hwaddr_canonical ()
char * nm_utils_hwaddr_canonical (+const char *asc, -gssize length);gssize length);Parses
ascto see if it is a valid hardware address of the given length, and if so, returns it in canonical form (uppercase, with @@ -2240,18 +2260,18 @@ is expected to convert toReturns
the canonicalized address if
+be a valid hardware address of the indicated length,ascappears to -be a valid hardware address of the indicated length,NULLif not.NULLif not.[transfer full]
nm_utils_hwaddr_matches ()
-gboolean -nm_utils_hwaddr_matches (+gconstpointer hwaddr1, -gssize hwaddr1_len, -gconstpointer hwaddr2, -gssize hwaddr2_len);gboolean +nm_utils_hwaddr_matches (gconstpointer hwaddr1, +gssize hwaddr1_len, +gconstpointer hwaddr2, +gssize hwaddr2_len);Generalized hardware address comparison function. Tests if
before being compared.hwaddr1andhwaddr2@@ -2265,7 +2285,7 @@ over a simplememcmp():@@ -2294,7 +2314,7 @@ guaranteed to not match if they are invalid.) If
hwaddr1orhwaddr2- isNULL, it is treated instead as though it was + isNULL, it is treated instead as though it was a zero-filled bufferhwaddr1_lenorhwaddr2_lenbytes long.- hwaddr1
+ pointer to a binary or ASCII hardware address, or
NULLpointer to a binary or ASCII hardware address, or
NULL@@ -2306,7 +2326,7 @@ is ASCII - hwaddr2
+ pointer to a binary or ASCII hardware address, or
NULLpointer to a binary or ASCII hardware address, or
NULL@@ -2321,9 +2341,9 @@ is ASCII @@ -2331,8 +2351,8 @@ different (or either of them is invalid).Returns
-
TRUEifhwaddr1+
TRUEifhwaddr1andhwaddr2-are equivalent,FALSEif they are +are equivalent,FALSEif they are different (or either of them is invalid).nm_utils_bin2hexstr ()
char * -nm_utils_bin2hexstr (gconstpointer src, -gsize len, +nm_utils_bin2hexstr (gconstpointer src, +gsize len,int final_len);Converts the byte array
srcinto a hexadecimal string. Iffinal_len@@ -2377,7 +2397,7 @@ array
nm_utils_hexstr2bin ()
-GBytes * +GBytes * nm_utils_hexstr2bin (const char *hex);Converts a hexadecimal string
hexinto an array of bytes. The optional @@ -2403,18 +2423,18 @@ may not start or end with ':'.Returns
-the converted bytes, or
+NULLon error.the converted bytes, or
NULLon error.[transfer full]
nm_utils_iface_valid_name ()
-gboolean +gboolean nm_utils_iface_valid_name (const char *name);-
nm_utils_iface_valid_namehas been deprecated since version 1.6 and should not be used in newly-written code.use
+nm_utils_is_valid_iface_name()insteead, with better error reporting.use
nm_utils_is_valid_iface_name()instead, with better error reporting.Validate the network interface name.
@@ -2434,15 +2454,15 @@ nm_utils_iface_valid_name (const
nm_utils_is_valid_iface_name ()
-gboolean +gboolean nm_utils_is_valid_iface_name (+const char *name, -GError **error);GError **error);Validate the network interface name.
This function is a 1:1 copy of the kernel's interface validation function in net/core/dev.c.
@@ -2462,7 +2482,7 @@ function in net/core/dev.c.@@ -2470,13 +2490,13 @@ function in net/core/dev.c. - error
+ location to store the error occurring, or
NULLto ignorelocation to store the error occurring, or
NULLto ignoreReturns
-+
TRUEif interface name is valid, otherwiseFALSEis returned.
TRUEif interface name is valid, otherwiseFALSEis returned.
nm_utils_is_uuid ()
-gboolean +gboolean nm_utils_is_uuid (const char *str);Checks if
@@ -2497,8 +2517,8 @@ nm_utils_is_uuid (stris a UUIDconst char
@@ -2527,7 +2547,7 @@ nm_utils_inet4_ntop (in_addr_tdst
- the destination buffer, it must contain at least
INET_ADDRSTRLENorNM_UTILS_INET_ADDRSTRLEN-characters. If set toNULL, it will return a pointer to an internal, static +characters. If set toNULL, it will return a pointer to an internal, static buffer (shared withnm_utils_inet6_ntop()). Beware, that the internal buffer will be overwritten with ever new call ofnm_utils_inet4_ntop()ornm_utils_inet6_ntop()that does not provied it's owndst@@ -2573,7 +2593,7 @@ nm_utils_inet6_ntop (const structdst
the destination buffer, it must contain at least
INET6_ADDRSTRLENorNM_UTILS_INET_ADDRSTRLEN-characters. If set toNULL, it will return a pointer to an internal, static +characters. If set toNULL, it will return a pointer to an internal, static buffer (shared withnm_utils_inet4_ntop()). Beware, that the internal buffer will be overwritten with ever new call ofnm_utils_inet4_ntop()ornm_utils_inet6_ntop()that does not provied it's owndst@@ -2590,7 +2610,7 @@ buffer to avoid these issues.Returns
the input buffer
@@ -2598,7 +2618,7 @@ otherwise, this function cannot fail.dst, or a pointer to an -internal, static buffer.NULLis not allowed asin6addr+internal, static buffer.NULLis not allowed asin6addr, otherwise, this function cannot fail.
nm_utils_ipaddr_valid ()
-gboolean +gboolean nm_utils_ipaddr_valid (int family,const char *ip);Checks if
ip@@ -2628,16 +2648,16 @@ nm_utils_ipaddr_valid (int
nm_utils_check_virtual_device_compatibility ()
-gboolean +gboolean nm_utils_check_virtual_device_compatibility - (+ (GType virtual_type, -GType other_type);GType virtual_type, +GType other_type);Determines if a connection of type
-virtual_typecan (in the general case) work with connections of typeother_type@@ -2651,7 +2671,7 @@ general case) work with connections of typeother_ty then this checks ifother_typeis a valid type for a slave of that master.Note that even if this returns
TRUEit is not guaranteed that +Note that even if this returns
TRUEit is not guaranteed that every connection of typeother_typeis compatible withvirtual_type@@ -2683,7 +2703,7 @@ underlying device driver.
@@ -2750,12 +2770,12 @@ available modes.@@ -2840,9 +2860,9 @@ containing the unrecognized token innm_utils_enum_to_str ()
char * -nm_utils_enum_to_str (GType type, +nm_utils_enum_to_str (GType type,int value);Converts an enum value to its string representation. If the enum is a -
+G_TYPE_FLAGSthe function returns a comma-separated list of matching values. -If the enum is aG_TYPE_ENUMand the given value is not valid the -function returnsNULL.G_TYPE_FLAGSthe function returns a comma-separated list of matching values. +If the enum is aG_TYPE_ENUMand the given value is not valid the +function returnsNULL.Parameters
@@ -2767,7 +2787,7 @@ function returns
type
-+ the
GTypeof the enumthe
GTypeof the enum@@ -2780,22 +2800,22 @@ function returns Returns
-a newly allocated string or
+NULLa newly allocated string or
NULLSince: 1.2
nm_utils_enum_from_str ()
-gboolean -nm_utils_enum_from_str (GType type, +gboolean +nm_utils_enum_from_str (GType type,const char *str,int *out_value,char **err_token);Converts a string to the matching enum value.
-If the enum is a
G_TYPE_FLAGSthe function returns the logical OR of values +If the enum is a
G_TYPE_FLAGSthe function returns the logical OR of values matching the comma-separated tokens in the string; if an unknown token is found -the function returnsFALSEand stores a pointer to a newly allocated string +the function returnsFALSEand stores a pointer to a newly allocated string containing the unrecognized token inerr_token.@@ -2809,7 +2829,7 @@ containing the unrecognized token inerr_token- type
+ the
GTypeof the enumthe
GTypeof the enum@@ -2825,14 +2845,14 @@ containing the unrecognized token in err_tokenerr_token
- location to store the first unrecognized token.
[out][allow-none] +[out][allow-none][transfer full] Returns
-+
TRUEif the conversion was successful,FALSEotherwise
TRUEif the conversion was successful,FALSEotherwiseSince: 1.2
err_tokennm_utils_enum_get_values ()
const char ** -nm_utils_enum_get_values (+nm_utils_enum_get_values (GType type, -gint from, -gint to);GType type, +gint from, +gint to);Returns the list of possible values for a given enum.
+ the
GTypeof the enumthe
GTypeof the enum@@ -2874,15 +2894,15 @@ nm_utils_enum_get_values ( Returns
a NULL-terminated dynamically-allocated array of static strings -or
-NULLon error.[transfer full]
+orNULLon error. +[transfer container]
Since: 1.2
+
+++nm_utils_parse_variant_attributes ()
+GHashTable * +nm_utils_parse_variant_attributes (+const char *string, +char attr_separator, +char key_value_separator, +gboolean ignore_unknown, +const NMVariantAttributeSpec *const *spec, +GError **error);Parse attributes from a string.
+++ +Parameters
+++
+ + ++ + + + ++ string
+ the input string
+ + ++ attr_separator
+ the attribute separator character
+ + ++ key_value_separator
+ character separating key and values
+ + ++ ignore_unknown
+ whether unknown attributes should be ignored
+ + ++ spec
+ the attribute format specifiers
+ + + ++ error
+ location to store the error on failure.
[out][allow-none] +Since: 1.8
+
++nm_utils_format_variant_attributes ()
+char * +nm_utils_format_variant_attributes (+GHashTable *attributes, +char attr_separator, +char key_value_separator);+Types and Values
@@ -2996,6 +3084,11 @@ for both +NMVariantAttributeSpec
+typedef struct _NMVariantAttributeSpec NMVariantAttributeSpec;+
+ -- cgit 1.3.0-6-gf8a5