colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-03-12 Dan Williams <dcbw@redhat.com>

Browse Source 
* libnm-util/nm-setting-ip4-config.c
	  libnm-util/nm-setting-ip4-config.h
		- (set_property, get_property, nm_setting_ip4_config_class_init): add
			the 'autoip' property from the spec



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3427 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-03-12 12:45:20 +00:00
parent 6103540d11
commit 763913b200
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2008-03-12 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-ip4-config.c
libnm-util/nm-setting-ip4-config.h
- (set_property, get_property, nm_setting_ip4_config_class_init): add
the 'autoip' property from the spec
2008-03-11 Dan Williams <dcbw@redhat.com> 2008-03-11 Dan Williams <dcbw@redhat.com>
* src/backends/NetworkManagerGeneric.c * src/backends/NetworkManagerGeneric.c

15
libnm-util/nm-setting-ip4-config.c
View File

@@ -10,6 +10,7 @@ G_DEFINE_TYPE (NMSettingIP4Config, nm_setting_ip4_config, NM_TYPE_SETTING)
enum { enum {
PROP_0, PROP_0,
PROP_MANUAL, PROP_MANUAL,
PROP_AUTOIP,
PROP_DNS, PROP_DNS,
PROP_DNS_SEARCH, PROP_DNS_SEARCH,
PROP_ADDRESSES, PROP_ADDRESSES,
@@ -127,6 +128,9 @@ set_property (GObject *object, guint prop_id,
case PROP_MANUAL: case PROP_MANUAL:
setting->manual = g_value_get_boolean (value); setting->manual = g_value_get_boolean (value);
break; break;
case PROP_AUTOIP:
setting->autoip = g_value_get_boolean (value);
break;
case PROP_DNS: case PROP_DNS:
if (setting->dns) if (setting->dns)
g_array_free (setting->dns, TRUE); g_array_free (setting->dns, TRUE);
@@ -156,6 +160,9 @@ get_property (GObject *object, guint prop_id,
case PROP_MANUAL: case PROP_MANUAL:
g_value_set_boolean (value, setting->manual); g_value_set_boolean (value, setting->manual);
break; break;
case PROP_AUTOIP:
g_value_set_boolean (value, setting->autoip);
break;
case PROP_DNS: case PROP_DNS:
g_value_set_boxed (value, setting->dns); g_value_set_boxed (value, setting->dns);
break; break;
@@ -192,6 +199,14 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
FALSE, FALSE,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
g_object_class_install_property
(object_class, PROP_AUTOIP,
g_param_spec_boolean (NM_SETTING_IP4_CONFIG_AUTOIP,
"Auto IP",
"Use Auto IP",
FALSE,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DNS, (object_class, PROP_DNS,
nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS, nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS,

2
libnm-util/nm-setting-ip4-config.h
View File

@@ -17,6 +17,7 @@ G_BEGIN_DECLS
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4" #define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
#define NM_SETTING_IP4_CONFIG_MANUAL "manual" #define NM_SETTING_IP4_CONFIG_MANUAL "manual"
#define NM_SETTING_IP4_CONFIG_AUTOIP "autoip"
#define NM_SETTING_IP4_CONFIG_DNS "dns" #define NM_SETTING_IP4_CONFIG_DNS "dns"
#define NM_SETTING_IP4_CONFIG_DNS_SEARCH "dns-search" #define NM_SETTING_IP4_CONFIG_DNS_SEARCH "dns-search"
#define NM_SETTING_IP4_CONFIG_ADDRESSES "addresses" #define NM_SETTING_IP4_CONFIG_ADDRESSES "addresses"
@@ -31,6 +32,7 @@ typedef struct {
NMSetting parent; NMSetting parent;
gboolean manual; gboolean manual;
gboolean autoip;
GArray *dns; /* array of guint32 */ GArray *dns; /* array of guint32 */
GSList *dns_search; /* list of strings */ GSList *dns_search; /* list of strings */
GSList *addresses; /* array of NMSettingIP4Address */ GSList *addresses; /* array of NMSettingIP4Address */