diff options
Diffstat (limited to 'libnm-core/nm-core-internal.h')
| -rw-r--r-- | libnm-core/nm-core-internal.h | 50 |
1 files changed, 43 insertions, 7 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 59ebfcb1..5a27d438 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -1,5 +1,4 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2014 Red Hat, Inc. + * (C) Copyright 2014 - 2017 Red Hat, Inc. */ #ifndef NM_CORE_NM_INTERNAL_H @@ -63,6 +62,7 @@ #include "nm-setting-ppp.h" #include "nm-setting-pppoe.h" #include "nm-setting-serial.h" +#include "nm-setting-tc-config.h" #include "nm-setting-team-port.h" #include "nm-setting-team.h" #include "nm-setting-tun.h" @@ -80,6 +80,20 @@ #include "nm-core-types-internal.h" #include "nm-vpn-editor-plugin.h" +/* IEEE 802.1D-1998 timer values */ +#define NM_BR_MIN_HELLO_TIME 1 +#define NM_BR_MAX_HELLO_TIME 10 + +#define NM_BR_MIN_FORWARD_DELAY 2 +#define NM_BR_MAX_FORWARD_DELAY 30 + +#define NM_BR_MIN_MAX_AGE 6 +#define NM_BR_MAX_MAX_AGE 40 + +/* IEEE 802.1D-1998 Table 7.4 */ +#define NM_BR_MIN_AGEING_TIME 0 +#define NM_BR_MAX_AGEING_TIME 1000000 + /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated * connection can be replaced by a already-defined connection. This flag only * takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE @@ -230,10 +244,6 @@ gssize _nm_utils_ptrarray_find_first (gconstpointer *list, gssize len, gconstpoi gssize _nm_utils_ptrarray_find_binary_search (gconstpointer *list, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data); gssize _nm_utils_array_find_binary_search (gconstpointer list, gsize elem_size, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data); -char ** _nm_utils_strsplit_set (const char *str, - const char *delimiters, - int max_tokens); - GSList * _nm_utils_strv_to_slist (char **strv, gboolean deep_copy); char ** _nm_utils_slist_to_strv (GSList *slist, gboolean deep_copy); @@ -429,11 +439,24 @@ NMSettingBluetooth *_nm_connection_get_setting_bluetooth_for_nap (NMConnection * /*****************************************************************************/ +const char *nm_utils_inet_ntop (int addr_family, gconstpointer addr, char *dst); + gboolean _nm_utils_inet6_is_token (const struct in6_addr *in6addr); /*****************************************************************************/ -gboolean _nm_utils_team_config_equal (const char *conf1, const char *conf2, gboolean port); +gboolean _nm_utils_team_config_equal (const char *conf1, const char *conf2, gboolean port); +GValue *_nm_utils_team_config_get (const char *conf, + const char *key, + const char *key2, + const char *key3, + gboolean port_config); + +gboolean _nm_utils_team_config_set (char **conf, + const char *key, + const char *key2, + const char *key3, + const GValue *value); /*****************************************************************************/ @@ -449,4 +472,17 @@ nm_setting_ip_config_get_addr_family (NMSettingIPConfig *s_ip) /*****************************************************************************/ +guint32 _nm_utils_parse_tc_handle (const char *str, + GError **error); +void _nm_utils_string_append_tc_parent (GString *string, + const char *prefix, + guint32 parent); +void _nm_utils_string_append_tc_qdisc_rest (GString *string, + NMTCQdisc *qdisc); +gboolean _nm_utils_string_append_tc_tfilter_rest (GString *string, + NMTCTfilter *tfilter, + GError **error); + +/*****************************************************************************/ + #endif |