mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-08 18:50:18 +01:00
54aac18883
* include/NetworkManager.h - Remove the DOWN and CANCELLED device states - Add UNMANAGED and UNAVAILABLE device states - Document the device states * introspection/nm-device.xml src/nm-device-interface.c src/nm-device-interface.h - Add the 'managed' property * test/nm-tool.c - (detail_device): print out device state * src/NetworkManagerSystem.h src/backends/NetworkManagerArch.c src/backends/NetworkManagerDebian.c src/backends/NetworkManagerFrugalware.c src/backends/NetworkManagerGentoo.c src/backends/NetworkManagerMandriva.c src/backends/NetworkManagerPaldo.c src/backends/NetworkManagerRedHat.c src/backends/NetworkManagerSlackware.c src/backends/NetworkManagerSuSE.c - (nm_system_device_get_system_config, nm_system_device_get_disabled nm_system_device_free_system_config): remove; they were unused and their functionality should be re-implemented in each distro's system settings service plugin * src/nm-gsm-device.c src/nm-gsm-device.h src/nm-cdma-device.c src/nm-cdma-device.h - (*_new): take the 'managed' argument * src/nm-device.c - (nm_device_set_address): remove, fold into nm_device_bring_up() - (nm_device_init): start in unmanaged state, not disconnected - (constructor): don't start device until the system settings service has had a chance to figure out if the device is managed or not - (nm_device_deactivate, nm_device_bring_up, nm_device_bring_down): don't set device state here, let callers handle that as appropriate - (nm_device_dispose): don't touch the device if it's not managed - (set_property, get_property, nm_device_class_init): implement the 'managed' property - (nm_device_state_changed): bring the device up if its now managed, and deactivate it if it used to be active - (nm_device_get_managed, nm_device_set_managed): do the right thing with the managed state * src/nm-hal-manager.c - (wired_device_creator, wireless_device_creator, modem_device_creator): take initial managed state and pass it along to device constructors - (create_device_and_add_to_list): get managed state and pass to type creators * src/nm-device-802-11-wireless.c - (real_can_activate): fold in most of nm_device_802_11_wireless_can_activate() - (can_scan): can't scan in UNAVAILABLE or UNMANAGED - (link_timeout_cb): instead of deactivating, change device state and let the device state handler to it - (real_update_hw_address): clean up - (state_changed_cb): when entering UNAVAILABLE state, schedule an idle handler to transition to DISCONNECTED if the device isn't rfkilled * src/nm-device-802-3-ethernet.c - (set_carrier): move above callers and get rid of prototype - (device_state_changed): when entering UNAVAILABLE state, schedule an idle handler to transition to DISCONNECTED if the device has a carrier - (real_update_hw_address): clean up - (link_timeout_cb, ppp_state_changed): change state instead of calling deactivation directly as deactivation doesn't change state anymore * src/NetworkManagerPolicy.c - (schedule_activate_check): yay, remove wireless_enabled hack since the NMManager and wireless devices work that out themselves now - (device_state_changed): change to a switch and update for new device states - (device_carrier_changed): remove; device handles this now through state changes - (device_added): don't care about carrier any more; the initial activation check will happen when the device transitions to DISCONNECTED * src/nm-manager.c - (dispose): clear unmanaged devices - (handle_unmanaged_devices): update unmanaged device list and toggle the managed property on each device when needed - (system_settings_properties_changed_cb): handle signals from the system settings service - (system_settings_get_unmanaged_devices_cb): handle callback from getting the unmanaged device list method call - (query_unmanaged_devices): ask the system settings service for its list of unmanaged devices - (nm_manager_name_owner_changed, initial_get_connections): get unmanaged devices - (manager_set_wireless_enabled): push rfkill state down to wireless devices directly and let them handle the necessary state transitions - (manager_device_state_changed): update for new device states - (nm_manager_add_device): set initial rfkill state on wireless devices - (nm_manager_remove_device): don't touch the device if it's unmanaged - (nm_manager_activate_connection): return error if the device is unmanaged - (nm_manager_sleep): handle new device states correctly; don't change the state of unavailable/unmanaged devices * libnm-glib/nm-device-802-11-wireless.c - (state_changed_cb): update for new device states git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3540 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
99 lines
3.9 KiB
C
99 lines
3.9 KiB
C
#ifndef NM_MANAGER_H
|
|
#define NM_MANAGER_H 1
|
|
|
|
#include <glib/gtypes.h>
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus-glib.h>
|
|
#include "nm-device.h"
|
|
#include "nm-device-interface.h"
|
|
|
|
#define NM_TYPE_MANAGER (nm_manager_get_type ())
|
|
#define NM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MANAGER, NMManager))
|
|
#define NM_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_MANAGER, NMManagerClass))
|
|
#define NM_IS_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MANAGER))
|
|
#define NM_IS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_MANAGER))
|
|
#define NM_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MANAGER, NMManagerClass))
|
|
|
|
#define NM_MANAGER_STATE "state"
|
|
#define NM_MANAGER_WIRELESS_ENABLED "wireless-enabled"
|
|
#define NM_MANAGER_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
|
|
#define NM_MANAGER_ACTIVE_CONNECTIONS "active-connections"
|
|
|
|
#define NM_MANAGER_CONNECTION_PROXY_TAG "dbus-proxy"
|
|
#define NM_MANAGER_CONNECTION_SECRETS_PROXY_TAG "dbus-secrets-proxy"
|
|
|
|
typedef struct {
|
|
GObject parent;
|
|
} NMManager;
|
|
|
|
typedef struct {
|
|
GObjectClass parent;
|
|
|
|
/* Signals */
|
|
void (*device_added) (NMManager *manager, NMDevice *device);
|
|
void (*device_removed) (NMManager *manager, NMDevice *device);
|
|
void (*state_changed) (NMManager *manager, guint state);
|
|
void (*properties_changed) (NMManager *manager, GHashTable *properties);
|
|
|
|
void (*connections_added) (NMManager *manager, NMConnectionScope scope);
|
|
|
|
void (*connection_added) (NMManager *manager,
|
|
NMConnection *connection,
|
|
NMConnectionScope scope);
|
|
|
|
void (*connection_updated) (NMManager *manager,
|
|
NMConnection *connection,
|
|
NMConnectionScope scope);
|
|
|
|
void (*connection_removed) (NMManager *manager,
|
|
NMConnection *connection,
|
|
NMConnectionScope scope);
|
|
} NMManagerClass;
|
|
|
|
GType nm_manager_get_type (void);
|
|
|
|
NMManager *nm_manager_new (void);
|
|
|
|
/* Device handling */
|
|
|
|
void nm_manager_add_device (NMManager *manager, NMDevice *device);
|
|
void nm_manager_remove_device (NMManager *manager, NMDevice *device, gboolean deactivate);
|
|
GSList *nm_manager_get_devices (NMManager *manager);
|
|
NMDevice *nm_manager_get_device_by_path (NMManager *manager, const char *path);
|
|
NMDevice *nm_manager_get_device_by_udi (NMManager *manager, const char *udi);
|
|
gboolean nm_manager_is_udi_managed (NMManager *manager, const char *udi);
|
|
|
|
const char * nm_manager_activate_connection (NMManager *manager,
|
|
NMConnection *connection,
|
|
const char *specific_object,
|
|
const char *device_path,
|
|
gboolean user_requested,
|
|
GError **error);
|
|
|
|
gboolean nm_manager_deactivate_connection (NMManager *manager,
|
|
const char *connection_path,
|
|
GError **error);
|
|
|
|
gboolean nm_manager_activation_pending (NMManager *manager);
|
|
|
|
/* State handling */
|
|
|
|
NMState nm_manager_get_state (NMManager *manager);
|
|
gboolean nm_manager_wireless_enabled (NMManager *manager);
|
|
gboolean nm_manager_wireless_hardware_enabled (NMManager *manager);
|
|
void nm_manager_set_wireless_hardware_enabled (NMManager *manager,
|
|
gboolean enabled);
|
|
void nm_manager_sleep (NMManager *manager, gboolean sleep);
|
|
|
|
/* Connections */
|
|
|
|
GSList *nm_manager_get_connections (NMManager *manager, NMConnectionScope scope);
|
|
|
|
NMConnection * nm_manager_get_connection_by_object_path (NMManager *manager,
|
|
NMConnectionScope scope,
|
|
const char *path);
|
|
|
|
GPtrArray * nm_manager_get_active_connections_by_connection (NMManager *manager,
|
|
NMConnection *connection);
|
|
|
|
#endif /* NM_MANAGER_H */
|