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

2007-08-12 Dan Williams <dcbw@redhat.com>

Browse Source 
Kill dhcdbd until it's dead, dead, dead.  Based on a patch from
	Robert Frank <rfrank@redhat.com>

	* src/dhcp-manager/nm-dhcp-manager.c
	  src/dhcp-manager/nm-dhcp-manager.c
	  src/nm-device.c
		- Spawn and communicate with dhclient directly, through means of a
		custom dhclient callout script.  Process callout D-Bus signals
		with dbus-glib instead of hand-rolled dbus.  DHCP timeouts are now
		sent via gobject signals rather than being driven by the dhcp manager
		directly.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2666 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-08-12 22:41:16 +00:00
parent 882a532b08
commit ab43fbb376
4 changed files with 759 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2007-08-12 Dan Williams <dcbw@redhat.com>
Kill dhcdbd until it's dead, dead, dead. Based on a patch from
Robert Frank <rfrank@redhat.com>
* src/dhcp-manager/nm-dhcp-manager.c
src/dhcp-manager/nm-dhcp-manager.c
src/nm-device.c
- Spawn and communicate with dhclient directly, through means of a
custom dhclient callout script. Process callout D-Bus signals
with dbus-glib instead of hand-rolled dbus. DHCP timeouts are now
sent via gobject signals rather than being driven by the dhcp manager
directly.
2007-08-12 Dan Williams <dcbw@redhat.com> 2007-08-12 Dan Williams <dcbw@redhat.com>
* callouts/nm-dhcp-client-action.c * callouts/nm-dhcp-client-action.c

1231
src/dhcp-manager/nm-dhcp-manager.c
View File

File diff suppressed because it is too large Load Diff

51
src/dhcp-manager/nm-dhcp-manager.h
View File

@@ -32,23 +32,31 @@
#define NM_IS_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP_MANAGER)) #define NM_IS_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP_MANAGER))
#define NM_DHCP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass)) #define NM_DHCP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass))
#define NM_DHCP_MANAGER_RUN_DIR "/var/run"
#define NM_DHCP_MANAGER_PID_FILENAME "dhclient"
#define NM_DHCP_MANAGER_PID_FILE_EXT "pid"
#define NM_DHCP_MANAGER_LEASE_FILENAME "dhclient"
#define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease"
typedef enum { typedef enum {
DHCDBD_NBI=0, /* no broadcast interfaces found */ DHC_NBI=0, /* no broadcast interfaces found */
DHCDBD_PREINIT, /* configuration started */ DHC_PREINIT, /* configuration started */
DHCDBD_BOUND, /* lease obtained */ DHC_BOUND, /* lease obtained */
DHCDBD_RENEW, /* lease renewed */ DHC_RENEW, /* lease renewed */
DHCDBD_REBOOT, /* have valid lease, but now obtained a different one */ DHC_REBOOT, /* have valid lease, but now obtained a different one */
DHCDBD_REBIND, /* new, different lease */ DHC_REBIND, /* new, different lease */
DHCDBD_STOP, /* remove old lease */ DHC_STOP, /* remove old lease */
DHCDBD_MEDIUM, /* media selection begun */ DHC_MEDIUM, /* media selection begun */
DHCDBD_TIMEOUT, /* timed out contacting DHCP server */ DHC_TIMEOUT, /* timed out contacting DHCP server */
DHCDBD_FAIL, /* all attempts to contact server timed out, sleeping */ DHC_FAIL, /* all attempts to contact server timed out, sleeping */
DHCDBD_EXPIRE, /* lease has expired, renewing */ DHC_EXPIRE, /* lease has expired, renewing */
DHCDBD_RELEASE, /* releasing lease */ DHC_RELEASE, /* releasing lease */
DHCDBD_START, /* sent when dhclient started OK */ DHC_START, /* sent when dhclient started OK */
DHCDBD_ABEND, /* dhclient exited abnormally */ DHC_ABEND, /* dhclient exited abnormally */
DHCDBD_END, /* dhclient exited normally */ DHC_END, /* dhclient exited normally */
DHCDBD_END_OPTIONS, /* last option in subscription sent */ DHC_END_OPTIONS, /* last option in subscription sent */
} NMDHCPState; } NMDHCPState;
typedef struct { typedef struct {
@@ -66,11 +74,14 @@ typedef struct {
GType nm_dhcp_manager_get_type (void); GType nm_dhcp_manager_get_type (void);
NMDHCPManager *nm_dhcp_manager_get (void); NMDHCPManager *nm_dhcp_manager_get (void);
gboolean nm_dhcp_manager_begin_transaction (NMDHCPManager *manager, const char *iface); gboolean nm_dhcp_manager_begin_transaction (NMDHCPManager *manager,
const char *iface,
guint32 timeout);
void nm_dhcp_manager_cancel_transaction (NMDHCPManager *manager, void nm_dhcp_manager_cancel_transaction (NMDHCPManager *manager,
const char *iface, const char *iface);
gboolean blocking); NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, const char *iface);
NMIP4Config *nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, const char *iface);
NMDHCPState nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, const char *iface); NMDHCPState nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, const char *iface);
gboolean nm_dhcp_manager_process_signal (NMDHCPManager *manager, DBusMessage *message);
#endif /* NM_DHCP_MANAGER_H */ #endif /* NM_DHCP_MANAGER_H */

