Timothy Pearson
12 years ago
parent
2df5ea4aaf
commit
475d08942f
@ -1,132 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
*
|
|
||||||
* tdenetman-vpn_plugin.cpp - A NetworkManager frontend for TDE
|
|
||||||
*
|
|
||||||
* Copyright (C) 2005, 2006 Novell, Inc.
|
|
||||||
*
|
|
||||||
* Author: Helmut Schaa <hschaa@suse.de>, <Helmut.Schaa@gmx.de>
|
|
||||||
* Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
*
|
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
// TDE includes
|
|
||||||
#include <kdebug.h>
|
|
||||||
|
|
||||||
// TQt includes
|
|
||||||
#include <tqhostaddress.h>
|
|
||||||
|
|
||||||
// TQT_DBus includes
|
|
||||||
#include <tqdbuserror.h>
|
|
||||||
#include <tqdbusconnection.h>
|
|
||||||
#include <tqdbusobjectpath.h>
|
|
||||||
|
|
||||||
// NM includes
|
|
||||||
#include <NetworkManager.h>
|
|
||||||
#include <NetworkManagerVPN.h>
|
|
||||||
|
|
||||||
// TDENM includes
|
|
||||||
#include "tdenetman.h"
|
|
||||||
#include "tdenetman-tray.h"
|
|
||||||
#include "tdenetman-vpn_plugin.h"
|
|
||||||
#include "dbus/vpnpluginproxy.h"
|
|
||||||
#include "tdenetman-hal_device_proxy.h"
|
|
||||||
#include "tdenetman-nm_proxy.h"
|
|
||||||
|
|
||||||
#if !defined(NM_CHECK_VERSION)
|
|
||||||
#define NM_CHECK_VERSION(x,y,z) 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
unsigned int current_vpn_state = 0;
|
|
||||||
extern NMDeviceState nm_device_state_global;
|
|
||||||
extern TQT_DBusObjectPath vpn_attempt_this_conn;
|
|
||||||
unsigned char vpn_new_credentials_needed = 0;
|
|
||||||
|
|
||||||
class VPNDBUSPluginPrivate
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
VPNDBUSPluginPrivate(TQString service, TQString obj_path)
|
|
||||||
: nmVPNDBUS(service, obj_path)
|
|
||||||
{}
|
|
||||||
~VPNDBUSPluginPrivate() {}
|
|
||||||
|
|
||||||
DBus::VPNPluginProxy nmVPNDBUS;
|
|
||||||
};
|
|
||||||
|
|
||||||
TQ_UINT32 VPNDBUSPlugin::getState()
|
|
||||||
{
|
|
||||||
TQT_DBusError err;
|
|
||||||
return d->nmVPNDBUS.getState(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
void VPNDBUSPlugin::slotStateChanged(TQ_UINT32 state)
|
|
||||||
{
|
|
||||||
current_vpn_state = state+1;
|
|
||||||
Tray* tray = Tray::getInstance();
|
|
||||||
tray->slotUpdateDeviceState(nm_device_state_global);
|
|
||||||
//emit StateChanged((NMDeviceState)state);
|
|
||||||
}
|
|
||||||
|
|
||||||
void VPNDBUSPlugin::slotLoginBanner(const TQString& banner)
|
|
||||||
{
|
|
||||||
Tray* tray = Tray::getInstance();
|
|
||||||
tray->slotVPNBannerShow(banner);
|
|
||||||
}
|
|
||||||
|
|
||||||
void VPNDBUSPlugin::slotFailure(TQ_UINT32 failure_reason)
|
|
||||||
{
|
|
||||||
printf("VPN failure code %d\n\r", failure_reason);
|
|
||||||
|
|
||||||
if ((failure_reason == 0) || (failure_reason == 1) || (failure_reason == 2)) {
|
|
||||||
// Try to connect again using cached information; request new login though
|
|
||||||
printf("Reactivate VPN connection on default device\n\r");
|
|
||||||
vpn_new_credentials_needed = 1;
|
|
||||||
int id;
|
|
||||||
TQT_DBusError err;
|
|
||||||
NMProxy* nm = NMProxy::getInstance();
|
|
||||||
TQT_DBusObjectPath act_conn = nm->getDefaultActiveConnection();
|
|
||||||
TQT_DBusObjectPath device = nm->getDeviceForActiveConnection(act_conn);
|
|
||||||
#if NM_CHECK_VERSION(0,8,992)
|
|
||||||
nm->ActivateConnectionAsync(id,"org.freedesktop.NetworkManagerUserSettings", vpn_attempt_this_conn, device, act_conn, err);
|
|
||||||
#else
|
|
||||||
nm->ActivateConnectionAsync(id,NM_DBUS_SERVICE_USER_SETTINGS, vpn_attempt_this_conn, device, act_conn, err);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
VPNDBUSPlugin::VPNDBUSPlugin ()
|
|
||||||
: TQObject()
|
|
||||||
{
|
|
||||||
d = new VPNDBUSPluginPrivate(NM_VPN_DBUS_PLUGIN_INTERFACE, NM_VPN_DBUS_PLUGIN_PATH);
|
|
||||||
d->nmVPNDBUS.setConnection(TQT_DBusConnection::systemBus());
|
|
||||||
|
|
||||||
// Connect the state changed signal to the handler
|
|
||||||
connect(&(d->nmVPNDBUS), TQT_SIGNAL(StateChanged(TQ_UINT32)), this, TQT_SLOT(slotStateChanged(TQ_UINT32)));
|
|
||||||
|
|
||||||
// Connect the failure signal to the handler
|
|
||||||
connect(&(d->nmVPNDBUS), TQT_SIGNAL(Failure(TQ_UINT32)), this, TQT_SLOT(slotFailure(TQ_UINT32)));
|
|
||||||
|
|
||||||
// And the banner signal
|
|
||||||
connect(&(d->nmVPNDBUS), TQT_SIGNAL(LoginBanner(const TQString&)), this, TQT_SLOT(slotLoginBanner(const TQString&)));
|
|
||||||
}
|
|
||||||
|
|
||||||
VPNDBUSPlugin::~VPNDBUSPlugin ()
|
|
||||||
{
|
|
||||||
delete d;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#include "tdenetman-vpn_plugin.moc"
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
*
|
|
||||||
* tdenetman-wired_device.h - A NetworkManager frontend for TDE
|
|
||||||
*
|
|
||||||
* Copyright (C) 2005, 2006 Novell, Inc.
|
|
||||||
*
|
|
||||||
* Author: Helmut Schaa <hschaa@suse.de>, <Helmut.Schaa@gmx.de>
|
|
||||||
* Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
*
|
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
#ifndef KNETWORKMANAGER_VPNDBUSPLUGIN_H
|
|
||||||
#define KNETWORKMANAGER_VPNDBUSPLUGIN_H
|
|
||||||
|
|
||||||
// std includes
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
// TDENM includes
|
|
||||||
#include "tdenetman.h"
|
|
||||||
|
|
||||||
class TDENetworkManager;
|
|
||||||
|
|
||||||
class VPNDBUSPluginPrivate;
|
|
||||||
|
|
||||||
class VPNDBUSPlugin : public TQObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
VPNDBUSPlugin ();
|
|
||||||
~VPNDBUSPlugin ();
|
|
||||||
|
|
||||||
TQ_UINT32 getState();
|
|
||||||
|
|
||||||
private:
|
|
||||||
VPNDBUSPluginPrivate * d;
|
|
||||||
|
|
||||||
// signals:
|
|
||||||
// void StateChanged(NMDeviceState);
|
|
||||||
|
|
||||||
public slots:
|
|
||||||
void slotFailure(TQ_UINT32);
|
|
||||||
void slotStateChanged(TQ_UINT32);
|
|
||||||
void slotLoginBanner(const TQString&);
|
|
||||||
// void slotDeactivate();
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* KNETWORKMANAGER_VPNDBUSPLUGIN_H */
|
|
||||||
Loading…
Reference in new issue