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

2008-03-07 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-netlink.c
		- (nm_netlink_get_default_handle): NMNetlinkMonitor now uses libnl,
			don't need this hack any more (Benoit Boissinot)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3384 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-03-07 12:26:55 +00:00
parent 31823c92b9
commit 2b200ca1b3
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2008-03-07 Dan Williams <dcbw@redhat.com>
* src/nm-netlink.c
- (nm_netlink_get_default_handle): NMNetlinkMonitor now uses libnl,
don't need this hack any more (Benoit Boissinot)
2008-03-06 Dan Williams <dcbw@redhat.com> 2008-03-06 Dan Williams <dcbw@redhat.com>
* autogen.sh * autogen.sh

17
src/nm-netlink.c
View File

@@ -70,23 +70,6 @@ nm_netlink_get_default_handle (void)
return NULL; return NULL;
} }
if (nl_connect (def_nl_handle, NETLINK_ROUTE) < 0) {
/* HACK: try one more time. Because the netlink monitor for link state
* inits before we get here, it grabs the port that matches the PID
* of the NM process, which also happens to be the PID that libnl uses
* the first time too. The real fix is to convert nm-netlink-monitor.c
* over to use libnl.
*/
nl_handle_destroy (def_nl_handle);
def_nl_handle = NULL;
def_nl_handle = nm_netlink_get_default_handle ();
if (!def_nl_handle) {
nm_error ("couldn't connect to netlink: %s", nl_geterror ());
return NULL;
}
}
return def_nl_handle; return def_nl_handle;
} }