88
src/nm-device.c
View File

@@ -73,7 +73,8 @@ struct _NMDevicePrivate
void * system_config_data; /* Distro-specific config data (parsed config file, etc) */ void * system_config_data; /* Distro-specific config data (parsed config file, etc) */
NMIP4Config * ip4_config; /* Config from DHCP, PPP, or system config files */ NMIP4Config * ip4_config; /* Config from DHCP, PPP, or system config files */
NMDHCPManager * dhcp_manager; NMDHCPManager * dhcp_manager;
gulong dhcp_signal_id; gulong dhcp_state_sigid;
gulong dhcp_timeout_sigid;
}; };
static void nm_device_activate (NMDeviceInterface *device, static void nm_device_activate (NMDeviceInterface *device,
@@ -518,12 +519,13 @@ real_act_stage3_ip_config_start (NMDevice *self)
/* DHCP manager will cancel any transaction already in progress and we do not /* DHCP manager will cancel any transaction already in progress and we do not
want to cancel this activation if we get "down" state from that. */ want to cancel this activation if we get "down" state from that. */
g_signal_handler_block (priv->dhcp_manager, priv->dhcp_signal_id); g_signal_handler_block (priv->dhcp_manager, priv->dhcp_state_sigid);
success = nm_dhcp_manager_begin_transaction (priv->dhcp_manager, success = nm_dhcp_manager_begin_transaction (priv->dhcp_manager,
nm_device_get_iface (self)); nm_device_get_iface (self),
45);
g_signal_handler_unblock (priv->dhcp_manager, priv->dhcp_signal_id); g_signal_handler_unblock (priv->dhcp_manager, priv->dhcp_state_sigid);
if (success) { if (success) {
/* DHCP devices will be notified by the DHCP manager when /* DHCP devices will be notified by the DHCP manager when
@@ -898,8 +900,7 @@ real_activation_cancel_handler (NMDevice *self)
nm_device_get_use_dhcp (self)) { nm_device_get_use_dhcp (self)) {
nm_dhcp_manager_cancel_transaction (NM_DEVICE_GET_PRIVATE (self)->dhcp_manager, nm_dhcp_manager_cancel_transaction (NM_DEVICE_GET_PRIVATE (self)->dhcp_manager,
nm_device_get_iface (self), nm_device_get_iface (self));
TRUE);
} }
} }
@@ -966,8 +967,7 @@ nm_device_deactivate_quickly (NMDevice *self)
nm_device_get_use_dhcp (self)) { nm_device_get_use_dhcp (self)) {
nm_dhcp_manager_cancel_transaction (NM_DEVICE_GET_PRIVATE (self)->dhcp_manager, nm_dhcp_manager_cancel_transaction (NM_DEVICE_GET_PRIVATE (self)->dhcp_manager,
nm_device_get_iface (self), nm_device_get_iface (self));
FALSE);
g_object_unref (act_request); g_object_unref (act_request);
self->priv->act_request = NULL; self->priv->act_request = NULL;
} }
@@ -1091,33 +1091,57 @@ dhcp_state_changed (NMDHCPManager *dhcp_manager,
NMDHCPState state, NMDHCPState state,
gpointer user_data) gpointer user_data)
{ {
NMDevice *device = NM_DEVICE (user_data); NMDevice * device = NM_DEVICE (user_data);
if (strcmp (nm_device_get_iface (device), iface) != 0)
return;
if (!nm_device_get_act_request (device)) if (!nm_device_get_act_request (device))
return; return;
if (!strcmp (nm_device_get_iface (device), iface) && nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG) { switch (state) {
switch (state) { case DHC_BOUND: /* lease obtained */
case DHCDBD_BOUND: /* lease obtained */ case DHC_RENEW: /* lease renewed */
case DHCDBD_RENEW: /* lease renewed */ case DHC_REBOOT: /* have valid lease, but now obtained a different one */
case DHCDBD_REBOOT: /* have valid lease, but now obtained a different one */ case DHC_REBIND: /* new, different lease */
case DHCDBD_REBIND: /* new, different lease */ if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG)
nm_device_activate_schedule_stage4_ip_config_get (device); nm_device_activate_schedule_stage4_ip_config_get (device);
break; break;
case DHCDBD_TIMEOUT: /* timed out contacting DHCP server */ case DHC_TIMEOUT: /* timed out contacting DHCP server */
if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG)
nm_device_activate_schedule_stage4_ip_config_timeout (device); nm_device_activate_schedule_stage4_ip_config_timeout (device);
break; break;
case DHCDBD_FAIL: /* all attempts to contact server timed out, sleeping */ case DHC_FAIL: /* all attempts to contact server timed out, sleeping */
case DHCDBD_ABEND: /* dhclient exited abnormally */ case DHC_ABEND: /* dhclient exited abnormally */
case DHCDBD_END: /* dhclient exited normally */ case DHC_END: /* dhclient exited normally */
if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG) {
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED);
break; } else if (nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED) {
default: if (nm_device_get_use_dhcp (device)) {
break; /* dhclient quit and therefore can't renew our lease, kill the conneciton */
nm_device_deactivate (device);
}
} }
break;
default:
break;
} }
} }
static void
dhcp_timeout (NMDHCPManager *dhcp_manager,
const char *iface,
gpointer user_data)
{
NMDevice * device = NM_DEVICE (user_data);
if (strcmp (nm_device_get_iface (device), iface) != 0)
return;
if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG)
nm_device_activate_schedule_stage4_ip_config_timeout (device);
}
gboolean gboolean
nm_device_get_use_dhcp (NMDevice *self) nm_device_get_use_dhcp (NMDevice *self)
{ {
@@ -1139,12 +1163,20 @@ nm_device_set_use_dhcp (NMDevice *self,
if (use_dhcp) { if (use_dhcp) {
if (!priv->dhcp_manager) { if (!priv->dhcp_manager) {
priv->dhcp_manager = nm_dhcp_manager_get (); priv->dhcp_manager = nm_dhcp_manager_get ();
priv->dhcp_signal_id = g_signal_connect (priv->dhcp_manager, "state-changed", priv->dhcp_state_sigid = g_signal_connect (priv->dhcp_manager,
G_CALLBACK (dhcp_state_changed), "state-changed",
self); G_CALLBACK (dhcp_state_changed),
self);
priv->dhcp_timeout_sigid = g_signal_connect (priv->dhcp_manager,
"timeout",
G_CALLBACK (dhcp_timeout),
self);
} }
} else if (priv->dhcp_manager) { } else if (priv->dhcp_manager) {
g_signal_handler_disconnect (priv->dhcp_manager, priv->dhcp_signal_id); g_signal_handler_disconnect (priv->dhcp_manager, priv->dhcp_state_sigid);
priv->dhcp_state_sigid = 0;
g_signal_handler_disconnect (priv->dhcp_manager, priv->dhcp_timeout_sigid);
priv->dhcp_timeout_sigid = 0;
g_object_unref (priv->dhcp_manager); g_object_unref (priv->dhcp_manager);
priv->dhcp_manager = NULL; priv->dhcp_manager = NULL;
} }