2005-12-31 Dan Williams <dcbw@redhat.com>
* refactor NMDevice into a GObject-based framework with separate objects for wired and wireless. The following files are no longer used but should stick around for a bit so we don't loose code through the cracks: NetworkManagerDevice.c NetworkManagerDevice.h NetworkManagerWireless.c NetworkManagerWireless.h The intent here is to allow each device type to manage its own connection & activation life-cycle, ie to allow wireless devices to interface with wpa_supplicant, etc. There's a fair bit of encapsulation breakage right now that should gradually get pulled back into each device, along with things like periodic property updates and link probing. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1244 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -36,6 +36,9 @@
|
||||
#include "NetworkManager.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-device.h"
|
||||
#include "nm-device-802-11-wireless.h"
|
||||
#include "nm-device-802-3-ethernet.h"
|
||||
|
||||
#include <netlink/addr.h>
|
||||
#include <netinet/in.h>
|
||||
@@ -217,7 +220,7 @@ NMSock *nm_dev_sock_open (NMDevice *dev, SockType type, const char *func_name, c
|
||||
sock->desc = desc ? g_strdup (desc) : NULL;
|
||||
sock->dev = dev;
|
||||
if (sock->dev)
|
||||
nm_device_ref (sock->dev);
|
||||
g_object_ref (G_OBJECT (sock->dev));
|
||||
|
||||
/* Add the sock to our global sock list for tracking */
|
||||
g_static_mutex_lock (&sock_list_mutex);
|
||||
@@ -244,7 +247,7 @@ void nm_dev_sock_close (NMSock *sock)
|
||||
g_free (sock->func);
|
||||
g_free (sock->desc);
|
||||
if (sock->dev)
|
||||
nm_device_unref (sock->dev);
|
||||
g_object_unref (G_OBJECT (sock->dev));
|
||||
|
||||
memset (sock, 0, sizeof (NMSock));
|
||||
|
||||
|
Reference in New Issue
Block a user