db5a10dc4d
Merge the beginnings of the new GSM card support.
* src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_stop): Remove
* the
ppp watch source before killing pppd - If this happens from
g_object_unref()
then the ppp manager is already destroyed by the time the watch
callback runs.
* src/nm-hal-manager.c: Add a device_type_name string to the
* device
creators, so that we can print a nice human readable string when
a
device is added.
* src/nm-umts-device.c (automatic_registration_get_network):
* Query
for the activated network, not much is done with the result
thought.
* src/nm-serial-device.c (nm_serial_device_get_reply):
* Implement.
(ppp_ip4_config): Change the device state to activated here for
now.
(real_check_connection): Make sure the connection includes ppp
setting.
* libnm-glib/nm-client.c (get_device): Handle umts devices.
* libnm-glib/Makefile.am: Add the new files to build.
* libnm-glib/nm-umts-device.c:
* libnm-glib/nm-umts-device.h: Implement.
2007-11-26 Tambet Ingo <tambet@gmail.com>
* src/nm-umts-device.c (automatic_registration_get_network): For
* now, dial
immediately, nm_serial_device_get_reply() isn't implemented
correctly yet.
* src/nm-serial-device.c (wait_for_reply_info_destroy): Don't
* try to remove
the timeout source - this function is only called when the
timeout source has
been removed.
(nm_serial_device_wait_for_reply): Allocate the duplicate
responses array
to be big enough to contain the terminating zero element as
well.
The timeout argument is meant to be in seconds now.
(real_deactivate_quickly): Implement.
* src/NetworkManager.conf: Allow root to own
"org.freedesktop.NetworkManager.PPP", deny it for everybody
else.
* libnm-util/nm-setting-umts.c: Network type and band properties
* are ints,
(not unsigned ints).
* libnm-util/nm-setting-serial.c (nm_setting_serial_class_init):
* Fix a
small issue with parity bounds - capital letters have lower
ascii codes
than lower case letters.
* libnm-util/nm-connection.c (register_default_settings):
* Register serial
and umts settings.
2007-11-22 Tambet Ingo <tambet@gmail.com>
Remove the "index" property from devices as not all device types
have this.
* include/NetworkManager.h (NM_DBUS_PATH_DEVICE): Remove.
* src/nm-hal-manager.c (nm_get_device_index_from_hal): Remove.
(wired_device_creator): Get the device interface from hal to
create the device.
(wireless_device_creator): Ditto.
* src/nm-device.c (nm_device_init): Remove the index member.
(constructor): Remove the checks for index property, make
interface property
a require constructor property.
Use the HAL udi for DBus path for devices.
(nm_device_get_index): Remove.
(set_property): Remove index handling.
(get_property): Ditto.
(nm_device_get_dbus_path): Remove.
* src/nm-device-interface.c (nm_device_interface_init): Remove
* the index
property.
* src/nm-device-802-3-ethernet.c
* (nm_device_802_3_ethernet_link_activated):
Access the device index through it's interface.
(nm_device_802_3_ethernet_link_deactivated): Ditto.
(nm_device_802_3_ethernet_new): Remove the useless argument
test_dev. Remove
index argument. Add interface argument.
* src/nm-device-802-11-wireless.c
* (nm_device_802_11_wireless_new): Remove
the useless test_dev argument. Remove index argument. Add
interface arugment.
* src/NetworkManagerSystem.c
* (nm_system_device_set_from_ip4_config): Get the
device index through interface.
(nm_system_set_mtu): Ditto.
* introspection/nm-device.xml: Remove the "Index" property.
2007-11-21 Tambet Ingo <tambet@gmail.com>
* src/nm-serial-device.c:
* src/nm-serial-device.c:
* src/nm-umts-device.c:
* src/nm-umts-device.h: Implement.
* src/nm-hal-manager.c (nm_get_device_driver_name):
* libhal_free_string the string
allocated by libhal.
(modem_device_creator): Implement.
(register_built_in_creators): Register the modem creator.
* src/nm-device-802-11-wireless.c
* (nm_device_802_11_wireless_new):
Remove the unused test_dev argument.
* src/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_new):
* Ditto.
* src/Makefile.am: Add new files to build.
Link in ppp-manager.
* libnm-util/nm-setting-umts.c:
* libnm-util/nm-setting-umts.h:
* libnm-util/nm-setting-serial.c:
* libnm-util/nm-setting-serial.h: Implement.
* libnm-util/Makefile.am: Add new files to build.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3116 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
141 lines
4.5 KiB
C
141 lines
4.5 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_H
|
|
#define NETWORK_MANAGER_H
|
|
|
|
/*
|
|
* dbus services details
|
|
*/
|
|
#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
|
|
|
|
#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
|
|
#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
|
|
#define NM_DBUS_INTERFACE_DEVICE "org.freedesktop.NetworkManager.Device"
|
|
#define NM_DBUS_INTERFACE_DEVICE_WIRED "org.freedesktop.NetworkManager.Device.Wired"
|
|
#define NM_DBUS_INTERFACE_DEVICE_WIRELESS "org.freedesktop.NetworkManager.Device.Wireless"
|
|
#define NM_DBUS_PATH_ACCESS_POINT "/org/freedesktop/NetworkManager/AccessPoint"
|
|
#define NM_DBUS_INTERFACE_ACCESS_POINT "org.freedesktop.NetworkManager.AccessPoint"
|
|
#define NM_DBUS_INTERFACE_UMTS_DEVICE "org.freedesktop.NetworkManager.Device.Umts"
|
|
|
|
#define NM_DBUS_SERVICE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings"
|
|
#define NM_DBUS_SERVICE_SYSTEM_SETTINGS "org.freedesktop.NetworkManagerSystemSettings"
|
|
#define NM_DBUS_IFACE_SETTINGS "org.freedesktop.NetworkManagerSettings"
|
|
#define NM_DBUS_PATH_SETTINGS "/org/freedesktop/NetworkManagerSettings"
|
|
|
|
#define NM_DBUS_IFACE_SETTINGS_CONNECTION "org.freedesktop.NetworkManagerSettings.Connection"
|
|
#define NM_DBUS_PATH_SETTINGS_CONNECTION "/org/freedesktop/NetworkManagerSettings/Connection"
|
|
#define NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS "org.freedesktop.NetworkManagerSettings.Connection.Secrets"
|
|
|
|
#define NMI_DBUS_USER_KEY_CANCELED_ERROR "org.freedesktop.NetworkManagerInfo.CanceledError"
|
|
|
|
|
|
/*
|
|
* Types of NetworkManager states
|
|
*/
|
|
typedef enum NMState
|
|
{
|
|
NM_STATE_UNKNOWN = 0,
|
|
NM_STATE_ASLEEP,
|
|
NM_STATE_CONNECTING,
|
|
NM_STATE_CONNECTED,
|
|
NM_STATE_DISCONNECTED
|
|
} NMState;
|
|
|
|
|
|
/*
|
|
* Types of NetworkManager devices
|
|
*/
|
|
typedef enum NMDeviceType
|
|
{
|
|
DEVICE_TYPE_UNKNOWN = 0,
|
|
DEVICE_TYPE_802_3_ETHERNET,
|
|
DEVICE_TYPE_802_11_WIRELESS,
|
|
DEVICE_TYPE_UMTS
|
|
} NMDeviceType;
|
|
|
|
|
|
/*
|
|
* General device capability bits
|
|
*
|
|
*/
|
|
#define NM_DEVICE_CAP_NONE 0x00000000
|
|
#define NM_DEVICE_CAP_NM_SUPPORTED 0x00000001
|
|
#define NM_DEVICE_CAP_CARRIER_DETECT 0x00000002
|
|
|
|
|
|
/* 802.11 wireless device-specific capabilities */
|
|
#define NM_802_11_DEVICE_CAP_NONE 0x00000000
|
|
#define NM_802_11_DEVICE_CAP_CIPHER_WEP40 0x00000001
|
|
#define NM_802_11_DEVICE_CAP_CIPHER_WEP104 0x00000002
|
|
#define NM_802_11_DEVICE_CAP_CIPHER_TKIP 0x00000004
|
|
#define NM_802_11_DEVICE_CAP_CIPHER_CCMP 0x00000008
|
|
#define NM_802_11_DEVICE_CAP_WPA 0x00000010
|
|
#define NM_802_11_DEVICE_CAP_RSN 0x00000020
|
|
|
|
|
|
/*
|
|
* 802.11 Access Point flags
|
|
*
|
|
*/
|
|
#define NM_802_11_AP_FLAGS_NONE 0x00000000
|
|
#define NM_802_11_AP_FLAGS_PRIVACY 0x00000001
|
|
|
|
/*
|
|
* 802.11 Access Point security flags
|
|
*
|
|
* These describe the current security requirements of the BSSID as extracted
|
|
* from various pieces of beacon information, like beacon flags and various
|
|
* information elements.
|
|
*/
|
|
#define NM_802_11_AP_SEC_NONE 0x00000000
|
|
#define NM_802_11_AP_SEC_PAIR_WEP40 0x00000001
|
|
#define NM_802_11_AP_SEC_PAIR_WEP104 0x00000002
|
|
#define NM_802_11_AP_SEC_PAIR_TKIP 0x00000004
|
|
#define NM_802_11_AP_SEC_PAIR_CCMP 0x00000008
|
|
#define NM_802_11_AP_SEC_GROUP_WEP40 0x00000010
|
|
#define NM_802_11_AP_SEC_GROUP_WEP104 0x00000020
|
|
#define NM_802_11_AP_SEC_GROUP_TKIP 0x00000040
|
|
#define NM_802_11_AP_SEC_GROUP_CCMP 0x00000080
|
|
#define NM_802_11_AP_SEC_KEY_MGMT_PSK 0x00000100
|
|
#define NM_802_11_AP_SEC_KEY_MGMT_802_1X 0x00000200
|
|
|
|
|
|
/*
|
|
* Device states. Will obsolete NMActStage soon.
|
|
*/
|
|
typedef enum
|
|
{
|
|
NM_DEVICE_STATE_UNKNOWN = 0,
|
|
NM_DEVICE_STATE_DOWN,
|
|
NM_DEVICE_STATE_DISCONNECTED,
|
|
NM_DEVICE_STATE_PREPARE,
|
|
NM_DEVICE_STATE_CONFIG,
|
|
NM_DEVICE_STATE_NEED_AUTH,
|
|
NM_DEVICE_STATE_IP_CONFIG,
|
|
NM_DEVICE_STATE_ACTIVATED,
|
|
NM_DEVICE_STATE_FAILED,
|
|
NM_DEVICE_STATE_CANCELLED,
|
|
} NMDeviceState;
|
|
|
|
|
|
#endif /* NETWORK_MANAGER_H */
|