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

2005-12-06 Dan Williams <dcbw@redhat.com>

Browse Source 
* Move NetworkManager.h -> include/NetworkManager.h
	* Split out VPN stuff to include/NetworkManagerVPN.h
	* Fix up makefiles to include new location
	* Fix up sources to include NetworkManagerVPN.h


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1130 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-12-06 23:37:09 +00:00
parent 4c42d4052c
commit 6bcf90acf2
20 changed files with 142 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2005-12-06 Dan Williams <dcbw@redhat.com>
* Move NetworkManager.h -> include/NetworkManager.h
* Split out VPN stuff into include/NetworkManagerVPN.h
* Fix up makefiles to include new location
* Fix up sources to include NetworkManagerVPN.h
2005-12-06 Dan Williams <dcbw@redhat.com>
Various changes in the applet to move VPN connection "state" -> "stage",

7
Makefile.am
View File

@@ -1,9 +1,8 @@
SUBDIRS = utils src dispatcher-daemon gnome initscript test po
SUBDIRS = utils src dispatcher-daemon gnome initscript test po include
EXTRA_DIST = \
CONTRIBUTING \
NetworkManager.pc.in \
NetworkManager.h \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
@@ -13,7 +12,3 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = NetworkManager.pc
NetworkManagerincludedir=$(includedir)/NetworkManager
NetworkManagerinclude_HEADERS = NetworkManager.h

1
configure.in
View File

