mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-09 11:10:21 +01:00
f39b3344c1
* info-daemon/NetworkManagerInfo.[ch] info-dameon/NetworkManagerInfoDbus.[ch] info-daemon/NetworkManagerInfoPassphraseDialog.[ch] - Preserve original label text in the passphrase dialog so that it actually gets updated with the new network name the next time around. Previously, we were overwriting it so you'd get the wrong network name to enter a key for - Add a "Key Type" combo to the passphrase dialog, user selects encryption key type now, type is stored in GConf too - Adjust NM<->NMI DBUS protocol to pass the key type back to NM too * src/NetworkManagerAP.[ch] - Remove all the encyption method magic. It's now set by the user and NetworkManager retrieves the type of encryption key from NetworkManagerInfo * src/NetworkManagerAPList.[ch] src/NetworkManagerDbus.[ch] - Adjust to new way of setting encryption key and method - Pull encryption method down from NMI along with key * src/NetworkManagerDevice.[ch] - Removed encryption method fallback magic as the method is now determined by the user. This greatly simplifies the connection logic. - More robust connection/link logic. Besides removing the encryption method fallback magic, check whether or not the card is receiving invalidly encrypted packets, which usually indicates that we have a bad WEP key set. - Don't blindly forge ahead when DHCP fails (still not completely fixed) * test/nminfotest.c - Test out new "Key Type" stuff in the NMI passphrase dialog git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@195 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
52 lines
1.8 KiB
C
52 lines
1.8 KiB
C
/* NetworkManagerInfo -- Manage allowed access points and provide a UI
|
|
* for WEP key entry
|
|
*
|
|
* 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_INFO_DBUS_SERVICE_H
|
|
#define NETWORK_MANAGER_INFO_DBUS_SERVICE_H
|
|
|
|
#include <glib.h>
|
|
#include <dbus/dbus.h>
|
|
#include <dbus/dbus-glib.h>
|
|
#include "NetworkManagerInfo.h"
|
|
|
|
/* MUST match MetworkManager NMNetworkType */
|
|
typedef enum
|
|
{
|
|
NETWORK_TYPE_UNKNOWN = 0,
|
|
NETWORK_TYPE_ALLOWED,
|
|
NETWORK_TYPE_INVALID,
|
|
NETWORK_TYPE_DEVICE
|
|
} NMINetworkType;
|
|
|
|
|
|
int nmi_dbus_service_init (DBusConnection *dbus_connection, NMIAppInfo *info);
|
|
|
|
const char * nmi_dbus_nm_get_network_essid (DBusConnection *connection, const char *ap_path);
|
|
|
|
gboolean nmi_dbus_nm_get_network_encrypted (DBusConnection *connection, const char *ap_path);
|
|
|
|
void nmi_dbus_return_user_key (DBusConnection *connection, const char *device,
|
|
const char *network, const char *passphrase, const char *key_type_string);
|
|
|
|
void nmi_dbus_signal_update_network (DBusConnection *connection, const char *network, NMINetworkType type);
|
|
|
|
#endif
|