2004-10-21 Dan Williams <dcbw@redhat.com>
* NetworkManager.h - New file, now contains commonly used structures and bits for the dbus API of NetworkManager * Makefile.am - Deliver NetworkManager.h to ${includedir}/NetworkManager * src/NetworkManager.h - Rename -> src/NetworkManagerMain.c * Various fixups all around to use NetworkManager.h and new src/NetworkManagerMain.h, remove redundant bits that got moved into NetworkManager.h * src/NetworkManagerDevice.[ch] src/NetworkManagerUtils.[ch] src/NetworkManagerPolicy.c src/NetworkManagerDbus.c - Whitelist wireless drivers, and blacklist some wired drivers. Also blacklist cipsec and ethernet-over-usb devices at this time (RH #135722, RH #135648) - Don't leak unsupported devices out over dbus, or allow them to be set as the active device. Skip over them during automatic device picking * test/nmclienttest.c - Clean up the dbus code a lot git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@261 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
65
src/NetworkManagerMain.h
Normal file
65
src/NetworkManagerMain.h
Normal file
@@ -0,0 +1,65 @@
|
||||
/* NetworkManager -- Network link manager
|
||||
*
|
||||
* Dan Williams <dcbw@redhat.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* (C) Copyright 2004 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#ifndef NETWORK_MANAGER_MAIN_H
|
||||
#define NETWORK_MANAGER_MAIN_H
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib/gthread.h>
|
||||
#include <dbus/dbus.h>
|
||||
#include <hal/libhal.h>
|
||||
#include "NetworkManager.h"
|
||||
#include "NetworkManagerAP.h"
|
||||
|
||||
typedef struct NMData
|
||||
{
|
||||
LibHalContext *hal_ctx;
|
||||
DBusConnection *dbus_connection;
|
||||
gboolean info_daemon_avail;
|
||||
gboolean enable_test_devices;
|
||||
gboolean starting_up; /* Hack for not taking down an already-set-up wired device when we launch */
|
||||
|
||||
GSList *dev_list;
|
||||
GMutex *dev_list_mutex;
|
||||
|
||||
struct NMDevice *active_device;
|
||||
gboolean active_device_locked;
|
||||
|
||||
struct NMDevice *user_device; /* Holds a device that the user requests NM to use. */
|
||||
GMutex *user_device_mutex;
|
||||
|
||||
gboolean state_modified;
|
||||
GMutex *state_modified_mutex;
|
||||
|
||||
gboolean update_ap_lists;
|
||||
struct NMAccessPointList *allowed_ap_list;
|
||||
struct NMAccessPointList *invalid_ap_list;
|
||||
} NMData;
|
||||
|
||||
|
||||
struct NMDevice *nm_create_device_and_add_to_list (NMData *data, const char *udi, const char *iface,
|
||||
gboolean test_device, NMDeviceType test_device_type);
|
||||
|
||||
void nm_remove_device_from_list (NMData *data, const char *udi);
|
||||
|
||||
void nm_data_mark_state_changed (NMData *data);
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user