mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-27 23:20:12 +01:00
1cfb4db69f
* libnm-util/nm-setting-ip4-config.c libnm-util/nm-setting-ip4-config.h - Remove 'manual' and 'autoip' properties - Add 'method' property - (verify): fix verification with 'method' - (finalize): free 'method' - (set_property, get_property, nm_setting_ip4_config_class_init): fix up for 'method' * src/nm-device.c - (real_act_stage3_ip_config_start): check IP4Config method - (nm_device_new_ip4_autoip_config): add a note about not sucking in the future - (merge_ip4_config): IP settings are valid with DHCP too - (real_act_stage4_get_ip4_config): handle all IP4Config methods - (real_act_stage4_ip_config_timeout): don't do autoip on DHCP timeout * src/nm-device-802-11-wireless.c - (real_act_stage3_ip_config_start): remove; autoip only on demand - (real_act_stage4_get_ip4_config): just chain up to parent; autoip only on demand * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-suse/parser.c - (make_ip4_setting): fix up for 'method' git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3443 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
53 lines
1.8 KiB
C
53 lines
1.8 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_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 */
|
|
} 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 */
|