colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-05-03 Dan Williams <dcbw@redhat.com>

Browse Source 
* Kill dhcpcd.  We now use "dhcdbd", a dbus daemon that controls dhclient.
	  This means that NetworkManager shouldn't have DHCP issues anymore.  It also
	  means you need dhcdbd, which you can get here (get the latest one):

		http://people.redhat.com/jvdias/dhcdbd/

	  Technically NetworkManager can use any DHCP daemon that uses the same DBUS
	  interface as dhcdbd.

	* Rewrite device activation to facilitate the new DHCP infrastructure and
	  future improvements.  Its now "activation request" based, ie there is a single
	  activation request composed of the device, access point, and other info which
	  follows the entire activation process.  There are 5 stages of the activation
	  process which correspond to:

		1) Device preparation
		2) Device configuration (bring it up, set ESSID/Key/etc)
		3) IP Config Start (fire off DHCP if we're using it)
		4) IP Config Get (grab config from DHCP or static config files)
		5) IP Config Commit (set device's IP address, DNS, etc)

	  Note that there is no longer a "scanning" step, since the access point must
	  be known _before_ activation starts.  If the access point drops out or does
	  not exist for some reason, the entire activation process fails and must be
	  restarted for a different access point or device.

	Patch from Bill Moss:
	* gnome/applet/applet.c
		- Fix type of vpn_failure dialog -> vpn_banner dialog


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@597 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-05-03 20:41:36 +00:00
parent 4ef3e67fc1
commit 567b5e3d31
66 changed files with 3204 additions and 7588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/NetworkManagerMain.h
View File

@@ -31,53 +31,67 @@
#include "nm-netlink-monitor.h"
#include "nm-named-manager.h"
typedef struct NMDbusMethodList NMDbusMethodList;
typedef struct NMVPNManager NMVPNManager;
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 NMDbusMethodList NMDbusMethodList;
typedef struct NMActRequest NMActRequest;
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];
GIOChannel * sigterm_iochannel;
int sigterm_pipe[2];
LibHalContext *hal_ctx;
LibHalContext * hal_ctx;
NmNetlinkMonitor *netlink_monitor;
NmNetlinkMonitor * netlink_monitor;
NMNamedManager *named;
NMVPNManager *vpn_manager;
NMNamedManager * named_manager;
NMVPNManager * vpn_manager;
NMDHCPManager * dhcp_manager;
DBusConnection *dbus_connection;
NMDbusMethodList *nm_methods;
NMDbusMethodList *device_methods;
NMDbusMethodList *net_methods;
NMDbusMethodList *dhcp_methods;
NMDbusMethodList *vpn_methods;
DBusConnection * dbus_connection;
NMDbusMethodList * nm_methods;
NMDbusMethodList * device_methods;
NMDbusMethodList * net_methods;
NMDbusMethodList * vpn_methods;
GMainContext *main_context;
GMainLoop *main_loop;
gboolean enable_test_devices;
GMainContext * main_context;
GMainLoop * main_loop;
gboolean enable_test_devices;
guint state_modified_idle_id;
guint dev_change_check_idle_id;
GSList *dev_list;
GMutex *dev_list_mutex;
GSList * dev_list;
GMutex * dev_list_mutex;
struct NMDevice *active_device;
gboolean active_device_locked;
gboolean forcing_device;
gboolean scanning_enabled;
gboolean wireless_enabled;
gboolean asleep;
gboolean scanning_enabled;
gboolean wireless_enabled;
gboolean asleep;
struct NMAccessPointList *allowed_ap_list;
struct NMAccessPointList *invalid_ap_list;
} NMData;
struct NMDevice *nm_create_device_and_add_to_list (NMData *data, const char *udi, const char *iface,
struct NMDevice * nm_get_active_device (NMData *data);
struct 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_remove_device_from_list (NMData *data, const char *udi);