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

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

Browse Source 
* src/nm-netlink-monitor.c
		- (nm_netlink_monitor_class_init): fix marshalling types for
			interface-connected/interface-disconnected
		- (nm_netlink_monitor_event_handler): clean up carrier on/off
			check



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2732 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-08-26 18:48:41 +00:00
parent cd00315325
commit 4c06f348af
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2007-08-26 Dan Williams <dcbw@redhat.com>
* src/nm-netlink-monitor.c
- (nm_netlink_monitor_class_init): fix marshalling types for
interface-connected/interface-disconnected
- (nm_netlink_monitor_event_handler): clean up carrier on/off
check
2007-08-26 Dan Williams <dcbw@redhat.com> 2007-08-26 Dan Williams <dcbw@redhat.com>
Convert to using interface indexes as the primary method of identifying Convert to using interface indexes as the primary method of identifying

9
src/nm-netlink-monitor.c
View File

@@ -120,7 +120,7 @@ nm_netlink_monitor_class_init (NMNetlinkMonitorClass *monitor_class)
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NMNetlinkMonitorClass, interface_connected), G_STRUCT_OFFSET (NMNetlinkMonitorClass, interface_connected),
NULL, NULL, g_cclosure_marshal_VOID__STRING, NULL, NULL, g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT); G_TYPE_NONE, 1, G_TYPE_INT);
signals[INTERFACE_DISCONNECTED] = signals[INTERFACE_DISCONNECTED] =
@@ -128,7 +128,7 @@ nm_netlink_monitor_class_init (NMNetlinkMonitorClass *monitor_class)
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NMNetlinkMonitorClass, interface_disconnected), G_STRUCT_OFFSET (NMNetlinkMonitorClass, interface_disconnected),
NULL, NULL, g_cclosure_marshal_VOID__STRING, NULL, NULL, g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT); G_TYPE_NONE, 1, G_TYPE_INT);
signals[ERROR] = signals[ERROR] =
@@ -692,10 +692,7 @@ nm_netlink_monitor_event_handler (GIOChannel *channel,
int data_len = RTA_PAYLOAD (attribute); int data_len = RTA_PAYLOAD (attribute);
if (attribute->rta_type == IFLA_IFNAME) { if (attribute->rta_type == IFLA_IFNAME) {
/* The !! weirdness is to cannonicalize the value to 0 or 1. */ if (interface_info->ifi_flags & IFF_RUNNING) {
gboolean is_connected = !!((gboolean) (interface_info->ifi_flags & IFF_RUNNING));
if (is_connected) {
g_signal_emit (G_OBJECT (monitor), g_signal_emit (G_OBJECT (monitor),
signals[INTERFACE_CONNECTED], signals[INTERFACE_CONNECTED],
0, interface_info->ifi_index); 0, interface_info->ifi_index);