diff options
Diffstat (limited to 'src/nm-ip4-config.h')
| -rw-r--r-- | src/nm-ip4-config.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index d9ac969c..45c1fa3f 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -138,18 +138,16 @@ typedef struct _NMIP4ConfigClass NMIP4ConfigClass; #define NM_IP4_CONFIG_ADDRESS_DATA "address-data" #define NM_IP4_CONFIG_ROUTE_DATA "route-data" #define NM_IP4_CONFIG_GATEWAY "gateway" -#define NM_IP4_CONFIG_NAMESERVER_DATA "nameserver-data" +#define NM_IP4_CONFIG_NAMESERVERS "nameservers" #define NM_IP4_CONFIG_DOMAINS "domains" #define NM_IP4_CONFIG_SEARCHES "searches" #define NM_IP4_CONFIG_DNS_OPTIONS "dns-options" #define NM_IP4_CONFIG_DNS_PRIORITY "dns-priority" -#define NM_IP4_CONFIG_WINS_SERVER_DATA "wins-server-data" +#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers" /* deprecated */ #define NM_IP4_CONFIG_ADDRESSES "addresses" #define NM_IP4_CONFIG_ROUTES "routes" -#define NM_IP4_CONFIG_NAMESERVERS "nameservers" -#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers" GType nm_ip4_config_get_type (void); @@ -175,7 +173,6 @@ gboolean nm_ip4_config_commit (const NMIP4Config *self, void nm_ip4_config_merge_setting (NMIP4Config *self, NMSettingIPConfig *setting, NMSettingConnectionMdns mdns, - NMSettingConnectionLlmnr llmnr, guint32 route_table, guint32 route_metric); NMSetting *nm_ip4_config_create_setting (const NMIP4Config *self); @@ -204,9 +201,6 @@ in_addr_t nmtst_ip4_config_get_gateway (NMIP4Config *config); NMSettingConnectionMdns nm_ip4_config_mdns_get (const NMIP4Config *self); void nm_ip4_config_mdns_set (NMIP4Config *self, NMSettingConnectionMdns mdns); -NMSettingConnectionLlmnr nm_ip4_config_llmnr_get (const NMIP4Config *self); -void nm_ip4_config_llmnr_set (NMIP4Config *self, - NMSettingConnectionLlmnr llmnr); const NMDedupMultiHeadEntry *nm_ip4_config_lookup_addresses (const NMIP4Config *self); void nm_ip4_config_reset_addresses (NMIP4Config *self); @@ -263,8 +257,8 @@ void nm_ip4_config_del_dns_option (NMIP4Config *self, guint i); guint nm_ip4_config_get_num_dns_options (const NMIP4Config *self); const char * nm_ip4_config_get_dns_option (const NMIP4Config *self, guint i); -void nm_ip4_config_set_dns_priority (NMIP4Config *self, int priority); -int nm_ip4_config_get_dns_priority (const NMIP4Config *self); +void nm_ip4_config_set_dns_priority (NMIP4Config *self, gint priority); +gint nm_ip4_config_get_dns_priority (const NMIP4Config *self); void nm_ip4_config_reset_nis_servers (NMIP4Config *self); void nm_ip4_config_add_nis_server (NMIP4Config *self, guint32 nis); @@ -437,7 +431,7 @@ nm_ip_config_get_dns_priority (const NMIPConfig *self) } static inline void -nm_ip_config_set_dns_priority (NMIPConfig *self, int priority) +nm_ip_config_set_dns_priority (NMIPConfig *self, gint priority) { _NM_IP_CONFIG_DISPATCH_VOID (self, nm_ip4_config_set_dns_priority, nm_ip6_config_set_dns_priority, priority); } |