mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-26 11:10:09 +01:00
81c31e820a
Rework DBus manager signal handling to be more flexible. Previously, only one signal handler could be registered for a particular interface. The DBus manager now reference counts DBus bus matches and allows multiple clients to register signal handlers for the same interface and sender. * src/NetworkManager.c - (main): track NMI signal handler ID and remove it when we quit * src/NetworkManagerMain.h - Keep track of NMI signal handler ID * src/nm-dbus-manager.c src/nm-dbus-manager.h - rework signal handling; each signal handler references one signal match, but a signal match may be referenced by one or more signal handlers. Matches are refcounted and are destroyed when the last signal handler that references the match is removed. This is necessary because two signal handlers may end up requiring the same dbus bus match, so the match must live until the last signal handler is destroyed (for example, with the wpa_supplicant network interface dbus interface). * src/dhcp-manager/nm-dhcp-manager.c - (nm_dhcp_manager_new): track DHCP signal handler id - (nm_dhcp_manager_dispose): remove DHCP signal handler * src/vpn-manager/nm-vpn-service.c - (nm_vpn_service_add_watch): track VPN service signal handler id - (nm_vpn_service_remove_watch): remove VPN service signal handler git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2124 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
109 lines
2.9 KiB
C
109 lines
2.9 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_MAIN_H
|
|
#define NETWORK_MANAGER_MAIN_H
|
|
|
|
#include <glib.h>
|
|
#include <glib/gthread.h>
|
|
#include <dbus/dbus.h>
|
|
#include <libhal.h>
|
|
#include "NetworkManager.h"
|
|
#include "NetworkManagerAP.h"
|
|
#include "nm-netlink-monitor.h"
|
|
#include "nm-named-manager.h"
|
|
#include "nm-device.h"
|
|
#include "NetworkManagerDbusUtils.h"
|
|
|
|
|
|
typedef enum NMIntState
|
|
{
|
|
NM_INT_STATE_UNKNOWN = 0,
|
|
NM_INT_STATE_ASLEEP,
|
|
NM_INT_STATE_CONFIGURE_AP,
|
|
NM_INT_STATE_CONFIGURE_DEV,
|
|
NM_INT_STATE_CONFIGURE_IP,
|
|
NM_INT_STATE_CONNECTED,
|
|
NM_INT_STATE_DISCONNECTED
|
|
} NMIntState;
|
|
|
|
|
|
typedef struct NMActRequest NMActRequest;
|
|
typedef struct NMVPNActRequest NMVPNActRequest;
|
|
typedef struct NMVPNManager NMVPNManager;
|
|
typedef struct NMDHCPManager NMDHCPManager;
|
|
|
|
#define DHCP_SERVICE_NAME "com.redhat.dhcp"
|
|
#define DHCP_OBJECT_PATH "/com/redhat/dhcp"
|
|
|
|
typedef struct NMData
|
|
{
|
|
GIOChannel * sigterm_iochannel;
|
|
int sigterm_pipe[2];
|
|
|
|
LibHalContext * hal_ctx;
|
|
|
|
NmNetlinkMonitor * netlink_monitor;
|
|
|
|
NMNamedManager * named_manager;
|
|
NMVPNManager * vpn_manager;
|
|
NMDHCPManager * dhcp_manager;
|
|
guint32 nmi_sig_handler_id;
|
|
|
|
NMDbusMethodList * nm_methods;
|
|
NMDbusMethodList * device_methods;
|
|
NMDbusMethodList * net_methods;
|
|
|
|
GMainContext * main_context;
|
|
GMainLoop * main_loop;
|
|
gboolean enable_test_devices;
|
|
|
|
guint dev_change_check_idle_id;
|
|
|
|
GSList * dev_list;
|
|
GMutex * dev_list_mutex;
|
|
|
|
gboolean wireless_enabled;
|
|
gboolean modem_active;
|
|
gboolean asleep;
|
|
|
|
GSList * dialup_list;
|
|
GMutex * dialup_list_mutex;
|
|
|
|
struct NMAccessPointList *allowed_ap_list;
|
|
struct NMAccessPointList *invalid_ap_list;
|
|
} NMData;
|
|
|
|
|
|
NMDevice * nm_get_active_device (NMData *data);
|
|
|
|
NMDevice * nm_create_device_and_add_to_list (NMData *data, const char *udi, const char *iface,
|
|
gboolean test_device, NMDeviceType test_device_type);
|
|
|
|
void nm_add_initial_devices (NMData *data);
|
|
|
|
void nm_remove_device (NMData *data, NMDevice *dev);
|
|
|
|
void nm_schedule_state_change_signal_broadcast (NMData *data);
|
|
|
|
int nm_get_sigterm_pipe (void);
|
|
|
|
#endif
|