diff -Nru l2tp-ipsec-vpn-1.0.5/changelog l2tp-ipsec-vpn-1.0.6/changelog --- l2tp-ipsec-vpn-1.0.5/changelog 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/changelog 2012-03-13 10:53:13.000000000 +0000 @@ -1,3 +1,7 @@ +1.0.6 + - transfered writing files connectionName.info and defaultgateway.info to + L2tpIPsecVpnControlDaemon + 1.0.5 - unified runtime path, no longer using /var/tmp/L2tpIPsecVpn - enhanced install Makefile to create a world writable runtime directory diff -Nru l2tp-ipsec-vpn-1.0.5/debian/bzr-builder.manifest l2tp-ipsec-vpn-1.0.6/debian/bzr-builder.manifest --- l2tp-ipsec-vpn-1.0.5/debian/bzr-builder.manifest 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/debian/bzr-builder.manifest 2012-03-13 10:53:13.000000000 +0000 @@ -1,2 +1,2 @@ # bzr-builder format 0.3 deb-version {debupstream}-0ubuntu1~ppa1 -lp:l2tp-ipsec-vpn revid:svn-v4:0616356e-b67b-11df-8cbb-8167e617e827:trunk:124 +lp:l2tp-ipsec-vpn revid:svn-v4:0616356e-b67b-11df-8cbb-8167e617e827:trunk:125 diff -Nru l2tp-ipsec-vpn-1.0.5/debian/changelog l2tp-ipsec-vpn-1.0.6/debian/changelog --- l2tp-ipsec-vpn-1.0.5/debian/changelog 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/debian/changelog 2012-03-13 10:53:13.000000000 +0000 @@ -1,8 +1,16 @@ -l2tp-ipsec-vpn (1.0.5-0ubuntu1~ppa1~maverick1) maverick; urgency=low +l2tp-ipsec-vpn (1.0.6-0ubuntu1~ppa1~maverick1) unstable; urgency=low * Auto build. - -- Werner Jaeger Mon, 12 Mar 2012 07:22:37 +0000 + -- Werner Jaeger Tue, 13 Mar 2012 10:53:13 +0000 + +l2tp-ipsec-vpn (1.0.6-1) unstable; urgency=low + + * New upstream release + - transfered writing files connectionName.info and defaultgateway.info to + L2tpIPsecVpnControlDaemon + + -- Werner Jaeger Mon, 12 Mar 2012 14:42:11 +0100 l2tp-ipsec-vpn (1.0.5-0ubuntu1~ppa1~precise1) precise; urgency=low diff -Nru l2tp-ipsec-vpn-1.0.5/debian/control l2tp-ipsec-vpn-1.0.6/debian/control --- l2tp-ipsec-vpn-1.0.5/debian/control 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/debian/control 2012-03-13 10:53:13.000000000 +0000 @@ -18,7 +18,7 @@ Package: l2tp-ipsec-vpn Architecture: linux-any Depends: gksu (>= 2.0), - l2tp-ipsec-vpn-daemon (>= 0.9.5), + l2tp-ipsec-vpn-daemon (>= 0.9.8), ${misc:Depends}, ${shlibs:Depends} Recommends: libengine-pkcs11-openssl (>=0.1.8-2), ppp-2.4.5-eaptls-mppe (>=0.98) diff -Nru l2tp-ipsec-vpn-1.0.5/debian/postinst l2tp-ipsec-vpn-1.0.6/debian/postinst --- l2tp-ipsec-vpn-1.0.5/debian/postinst 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/debian/postinst 2012-03-13 10:53:13.000000000 +0000 @@ -24,18 +24,10 @@ # re-apply settings just in case the new version has changed some things L2tpIPsecVpn applySettings || true - # restart syslog daemon just in case the new version has changed the - # Rsyslogd configuration file (potentially written out with the command + # restart syslog daemon just in case the new version has changed the + # Rsyslogd configuration file (potentially written out with the command # 'L2tpIPsecVpn applySettings' above) invoke-rc.d rsyslog restart || true - - # create runtime directory if it not exists - if [ ! -d /var/run/L2tpIPsecVpn ]; then - mkdir /var/run/L2tpIPsecVpn - fi - - chmod go+rw /var/run/L2tpIPsecVpn - ;; abort-upgrade|abort-remove|abort-deconfigure) diff -Nru l2tp-ipsec-vpn-1.0.5/debian/prerm l2tp-ipsec-vpn-1.0.6/debian/prerm --- l2tp-ipsec-vpn-1.0.5/debian/prerm 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/debian/prerm 2012-03-13 10:53:13.000000000 +0000 @@ -18,9 +18,6 @@ echo "Trying to delete all generated config files" >&2 L2tpIPsecVpn deleteAllConfFiles || true - # Remove run time files - rm -rf /var/run/L2tpIPsecVpn - # Remove syslog pipe and restart syslog service rm -f /var/log/l2tpipsecvpn.pipe invoke-rc.d rsyslog restart || true diff -Nru l2tp-ipsec-vpn-1.0.5/docs/L2tpIPsecVpn.1 l2tp-ipsec-vpn-1.0.6/docs/L2tpIPsecVpn.1 --- l2tp-ipsec-vpn-1.0.5/docs/L2tpIPsecVpn.1 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/docs/L2tpIPsecVpn.1 2012-03-13 10:53:13.000000000 +0000 @@ -1,4 +1,4 @@ -.TH L2tpIPsecVpn 1 "11 Mar 2012" "version 1.0.5" +.TH L2tpIPsecVpn 1 "12 Mar 2012" "version 1.0.6" .SH NAME \fBL2tpIPsecVpn\fP \- L2tp over IPsec VPN Manager applet for the GNOME Desktop diff -Nru l2tp-ipsec-vpn-1.0.5/Makefile l2tp-ipsec-vpn-1.0.6/Makefile --- l2tp-ipsec-vpn-1.0.5/Makefile 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/Makefile 2012-03-13 10:53:13.000000000 +0000 @@ -55,14 +55,6 @@ invoke-rc.d rsyslog restart; \ fi - @if [ "$${INSTALL_ROOT}" = "" -a ! -d $(INSTALL_ROOT)/var/run/$(QMAKE_TARGET) ]; then \ - mkdir $(INSTALL_ROOT)/var/run/$(QMAKE_TARGET); \ - fi - - @if [ "$${INSTALL_ROOT}" = "" ]; then \ - chmod go+rw $(INSTALL_ROOT)/var/run/$(QMAKE_TARGET); \ - fi - # uninstall uninstall: nbproject/qt-${CONF}.mk # if applet is running try to terminate it @@ -76,9 +68,6 @@ @echo "Trying to delete all generated config files" >&2 $(QMAKE_TARGET) deleteAllConfFiles || true - # Remove run time files - rm -rf $(INSTALL_ROOT)/var/run/$(QMAKE_TARGET) - # Remove lock files and sockets rm -f $(INSTALL_ROOT)/tmp/$(QMAKE_TARGET)-* diff -Nru l2tp-ipsec-vpn-1.0.5/nbproject/configurations.xml l2tp-ipsec-vpn-1.0.6/nbproject/configurations.xml --- l2tp-ipsec-vpn-1.0.5/nbproject/configurations.xml 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/nbproject/configurations.xml 2012-03-13 10:53:13.000000000 +0000 @@ -173,7 +173,7 @@ ${CND_DISTDIR}/${CND_CONF} L2tpIPsecVpn - 1.0.5 + 1.0.6 core gui network src/generated src/generated @@ -211,7 +211,7 @@ Tar - ${CND_DISTDIR}/${CND_CONF}/package/l2tp-ipsec-vpn-1.0.5.tar + ${CND_DISTDIR}/${CND_CONF}/package/l2tp-ipsec-vpn-1.0.6.tar ${CND_DISTDIR}/${CND_CONF} L2tpIPsecVpn - 1.0.5 + 1.0.6 1 core gui network src/generated @@ -317,7 +317,7 @@ Tar - ${CND_DISTDIR}/${CND_CONF}/package/l2tp-ipsec-vpn-1.0.5.tar + ${CND_DISTDIR}/${CND_CONF}/package/l2tp-ipsec-vpn-1.0.6.tar /var/run/L2tpIPsecVpn/${PPP_REMOTE} +echo "${PPP_IPPARAM}" | cut -d'-' -f2 > /var/run/L2tpIPsecVpnControlDaemon/${PPP_REMOTE} case $PPP_IPPARAM in {{#CONN_SECTION}} "{{IPPARAM}}" ) diff -Nru l2tp-ipsec-vpn-1.0.5/src/ConnectionManager.cpp l2tp-ipsec-vpn-1.0.6/src/ConnectionManager.cpp --- l2tp-ipsec-vpn-1.0.5/src/ConnectionManager.cpp 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/src/ConnectionManager.cpp 2012-03-13 10:53:13.000000000 +0000 @@ -54,7 +54,7 @@ static const int PTPINTERFACE_CHECK_DOWN_TIME(30000); static const int VPN_TASK_TIMOUT(80000); -static const QString strRuntimePath("/var/run/L2tpIPsecVpn/"); +static const QString strRuntimePath("/var/run/L2tpIPsecVpnControlDaemon/"); static const char* const strAbout( "

