fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 02:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-10-13 Dan Williams <dcbw@redhat.com>

Browse source 
* libnm-util/nm-setting.h
	  libnm-util/nm-setting.c
	  src/supplicant-manager/nm-supplicant-config.c
		- Make the 'proto' field of the 802-11-wireless-security field a
			string list



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2973 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-14 02:28:28 +00:00
parent 86306041af
commit 52fd366c05
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-10-13 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting.h
libnm-util/nm-setting.c
src/supplicant-manager/nm-supplicant-config.c
- Make the 'proto' field of the 802-11-wireless-security field a
string list
2007-10-12 Tambet Ingo <tambet@gmail.com>
Rework the "properties-changed" signal listening implementation.

10
libnm-util/nm-setting.c
View file

@ -866,7 +866,7 @@ setting_wireless_security_verify (NMSetting *setting, GHashTable *all_settings)
return FALSE;
}
if (self->proto && !string_in_list (self->proto, valid_protos)) {
if (self->proto && !string_slist_validate (self->proto, valid_protos)) {
g_warning ("Invalid authentication protocol");
return FALSE;
}
@ -925,7 +925,6 @@ setting_wireless_security_destroy (NMSetting *setting)
g_free (self->key_mgmt);
g_free (self->auth_alg);
g_free (self->proto);
g_free (self->identity);
g_free (self->anonymous_identity);
g_free (self->ca_path);
@ -947,6 +946,11 @@ setting_wireless_security_destroy (NMSetting *setting)
g_free (self->private_key_passwd);
g_free (self->phase2_private_key_passwd);
if (self->proto) {
g_slist_foreach (self->proto, (GFunc) g_free, NULL);
g_slist_free (self->proto);
}
if (self->pairwise) {
g_slist_foreach (self->pairwise, (GFunc) g_free, NULL);
g_slist_free (self->pairwise);
@ -1111,7 +1115,7 @@ static SettingMember wireless_sec_table[] = {
{ "key-mgmt", NM_S_TYPE_STRING, G_STRUCT_OFFSET (NMSettingWirelessSecurity, key_mgmt), TRUE, FALSE },
{ "wep-tx-keyidx", NM_S_TYPE_UINT32, G_STRUCT_OFFSET (NMSettingWirelessSecurity, wep_tx_keyidx), FALSE, FALSE },
{ "auth-alg", NM_S_TYPE_STRING, G_STRUCT_OFFSET (NMSettingWirelessSecurity, auth_alg), FALSE, FALSE },
{ "proto", NM_S_TYPE_STRING, G_STRUCT_OFFSET (NMSettingWirelessSecurity, proto), FALSE, FALSE },
{ "proto", NM_S_TYPE_STRING_ARRAY, G_STRUCT_OFFSET (NMSettingWirelessSecurity, proto), FALSE, FALSE },
{ "pairwise", NM_S_TYPE_STRING_ARRAY, G_STRUCT_OFFSET (NMSettingWirelessSecurity, pairwise), FALSE, FALSE },
{ "group", NM_S_TYPE_STRING_ARRAY, G_STRUCT_OFFSET (NMSettingWirelessSecurity, group), FALSE, FALSE },
{ "eap", NM_S_TYPE_STRING_ARRAY, G_STRUCT_OFFSET (NMSettingWirelessSecurity, eap), FALSE, FALSE },

2
libnm-util/nm-setting.h
View file

@ -154,7 +154,7 @@ typedef struct {
char *key_mgmt;
guint32 wep_tx_keyidx;
char *auth_alg;
char *proto;
GSList *proto; /* GSList of strings */
GSList *pairwise; /* GSList of strings */
GSList *group; /* GSList of strings */
GSList *eap; /* GSList of strings */

2
src/supplicant-manager/nm-supplicant-config.c
View file

@ -346,7 +346,6 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig * self,
ADD_STRING_VAL (setting->key_mgmt, "key_mgmt", TRUE, FALSE, FALSE);
ADD_STRING_VAL (setting->auth_alg, "auth_alg", TRUE, FALSE, FALSE);
ADD_STRING_VAL (setting->proto, "proto", TRUE, FALSE, FALSE);
ADD_STRING_VAL (setting->identity, "identity", FALSE, FALSE, FALSE);
ADD_STRING_VAL (setting->anonymous_identity, "anonymous_identity", FALSE, FALSE, FALSE);
ADD_STRING_VAL (setting->nai, "nai", FALSE, FALSE, FALSE);
@ -361,6 +360,7 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig * self,
ADD_STRING_VAL (setting->private_key_passwd, "private_key_passwd", FALSE, FALSE, TRUE);
ADD_STRING_VAL (setting->phase2_private_key_passwd, "phase2_private_key_passwd", FALSE, FALSE, TRUE);
ADD_STRING_LIST_VAL (setting->proto, "proto", TRUE, FALSE);
ADD_STRING_LIST_VAL (setting->pairwise, "pairwise", TRUE, FALSE);
ADD_STRING_LIST_VAL (setting->group, "group", TRUE, FALSE);
ADD_STRING_LIST_VAL (setting->eap, "eap", TRUE, FALSE);