@@ -280,6 +280,7 @@ fi
AC_OUTPUT([
Makefile
include/Makefile
utils/Makefile
src/Makefile
src/named-manager/Makefile

3
dispatcher-daemon/Makefile.am
View File

@@ -1,4 +1,5 @@
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include
NULL=
bin_PROGRAMS = NetworkManagerDispatcher

2
gnome/applet/Makefile.am
View File

@@ -2,7 +2,7 @@ SUBDIRS=icons
NULL=
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include
bin_PROGRAMS = nm-applet

1
gnome/applet/vpn-connection.h
View File

@@ -23,6 +23,7 @@
#define VPN_CONNECTION_H
#include "applet.h"
#include "NetworkManagerVPN.h"
VPNConnection * nmwa_vpn_connection_new (const char *name);
VPNConnection * nmwa_vpn_connection_copy (VPNConnection *vpn);

2
gnome/libnm_glib/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include
lib_LTLIBRARIES=libnm_glib.la

7
include/Makefile.am Normal file
View File

@@ -0,0 +1,7 @@
EXTRA_DIST = \
NetworkManager.h \
NetworkManagerVPN.h
NetworkManagerincludedir=$(includedir)/NetworkManager
NetworkManagerinclude_HEADERS = NetworkManager.h NetworkManagerVPN.h

57
NetworkManager.h → include/NetworkManager.h
View File

@@ -33,8 +33,6 @@
#define NM_DBUS_INTERFACE_DEVICES "org.freedesktop.NetworkManager.Devices"
#define NM_DBUS_PATH_DHCP "/org/freedesktop/NetworkManager/DhcpOptions"
#define NM_DBUS_INTERFACE_DHCP "org.freedesktop.NetworkManager.DhcpOptions"
#define NM_DBUS_PATH_VPN "/org/freedesktop/NetworkManager/VPNConnections"
#define NM_DBUS_INTERFACE_VPN "org.freedesktop.NetworkManager.VPNConnections"
#define NMI_DBUS_SERVICE "org.freedesktop.NetworkManagerInfo"
#define NMI_DBUS_PATH "/org/freedesktop/NetworkManagerInfo"
@@ -50,30 +48,6 @@
#define NM_DBUS_NO_ACTIVE_DEVICE_ERROR "org.freedesktop.NetworkManager.NoActiveDevice"
#define NM_DBUS_NO_ACTIVE_NET_ERROR "org.freedesktop.NetworkManager.NoActiveNetwork"
#define NM_DBUS_NO_ACTIVE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.NoActiveVPNConnection"
#define NM_DBUS_NO_VPN_CONNECTIONS "org.freedesktop.NetworkManager.VPNConnections.NoVPNConnections"
#define NM_DBUS_INVALID_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.InvalidVPNConnection"
#define NM_DBUS_VPN_STARTING_IN_PROGRESS "StartingInProgress"
#define NM_DBUS_VPN_ALREADY_STARTED "AlreadyStarted"
#define NM_DBUS_VPN_STOPPING_IN_PROGRESS "StoppingInProgress"
#define NM_DBUS_VPN_ALREADY_STOPPED "AlreadyStopped"
#define NM_DBUS_VPN_WRONG_STATE "WrongState"
#define NM_DBUS_VPN_BAD_ARGUMENTS "BadArguments"
/*
* VPN daemon signals
*/
#define NM_DBUS_VPN_SIGNAL_LOGIN_BANNER "LoginBanner"
#define NM_DBUS_VPN_SIGNAL_LOGIN_FAILED "LoginFailed"
#define NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED "LaunchFailed"
#define NM_DBUS_VPN_SIGNAL_CONNECT_FAILED "ConnectFailed"
#define NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD "VPNConfigBad"
#define NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD "IPConfigBad"
#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG "IP4Config"
/*
* NetworkManager signals
@@ -176,37 +150,6 @@ typedef enum NMDeviceAuthMethod
} NMDeviceAuthMethod;
/*
* VPN daemon states
*/
typedef enum NMVPNState
{
NM_VPN_STATE_UNKNOWN = 0,
NM_VPN_STATE_INIT,
NM_VPN_STATE_SHUTDOWN,
NM_VPN_STATE_STARTING,
NM_VPN_STATE_STARTED,
NM_VPN_STATE_STOPPING,
NM_VPN_STATE_STOPPED
} NMVPNState;
/*
* VPN connection activation stages
*/
typedef enum NMVPNActStage
{
NM_VPN_ACT_STAGE_UNKNOWN = 0,
NM_VPN_ACT_STAGE_DISCONNECTED,
NM_VPN_ACT_STAGE_PREPARE,
NM_VPN_ACT_STAGE_CONNECT,
NM_VPN_ACT_STAGE_IP_CONFIG_GET,
NM_VPN_ACT_STAGE_ACTIVATED,
NM_VPN_ACT_STAGE_FAILED,
NM_VPN_ACT_STAGE_CANCELED
} NMVPNActStage;
/*
* Device activation stages
*/

90
include/NetworkManagerVPN.h Normal file
View File

@@ -0,0 +1,90 @@
/* 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_VPN_H
#define NETWORK_MANAGER_VPN_H
/*
* dbus services details
*/
#define NM_DBUS_PATH_VPN "/org/freedesktop/NetworkManager/VPNConnections"
#define NM_DBUS_INTERFACE_VPN "org.freedesktop.NetworkManager.VPNConnections"
/*
* VPN Errors
*/
#define NM_DBUS_NO_ACTIVE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.NoActiveVPNConnection"
#define NM_DBUS_NO_VPN_CONNECTIONS "org.freedesktop.NetworkManager.VPNConnections.NoVPNConnections"
#define NM_DBUS_INVALID_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.InvalidVPNConnection"
#define NM_DBUS_VPN_STARTING_IN_PROGRESS "StartingInProgress"
#define NM_DBUS_VPN_ALREADY_STARTED "AlreadyStarted"
#define NM_DBUS_VPN_STOPPING_IN_PROGRESS "StoppingInProgress"
#define NM_DBUS_VPN_ALREADY_STOPPED "AlreadyStopped"
#define NM_DBUS_VPN_WRONG_STATE "WrongState"
#define NM_DBUS_VPN_BAD_ARGUMENTS "BadArguments"
/*
* VPN daemon signals
*/
#define NM_DBUS_VPN_SIGNAL_LOGIN_BANNER "LoginBanner"
#define NM_DBUS_VPN_SIGNAL_LOGIN_FAILED "LoginFailed"
#define NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED "LaunchFailed"
#define NM_DBUS_VPN_SIGNAL_CONNECT_FAILED "ConnectFailed"
#define NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD "VPNConfigBad"
#define NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD "IPConfigBad"
#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG "IP4Config"
/*
* VPN daemon states
*/
typedef enum NMVPNState
{
NM_VPN_STATE_UNKNOWN = 0,
NM_VPN_STATE_INIT,
NM_VPN_STATE_SHUTDOWN,
NM_VPN_STATE_STARTING,
NM_VPN_STATE_STARTED,
NM_VPN_STATE_STOPPING,
NM_VPN_STATE_STOPPED
} NMVPNState;
/*
* VPN connection activation stages
*/
typedef enum NMVPNActStage
{
NM_VPN_ACT_STAGE_UNKNOWN = 0,
NM_VPN_ACT_STAGE_DISCONNECTED,
NM_VPN_ACT_STAGE_PREPARE,
NM_VPN_ACT_STAGE_CONNECT,
NM_VPN_ACT_STAGE_IP_CONFIG_GET,
NM_VPN_ACT_STAGE_ACTIVATED,
NM_VPN_ACT_STAGE_FAILED,
NM_VPN_ACT_STAGE_CANCELED
} NMVPNActStage;
#endif /* NETWORK_MANAGER_VPN_H */

7
src/Makefile.am
View File

@@ -1,6 +1,11 @@
SUBDIRS=named-manager vpn-manager dhcp-manager backends
INCLUDES = -I${top_srcdir} -I${top_srcdir}/src/named-manager -I${top_srcdir}/src/vpn-manager -I${top_srcdir}/src/dhcp-manager -I${top_srcdir}/utils
INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/include \
-I${top_srcdir}/src/named-manager \
-I${top_srcdir}/src/vpn-manager \
-I${top_srcdir}/src/dhcp-manager \
-I${top_srcdir}/utils
bin_PROGRAMS = NetworkManager

7
src/backends/Makefile.am
View File

@@ -1,4 +1,9 @@
INCLUDES = -I${top_srcdir} -I${top_srcdir}/src/named-manager -I${top_srcdir}/src/vpn-manager -I${top_srcdir}/src -I${top_srcdir}/utils
INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/include \
-I${top_srcdir}/utils \
-I${top_srcdir}/src \
-I${top_srcdir}/src/vpn-manager \
-I${top_srcdir}/src/named-manager
noinst_LTLIBRARIES = libnmbackend.la

6
src/dhcp-manager/Makefile.am
View File

@@ -1,4 +1,8 @@
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/src -I${top_srcdir}/src/named-manager
INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/include \
-I${top_srcdir}/utils \
-I${top_srcdir}/src \
-I${top_srcdir}/src/named-manager
noinst_LTLIBRARIES = libdhcp-manager.la

6
src/vpn-manager/Makefile.am
View File

@@ -1,4 +1,8 @@
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/src -I${top_srcdir}/src/named-manager
INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/include \
-I${top_srcdir}/utils \
-I${top_srcdir}/src \
-I${top_srcdir}/src/named-manager
noinst_LTLIBRARIES = libvpn-manager.la

1
src/vpn-manager/nm-dbus-vpn.c
View File

@@ -25,6 +25,7 @@
#include "NetworkManagerDevice.h"
#include "NetworkManagerDbus.h"
#include "NetworkManagerUtils.h"
#include "NetworkManagerVPN.h"
#include "nm-dbus-vpn.h"
#include "nm-vpn-manager.h"
#include "nm-vpn-connection.h"

1
src/vpn-manager/nm-vpn-service.h
View File

@@ -25,6 +25,7 @@
#include <dbus/dbus.h>
#include "NetworkManager.h"
#include "NetworkManagerVPN.h"
#include "NetworkManagerMain.h"
#include "nm-vpn-connection.h"

5
test/Makefile.am
View File

@@ -1,4 +1,7 @@
INCLUDES = -I${top_srcdir} -I${top_srcdir}/gnome/libnm_glib -I${top_srcdir}/utils
INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/gnome/libnm_glib \
-I${top_srcdir}/utils \
-I${top_srcdir}/include
AM_CPPFLAGS = \
$(DBUS_CFLAGS) \

1
vpn-daemons/openvpn/src/nm-openvpn-service.c
View File

@@ -45,6 +45,7 @@
#include <ctype.h>
#include <NetworkManager/NetworkManager.h>
#include <NetworkManager/NetworkManagerVPN.h>
#include "nm-openvpn-service.h"
#include "nm-utils.h"

2
vpn-daemons/vpnc/src/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/vpn-daemons/vpnc
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/vpn-daemons/vpnc
AM_CPPFLAGS = \
$(DBUS_CFLAGS) \

1
vpn-daemons/vpnc/src/nm-vpnc-service.c
View File

@@ -42,6 +42,7 @@
#include <ctype.h>
#include <NetworkManager/NetworkManager.h>
#include <NetworkManager/NetworkManagerVPN.h>
#include "nm-vpnc-service.h"
#include "nm-utils.h"