Copyright © 2010-2012 Werner Jaeger

" "

Help

" diff -Nru l2tp-ipsec-vpn-1.0.5/src/L2tpIPsecVpnApplication.cpp l2tp-ipsec-vpn-1.0.6/src/L2tpIPsecVpnApplication.cpp --- l2tp-ipsec-vpn-1.0.5/src/L2tpIPsecVpnApplication.cpp 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/src/L2tpIPsecVpnApplication.cpp 2012-03-13 10:53:13.000000000 +0000 @@ -48,7 +48,7 @@ setOrganizationName("WernerJaeger"); setOrganizationDomain("wejaeger.com"); setApplicationName(APPLICATIONNAME); - setApplicationVersion("1.0.5"); + setApplicationVersion("1.0.6"); setObjectName("L2tpIPsecVpn"); qRegisterMetaType("NetworkInterface"); qRegisterMetaType("QAbstractSocket::SocketState"); diff -Nru l2tp-ipsec-vpn-1.0.5/src/util/NetworkInterface.cpp l2tp-ipsec-vpn-1.0.6/src/util/NetworkInterface.cpp --- l2tp-ipsec-vpn-1.0.5/src/util/NetworkInterface.cpp 2012-03-12 07:22:37.000000000 +0000 +++ l2tp-ipsec-vpn-1.0.6/src/util/NetworkInterface.cpp 2012-03-13 10:53:13.000000000 +0000 @@ -33,11 +33,12 @@ #include #include +#include "util/VpnControlDaemonClient.h" + #include "NetworkInterface.h" const char* const pcProcNetDevPath("/proc/net/dev"); -const char* const pcL2tpRunDir("/var/run/L2tpIPsecVpn"); -const char* const pcDefaultGatewayInfoPath("/var/run/L2tpIPsecVpn/defaultgateway.info"); +const char* const pcDefaultGatewayInfoPath("/var/run/L2tpIPsecVpnControlDaemon/defaultgateway.info"); const NetworkInterface NetworkInterface::null(NetworkInterface("", 0, 0)); NetworkInterface::NetworkInterface(const NetworkInterface& orig) : m_strName(orig.m_strName), m_iIndex(orig.m_iIndex), m_Flags(orig.m_Flags), m_AddressEntries(orig.m_AddressEntries), m_RouteEntries(orig.m_RouteEntries) @@ -337,25 +338,20 @@ if (nif.routeEntries().size() > 0) { - struct stat st; - - if (::stat(pcL2tpRunDir, &st) == 0 || ::mkdir(pcL2tpRunDir, S_IRWXU) == 0) - { - using namespace std; + using namespace std; - const QNetworkAddressEntry ae(nif.routeEntries()[0]); + const QNetworkAddressEntry ae(nif.routeEntries()[0]); - ofstream defaultGatewayInfo(pcDefaultGatewayInfoPath, ios::out | ios::trunc); + stringstream strDefaultGatewayInfo; - if (defaultGatewayInfo) - { - defaultGatewayInfo << "defaultroutephys=" << nif.m_strName << endl; - defaultGatewayInfo << "defaultroutevirt=none" << endl; - defaultGatewayInfo << "defaultrouteaddr=" << ipAddress(nif.m_strName) << endl; - defaultGatewayInfo << "defaultroutenexthop=" << ae.broadcast().toString().toStdString() <