1.1 --- a/epoc32/include/nifman.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/nifman.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 1997-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 @@ -25,11 +23,28 @@
1.25 #if !defined(__NIFMAN_H__)
1.26 #define __NIFMAN_H__
1.27
1.28 -#include <es_prot.h>
1.29 #include <nifvar.h>
1.30 -#include <cdbover.h>
1.31 +
1.32 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.33 +#include <nifman_internal.h>
1.34 +#else
1.35 +#include <es_sock_partner.h>
1.36 +#endif
1.37 +
1.38 +/**
1.39 +@publishedPartner
1.40 +*/
1.41 +enum TAgentConnectType
1.42 + {
1.43 + EAgentStartDialOut,
1.44 + EAgentReconnect,
1.45 + EAgentStartCallBack,
1.46 + EAgentNone,
1.47 + EAgentStartDialIn
1.48 + };
1.49
1.50 class CNifMan;
1.51 +class MNifIfUser;
1.52 class CNifFactory : public CObject
1.53 /**
1.54 Manager classes
1.55 @@ -54,46 +69,6 @@
1.56 CAsyncCallBack* iAsyncDtor;
1.57 };
1.58
1.59 -/**
1.60 -Static internal API class
1.61 -@internalComponent
1.62 -*/
1.63 -enum TNifSocketState { ENifBuffers2048=-4, ENifBuffers1024, ENifBuffers512,
1.64 - ENifSocketNull=-1,
1.65 - ENifSocketCreated=0, ENifSocketOpen=3, ENifSocketConnected=4,
1.66 - ENifSocketError=9 };
1.67 -
1.68 -class MNifIfUser;
1.69 -class MNifIfNotify;
1.70 -class CNifIfBase;
1.71 -class CNifAgentBase;
1.72 -class CSockSession;
1.73 -class CConnectionProvdBase;
1.74 -class Nif
1.75 -/**
1.76 -@internalTechnology
1.77 -*/
1.78 - {
1.79 -public:
1.80 - /** Network protocol support */
1.81 - IMPORT_C static void BindL(MNifIfUser& aUser, TAny* aId, TDes& aResult, const TDesC& aName=TPtrC(0,0));
1.82 - IMPORT_C static void NetworkLayerClosed(MNifIfUser& aUser);
1.83 - IMPORT_C static void StartL(TDes& aResult, const TDesC& aName=TPtrC());
1.84 - IMPORT_C static void Stop(const TDesC& aName=TPtrC());
1.85 - IMPORT_C static CNifIfBase* CreateInterfaceL(const TDesC& aName, MNifIfNotify* aNotify);
1.86 - IMPORT_C static CNifAgentBase* CreateAgentL(const TDesC& aAgentName, const TBool aNewInstance = EFalse);
1.87 - IMPORT_C static void CheckInstalledMBufManagerL();
1.88 - IMPORT_C static CProtocolBase* IsProtocolLoaded(const TDesC& aName);
1.89 - IMPORT_C static void CheckInstalledL();
1.90 - IMPORT_C static TInt SetSocketState(TNifSocketState aState, CServProviderBase* aProvd);
1.91 - IMPORT_C static void ProgressL(TNifProgress& aProgress, const TDesC& aName=TPtrC());
1.92 - IMPORT_C static void Stop(TAny* aId, CNifIfBase* aIf=0);
1.93 - IMPORT_C static void ProgressL(TNifProgress& aProgress, TAny* aId, CNifIfBase* aIf=0);
1.94 - IMPORT_C static CConnectionProvdBase* NewConnectionL(MConnectionNotify* aConnection, TUint aId);
1.95 - /** deprecated function */
1.96 - IMPORT_C static CNifIfBase* CreateInterfaceL(const TDesC& aName);
1.97 - };
1.98 -
1.99
1.100 /**
1.101 Client side classes
1.102 @@ -131,15 +106,6 @@
1.103 */
1.104 const TUint KCOLConfiguration = 300;
1.105
1.106 -#ifdef _DEBUG
1.107 -/**
1.108 -Debug-only option level used to pass test-only option names onto PPP.
1.109 -@internalTechnology
1.110 -*/
1.111 -const TUint KCOLLinkLayerTestLevel = 325;
1.112 -#endif
1.113 -
1.114 -
1.115 // RConnection::Control() options
1.116
1.117 /**
1.118 @@ -218,35 +184,6 @@
1.119 */
1.120 const TUint KConnAddrRenew = 7;
1.121
1.122 -/**
1.123 -@internalTechnology
1.124 -@released 9.1
1.125 -*/
1.126 -const TUint KNifSessionSetConnectionAttempt = KConnInternalOptionBit|8;
1.127 -
1.128 -/**
1.129 -@internalTechnology
1.130 -@released 9.1
1.131 -*/
1.132 -const TUint KNifSessionGetConnectionAttempt = KConnInternalOptionBit|9;
1.133 -/**
1.134 -@internalTechnology
1.135 -@released 9.1
1.136 -*/
1.137 -const TUint KNifSessionSetBlockProgresses = KConnInternalOptionBit|10;
1.138 -
1.139 -/**
1.140 -@internalTechnology
1.141 -@released 9.1
1.142 -*/
1.143 -const TUint KNifSessionGetBlockProgresses = KConnInternalOptionBit|11;
1.144 -
1.145 -/**
1.146 -@internalTechnology
1.147 -@released 9.1
1.148 -*/
1.149 -const TUint KNifSessionGetStopping = KConnInternalOptionBit|12;
1.150 -
1.151 // DHCP specific RConnection::Ioctl options
1.152 /**
1.153 @publishedPartner
1.154 @@ -268,16 +205,6 @@
1.155 */
1.156 const TUint KConnGetSipServerDomain = KConnWriteUserDataBit|KConnReadUserDataBit|102;
1.157
1.158 -#ifdef SYMBIAN_NETWORKING_DHCPSERVER
1.159 -/**
1.160 -@internalTechnology
1.161 -@released
1.162 -@ref RConnection::Ioctl
1.163 -*/
1.164 -const TUint KConnSetDhcpRawOptionData = KConnWriteUserDataBit|KConnReadUserDataBit|103;
1.165 -#endif // SYMBIAN_NETWORKING_DHCPSERVER
1.166 -
1.167 -#ifdef SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
1.168 /**
1.169 * This constant is used to retrieve the DHCP Header Sname which is the
1.170 * host name of the next available server. This is sometimes overloaded
1.171 @@ -321,8 +248,6 @@
1.172 * @see RConnection::Ioctl()
1.173 */
1.174 const TUint KConnDhcpGetMultipleParams = KConnWriteUserDataBit|KConnReadUserDataBit|108;
1.175 -#endif //SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
1.176 -
1.177
1.178 /**
1.179 @publishedPartner
1.180 @@ -340,16 +265,36 @@
1.181 TUint iIndex;
1.182 TBuf<KConnMaxInterfaceName> iName;
1.183 };
1.184 +
1.185 +
1.186 /**
1.187 -@internalTechnology
1.188 +* This constant is used to provision hardware address in the DHCP server. This enables DHCP server to assign the only available IP address in
1.189 +* its pool to the authorised hardware address as configured by the application.
1.190 +* @publishedPartner
1.191 +* @released
1.192 +* @see RConnection::Ioctl()
1.193 */
1.194 -enum TAgentConnectType
1.195 - {
1.196 - EAgentStartDialOut,
1.197 - EAgentReconnect,
1.198 - EAgentStartCallBack,
1.199 - EAgentNone,
1.200 - EAgentStartDialIn
1.201 - };
1.202 +const TUint KConnDhcpSetHwAddressParams = KConnWriteUserDataBit|KConnReadUserDataBit|109;
1.203 +
1.204 +#ifdef SYMBIAN_TCPIPDHCP_UPDATE
1.205 +/**
1.206 + * This constant is used to retrieve list of domain names to be searched during name resolution.
1.207 + * Ref : RFC 3646 sec 4
1.208 + * @publishedPartner
1.209 + * @released
1.210 + * @see RConnection::Ioctl
1.211 +*/
1.212 +const TUint KConnGetDomainSearchList = KConnWriteUserDataBit|KConnReadUserDataBit|110;
1.213 +
1.214 +/**
1.215 + * This constant is used to retrieve list of IPv6 addresses of DNS recursive name servers to which a client's DNS
1.216 + resolver will send DNS queries.
1.217 + * Ref: RFC 3646 sec 3
1.218 + * @publishedPartner
1.219 + * @released
1.220 + * @see RConnection::Ioctl
1.221 +*/
1.222 +const TUint KConnGetDNSServerList = KConnWriteUserDataBit|KConnReadUserDataBit|111;
1.223 +#endif //SYMBIAN_TCPIPDHCP_UPDATE
1.224
1.225 #endif // __NIFMAN_H__