diff options
Diffstat (limited to 'src/dns-manager/nm-dns-manager.h')
| -rw-r--r-- | src/dns-manager/nm-dns-manager.h | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h index bc374fcf..7a55f1a2 100644 --- a/src/dns-manager/nm-dns-manager.h +++ b/src/dns-manager/nm-dns-manager.h @@ -24,7 +24,7 @@ #ifndef __NETWORKMANAGER_DNS_MANAGER_H__ #define __NETWORKMANAGER_DNS_MANAGER_H__ -#include <glib-object.h> +#include "nm-default.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" @@ -41,7 +41,7 @@ G_BEGIN_DECLS #define NM_DNS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NM_TYPE_DNS_MANAGER, NMDnsManagerClass)) #define NM_IS_DNS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_DNS_MANAGER)) #define NM_IS_DNS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_DNS_MANAGER)) -#define NM_DNS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_DNS_MANAGER, NMDnsManagerClass)) +#define NM_DNS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_DNS_MANAGER, NMDnsManagerClass)) typedef struct { GObject parent; @@ -59,26 +59,26 @@ GType nm_dns_manager_get_type (void); NMDnsManager * nm_dns_manager_get (void); /* Allow changes to be batched together */ -void nm_dns_manager_begin_updates (NMDnsManager *mgr, const char *func); -void nm_dns_manager_end_updates (NMDnsManager *mgr, const char *func); +void nm_dns_manager_begin_updates (NMDnsManager *self, const char *func); +void nm_dns_manager_end_updates (NMDnsManager *self, const char *func); -gboolean nm_dns_manager_add_ip4_config (NMDnsManager *mgr, +gboolean nm_dns_manager_add_ip4_config (NMDnsManager *self, const char *iface, NMIP4Config *config, NMDnsIPConfigType cfg_type); -gboolean nm_dns_manager_remove_ip4_config (NMDnsManager *mgr, NMIP4Config *config); +gboolean nm_dns_manager_remove_ip4_config (NMDnsManager *self, NMIP4Config *config); -gboolean nm_dns_manager_add_ip6_config (NMDnsManager *mgr, +gboolean nm_dns_manager_add_ip6_config (NMDnsManager *self, const char *iface, NMIP6Config *config, NMDnsIPConfigType cfg_type); -gboolean nm_dns_manager_remove_ip6_config (NMDnsManager *mgr, NMIP6Config *config); +gboolean nm_dns_manager_remove_ip6_config (NMDnsManager *self, NMIP6Config *config); -void nm_dns_manager_set_initial_hostname (NMDnsManager *mgr, +void nm_dns_manager_set_initial_hostname (NMDnsManager *self, const char *hostname); -void nm_dns_manager_set_hostname (NMDnsManager *mgr, +void nm_dns_manager_set_hostname (NMDnsManager *self, const char *hostname); /** @@ -99,7 +99,23 @@ typedef enum { NM_DNS_MANAGER_RESOLV_CONF_PROXY } NMDnsManagerResolvConfMode; -NMDnsManagerResolvConfMode nm_dns_manager_get_resolv_conf_mode (NMDnsManager *mgr); +/** + * NMDnsManagerResolvConfManager + * @NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE: NM directly writes resolv.conf + * @NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF: NM is managing resolv.conf + through resolvconf + * @NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG: NM is managing resolv.conf + through netconfig + * + * NMDnsManager's management of resolv.conf + */ +typedef enum { + NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE, + NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF, + NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG, +} NMDnsManagerResolvConfManager; + +NMDnsManagerResolvConfMode nm_dns_manager_get_resolv_conf_mode (NMDnsManager *self); G_END_DECLS |