--- a/vpnengine/ikev1lib/src/ikev1pluginsession.cpp Fri Feb 19 23:50:52 2010 +0200
+++ b/vpnengine/ikev1lib/src/ikev1pluginsession.cpp Fri Mar 12 15:48:43 2010 +0200
@@ -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"
@@ -1447,7 +1447,8 @@
CleanupStack::Pop(); //negotiation safe
return;
}
- CleanupStack::PopAndDestroy();
+ CleanupStack::Pop();
+ DeleteNegotiation(negotiation);
}
return;
}
@@ -1900,7 +1901,7 @@
//
void CIkev1PluginSession::DoCancelDataTransfer()
{
- iReceiver->Cancel();
+ iReceiver->CancelReceive();
iDataInterface.StopReceive();
DoEmptySendQueue();
iSender->Cancel();