mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-08 16:10:36 +01:00
7e7b8f001a
* gnome/applet/applet-dbus-info.c - (nmi_dbus_get_key_for_network): Grab new "new_key" parameter from the dbus message, which tells us to unconditionally ask the user for a new key. Otherwise, we pull the key from the keyring and return it. If we fail to get the key from the keyring, we ask the user for a new key. - (nmi_dbus_get_network_key): new function to grab the key for an essid from the keyring. - (nmi_dbus_get_network_properties): don't access the keyring here. Also, don't return any key in the dbus message. * src/NetworkManagerDbus.[ch] - (nm_dbus_get_user_key_for_network): Add "new_key" parameter to indicate that we unconditionally want a new key. This function is now also used to get keys from the info-daemon which are pre-stored, not just for asking the user for a new key. The "new_key" parameter indicates whether or not we wish to ask the user for a new key. - (nm_dbus_get_network_data_cb): we no longer get a key from the info-daemon in the return message, so use NULL instead. The key will be filled in at connect time by calling nm_dbus_get_user_key_for_network() * src/NetworkManagerDevice.c - (nm_device_wireless_configure): update for "new_key" param to nm_dbus_get_user_key_for_network(). We initially set new_key to FALSE to see if we have a stored key in the info-daemon, but if the connection is unsuccessful at this stage we request a new one git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@862 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
89 lines
3.2 KiB
C
89 lines
3.2 KiB
C
/* NetworkManager -- Network link manager
|
|
*
|
|
* Dan Williams <dcbw@redhat.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* (C) Copyright 2004 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef NETWORK_MANAGER_DBUS_H
|
|
#define NETWORK_MANAGER_DBUS_H
|
|
|
|
#include <glib.h>
|
|
#include <dbus/dbus.h>
|
|
#include <dbus/dbus-glib.h>
|
|
#include "NetworkManager.h"
|
|
#include "NetworkManagerAPList.h"
|
|
|
|
|
|
typedef enum
|
|
{
|
|
DEVICE_STATUS_INVALID,
|
|
DEVICE_NOW_ACTIVE,
|
|
DEVICE_NO_LONGER_ACTIVE,
|
|
DEVICE_ACTIVATING,
|
|
DEVICE_ACTIVATION_FAILED,
|
|
DEVICE_ACTIVATION_CANCELED,
|
|
DEVICE_ADDED,
|
|
DEVICE_REMOVED,
|
|
DEVICE_CARRIER_ON,
|
|
DEVICE_CARRIER_OFF
|
|
} DeviceStatus;
|
|
|
|
|
|
static inline gboolean message_is_error (DBusMessage *msg)
|
|
{
|
|
g_return_val_if_fail (msg != NULL, FALSE);
|
|
|
|
return (dbus_message_get_type (msg) == DBUS_MESSAGE_TYPE_ERROR);
|
|
}
|
|
|
|
|
|
DBusConnection *nm_dbus_init (NMData *data);
|
|
|
|
gboolean nm_dbus_is_info_daemon_running (DBusConnection *connection);
|
|
char * get_name_owner (DBusConnection *con, const char *name);
|
|
|
|
char * nm_dbus_get_object_path_for_device (NMDevice *dev);
|
|
char * nm_dbus_get_object_path_for_network (NMDevice *dev, NMAccessPoint *ap);
|
|
|
|
void nm_dbus_schedule_device_status_change_signal (NMData *data, NMDevice *dev, NMAccessPoint *ap, DeviceStatus status);
|
|
|
|
void nm_dbus_signal_state_change (DBusConnection *connection, NMData *data);
|
|
|
|
void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevice *dev, NMAccessPoint *ap, NMNetworkStatus status, gint8 strength);
|
|
|
|
void nm_dbus_get_user_key_for_network (DBusConnection *connection, NMActRequest *req, const gboolean new_key);
|
|
|
|
void nm_dbus_cancel_get_user_key_for_network (DBusConnection *connection, NMActRequest *req);
|
|
|
|
void nm_dbus_update_wireless_scan_method (DBusConnection *connection, NMData *data);
|
|
|
|
NMAccessPoint *nm_dbus_get_network_object (DBusConnection *connection, NMNetworkType type, const char *network);
|
|
|
|
gboolean nm_dbus_add_network_address (DBusConnection *connection, NMNetworkType type, const char *network, struct ether_addr *addr);
|
|
|
|
gboolean nm_dbus_update_network_info (DBusConnection *connection, NMAccessPoint *ap, const gboolean user_requested);
|
|
|
|
void nm_dbus_update_allowed_networks (DBusConnection *connection, NMAccessPointList *list, NMData *data);
|
|
|
|
NMDevice * nm_dbus_get_device_from_object_path (NMData *data, const char *path);
|
|
|
|
NMState nm_get_app_state_from_data (NMData *data);
|
|
|
|
DBusMessage * nm_dbus_create_error_message (DBusMessage *message, const char *exception_namespace, const char *exception, const char *format, ...);
|
|
|
|
#endif
|