mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-04 15:40:22 +01:00
1817c62082
Properly re-query secrets from the settings daemon when stuff fails. * src/nm-device-802-11-wireless.c - (ap_auth_enforced): handle static WEP correctly here by differentiating between Shared Key and Open System auth modes - (link_timeout_cb, supplicant_connection_timeout_cb, real_act_stage4_ip_config_timeout): clear existing secrets and request new ones when something fails due to a suspected wrong key - (real_act_stage2_config): fix for new request_new argument to nm_manager_get_connection_secrets() * src/nm-manager.c src/nm-manager.h - (nm_manager_get_connection_secrets): return error status; pass new request_new argument on to the settings daemon * introspection/nm-settings-connection.xml - New 'request_new' argument to the GetSecrets call that hints to the settings daemon to ask the user for completely new secrets * libnm-glib/nm-settings.c libnm-glib/nm-settings.h - (impl_connection_settings_get_secrets): handle new 'request_new' argument git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2872 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
77 lines
3 KiB
C
77 lines
3 KiB
C
|
|
#ifndef NM_SETTINGS_H
|
|
#define NM_SETTINGS_H 1
|
|
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus-glib.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_CONNECTION_SETTINGS (nm_connection_settings_get_type ())
|
|
#define NM_CONNECTION_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION_SETTINGS, NMConnectionSettings))
|
|
#define NM_CONNECTION_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CONNECTION_SETTINGS, NMConnectionSettingsClass))
|
|
#define NM_IS_CONNECTION_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CONNECTION_SETTINGS))
|
|
#define NM_IS_CONNECTION_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_CONNECTION_SETTINGS))
|
|
#define NM_CONNECTION_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_CONNECTION_SETTINGS, NMConnectionSettingsClass))
|
|
|
|
typedef struct {
|
|
GObject parent;
|
|
|
|
/* private */
|
|
char * dbus_path;
|
|
} NMConnectionSettings;
|
|
|
|
typedef struct {
|
|
GObjectClass parent_class;
|
|
|
|
/* virtual methods */
|
|
gchar * (* get_id) (NMConnectionSettings *connection);
|
|
GHashTable * (* get_settings) (NMConnectionSettings *connection);
|
|
void (* get_secrets) (NMConnectionSettings *connection,
|
|
const gchar *setting_name,
|
|
gboolean request_new,
|
|
DBusGMethodInvocation *context);
|
|
|
|
/* signals */
|
|
void (* updated) (NMConnectionSettings *connection, GHashTable *settings);
|
|
void (* removed) (NMConnectionSettings *connection);
|
|
} NMConnectionSettingsClass;
|
|
|
|
GType nm_connection_settings_get_type (void);
|
|
void
|
|
nm_connection_settings_register_object (NMConnectionSettings *connection,
|
|
DBusGConnection *dbus_connection);
|
|
const char *nm_connection_settings_get_dbus_object_path (NMConnectionSettings *connection);
|
|
|
|
|
|
void nm_connection_settings_signal_updated (NMConnectionSettings *connection, GHashTable *settings);
|
|
void nm_connection_settings_signal_removed (NMConnectionSettings *connection);
|
|
|
|
#define NM_TYPE_SETTINGS (nm_settings_get_type ())
|
|
#define NM_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTINGS, NMSettings))
|
|
#define NM_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTINGS, NMSettingsClass))
|
|
#define NM_IS_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTINGS))
|
|
#define NM_IS_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTINGS))
|
|
#define NM_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTINGS, NMSettingsClass))
|
|
|
|
typedef struct {
|
|
GObject parent;
|
|
} NMSettings;
|
|
|
|
typedef struct {
|
|
GObjectClass parent_class;
|
|
|
|
/* virtual methods */
|
|
GPtrArray * (* list_connections) (NMSettings *settings);
|
|
|
|
/* signals */
|
|
void (* new_connection) (NMSettings *settings, NMConnectionSettings *connection);
|
|
} NMSettingsClass;
|
|
|
|
GType nm_settings_get_type (void);
|
|
|
|
void nm_settings_signal_new_connection (NMSettings *settings, NMConnectionSettings *connection);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif
|