--- a/group/bld.inf Fri Apr 16 16:02:48 2010 +0300
+++ b/group/bld.inf Mon May 03 13:28:39 2010 +0300
@@ -19,7 +19,6 @@
PRJ_EXPORTS
-#ifdef FF_VPN_CLIENT
../vpnengine/dmadengine/rom/dmadengine.iby CORE_MW_LAYER_IBY_EXPORT_PATH(dmadengine.iby)
../vpnengine/dmadipsecvpn/rom/dmadipsecvpn.iby CORE_MW_LAYER_IBY_EXPORT_PATH(dmadipsecvpn.iby)
../vpnengine/dmadpki/rom/dmadpki.iby CORE_MW_LAYER_IBY_EXPORT_PATH(dmadpki.iby)
@@ -47,6 +46,7 @@
../vpnengine/vpnmanager/rom/vpnmanager.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vpnmanager.iby)
../vpnengine/vpnins/rom/vpnins.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vpnins.iby)
../vpnengine/vpnipsecpolparser/rom/vpnipsecpolparser.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vpnipsecpolparser.iby)
+../vpnengine/vpntcwrapper/rom/vpntcwrapper.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vpntcwrapper.iby)
../vpnui/vpnecomnotifier/rom/vpnecomnotifier.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vpnecomnotifier.iby)
../vpnui/vpndialogmanager/rom/vpndialogmanager.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vpndialogmanager.iby)
@@ -54,13 +54,8 @@
../vpnui/vpnecomnotifier/rom/vpnecomnotifierResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(vpnecomnotifierResources.iby)
-#ifndef FF_GENERIC_ACCESS_NETWORK // UMA not supported
../vpnui/vpnpolicyrecognizer/rom/vpnpolicyrecognizer.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vpnpolicyrecognizer.iby)
../rom/ipsecvpn.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ipsecvpn.iby)
-#endif
-
-
-#endif // FF_VPN_CLIENT
// vpnapi.dll should be in rom always
../vpnapiimpl/rom/vpnapi.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vpnapi.iby)
--- a/group/update_version_h.pl Fri Apr 16 16:02:48 2010 +0300
+++ b/group/update_version_h.pl Mon May 03 13:28:39 2010 +0300
@@ -19,8 +19,8 @@
use Cwd;
use POSIX qw(strftime);
-my $PLATFORM_LONG = "4_2";
-my $PLATFORM_SHORT = "42";
+my $PLATFORM_LONG = "5_0";
+my $PLATFORM_SHORT = "50";
sub update_version_h
{
--- a/rom/ipsecvpn.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/rom/ipsecvpn.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,15 @@
#ifndef __IPSECVPN_IBY__
#define __IPSECVPN_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifdef FF_VPN_CLIENT
-REM Feature VPNCLIENT STUB SISSES not included in this rom
-
-#else
+#ifndef FF_GENERIC_ACCESS_NETWORK // UMA not supported
data=ZSYSTEM\install\ipsecvpn.sis system\install\ipsecvpn.sis
data=ZSYSTEM\install\ipsecvpn_vpnpolins.sis system\install\ipsecvpn_vpnpolins.sis
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif
+
+#endif // FF_VPN_CLIENT
#endif // __IPSECVPN_IBY__
--- a/vpnclient_sis/group/bld.inf Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnclient_sis/group/bld.inf Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -17,16 +17,12 @@
*
*
*/
-
-
-
PRJ_PLATFORMS
-DEFAULT
+ARMV5
PRJ_EXPORTS
PRJ_MMPFILES
- gnumakefile update_versions.mk
gnumakefile vpnclient_sis.mk
// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vpnclient_sis/group/create_vpnclient_sis.pl Mon May 03 13:28:39 2010 +0300
@@ -0,0 +1,129 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Updates pkg-files' and vpnclient_sis.mk's version information with current date.
+# Creates temporary pkg-files with updated version.
+#
+
+use strict;
+use POSIX qw(strftime);
+use File::Copy;
+
+
+#Subroutines to update version information
+my $PLATFORM = "50";
+
+#
+# Creates a temp file and replaces line
+#
+sub replace_line_and_create_temp
+{
+ # arguments
+ my ($pattern, $replacement, $path) = @_;
+
+ # create temp file
+ my $temp_path = "temp_".$path;
+ if (-e $temp_path)
+ {
+ chmod 0666, $temp_path;
+ unlink $temp_path;
+ }
+ copy($path, $temp_path);
+ chmod 0666, $temp_path;
+
+ # update version information
+ my ($infile, $outfile);
+ open $infile, "<".$path or die "Can't open $path : $!";
+ open $outfile, ">".$temp_path or die "Can't open $temp_path : $!";
+ while (<$infile>)
+ {
+ my $line = $_;
+ if ($line =~ s/$pattern/$replacement/g)
+ {
+ print "Replaced line in $temp_path\n";
+ }
+ print $outfile $line;
+ }
+ close $infile;
+ close $outfile;
+}
+
+
+# Define variables
+my $pkgtime = strftime($PLATFORM.",%y,%m%d", localtime());
+my $mktime = strftime("%y%m%d", localtime());
+my $epocroot = $ENV{'EPOCROOT'};
+$epocroot =~ s/\\/\//;
+
+my $rdderdir="../data/RDTest_02.der";
+my $rdkeydir="../data/RDTest_02.key";
+my $localisation_files = $epocroot . "epoc32/data/Z/resource/vpnecomnotifier.r05";
+
+if (!(-e $localisation_files))
+{
+ die "Localisation files are not available! Exiting..\n";
+}
+
+
+my $numArgs = $#ARGV + 1;
+if (!($#ARGV + 1 eq 1))
+{
+ die "wrong number of command line arguments.";
+}
+my $config = @ARGV[0];
+
+# Creates temp pkg files with updated version information
+if ($config eq "UREL")
+{
+# nokia_vpn_client_localised_armv5_urel.pkg
+ replace_line_and_create_temp(
+ '^\(0x101F5147\),.*?,.*?,.*?, TYPE=SA, RU$',
+ "(0x101F5147),$pkgtime, TYPE=SA, RU",
+ 'nokia_vpn_client_localised_armv5_urel.pkg');
+
+ print "Processing temp_nokia_vpn_client_localised_armv5_urel.pkg\n";
+ system("makesis -v temp_nokia_vpn_client_localised_armv5_urel.pkg mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_urel.sis") == 0 or
+ die "UREL sis creation failed";
+ print "\nSigning created mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_urel.sis\n";
+ system("signsis mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_urel.sis mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_urel.sis " . $rdderdir . " " . $rdkeydir) == 0 or
+ die "UREL sis signing failed";
+
+ # remove temp files
+ unlink <temp_*_urel.pkg>;
+
+}
+elsif ($config eq "UDEB")
+{
+ # nokia_vpn_client_localised_armv5_udeb.pkg
+ replace_line_and_create_temp(
+ '^\(0x101F5147\),.*?,.*?,.*?, TYPE=SA, RU$',
+ "(0x101F5147),$pkgtime, TYPE=SA, RU",
+ 'nokia_vpn_client_localised_armv5_udeb.pkg');
+
+ print "Processing temp_nokia_vpn_client_localised_armv5_udeb.pkg\n";
+ my $udeb_sis_file_name = "mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_udeb.sis";
+ system("makesis -v temp_nokia_vpn_client_localised_armv5_udeb.pkg " . $udeb_sis_file_name ) == 0 or
+ die "UDEB sis creation failed";
+ print "\nSigning created mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_udeb.sis\n";
+ system ("signsis " . $udeb_sis_file_name . " " . $udeb_sis_file_name . " " . $rdderdir . " " . $rdkeydir) == 0 or
+ die "UDEB sis signing failed";
+
+ # remove temp files
+ unlink <temp_*_udeb.pkg>;
+}
+else
+{
+ die "Unknown config " . $config . "\n";
+}
+
\ No newline at end of file
Binary file vpnclient_sis/group/mVPN_vpnpolins_armv5.sis has changed
--- a/vpnclient_sis/group/nokia_vpn_acuins_armv5.pkg Fri Apr 16 16:02:48 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: Package file for project Acu Policy Installer
-;
-
-
-; LANGUAGES
-; - None (English only by default)
-
-; INSTALLATION HEADER
-#{"Nokia VPN Server Installer"},(0xA0000132),32,08,0124, TYPE=SA, RU
-
-; Product / platform version compatibility - S60 5.1 and 5.2
-[0x10283160],0,0,0,{"Series60ProductID"}
-[0x20022e6d],0,0,0,{"Series60ProductID"}
-
-; List of localised vendor names - one per language.
-; At least one must be provided (English [EN]).
-%{"Nokia"}
-
-; Unique Vendor Name
-:"Nokia"
-
-; LIST OF FILES
-; No files!
--- a/vpnclient_sis/group/update_versions.mk Fri Apr 16 16:02:48 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2008-2008 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: Calls version update script
-#
-
-do_nothing :
- @rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD :
- @echo Updating versions..
- perl update_versions.pl
- @echo Update done!
-
-FREEZE LIB CLEANLIB RESOURCE RELEASABLES CLEAN FINAL SAVESPACE : do_nothing
\ No newline at end of file
--- a/vpnclient_sis/group/update_versions.pl Fri Apr 16 16:02:48 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-# Updates pkg-files' and vpnclient_sis.mk's version information with current date.
-# Creates temporary pkg-files with updated version.
-#
-
-use strict;
-use POSIX qw(strftime);
-use File::Copy;
-
-
-my $PLATFORM = "42";
-
-#
-# Creates a temp file and replaces line
-#
-sub replace_line_and_create_temp
-{
- # arguments
- my ($pattern, $replacement, $path) = @_;
-
- # create temp file
- my $temp_path = "temp_".$path;
- if (-e $temp_path)
- {
- chmod 0666, $temp_path;
- unlink $temp_path;
- }
- copy($path, $temp_path);
- chmod 0666, $temp_path;
-
- # update version information
- my ($infile, $outfile);
- open $infile, "<".$path or die "Can't open $path : $!";
- open $outfile, ">".$temp_path or die "Can't open $temp_path : $!";
- while (<$infile>)
- {
- my $line = $_;
- if ($line =~ s/$pattern/$replacement/g)
- {
- print "Replaced line in $temp_path\n";
- }
- print $outfile $line;
- }
- close $infile;
- close $outfile;
-}
-
-#
-# Replaces line
-#
-sub replace_line
-{
- # arguments
- my ($pattern, $replacement, $path) = @_;
-
- # Backup
- if (-e "$path.BACKUP")
- {
- chmod 0666, "$path.BACKUP";
- unlink "$path.BACKUP";
- }
- chmod 0666, $path;
- rename $path, "$path.BACKUP";
-
- # update version information
- my ($infile, $outfile);
- open $infile, "<$path.BACKUP" or die "Can't open $path.BACKUP : $!";
- open $outfile, ">$path" or die "Can't open $path : $!";
- while (<$infile>)
- {
- my $line = $_;
- if ($line =~ s/$pattern/$replacement/g)
- {
- print "Replaced line in $path\n";
- }
- print $outfile $line;
- }
- close $infile;
- close $outfile;
-}
-
-my $pkgtime = strftime($PLATFORM.",%y,%m%d", localtime());
-my $mktime = strftime("%y%m%d", localtime());
-
-# nokia_vpn_vpnpolins_armv5.pkg
-replace_line_and_create_temp(
- '^#{"Nokia VPN Policy Installer"},\(0xA0000131\),.*?,.*?,.*?, TYPE=SA, RU$',
- "#{\"Nokia VPN Policy Installer\"},(0xA0000131),$pkgtime, TYPE=SA, RU",
- 'nokia_vpn_vpnpolins_armv5.pkg');
-
-# nokia_vpn_client_localised_armv5_urel.pkg
-replace_line_and_create_temp(
- '^\(0x101F5147\),.*?,.*?,.*?, TYPE=SA, RU$',
- "(0x101F5147),$pkgtime, TYPE=SA, RU",
- 'nokia_vpn_client_localised_armv5_urel.pkg');
-
-# nokia_vpn_client_localised_armv5_udeb.pkg
-replace_line_and_create_temp(
- '^\(0x101F5147\),.*?,.*?,.*?, TYPE=SA, RU$',
- "(0x101F5147),$pkgtime, TYPE=SA, RU",
- 'nokia_vpn_client_localised_armv5_udeb.pkg');
-
-# vpnclient_sis.mk
-replace_line(
- '^VERSION=.*?$',
- "VERSION=$mktime",
- 'vpnclient_sis.mk');
--- a/vpnclient_sis/group/vpnclient_sis.mk Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnclient_sis/group/vpnclient_sis.mk Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of "Eclipse Public License v1.0"
@@ -14,69 +14,18 @@
# Description: Creates either localised or nonlocalised mVPN Client SIS files
#
-# To ensure that EPOCROOT always ends with a forward slash
-TMPROOT:=$(subst \,/,$(EPOCROOT))
-EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
-
-VERSION=091014
-RDDERDIR=../data/RDTest_02.der
-RDKEYDIR=../data/RDTest_02.key
-LOCALISATION_FILES=$(EPOCROOT)epoc32/data/Z/resource/vpnecomnotifier.r05
-S60PLATFORM=v42
-
do_nothing :
@rem do_nothing
MAKMAKE : do_nothing
BLD :
-
-#
-# Localisation files must exist
-#
- @echo --
- if exist $(LOCALISATION_FILES) @echo Building localised version
- if not exist $(LOCALISATION_FILES) @echo Localisation files are not available! Exiting..
- if not exist $(LOCALISATION_FILES) @echo --
- if not exist $(LOCALISATION_FILES) exit 1
- @echo --
-
-#
-# vpn policy installer
-#
- @echo Processing temp_nokia_vpn_vpnpolins_armv5.pkg
- $(EPOCROOT)epoc32\tools\makesis -v temp_nokia_vpn_vpnpolins_armv5.pkg mVPN_vpnpolins_armv5.sis
- @echo Signing created mVPN_vpnpolins_armv5.sis
- $(EPOCROOT)epoc32\tools\signsis mVPN_vpnpolins_armv5.sis mVPN_vpnpolins_armv5.sis $(RDDERDIR) $(RDKEYDIR)
+ perl create_vpnclient_sis.pl $(CFG)
-#
-# If localisation files exist create localised SIS files.
-#
-# UREL
- @echo Processing temp_nokia_vpn_client_localised_armv5_urel.pkg
- $(EPOCROOT)epoc32\tools\makesis -v temp_nokia_vpn_client_localised_armv5_urel.pkg mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis
- @echo Signing created mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis
- $(EPOCROOT)epoc32\tools\signsis mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis $(RDDERDIR) $(RDKEYDIR)
-# UDEB
- @echo Processing temp_nokia_vpn_client_localised_armv5_udeb.pkg
- $(EPOCROOT)epoc32\tools\makesis -v temp_nokia_vpn_client_localised_armv5_udeb.pkg mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis
- @echo Signing created mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis
- $(EPOCROOT)epoc32\tools\signsis mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis $(RDDERDIR) $(RDKEYDIR)
-
-
-# remove policy installer
- @echo Remove unnecessary temporary sis files
- if exist mVPN_vpnpolins_armv5.sis erase mVPN_vpnpolins_armv5.sis
+CLEAN :
+ if exist mVPN_RnD*.sis erase mVPN_RnD*.sis
if exist temp_* erase temp_*
-CLEAN :
- if exist mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis erase mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis
- if exist mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis erase mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis
- if exist mVPN_vpnpolins_armv5.sis erase mVPN_vpnpolins_armv5.sis
- if exist temp_* erase temp_*
- if exist *.BACKUP erase *.BACKUP
-
-
LIB : do_nothing
CLEANLIB : do_nothing
--- a/vpnclient_sis/stub_sis/group/bld.inf Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnclient_sis/stub_sis/group/bld.inf Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,7 +21,7 @@
PRJ_PLATFORMS
-DEFAULT
+ARMV5
PRJ_EXPORTS
../data/101f877b.txt.vpn /epoc32/data/z/private/10202be9/101f877b.txt.vpn
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vpnclient_sis/stub_sis/group/create_vpnclient_sis.pl Mon May 03 13:28:39 2010 +0300
@@ -0,0 +1,127 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Updates pkg-files' and vpnclient_sis.mk's version information with current date.
+# Creates temporary pkg-files with updated version.
+#
+
+use strict;
+use POSIX qw(strftime);
+use File::Copy;
+
+
+#Subroutines to update version information
+my $PLATFORM = "42";
+
+#
+# Creates a temp file and replaces line
+#
+sub replace_line_and_create_temp
+{
+ # arguments
+ my ($pattern, $replacement, $path) = @_;
+
+ # create temp file
+ my $temp_path = "temp_".$path;
+ if (-e $temp_path)
+ {
+ chmod 0666, $temp_path;
+ unlink $temp_path;
+ }
+ copy($path, $temp_path);
+ chmod 0666, $temp_path;
+
+ # update version information
+ my ($infile, $outfile);
+ open $infile, "<".$path or die "Can't open $path : $!";
+ open $outfile, ">".$temp_path or die "Can't open $temp_path : $!";
+ while (<$infile>)
+ {
+ my $line = $_;
+ if ($line =~ s/$pattern/$replacement/g)
+ {
+ print "Replaced line in $temp_path\n";
+ }
+ print $outfile $line;
+ }
+ close $infile;
+ close $outfile;
+}
+
+
+# Define variables
+my $pkgtime = strftime($PLATFORM.",%y,%m%d", localtime());
+my $mktime = strftime("%y%m%d", localtime());
+my $epocroot = $ENV{'EPOCROOT'};
+$epocroot =~ s/\\/\//;
+
+my $rdderdir="../data/RDTest_02.der";
+my $rdkeydir="../data/RDTest_02.key";
+my $localisation_files = $epocroot . "epoc32/data/Z/resource/vpnecomnotifier.r05";
+
+if (!(-e $localisation_files))
+{
+ die "Localisation files are not available! Exiting..\n";
+}
+
+
+my $numArgs = $#ARGV + 1;
+if (!($#ARGV + 1 eq 1))
+{
+ die "wrong number of command line arguments.";
+}
+my $config = @ARGV[0];
+
+# Creates temp pkg files with updated version information
+if ($config eq "UREL")
+{
+
+# stub_nokia_vpn_vpnpolins_armv5.pkg
+replace_line_and_create_temp(
+ '^#{"Nokia VPN Policy Installer Stub"},\(0xA0000131\),.*?,.*?,.*?',
+ "#{\"Nokia VPN Policy Installer Stub\"},(0xA0000131),$pkgtime",
+ 'stub_vpnpolins_armv5.pkg');
+
+# stub_nokia_vpn_client_localised_armv5.pkg
+replace_line_and_create_temp(
+ '^\(0x101F5147\),.*?,.*?,.*?$',
+ "(0x101F5147),$pkgtime",
+ 'stub_nokia_vpn_client_armv5.pkg');
+
+ print "Processing stub_vpnpolins_armv5.pkg\n";
+ system("makesis -v -s stub_vpnpolins_armv5.pkg ipsecvpn_vpnpolins.SIS") == 0 or
+ die "ipsecvpn_vpnpolins.SIS creation failed";
+
+
+ print "Processing stub_nokia_vpn_client_armv5.pkg\n";
+ system("makesis -v -s stub_nokia_vpn_client_armv5.pkg ipsecvpn.SIS") == 0 or
+ die "ipsecvpn.SIS creation failed";
+
+ print "Export stub sis files to " . $epocroot . "epoc32/data/z/system/install\n";
+ copy("ipsecvpn_vpnpolins.SIS", $epocroot . "epoc32/data/z/system/install") or die "ipsecvpn_vpnpolins.SIS cannot be copied.";
+ copy("ipsecvpn.SIS", $epocroot . "epoc32/data/z/system/install") or die "ipsecvpn_vpnpolins.SIS cannot be copied.";
+
+ # remove temp files
+ unlink <temp_*.pkg>;
+
+}
+elsif ($config eq "UDEB")
+{
+ #do nothing
+}
+else
+{
+ die "Unknown config " . $config . "\n";
+}
+
\ No newline at end of file
--- a/vpnclient_sis/stub_sis/group/update_versions.pl Fri Apr 16 16:02:48 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-#
-# update_versions.pl
-#
-# Updates pkg-files' and vpnclient_sis.mk's version information with current date.
-# Creates temporary pkg-files with updated version.
-#
-
-use strict;
-use POSIX qw(strftime);
-use File::Copy;
-
-
-my $PLATFORM = "41";
-
-#
-# Creates a temp file and replaces line
-#
-sub replace_line_and_create_temp
-{
- # arguments
- my ($pattern, $replacement, $path) = @_;
-
- # create temp file
- my $temp_path = "temp_".$path;
- if (-e $temp_path)
- {
- chmod 0666, $temp_path;
- unlink $temp_path;
- }
- copy($path, $temp_path);
- chmod 0666, $temp_path;
-
- # update version information
- my ($infile, $outfile);
- open $infile, "<".$path or die "Can't open $path : $!";
- open $outfile, ">".$temp_path or die "Can't open $temp_path : $!";
- while (<$infile>)
- {
- my $line = $_;
- if ($line =~ s/$pattern/$replacement/g)
- {
- print "Replaced line in $temp_path\n";
- }
- print $outfile $line;
- }
- close $infile;
- close $outfile;
-}
-
-my $pkgtime = strftime($PLATFORM.",%y,%m%d", localtime());
-my $mktime = strftime("%y%m%d", localtime());
-
-# stub_nokia_vpn_vpnpolins_armv5.pkg
-replace_line_and_create_temp(
- '^#{"Nokia VPN Policy Installer Stub"},\(0xA0000131\),.*?,.*?,.*?',
- "#{\"Nokia VPN Policy Installer Stub\"},(0xA0000131),$pkgtime",
- 'stub_vpnpolins_armv5.pkg');
-
-# stub_nokia_vpn_client_localised_armv5.pkg
-replace_line_and_create_temp(
- '^\(0x101F5147\),.*?,.*?,.*?$',
- "(0x101F5147),$pkgtime",
- 'stub_nokia_vpn_client_armv5.pkg');
--- a/vpnclient_sis/stub_sis/group/vpnclient_stub_sis.mk Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnclient_sis/stub_sis/group/vpnclient_stub_sis.mk Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006 - 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006 - 2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of "Eclipse Public License v1.0"
@@ -21,21 +21,13 @@
MAKMAKE : do_nothing
-BLD :
- @echo Processing stub_vpnpolins_armv5.pkg
- makesis -v -s stub_vpnpolins_armv5.pkg ipsecvpn_vpnpolins.SIS
-
- @echo Processing stub_nokia_vpn_client_armv5.pkg
- makesis -v -s stub_nokia_vpn_client_armv5.pkg ipsecvpn.SIS
-
- @echo Export stub sis files to $(EPOCROOT)epoc32\data\z\system\install
- copy ipsecvpn_vpnpolins.SIS $(EPOCROOT)epoc32\data\z\system\install
- copy ipsecvpn.SIS $(EPOCROOT)epoc32\data\z\system\install
+BLD :
+ perl create_vpnclient_sis.pl $(CFG)
CLEAN :
if exist ipsecvpn_vpnpolins.SIS erase ipsecvpn_vpnpolins.SIS
- if exist $(EPOCROOT)epoc32/data/z/system/install/ipsecvpn_vpnpolins.SIS erase $(EPOCROOT)epoc32/data/z/system/install/ipsecvpn_vpnpolins.SIS
- if exist $(EPOCROOT)epoc32/data/z/system/install/ipsecvpn.SIS erase $(EPOCROOT)epoc32/data/z/system/install/ipsecvpn.SIS
+ if exist $(EPOCROOT)epoc32\data\z\system\install\ipsecvpn_vpnpolins.SIS erase $(EPOCROOT)epoc32\data\z\system\install\ipsecvpn_vpnpolins.SIS
+ if exist $(EPOCROOT)epoc32\data\z\system\install\ipsecvpn.SIS erase $(EPOCROOT)epoc32\data\z\system\install\ipsecvpn.SIS
if exist ipsecvpn.SIS erase ipsecvpn.SIS
if exist *BACKUP erase *BACKUP
--- a/vpnengine/dmadengine/rom/dmadengine.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/dmadengine/rom/dmadengine.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -19,14 +19,10 @@
#ifndef __DMADENGINE_IBY__
#define __DMADENGINE_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM dmadentine not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\dmadengine.dll SHARED_LIB_DIR\dmadengine.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __DMADENGINE_IBY__
--- a/vpnengine/dmadipsecvpn/rom/dmadipsecvpn.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/dmadipsecvpn/rom/dmadipsecvpn.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __DMADIPSECVPN_IBY__
#define __DMADIPSECVPN_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM dmadipsecvpn not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
ECOM_PLUGIN(dmadipsecvpn.dll, dmadipsecvpn.rsc)
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __DMADIPSECVPN_IBY__
--- a/vpnengine/dmadpki/rom/dmadpki.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/dmadpki/rom/dmadpki.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __DMADPKI_IBY__
#define __DMADPKI_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM dmadpki not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
ECOM_PLUGIN(dmadpki.dll, dmadpki.rsc)
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __DMADPKI_IBY__
--- a/vpnengine/eventmediator/rom/eventmediator.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/eventmediator/rom/eventmediator.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,10 @@
#ifndef __EVENTMEDIATOR_IBY__
#define __EVENTMEDIATOR_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature EVENTMEDIATOR not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\eventmed.exe PROGRAMS_DIR\eventmed.exe
-// data=EPOCROOT##epoc32\winscw\c\private\101FD288\backup_registration.xml Private\101FD288\backup_registration.xml
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __EVENTMEDIATOR_IBY__
--- a/vpnengine/eventmediatorapi/rom/eventmediatorapi.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/eventmediatorapi/rom/eventmediatorapi.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __EVENTMEDIATORAPI_IBY__
#define __EVENTMEDIATORAPI_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature EVENTMEDIATORAPI not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\eventmedapi.dll SHARED_LIB_DIR\eventmedapi.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __EVENTMEDIATORAPI_IBY__
--- a/vpnengine/eventviewer/rom/eventviewer.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/eventviewer/rom/eventviewer.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
#ifndef __EVENTVIEWER_IBY__
#define __EVENTVIEWER_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature EVENTVIEWER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\eventviewer.dll SHARED_LIB_DIR\eventviewer.dll
data=DATAZ_\RESOURCE_FILES_DIR\vpnlogmessages.rsc RESOURCE_FILES_DIR\vpnlogmessages.rsc
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __EVENTVIEWER_IBY__
--- a/vpnengine/ikecert/rom/ikecert.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/ikecert/rom/ikecert.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __IKECERT_IBY__
#define __IKECERT_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKECERT not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\ikecert.dll SHARED_LIB_DIR\ikecert.dll
-#endif
+#endif // FF_VPN_CLIENT
#endif // __IKECERT_IBY__
--- a/vpnengine/ikepolparser/rom/ikepolparser.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/ikepolparser/rom/ikepolparser.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,14 +21,10 @@
#ifndef __IKEPOLPARSER_IBY__
#define __IKEPOLPARSER_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKEPOLPARSER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\ikepolparser.dll SHARED_LIB_DIR\ikepolparser.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __IKEPOLPARSER_IBY__
--- a/vpnengine/ikesocket/inc/receiver.h Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/ikesocket/inc/receiver.h Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -68,7 +68,7 @@
*
* @lib ikesocket.lib
*/
-NONSHARABLE_CLASS( CReceiver ) : private CActive
+NONSHARABLE_CLASS( CReceiver ) : private CTimer
{
public:
/**
@@ -113,9 +113,10 @@
enum TReceiverState
{
- EIdle, // Idle
- EWaitingData, // Waiting data to become available for reading
- EReceiving // Receiving data
+ EIdle, // Idle
+ EWaitingData, // Waiting data to become available for reading
+ EReceiving, // Receiving data
+ EWaitingAfterSocketError // Waiting after socket error
};
CReceiver( RSocket& aSocket,
@@ -141,8 +142,11 @@
/**
* Handles error in receiving.
+ * @param aStatus Error status
+ * @param aSocket Informs if delay needed
*/
- void HandleError( const TInt aStatus );
+ void HandleError( const TInt aStatus,
+ const TBool aDelayNeeded = EFalse );
/**
* Notifies client that data has been received.
@@ -180,7 +184,13 @@
* Own.
*/
TReceiverState iState;
-
+
+ /**
+ * Maximum error count.
+ * Own.
+ */
+ TInt iErrorCount;
+
/**
* Message data.
* Own.
--- a/vpnengine/ikesocket/rom/ikesocket.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/ikesocket/rom/ikesocket.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,13 +20,9 @@
#ifndef __IKESOCKET_IBY__
#define __IKESOCKET_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKESOCKET not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\ikesocket.dll SHARED_LIB_DIR\ikesocket.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif
\ No newline at end of file
--- a/vpnengine/ikesocket/src/connobserver.cpp Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/ikesocket/src/connobserver.cpp Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -83,7 +83,7 @@
CConnObserver::CConnObserver( RConnection& aConnection,
MConnObserverCallback& aCallback,
MIkeDebug& aDebug )
- :CActive(EPriorityStandard),
+ :CActive( EPriorityStandard ),
iConnection( aConnection ),
iCallback( aCallback ),
iDebug( aDebug )
@@ -107,8 +107,15 @@
//
void CConnObserver::RunL()
{
- DEBUG_LOG1( _L("CConnObserver::RunL(), iStatus=%d"), iStatus.Int() );
- iCallback.LinkDisconnected( iStatus.Int() );
+ DEBUG_LOG2( _L("CConnObserver::RunL(), iStatus=%d, error=%d"),
+ iStatus.Int(), iProgressBuf().iError );
+ TInt status = iStatus.Int();
+ if ( status == KErrNone )
+ {
+ status = iProgressBuf().iError;
+ }
+
+ iCallback.LinkDisconnected( status );
}
// ---------------------------------------------------------------------------
--- a/vpnengine/ikesocket/src/receiver.cpp Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/ikesocket/src/receiver.cpp Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -65,7 +65,7 @@
CReceiver::CReceiver( RSocket& aSocket,
MReceiverCallback& aCallback,
MIkeDebug& aDebug )
- : CActive( EPriorityStandard ),
+ : CTimer( EPriorityStandard ),
iState( EIdle ),
iMsgPtr( 0, 0, 0 ),
iSocket( aSocket ),
@@ -82,6 +82,7 @@
void CReceiver::ConstructL()
{
DEBUG_LOG( _L("CReceiver::ConstructL") );
+ CTimer::ConstructL();
}
// ---------------------------------------------------------------------------
@@ -244,25 +245,38 @@
// Handles error in receiving.
// ---------------------------------------------------------------------------
//
-void CReceiver::HandleError( const TInt aStatus )
+void CReceiver::HandleError( const TInt aStatus,
+ const TBool aDelayNeeded )
{
- DEBUG_LOG1( _L("CReceiver::HandleError, aStatus=%d"), aStatus );
+ DEBUG_LOG3( _L("CReceiver::HandleError, aStatus=%d, error count=%d, delay needed=%d"),
+ aStatus, iErrorCount, aDelayNeeded );
delete iMsg;
iMsg = NULL;
iMsgPtr.Set( 0, 0, 0 );
- iState = EIdle;
+
+ const TInt KMaxReceiverErrorCount( 20 );
if ( aStatus == KErrDied ||
aStatus == KErrServerTerminated ||
- aStatus == KErrNoMemory )
+ aStatus == KErrNoMemory ||
+ iErrorCount >= KMaxReceiverErrorCount )
{
- // Fatal error. Notify client.
+ // Fatal error or maximum error count reached. Notify client.
+ iState = EIdle;
iCallback.ReceiveError( aStatus );
}
+ else if ( aDelayNeeded )
+ {
+ // Restart receiving after delay.
+ iState = EWaitingAfterSocketError;
+ const TInt KDelayIntervalSocketError( 1000000 ); // 1s
+ After( iErrorCount*KDelayIntervalSocketError );
+ }
else
{
- // Error is not fatal. Restart receiving
+ // Receiving can be continued without delay.
+ iState = EIdle;
Receive();
}
}
@@ -308,13 +322,15 @@
void CReceiver::RunL()
{
IKESOCKET_ASSERT( iState == EWaitingData ||
- iState == EReceiving );
+ iState == EReceiving ||
+ iState == EWaitingAfterSocketError );
DEBUG_LOG2( _L("CReceiver::RunL, iState=%d, iStatus=%d"),
iState, iStatus.Int() );
if ( iStatus.Int() )
{
- HandleError( iStatus.Int() );
+ HandleError( iStatus.Int(), ETrue );
+ iErrorCount++;
return;
}
@@ -327,9 +343,16 @@
}
case EReceiving:
{
+ iErrorCount = 0;
HandleDataReceivedL();
break;
}
+ case EWaitingAfterSocketError:
+ {
+ iState = EIdle;
+ Receive();
+ break;
+ }
default:
break;
}
@@ -343,10 +366,13 @@
void CReceiver::DoCancel()
{
IKESOCKET_ASSERT( iState == EWaitingData ||
- iState == EReceiving );
+ iState == EReceiving ||
+ iState == EWaitingAfterSocketError );
DEBUG_LOG1( _L("CReceiver::DoCancel, iState=%d"),
iState );
+ iErrorCount = 0;
+
switch ( iState )
{
case EWaitingData:
@@ -359,6 +385,11 @@
iSocket.CancelRecv();
break;
}
+ case EWaitingAfterSocketError:
+ {
+ CTimer::DoCancel();
+ break;
+ }
default:
break;
}
--- a/vpnengine/ikeutils/rom/ikeutils.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/ikeutils/rom/ikeutils.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
#ifndef __IKEUTILS_IBY__
#define __IKEUTILS_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKEUTILS not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\ikeutils.dll SHARED_LIB_DIR\ikeutils.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __IKEUTILS_IBY__
--- a/vpnengine/ikev1lib/rom/ikev1lib.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/ikev1lib/rom/ikev1lib.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
#ifndef __IKEV1LIB_IBY__
#define __IKEV1LIB_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKEV1LIB not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\ikev1lib.dll SHARED_LIB_DIR\ikev1lib.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __IKEV1LIB_IBY__
--- a/vpnengine/ikev2lib/rom/ikev2lib.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/ikev2lib/rom/ikev2lib.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
#ifndef __IKEV2LIB_IBY__
#define __IKEV2LIB_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKEV2LIB not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\ikev2lib.dll SHARED_LIB_DIR\ikev2lib.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __IKEV2LIB_IBY__
--- a/vpnengine/kmdapi/rom/kmdapi.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/kmdapi/rom/kmdapi.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
#ifndef __KMDAPI_IBY__
#define __KMDAPI_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature KMDAPI not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\kmdapi.dll SHARED_LIB_DIR\kmdapi.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __KMDSERVER_IBY__
--- a/vpnengine/kmdserver/rom/kmdserver.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/kmdserver/rom/kmdserver.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
#ifndef __KMDSERVER_IBY__
#define __KMDSERVER_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature KMDSERVER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\kmdserver.exe PROGRAMS_DIR\kmdserver.exe
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __KMDSERVER_IBY__
--- a/vpnengine/kmdserver/src/connectionstarter.cpp Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/kmdserver/src/connectionstarter.cpp Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -51,7 +51,7 @@
//
CConnectionStarter::CConnectionStarter( CVpnConnection& aConnection,
MConnectionStarterCallback& aCallback )
- : CActive( EPriorityStandard ),
+ : CActive( EPriorityHigh ), // Higher priority than in CDisconnectionObserver
iConnection( aConnection ),
iCallback( aCallback )
{
--- a/vpnengine/pkiservice/rom/pkiservice.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/pkiservice/rom/pkiservice.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __PKISERVICE_IBY__
#define __PKISERVICE_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature PKISERVICE not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\pkiservice.exe PROGRAMS_DIR\pkiservice.exe
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __PKISERVICE_IBY__
--- a/vpnengine/pkiserviceapi/rom/pkiserviceapi.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/pkiserviceapi/rom/pkiserviceapi.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __PKISERVICEAPI_IBY__
#define __PKISERVICEAPI_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature PKISERVICEAPI not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\pkiserviceapi.dll SHARED_LIB_DIR\pkiserviceapi.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __PKISERVICEAPI_IBY__
--- a/vpnengine/sit/rom/eventmedsit.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/sit/rom/eventmedsit.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __EVENTMEDSIT_IBY__
#define __EVENTMEDSIT_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature EVENTMEDSIT not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\eventmedsit.dll SHARED_LIB_DIR\eventmedsit.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __EVENTMEDSIT_IBY__
--- a/vpnengine/utlbase64/rom/utlbase64.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/utlbase64/rom/utlbase64.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __UTLBASE64_IBY__
#define __UTLBASE64_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLBASE64 not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\utlbase64.dll SHARED_LIB_DIR\utlbase64.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __UTLBASE64_IBY__
--- a/vpnengine/utlcrypto/rom/utlcrypto.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/utlcrypto/rom/utlcrypto.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __UTLCRYPTO_IBY__
#define __UTLCRYPTO_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLCRYPTO not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\utlcrypto.dll SHARED_LIB_DIR\utlcrypto.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __UTLCRYPTO_IBY__
--- a/vpnengine/utlpkcs10/rom/utlpkcs10.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/utlpkcs10/rom/utlpkcs10.iby Mon May 03 13:28:39 2010 +0300
@@ -20,14 +20,10 @@
#ifndef __UTLPKCS10_IBY__
#define __UTLPKCS10_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLPKCS10 not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\utlpkcs10.dll SHARED_LIB_DIR\utlpkcs10.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __UTLPKCS10_IBY__
--- a/vpnengine/utlpkcs12/rom/utlpkcs12.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/utlpkcs12/rom/utlpkcs12.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __UTLPKCS12_IBY__
#define __UTLPKCS12_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLPKCS12 not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\utlpkcs12.dll SHARED_LIB_DIR\utlpkcs12.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __UTLPKCS12_IBY__
--- a/vpnengine/utlxml/rom/utlxml.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/utlxml/rom/utlxml.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,14 +21,10 @@
#ifndef __UTLXML_IBY__
#define __UTLXML_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLXML not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\utlxml.dll SHARED_LIB_DIR\utlxml.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __UTLXML_IBY__
--- a/vpnengine/vpncleaner/rom/vpncleaner.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/vpncleaner/rom/vpncleaner.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
#ifndef __VPNCLEANER_IBY__
#define __VPNCLEANER_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNCLEANER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\vpncleaner.exe PROGRAMS_DIR\vpncleaner.exe
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __VPNCLEANER_IBY__
--- a/vpnengine/vpnconnagt/rom/vpnconnagt.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/vpnconnagt/rom/vpnconnagt.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
#ifndef __VPNCONNAGT_IBY__
#define __VPNCONNAGT_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNCONNAGT not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\vpnconnagt.agt SHARED_LIB_DIR\vpnconnagt.agt
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __VPNCONNAGT_IBY__
--- a/vpnengine/vpnconnagt/src/vpnconnagt.cpp Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/vpnconnagt/src/vpnconnagt.cpp Mon May 03 13:28:39 2010 +0300
@@ -15,8 +15,6 @@
*
*/
-
-
#include <cmmanager.h>
#include <cmconnectionmethod.h>
#include <cmpluginvpndef.h>
@@ -315,7 +313,9 @@
name.AppendFormat(_L("[0x%08x]"), this);
Log::Printf(_L("%s Error %d in reading configuration\n"),name.PtrZ(), iLastErrorCode));
+ iNotify->AgentProgress(EVPNConnAgtDisconnected, iLastErrorCode);
iNotify->ConnectComplete(iLastErrorCode);
+
aError = iLastErrorCode;
return;
}
@@ -769,7 +769,11 @@
RCmConnectionMethod vpnConnection =
cmManager.ConnectionMethodL( iSettings.iIAPId );
CleanupClosePushL(vpnConnection);
- ASSERT( vpnConnection.GetBoolAttributeL(ECmVirtual) );
+
+ if ( EFalse == vpnConnection.GetBoolAttributeL(ECmVirtual) )
+ {
+ User::Leave( KErrNotSupported );
+ }
// Read VPN Network Id
const TUint32 vpnNetworkId(vpnConnection.GetIntAttributeL(ECmNetworkId));
@@ -805,7 +809,11 @@
RCmConnectionMethod realConnection =
cmManager.ConnectionMethodL( realIap );
CleanupClosePushL(realConnection);
- ASSERT( !realConnection.GetBoolAttributeL(ECmVirtual) );
+
+ if ( EFalse != realConnection.GetBoolAttributeL(ECmVirtual) )
+ {
+ User::Leave( KErrNotSupported );
+ }
// real iap id
const TUint32 realIapId( realConnection.GetIntAttributeL(ECmIapId) );
--- a/vpnengine/vpnins/rom/vpnins.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/vpnins/rom/vpnins.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __VPNINS_IBY__
#define __VPNINS_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNINS not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\vpnins.exe PROGRAMS_DIR\vpnins.exe
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __VPNINS_IBY__
--- a/vpnengine/vpnipsecpolparser/rom/vpnipsecpolparser.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/vpnipsecpolparser/rom/vpnipsecpolparser.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef __VPNIPSECPOLPARSER_IBY__
#define __VPNIPSECPOLPARSER_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNIPSECPOLPARSER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\vpnipsecpolparser.dll SHARED_LIB_DIR\vpnipsecpolparser.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __VPNIPSECPOLPARSER_IBY__
--- a/vpnengine/vpnmanager/rom/vpnmanager.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/vpnmanager/rom/vpnmanager.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
#ifndef __VPNMANAGER_IBY__
#define __VPNMANAGER_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNMANAGER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\vpnmanager.exe PROGRAMS_DIR\vpnmanager.exe
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __VPNMANAGER_IBY__
--- a/vpnengine/vpntcwrapper/rom/vpntcwrapper.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnengine/vpntcwrapper/rom/vpntcwrapper.iby Mon May 03 13:28:39 2010 +0300
@@ -20,11 +20,7 @@
#ifndef __VPNTCWRAPPER_IBY__
#define __VPNTCWRAPPER_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNTCWRAPPER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
#ifdef __SAP_TERMINAL_CONTROL_FW
#ifdef __SAP_POLICY_MANAGEMENT
@@ -34,6 +30,6 @@
#endif //__SAP_POLICY_MANAGEMENT
#endif //__SAP_TERMINAL_CONTROL_FW
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __VPNTCWRAPPER_IBY__
--- a/vpnui/vpndialogmanager/rom/vpndialogmanager.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnui/vpndialogmanager/rom/vpndialogmanager.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef VPNDIALOGMANAGER_IBY
#define VPNDIALOGMANAGER_IBY
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPN DIALOG MANAGER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\vpndialogmanager.dll SHARED_LIB_DIR\vpndialogmanager.dll
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // VPNDIALOGMANAGER_IBY
--- a/vpnui/vpnecomnotifier/rom/vpnecomnotifier.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnui/vpnecomnotifier/rom/vpnecomnotifier.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -16,37 +16,15 @@
*
*/
-
-
-
-
#ifndef VPNECOMNOTIFIER_IBY
-
#define VPNECOMNOTIFIER_IBY
-
-
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-
-
-REM Feature ACUNOTIFIER not included in this rom
-
-
-
-#else
-
-
+#ifdef FF_VPN_CLIENT
// ECOM_PLUGIN is defined in header.iby
-
ECOM_PLUGIN(vpnecomnotifier.dll,vpnecomnotifier.rsc)
-
-
-#endif // SYMBIAN_EXCLUDE_IPSEC
-
-
+#endif // FF_VPN_CLIENT
#endif // VPNECOMNOTIFIER_IBY
--- a/vpnui/vpnecomnotifier/rom/vpnecomnotifierResources.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnui/vpnecomnotifier/rom/vpnecomnotifierResources.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
#ifndef VPNECOMNOTIFIERRESOURCES_IBY
#define VPNECOMNOTIFIERRESOURCES_IBY
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNECOMNOTIFIER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
data=DATAZ_\RESOURCE_FILES_DIR\vpnecomnotifier.rsc RESOURCE_FILES_DIR\vpnecomnotifier.rsc
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // VPNECOMNOTIFIERRESOURCES_IBY
--- a/vpnui/vpnpolicyrecognizer/rom/vpnpolicyrecognizer.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnui/vpnpolicyrecognizer/rom/vpnpolicyrecognizer.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,16 +20,15 @@
#ifndef __VPNPOLICYRECOGNIZER_IBY__
#define __VPNPOLICYRECOGNIZER_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifdef FF_VPN_CLIENT
-REM Feature VPNPOLINS not included in this rom
-
-#else
-
+#ifndef FF_GENERIC_ACCESS_NETWORK // UMA not supported
ECOM_PLUGIN(vpnpolicyrecognizer.dll,vpnpolicyrecognizer.rsc)
data=ZRESOURCE\plugins\vpnpolicyrecognizer.rsc RESOURCE_FILES_DIR\plugins\vpnpolicyrecognizer.rsc
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif
+
+#endif // FF_VPN_CLIENT
#endif // __VPNPOLICYRECOGNIZER_IBY__
--- a/vpnui/vpnpolins/rom/vpnpolins.iby Fri Apr 16 16:02:48 2010 +0300
+++ b/vpnui/vpnpolins/rom/vpnpolins.iby Mon May 03 13:28:39 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005 - 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005 - 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
#ifndef __VPNPOLINS_IBY__
#define __VPNPOLINS_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNPOLINS not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
file=ABI_DIR\BUILD_DIR\vpnpolins.exe PROGRAMS_DIR\vpnpolins.exe
data=ZPRIVATE\10003A3F\APPS\vpnpolins_REG.RSC Private\10003a3f\import\apps\vpnpolins_reg.rsc
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
#endif // __VPNPOLINS_IBY__