mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-03 19:50:14 +01:00
6a68d79c08
[Based on patch by Helmut Schaa <hschaa@suse.de>]
* libnm-glib/nm-client.h:
* libnm-glib/nm-object.h:
* libnm-glib/nm-vpn-connection.h:
* libnm-glib/nm-settings.h:
* libnm-glib/nm-device.h:
* libnm-glib/nm-ip4-config.h:
* libnm-glib/nm-access-point.h:
* libnm-glib/nm-device-802-3-ethernet.h:
* libnm-util/nm-setting.h:
* libnm-util/nm-connection.h: Add G_BEGIN_DECLS / G_END_DECLS to
* support C++.
* libnm-glib/nm-object.c (nm_object_get_byte_property):
* Implement.
* libnm-glib/nm-access-point.c: Strength has type char.
* gnome/vpn-properties/Makefile.am: Remove
* GNOME_DISABLE_DEPRECTATED for now
to fix build. GnomeDruid is deprecated in recent libgnomeui.
* introspection/nm-access-point.xml: Strength property is char,
* not int.
* src/NetworkManagerAP.c (set_property): Set strength from char.
(get_property): Handle hidden APs (with empty SSID).
Get strength value from char.
(nm_ap_class_init): Strength property has char type.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2659 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
141 lines
2.9 KiB
C
141 lines
2.9 KiB
C
#ifndef NM_SETTING_H
|
|
#define NM_SETTING_H
|
|
|
|
#include <glib.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
typedef struct _NMSetting NMSetting;
|
|
|
|
typedef NMSetting *(*NMSettingCreateFn) (GHashTable *settings);
|
|
typedef gboolean (*NMSettingVerifyFn) (NMSetting *setting,
|
|
GHashTable *all_settings);
|
|
|
|
typedef GHashTable *(*NMSettingToHashFn) (NMSetting *setting);
|
|
|
|
typedef void (*NMSettingDestroyFn) (NMSetting *setting);
|
|
|
|
struct _NMSetting {
|
|
char *name;
|
|
|
|
NMSettingVerifyFn verify_fn;
|
|
NMSettingToHashFn hash_fn;
|
|
NMSettingDestroyFn destroy_fn;
|
|
};
|
|
|
|
gboolean nm_settings_verify (GHashTable *all_settings);
|
|
GHashTable *nm_setting_to_hash (NMSetting *setting);
|
|
void nm_setting_destroy (NMSetting *setting);
|
|
|
|
/* Default, built-in settings */
|
|
|
|
/* Info */
|
|
|
|
typedef struct {
|
|
NMSetting parent;
|
|
|
|
char *name;
|
|
char *devtype;
|
|
gboolean autoconnect;
|
|
} NMSettingInfo;
|
|
|
|
NMSetting *nm_setting_info_new (void);
|
|
NMSetting *nm_setting_info_new_from_hash (GHashTable *settings);
|
|
|
|
/* IP4 config */
|
|
|
|
typedef struct {
|
|
NMSetting parent;
|
|
|
|
gboolean manual;
|
|
guint32 address;
|
|
guint32 netmask;
|
|
guint32 gateway;
|
|
} NMSettingIP4Config;
|
|
|
|
NMSetting *nm_setting_ip4_config_new (void);
|
|
NMSetting *nm_setting_ip4_config_new_from_hash (GHashTable *settings);
|
|
|
|
/* Wired device */
|
|
|
|
typedef struct {
|
|
NMSetting parent;
|
|
|
|
char *port;
|
|
guint32 speed;
|
|
char *duplex;
|
|
gboolean auto_negotiate;
|
|
GByteArray *mac_address;
|
|
guint32 mtu;
|
|
} NMSettingWired;
|
|
|
|
NMSetting *nm_setting_wired_new (void);
|
|
NMSetting *nm_setting_wired_new_from_hash (GHashTable *settings);
|
|
|
|
/* Wireless device */
|
|
|
|
typedef struct {
|
|
NMSetting parent;
|
|
|
|
GByteArray *ssid;
|
|
char *mode;
|
|
char *band;
|
|
guint32 channel;
|
|
GByteArray *bssid;
|
|
guint32 rate;
|
|
guint32 tx_power;
|
|
GByteArray *mac_address;
|
|
guint32 mtu;
|
|
GSList *seen_bssids;
|
|
char *security;
|
|
} NMSettingWireless;
|
|
|
|
NMSetting *nm_setting_wireless_new (void);
|
|
NMSetting *nm_setting_wireless_new_from_hash (GHashTable *settings);
|
|
|
|
/* Wireless security */
|
|
|
|
typedef struct {
|
|
NMSetting parent;
|
|
|
|
char *key_mgmt;
|
|
guint8 wep_tx_keyidx;
|
|
char *auth_alg;
|
|
char *proto;
|
|
GSList *pairwise; /* GSList of strings */
|
|
GSList *group; /* GSList of strings */
|
|
GSList *eap; /* GSList of strings */
|
|
char *identity;
|
|
char *anonymous_identity;
|
|
GByteArray *ca_cert;
|
|
char *ca_path;
|
|
GByteArray *client_cert;
|
|
GByteArray *private_key;
|
|
char *phase1_peapver;
|
|
char *phase1_peaplabel;
|
|
char *phase1_fast_provisioning;
|
|
char *phase2_auth;
|
|
char *phase2_autheap;
|
|
GByteArray *phase2_ca_cert;
|
|
char *phase2_ca_path;
|
|
GByteArray *phase2_client_cert;
|
|
GByteArray *phase2_private_key;
|
|
char *nai;
|
|
char *wep_key0;
|
|
char *wep_key1;
|
|
char *wep_key2;
|
|
char *wep_key3;
|
|
char *psk;
|
|
char *password;
|
|
char *pin;
|
|
char *eappsk;
|
|
char *private_key_passwd;
|
|
char *phase2_private_key_passwd;
|
|
} NMSettingWirelessSecurity;
|
|
|
|
NMSetting *nm_setting_wireless_security_new (void);
|
|
NMSetting *nm_setting_wireless_security_new_from_hash (GHashTable *settings);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* NM_SETTING_H */
|