1.1 --- a/epoc32/include/securesocket.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/securesocket.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
1.5 // All rights reserved.
1.6 // This component and the accompanying materials are made available
1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
1.8 +// under the terms of "Eclipse Public License v1.0"
1.9 // which accompanies this distribution, and is available
1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
1.12 //
1.13 // Initial Contributors:
1.14 // Nokia Corporation - initial contribution.
1.15 @@ -15,8 +15,6 @@
1.16 //
1.17 //
1.18
1.19 -
1.20 -
1.21 /**
1.22 @file
1.23 */
1.24 @@ -34,104 +32,12 @@
1.25 #include <x509cert.h>
1.26
1.27 #include <securesocketinterface.h>
1.28 -//Secure Socket specific panic
1.29 -_LIT(KSecureSocketPanic,"SecureSocket Panic");
1.30 -
1.31 -/**
1.32 - * Maximum length of the protocol name.
1.33 - *
1.34 - * @internalComponent
1.35 - */
1.36 -const TInt KMaxProtocolName = 32;
1.37 -
1.38 -class TSecSocketProtocol
1.39 -/**
1.40 - * The secure socket protocol class.
1.41 - *
1.42 - * @internalComponent
1.43 - *
1.44 - * @since v7.0
1.45 - */
1.46 - {
1.47 -public:
1.48 - /** Protocol name. */
1.49 - TBuf<KMaxProtocolName> iName;
1.50 - /** Handle to the DLL. */
1.51 - RLibrary iLibrary;
1.52 - static inline TInt Offset()
1.53 - /**
1.54 - * Gets the offset to the iSlink member.
1.55 - *
1.56 - * @return The offset to the iSlink member. */
1.57 - {return _FOFF(TSecSocketProtocol,iSlink);}
1.58 - // Moved the implementation to the cpp file
1.59 - virtual ~TSecSocketProtocol();
1.60 -private:
1.61 - TSglQueLink iSlink;
1.62 - };
1.63 -
1.64 -
1.65 -class TSecureSocketGlobals
1.66 -/**
1.67 - * Class to store the Secure Sockets Globals.
1.68 - *
1.69 - * @internalComponent
1.70 - *
1.71 - * @since v7.0
1.72 - */
1.73 - {
1.74 -public:
1.75 - inline TSecureSocketGlobals():
1.76 - iSecureSocketProtocols(TSecSocketProtocol::Offset()),
1.77 - /** Constructor. */
1.78 - iSecureSocketProtocolsIter(iSecureSocketProtocols),
1.79 - iUseCount(0){};
1.80 - /** List of supported protocols. */
1.81 - TSglQue<TSecSocketProtocol> iSecureSocketProtocols;
1.82 - /** A templated class that provides for iterating through the list of supported
1.83 - * protocols. */
1.84 - TSglQueIter<TSecSocketProtocol> iSecureSocketProtocolsIter;
1.85 - /** Use counter. */
1.86 - TInt iUseCount;
1.87 - };
1.88 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.89 +#include <securesocket_internal.h>
1.90 +#endif
1.91
1.92 class MGenericSecureSocket;
1.93
1.94 -/**
1.95 - * Definition for the entry point function exported by Secure Socket modules.
1.96 - *
1.97 - * @internalComponent
1.98 - */
1.99 -typedef TInt (*TSecSockDllLibraryFunction)( RSocket& aSocket, const TDesC& aProtocol );
1.100 -typedef TInt (*TSecSockDllLibraryGenericFunction)(MGenericSecureSocket& aSocket, const TDesC& aProtocol);
1.101 -
1.102 -/**
1.103 - * Definition for the entry point for the cleanup function exported by secureSocket modules
1.104 - *
1.105 - * @internalComponent
1.106 - */
1.107 -typedef void (*TSecSockDllUnloadFunction)( TAny* );
1.108 -
1.109 -class CSecureSocketLibraryLoader : public CBase
1.110 -/**
1.111 - * Factory class for creating secure sockets.
1.112 - *
1.113 - * @internalAll
1.114 - *
1.115 - * @since v6.2 */
1.116 - // Create and reference Secure Sockets
1.117 - {
1.118 -public:
1.119 - static TInt OpenL(const TDesC& aProtocolName,TSecSockDllLibraryFunction& anEntryPoint);
1.120 - static TInt OpenL(const TDesC& aProtocolName, TSecSockDllLibraryGenericFunction& aEntryPoint);
1.121 - static void FindItemInDbL(const TDesC& aProtocolName, TDes& aLibraryName);
1.122 - IMPORT_C static void Unload();
1.123 -
1.124 -private:
1.125 - static void OpenWithIdL(TInt aId, const TDesC& aProtocolName, TLibraryFunction& aEntryPoint);
1.126 - };
1.127 -
1.128 -
1.129 class CSecureSocket : public CBase
1.130 /**
1.131 * Secure sockets class.
1.132 @@ -141,7 +47,6 @@
1.133 *
1.134 * @since v6.2 */
1.135 // New secure sockets can be created through the static CSecureSocket::NewL method.
1.136 - // @public
1.137 {
1.138 public:
1.139 IMPORT_C static CSecureSocket* NewL(RSocket& aSocket,const TDesC& aProtocol);
1.140 @@ -190,7 +95,7 @@
1.141
1.142 TUint iSecureSocketState;
1.143
1.144 - TSecSockDllLibraryFunction iUNUSED;
1.145 + TInt iUNUSED;
1.146 MSecureSocket* iSecureImplementation;
1.147 };
1.148