From aff2d6bdcf4f745af86ccb91b3e875810ef3fc33 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 1 Jan 2006 22:22:39 +0000 Subject: [PATCH] 2006-1-1 Dan Williams * src/nm-activation-request.c - Change dhcp_state member of the NMActRequest structure from guint8 to guint32 * src/dhcp-manager/nm-dhcp-manager.[ch] - (nm_dhcp_manager_get_state_for_device): return guint32 rather than guint8 to match the dbus argument. Turns out we were overwriting memory since we were passing in only a guint8 git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1245 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 11 +++++++++++ src/dhcp-manager/nm-dhcp-manager.c | 4 ++-- src/dhcp-manager/nm-dhcp-manager.h | 2 +- src/nm-activation-request.c | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4268bf6cf..8b92f17c89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-1-1 Dan Williams + + * src/nm-activation-request.c + - Change dhcp_state member of the NMActRequest structure + from guint8 to guint32 + + * src/dhcp-manager/nm-dhcp-manager.[ch] + - (nm_dhcp_manager_get_state_for_device): return guint32 rather + than guint8 to match the dbus argument. Turns out we were + overwriting memory since we were passing in only a guint8 + 2005-12-31 Dan Williams * refactor NMDevice into a GObject-based framework with separate diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index a09a9c8950..c9aca3ffa6 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -138,12 +138,12 @@ void nm_dhcp_manager_dispose (NMDHCPManager *manager) } -guint8 nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, NMDevice *dev) +guint32 nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, NMDevice *dev) { DBusMessage * message; DBusMessage * reply; char * path; - guint8 state = 0; + guint32 state = 0; DBusError error; g_return_val_if_fail (manager != NULL, 0); diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index 71fdca7600..7cf4a19db3 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -37,6 +37,6 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActRe gboolean nm_dhcp_manager_process_signal (NMDHCPManager *manager, DBusMessage *message); gboolean nm_dhcp_manager_process_name_owner_changed (NMDHCPManager *manager, const char *changed_service_name, const char *old_owner, const char *new_owner); -guint8 nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, NMDevice *dev); +guint32 nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, NMDevice *dev); #endif diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 83223c1c53..1b7d1928f3 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -43,7 +43,7 @@ struct NMActRequest NMActStage stage; DBusPendingCall * user_key_pcall; - guint8 dhcp_state; + guint32 dhcp_state; guint dhcp_timeout; };