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

2006-1-1 Dan Williams <dcbw@redhat.com>

Browse Source 
* 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
This commit is contained in:
Dan Williams
2006-01-01 22:22:39 +00:00
parent 4ed4b491fa
commit aff2d6bdcf
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,3 +1,14 @@
2006-1-1 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com> 2005-12-31 Dan Williams <dcbw@redhat.com>
* refactor NMDevice into a GObject-based framework with separate * refactor NMDevice into a GObject-based framework with separate

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

@@ -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 * message;
DBusMessage * reply; DBusMessage * reply;
char * path; char * path;
guint8 state = 0; guint32 state = 0;
DBusError error; DBusError error;
g_return_val_if_fail (manager != NULL, 0); g_return_val_if_fail (manager != NULL, 0);

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

@@ -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_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); 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 #endif

2
src/nm-activation-request.c
View File

@@ -43,7 +43,7 @@ struct NMActRequest
NMActStage stage; NMActStage stage;
DBusPendingCall * user_key_pcall; DBusPendingCall * user_key_pcall;
guint8 dhcp_state; guint32 dhcp_state;
guint dhcp_timeout; guint dhcp_timeout;
}; };