
Add a flag to NMSettingIP4Config to make it possible to ignore the DNS information received from DHCP. * libnm-util/nm-setting-ip4-config.c: Add a new membet "ignore_dhcp_dns" to make it possible to ignore the DNS information (both servers and searches) returned by DHCP server. * src/NetworkManagerUtils.c (nm_utils_merge_ip4_config): Reset the name servers and searches if "ignore_dhcp_dns" is set. * src/nm-ip4-config.c (nm_ip4_config_reset_nameservers) (nm_ip4_config_reset_searches): Implement. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3685 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
56 lines
1.9 KiB
C
56 lines
1.9 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
|
|
#ifndef NM_SETTING_IP4_CONFIG_H
|
|
#define NM_SETTING_IP4_CONFIG_H
|
|
|
|
#include "nm-setting.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_SETTING_IP4_CONFIG (nm_setting_ip4_config_get_type ())
|
|
#define NM_SETTING_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4Config))
|
|
#define NM_SETTING_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_IP4CONFIG, NMSettingIP4ConfigClass))
|
|
#define NM_IS_SETTING_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_IP4_CONFIG))
|
|
#define NM_IS_SETTING_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_IP4_CONFIG))
|
|
#define NM_SETTING_IP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4ConfigClass))
|
|
|
|
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
|
|
|
|
#define NM_SETTING_IP4_CONFIG_METHOD "method"
|
|
#define NM_SETTING_IP4_CONFIG_DNS "dns"
|
|
#define NM_SETTING_IP4_CONFIG_DNS_SEARCH "dns-search"
|
|
#define NM_SETTING_IP4_CONFIG_ADDRESSES "addresses"
|
|
#define NM_SETTING_IP4_CONFIG_IGNORE_DHCP_DNS "ignore-dhcp-dns"
|
|
|
|
#define NM_SETTING_IP4_CONFIG_METHOD_DHCP "dhcp"
|
|
#define NM_SETTING_IP4_CONFIG_METHOD_AUTOIP "autoip"
|
|
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL "manual"
|
|
|
|
typedef struct {
|
|
guint32 address;
|
|
guint32 netmask;
|
|
guint32 gateway;
|
|
} NMSettingIP4Address;
|
|
|
|
typedef struct {
|
|
NMSetting parent;
|
|
|
|
char *method;
|
|
GArray *dns; /* array of guint32 */
|
|
GSList *dns_search; /* list of strings */
|
|
GSList *addresses; /* array of NMSettingIP4Address */
|
|
gboolean ignore_dhcp_dns;
|
|
} NMSettingIP4Config;
|
|
|
|
typedef struct {
|
|
NMSettingClass parent;
|
|
} NMSettingIP4ConfigClass;
|
|
|
|
GType nm_setting_ip4_config_get_type (void);
|
|
|
|
NMSetting *nm_setting_ip4_config_new (void);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* NM_SETTING_IP4_CONFIG_H */
|