# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286976473 -10800 # Node ID 254b651f304e83061e93fe7e397c104251b5635d # Parent c44f36bb61a381047ba2277a86a11dc4b6f9284a Revision: 201039 Kit: 201041 diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/cppstdlib/stl/src/allocators.cpp --- a/genericopenlibs/cppstdlib/stl/src/allocators.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/src/allocators.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -770,7 +770,10 @@ struct __node_alloc_cleaner { ~__node_alloc_cleaner() { - __node_alloc_impl::_S_dealloc_call(); + __node_alloc_impl::_S_dealloc_call(); +#ifndef _STLP_USE_LOCK_FREE_IMPLEMENTATION + std::_Node_Alloc_Lock::_S_lock._M_destroy(); +#endif//_STLP_USE_LOCK_FREE_IMPLEMENTATION } }; diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/cppstdlib/stl/src/iostream.cpp --- a/genericopenlibs/cppstdlib/stl/src/iostream.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/src/iostream.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -447,6 +447,9 @@ _Destroy(ptr_wcerr); _Destroy(ptr_wclog); #endif + fclose(stdin); + fclose(stdout); + fclose(stderr); } diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/bwins/backendu.def --- a/genericopenlibs/openenvcore/backend/bwins/backendu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/bwins/backendu.def Wed Oct 13 16:27:53 2010 +0300 @@ -171,6 +171,3 @@ _memmove_r @ 170 NONAME _lstat_r @ 171 NONAME _unsetdefaultif_r @ 172 NONAME - ?freednssuffixes@CLocalSystemInterface@@QAEXPAUif_dns_suffixes@@@Z @ 173 NONAME ; void CLocalSystemInterface::freednssuffixes(struct if_dns_suffixes *) - ?TZServer@CLocalSystemInterface@@QAEAAVRTz@@AAH@Z @ 174 NONAME ; class RTz & CLocalSystemInterface::TZServer(int &) - diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def --- a/genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def Wed Oct 13 16:27:53 2010 +0300 @@ -171,6 +171,3 @@ _memmove_r @ 170 NONAME _lstat_r @ 171 NONAME _unsetdefaultif_r @ 172 NONAME - ?freednssuffixes@CLocalSystemInterface@@QAEXPAUif_dns_suffixes@@@Z @ 173 NONAME ; void CLocalSystemInterface::freednssuffixes(struct if_dns_suffixes *) - ?TZServer@CLocalSystemInterface@@QAEAAVRTz@@AAH@Z @ 174 NONAME ; class RTz & CLocalSystemInterface::TZServer(int &) - diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/bwins/old_backendu.def --- a/genericopenlibs/openenvcore/backend/bwins/old_backendu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/bwins/old_backendu.def Wed Oct 13 16:27:53 2010 +0300 @@ -171,6 +171,3 @@ _memmove_r @ 170 NONAME _lstat_r @ 171 NONAME _unsetdefaultif_r @ 172 NONAME - ?freednssuffixes@CLocalSystemInterface@@QAEXPAUif_dns_suffixes@@@Z @ 173 NONAME ; void CLocalSystemInterface::freednssuffixes(struct if_dns_suffixes *) - ?TZServer@CLocalSystemInterface@@QAEAAVRTz@@AAH@Z @ 174 NONAME ; class RTz & CLocalSystemInterface::TZServer(int &) - diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/eabi/backendu.def --- a/genericopenlibs/openenvcore/backend/eabi/backendu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/eabi/backendu.def Wed Oct 13 16:27:53 2010 +0300 @@ -175,6 +175,3 @@ _memmove_r @ 174 NONAME _lstat_r @ 175 NONAME _unsetdefaultif_r @ 176 NONAME - _ZN21CLocalSystemInterface15freednssuffixesEP15if_dns_suffixes @ 177 NONAME - _ZN21CLocalSystemInterface8TZServerERi @ 178 NONAME - diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def --- a/genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def Wed Oct 13 16:27:53 2010 +0300 @@ -175,6 +175,3 @@ _memmove_r @ 174 NONAME _lstat_r @ 175 NONAME _unsetdefaultif_r @ 176 NONAME - _ZN21CLocalSystemInterface15freednssuffixesEP15if_dns_suffixes @ 177 NONAME - _ZN21CLocalSystemInterface8TZServerERi @ 178 NONAME - diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/eabi/old_backendu.def --- a/genericopenlibs/openenvcore/backend/eabi/old_backendu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/eabi/old_backendu.def Wed Oct 13 16:27:53 2010 +0300 @@ -174,7 +174,4 @@ _memcpy_r @ 173 NONAME _memmove_r @ 174 NONAME _lstat_r @ 175 NONAME - _unsetdefaultif_r @ 176 NONAME - _ZN21CLocalSystemInterface15freednssuffixesEP15if_dns_suffixes @ 177 NONAME - _ZN21CLocalSystemInterface8TZServerERi @ 178 NONAME - + _unsetdefaultif_r @ 176 NONAME diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/inc/fdesc.h --- a/genericopenlibs/openenvcore/backend/inc/fdesc.h Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/inc/fdesc.h Wed Oct 13 16:27:53 2010 +0300 @@ -641,7 +641,7 @@ { return ESocketDesc; } - static void FreeDNSSuffixes(char ** suffixes); + protected: TInt FinalClose(); private: @@ -671,10 +671,8 @@ TInt StartSubConnection(void *aParam); TInt GetInterface(void *Param, TInt aType); TInt GetInterafceNumber(void *aParam); - TInt EnumerateRoutes(void* aParam); + TInt GetIpAddress( void *aParam ); - TInt SetNameServer(void *aParam, int aFlag); - TInt GetNameServer(void *aParam, int aFlag); TInt RouteRequest(TInt aReq, void *aParam); TInt GetInterfaceHWAddress(void *aParam); @@ -688,16 +686,11 @@ TInt GetInterafceParamInfo( void *aParam,TInt aType); void FindConnectionDetailsL(CArrayFixFlat*& aRecordPtr, TInt& aCount); void FindConnectionInfoL(TAccessPointRecord &aRecord,char *ptr); - TInt GetInterfaceDetails( void *aParam ,TInt aFlag, TInt aType, TInt aIapId ); + TInt GetInterfaceDetails( void *aParam ,TInt aFlag, TInt aType ); TInt SetInterafceParamInfo( void *aParam,TInt aType); - TInt SetInterfaceDetails( void *aParam ,TInt aFlag, TInt aType,TInt aIapId ); - TInt GetInterfaceAttributes(void *aParam, int aFlag); - TInt GetActiveInterfaceIAPIdByName(const char *aIapName,TInt& aIapId); - TInt SetInterfaceAttributes(void *aParam, int aFlag); - TInt ConvertTInetToSockAddr(const TInetAddr& aInetAddr, sockaddr * aSockAddr ); - TInt ConvertSockToTInetAddr(const sockaddr * aSockAddr, TInetAddr& aInetAddr); - TInt GetInterfaceInfo(TSoInetInterfaceInfo& aIfInfo, TInt aIapId ); - TInt maybe_reopen_socket() + TInt SetInterfaceDetails( void *aParam ,TInt aFlag, TInt aType ); + + TInt maybe_reopen_socket() { TInt err = KErrNone; if (!__e32_atomic_load_acq32(&iSocketPtr)) @@ -723,18 +716,13 @@ EACCESS_GETBROADCAST, EACCESS_GETPHYSADDR, EACCESS_GETFLAGS, - EACCESS_GETDEFGATEWAY, EACCESS_SETMETRIC, EACCESS_SETMTU, EACCESS_SETFLAGS, EACCESS_SETPHYSADDR, EACTIVE_SETIP, EACCESS_SETNETMASK, - EACCESS_SETBROADCAST, - EACCESS_GETDNSSUFFIX, - EACCESS_SETDNSSUFFIX, - EACCESS_SETNAMESERVERS, - EACCESS_GETNAMESERVERS + EACCESS_SETBROADCAST }; TPtr8 iIoctlBuf; diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/inc/sysif.h --- a/genericopenlibs/openenvcore/backend/inc/sysif.h Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/inc/sysif.h Wed Oct 13 16:27:53 2010 +0300 @@ -36,7 +36,6 @@ #include #include -#include #ifdef SYMBIAN_OE_POSIX_SIGNALS #include "signalclient.h" @@ -115,7 +114,7 @@ */ { public: - void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock,RFastLock* aDefConnLock,RFastLock* aAESelectLock,RFastLock* aTzServerLock) + void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock,RFastLock* aDefConnLock,RFastLock* aAESelectLock) { iHeap = aHeap; iFs = aFs; @@ -125,7 +124,6 @@ iCsLock = aCsLock; iDefConnLock = aDefConnLock; iAESelectLock = aAESelectLock; - iTzServerLock = aTzServerLock; } ~TCLSICleanup() @@ -138,7 +136,6 @@ iHeap->Close(); iDefConnLock->Close(); iAESelectLock->Close(); - iTzServerLock->Close(); } private: RHeap* iHeap; @@ -148,8 +145,7 @@ RFastLock* iSsLock; RFastLock* iCsLock; RFastLock* iDefConnLock; - RFastLock* iAESelectLock; - RFastLock* iTzServerLock; + RFastLock* iAESelectLock; }; @@ -457,8 +453,6 @@ int popen (const wchar_t* file, const wchar_t* cmd, const char* mode, int& anErrno); int pclose (int aFid, int& anErrno); IMPORT_C void CheckOrigins (wchar_t**& wenvp, int& aCount); - IMPORT_C void freednssuffixes(if_dns_suffixes * suffixes); - #ifdef SYMBIAN_OE_POSIX_SIGNALS TInt SignalHandler(); IMPORT_C void InitSignalHandler(); @@ -597,8 +591,6 @@ //Save the file server session path TInt SaveSessionPath(const TDesC& aPath); - static void WaitForNRequest(TRequestStatus **aStatusArray, TInt aNum); - static void WaitForNRequest(TRequestStatus aStatusArray[], TInt aNum); private: @@ -621,8 +613,6 @@ // default RConnection with the new settings. TInt StartDefConnection(); - // Helper function for doing an on-demand connection to RTz server - TInt OnDemandTZServerConnection(); private: // NOTE: iCleanup should be the first member of CLSI, since iPrivateHeap // will be destroyed from within iCleanup destructor. @@ -699,8 +689,6 @@ // Default connection settings, set/cleared using setdefaultif TConnPref* iDefConnPref; RTz iTzServer; - RFastLock iTzServerLock; - TBool iIsRTzConnected; RPointerArray iSocketArray; #ifdef SYMBIAN_OE_POSIX_SIGNALS // Signal handler thread @@ -854,8 +842,10 @@ #endif // SYMBIAN_OE_POSIX_SIGNALS public: - IMPORT_C RTz & TZServer(TInt& aStatus); - + inline RTz & TZServer() + { + return iTzServer; + } //ipc server session RIpcSession iIpcS; friend class RFileDesTransferSession; @@ -966,7 +956,6 @@ TUSockAddr() : TSockAddr(), iError(0) {} TUSockAddr(TAny* addr); // constructor form of Prepare - TUSockAddr(const TSockAddr& aSockAddr):TSockAddr(aSockAddr),iError(0){}; IMPORT_C TUSockAddr(const TAny* addr, TUint len); // constructor form of Set private: void Prepare(TAny* addr); diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -79,42 +79,10 @@ return &backend; #endif } - -EXPORT_C RTz& CLocalSystemInterface::TZServer(TInt &aStatus) - { - aStatus = OnDemandTZServerConnection(); - return iTzServer; - } - -TInt CLocalSystemInterface::OnDemandTZServerConnection() - { - TInt v = EFalse; - TInt err = KErrNone; - - if(__e32_atomic_load_acq32(&iIsRTzConnected)) - return err; - - iTzServerLock.Wait(); - if (!iIsRTzConnected) - { - err = iTzServer.Connect(); - if ( err == KErrNone ) - { - err = iTzServer.ShareAuto(); - if( err == KErrNone) { - v = ETrue; - } - } - __e32_atomic_store_rel32(&iIsRTzConnected, v); - } - iTzServerLock.Signal(); - - return err; - } // Construction of Backend Object which is going to be singleton object for the process EXPORT_C CLocalSystemInterface::CLocalSystemInterface() : iOpenDirList(CLocalSystemInterface::KDirGran), -iTLDInfoList(CLocalSystemInterface::KTLDInfoListGran), iDefConnResurrect(ETrue), iDefConnPref(NULL), iIsRTzConnected(EFalse) +iTLDInfoList(CLocalSystemInterface::KTLDInfoListGran), iDefConnResurrect(ETrue), iDefConnPref(NULL) { #ifdef SYMBIAN_OE_POSIX_SIGNALS iSignalsInitialized = EFalse; @@ -188,7 +156,6 @@ //Create Server Locks err |= iSSLock.CreateLocal(); err |= iCSLock.CreateLocal(); - err |= iIpcS.iLock.CreateLocal(); //Create TLDList Lock err |= iTLDListLock.CreateLocal(); //Create the lock for Session Path @@ -197,17 +164,25 @@ err |= iASelectLock.CreateLocal(); //Protect the iDefConnection from concurrent GetDefaultConnection calls err |= iDefConnLock.CreateLocal(); - //Protect the time zone server while connecting - err |= iTzServerLock.CreateLocal(); } + if(err == KErrNone) + { + err = iTzServer.Connect(); + if(!err) + { + err = iTzServer.ShareAuto(); + } + } + + //Panic if any of the above operation returns with error if (err) { User::Panic(KEstlibInit, err); } - iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock,&iDefConnLock,&iASelectLock,&iTzServerLock); + iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock,&iDefConnLock,&iASelectLock); } @@ -243,6 +218,7 @@ //close the RTz connection iTzServer.Close(); + if( iDefConnPref ) { switch( iDefConnPref->ExtensionId() ) @@ -1763,11 +1739,6 @@ return MapError(err,anErrno); } -EXPORT_C void CLocalSystemInterface::freednssuffixes(if_dns_suffixes * suffixes) - { - CSocketDesc::FreeDNSSuffixes(suffixes->suffixes); - } - int CLocalSystemInterface::ioctl_complete (int fid, int cmd, void* param, TRequestStatus& aStatus, int& anErrno) { return iFids.ioctlcomplete(fid,cmd,param,aStatus,anErrno); @@ -2194,7 +2165,7 @@ { timer.After(*reqarray[numReqs+arraycount], timeout); // Wait for any request to complete - CLocalSystemInterface::WaitForNRequest(reqarray, numReqs+arraycount+1); + CLocalSystemInterface::WaitForNRequest(*reqarray, numReqs+arraycount+1); if( (*reqarray[numReqs+arraycount]).Int() == KRequestPending) { // The timer hasn't fired yet. @@ -2209,7 +2180,7 @@ } else { - CLocalSystemInterface::WaitForNRequest(reqarray, numReqs+arraycount); + CLocalSystemInterface::WaitForNRequest(*reqarray, numReqs+arraycount); // Completion Status of one request has been gathered onedown = ETrue; } @@ -3655,47 +3626,6 @@ // Used in lieu of User::WaitForNRequest because of need to support pre-Argus builds // --------------------------------------------------------------------------------- // -void CLocalSystemInterface::WaitForNRequest(TRequestStatus **aStatusArray, TInt aNum) - { - if (aNum) - { - // used to keep count of requests we have not been asked to wait for - TInt nOther = -1; - TBool done = EFalse; - - do - { - ++nOther; - User::WaitForAnyRequest(); - for (TInt i = 0; i < aNum; ++i) - { - if ((*aStatusArray[i]).Int() != KRequestPending) - { - done = ETrue; - break; - } - } - } while (!done); - - if (nOther) - { - // Adjust the thread's signal semaphore to account for the requests - // we were not asked to wait for. - RThread thrd; - for (TInt i = 0; i < nOther; ++i) - { - thrd.RequestSignal(); - } - } - } - } - -// --------------------------------------------------------------------------------- -// CLocalSystemInterface::WaitForNRequest -// Wait for any one of the input asynchronous requests to complete -// Used in lieu of User::WaitForNRequest because of need to support pre-Argus builds -// --------------------------------------------------------------------------------- -// void CLocalSystemInterface::WaitForNRequest(TRequestStatus aStatusArray[], TInt aNum) { if (aNum) diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/src/corebackend/usocket.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/usocket.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/usocket.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -232,11 +232,7 @@ fromaddr = (from[15]<<24)+(from[14]<<16)+(from[13]<<8)+from[12]; else fromaddr = (from[0]<<24)+(from[1]<<16)+(from[2]<<8)+ from[3]; - unsigned char * ptr = (unsigned char *)&fromaddr; - sp->sa_data[0] = ptr[0]; - sp->sa_data[1] = ptr[1]; - sp->sa_data[2] = ptr[2]; - sp->sa_data[3] = ptr[3]; + *(TUint32*)sp->sa_data=fromaddr; *len=8; return; } @@ -960,7 +956,7 @@ ATOMICSOCKETOP(ret=iSocket.GetOpt(KSoTcpRcvAtMark,KSolInetTcp,*param), ret = KErrBadHandle) break; case SIOCGIFADDR: - ret = GetInterfaceAttributes(aParam, EACTIVE_GETIP); + ret = GetIpAddress(aParam); break; case SIOCGIFNUM: ret = GetInterafceNumber(aParam); @@ -977,37 +973,7 @@ case SIOCGIFACTIVEIAP: ret = GetActiveInterface( aParam); break; - case SIOCGIFFLAGS: - ret = GetInterfaceAttributes(aParam, EACCESS_GETFLAGS); - break; - case SIOCGIFMTU: - ret = GetInterfaceAttributes(aParam, EACCESS_GETMTU); - break; - case SIOCGIFNETMASK: - ret = GetInterfaceAttributes(aParam, EACCESS_GETNETMASK); - break; - case SIOCGIFDEFGATEWAY: - ret = GetInterfaceAttributes(aParam, EACCESS_GETDEFGATEWAY); - break; - - case SIOCSIFMTU: - ret = SetInterfaceAttributes(aParam, EACCESS_SETMTU); - break; - case SIOCENUMROUTES: - ret = EnumerateRoutes(aParam); - break; - case SIOCSETDNSSUFFIX: - ret = SetInterfaceAttributes(aParam, EACCESS_SETDNSSUFFIX); - break; - case SIOCGETDNSSUFFIX: - ret = GetInterfaceAttributes(aParam, EACCESS_GETDNSSUFFIX); - break; - case SIOCSNAMESERVER: - ret = SetNameServer(aParam,EACCESS_SETNAMESERVERS ); - break; - case SIOCGNAMESERVER: - ret = GetNameServer(aParam, EACCESS_GETNAMESERVERS); - break; + default: ret=KErrNotSupported; break; @@ -1051,7 +1017,7 @@ return CSockDescBase::Fcntl(anArg, aCmd); } -/* + TInt CSocketDesc :: GetIpAddress( void *aParam ) { TInetAddr myAddr; @@ -1065,7 +1031,7 @@ ifreq *ifr = (ifreq *)aParam; ((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr.s_addr = myIP; return KErrNone; - }*/ + } TInt CSocketDesc :: GetRemoteIpAddress( void *aParam ) { @@ -1218,310 +1184,279 @@ CleanupStack::PopAndDestroy(iapDatabase); return; } -#endif // __SYMBIAN_COMPILE_UNUSED__ - - -TInt CSocketDesc::GetInterfaceInfo(TSoInetInterfaceInfo& aIfInfo, TInt aIapId ) +TInt CSocketDesc :: SetInterfaceDetails( void *aParam ,TInt aFlag, TInt aType ) { - TPckgBuf info; + ifreq *ifr = (ifreq *)aParam; + TPckgBuf ifq; + TBuf8 <25> ipBuf8; + TName aBuf; TInt ret = KErrNone; ATOMICSOCKETOP( ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl), ret = KErrBadHandle ) if (ret != KErrNone) { return KErrGeneral; } + TPckgBuf info; + TSoInet6InterfaceInfo &in = info(); ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info), ret = KErrBadHandle ) while(ret == KErrNone) { - if(info().iName != _L("")) - { - TPckgBuf optifquery; - optifquery().iName = info().iName; - ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetIfQueryByName, KSolInetIfQuery, optifquery), ret = KErrBadHandle ) - if( ret == KErrNone) - { - if(optifquery().iZone[1] == aIapId && info().iAddress.Address() != NULL) - { - aIfInfo = info(); - return KErrNone; - } - } - } - ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info), ret = KErrBadHandle ) - } - return KErrNotFound; - } -TInt CSocketDesc :: SetInterfaceDetails( void *aParam ,TInt /*aFlag*/, TInt aType, TInt aIapId ) - { - TSoInet6InterfaceInfo ifInfo; - TInt ret = KErrNone; - if((ret = GetInterfaceInfo(ifInfo,aIapId)) != KErrNone) - { - return ret; - } - ifreq *ifr = (ifreq *)aParam; - switch(aType) - { - case EACCESS_SETMETRIC: - if(ifInfo.iState == EIfUp) + if(info().iName != _L("") && info().iName != _L("loop6") && info().iName != _L("loop4")) + { + TDes16& aName = info().iName; + if( ((aFlag == 0 ) && ( aName.FindC(_L("WLAN")) != KErrNotFound )) || + ((aFlag == 1) && (aName.FindC(_L("Generic")) != KErrNotFound )) ) { - ifInfo.iSpeedMetric = ifr->ifr_metric; - } - break; + switch(aType) + { + case EACCESS_SETMETRIC: + if(info().iState == EIfUp) + { + info().iSpeedMetric = ifr->ifr_metric; + } + goto setout; + + case EACCESS_SETMTU: + if(info().iState == EIfUp) + { + info().iMtu = ifr->ifr_mtu ; + } + goto setout; + + case EACCESS_SETNETMASK : + // Presently netmask address is NULL + if((info().iState == EIfUp) && (ifr->ifr_addr.sa_data !=NULL)) + { + /* + CharToTBuf8(ifr->ifr_addr.sa_data,ipBuf8); + if (CnvUtfConverter::ConvertToUnicodeFromUtf8( aBuf,ipBuf8 ) == KErrNone) + { + ret = info().iNetMask.Input(aBuf); + } + info().iNetMask.SetAddress(INET_ADDR(255,255,255,0)); + */ + return KErrNotSupported; + } + break; + case EACCESS_SETBROADCAST : + if((info().iState == EIfUp) && (ifr->ifr_broadaddr.sa_data !=NULL)) + { + /*CharToTBuf8(ifr->ifr_broadaddr.sa_data,ipBuf8); + if (CnvUtfConverter::ConvertToUnicodeFromUtf8( aBuf,ipBuf8 ) == KErrNone) + { + ret = info().iBrdAddr.Input(aBuf); + } + */ + return KErrNotSupported; + } - case EACCESS_SETMTU: - if(ifInfo.iState == EIfUp) - { - ifInfo.iMtu = ifr->ifr_mtu ; - } - break; + break; + case EACCESS_SETPHYSADDR : + // Currently no imeplentation is given as KIfHasHardwareAddr is always + // set to 0 for wlan and GPRS + if(info().iFeatures&KIfHasHardwareAddr) + { + return KErrNotSupported; + } + break; + case EACCESS_SETFLAGS : + info().iFeatures = 0; + // Interface UP + if((ifr->ifr_flags & IFF_UP) && (ifr->ifr_flags & IFF_DRV_RUNNING)) + { + info().iState = EIfUp; + } + else + { + info().iState = EIfDown; + } + + // Loopback + if(ifr->ifr_flags & IFF_LOOPBACK) + { + info().iFeatures |= KIfIsLoopback; + } - case EACCESS_SETPHYSADDR : - // Currently no imeplentation is given as KIfHasHardwareAddr is always - // set to 0 for wlan and GPRS - if(ifInfo.iFeatures&KIfHasHardwareAddr) - { - return KErrNotSupported; + // point to point support + if(ifr->ifr_flags & IFF_POINTOPOINT) + { + info().iFeatures |= KIfIsPointToPoint; + } + + // Broadcast + if(ifr->ifr_flags & IFF_BROADCAST) + { + info().iFeatures |=KIfCanBroadcast; + } + + + // Multicast + if(ifr->ifr_flagshigh & IFF_MULTICAST) + { + info().iFeatures = KIfCanMulticast; + } + //these flags details are available in symbian but not used by lib layer. + /* if(info().iFeatures&KIfCanSetMTU) + if(info().iFeatures&KIfHasHardwareAddr) + if(info().iFeatures&KIfCanSetHardwareAddr) */ + goto setout; + + default: + break; + } } - break; - case EACCESS_SETDNSSUFFIX: - { - if_dns_suffixes * dns_suffix = static_cast(aParam); - char **suffixes = dns_suffix->suffixes; - TSoInetInterfaceInfoExtnDnsSuffix interfaceInfo; - (TSoInetInterfaceInfo &)interfaceInfo = ifInfo; - interfaceInfo.iDomainSuffix.DeleteAll(); - TPckgBuf configInfo(interfaceInfo); - ATOMICSOCKETOP(ret = iSocket.SetOpt(KSoInetConfigInterface,KSolInetIfCtrl,configInfo), ret = KErrBadHandle) - - for(int i = 0; suffixes[i]; i++) //check the number of suffixes that can be configured - { - TPtrC8 suffix((const unsigned char *)suffixes[i]); - /*ret = configInfo().iDomainSuffix.Copy(suffix); - if(ret != KErrNone) - { - return ret; - }*/ - ret = CnvUtfConverter::ConvertToUnicodeFromUtf8(configInfo().iDomainSuffix.iSuffixName,suffix); - configInfo().iDomainSuffix.iDomainSuffixFunction = EInetAddSuffix; - ATOMICSOCKETOP( ret = iSocket.SetOpt(KSoInetConfigInterface,KSolInetIfCtrl,configInfo), ret = KErrBadHandle) - if(ret != KErrNone) - { - return ret; - } - - } - return ret; } - case EACCESS_SETNAMESERVERS: - { - if_name_servers *name_server = static_cast(aParam); - if((ret = ConvertSockToTInetAddr(&name_server->nameserver1,ifInfo.iNameSer1)) != KErrNone) - { - return ret; - } - if((ret = ConvertSockToTInetAddr(&name_server->nameserver2,ifInfo.iNameSer2)) != KErrNone) - { - return ret; - } - break; - } - - default: - return KErrArgument; + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info), ret = KErrBadHandle ) } - TPckgBuf pkgIfInfo(ifInfo); - ATOMICSOCKETOP(ret = iSocket.SetOpt(KSoInetConfigInterface, KSolInetIfCtrl,pkgIfInfo), ret = KErrBadHandle) + setout: + TPckgBuf changeToNew(info()); + ATOMICSOCKETOP(ret = iSocket.SetOpt(KSoInetConfigInterface, KSolInetIfCtrl,changeToNew), return KErrBadHandle ) return ret; } +#endif // __SYMBIAN_COMPILE_UNUSED__ -//This function frees the memory allocated by SIOCGETDNSSUFFIX ioctl -void CSocketDesc::FreeDNSSuffixes(char ** suffixes) - { - for(int i = 0; suffixes[i]; i++) - { - delete[] suffixes[i]; - } - delete[] suffixes; - } - -TInt CSocketDesc::GetInterfaceDetails( void *aParam ,TInt /*aFlag*/, TInt aType, TInt aIapId ) +TInt CSocketDesc::GetInterfaceDetails( void *aParam ,TInt aFlag, TInt aType ) { - - ifreq *ifr = (ifreq *)aParam; - *(ifr->ifr_addr.sa_data) = '\0'; - TInt ret = 0; - - TSoInetInterfaceInfo ifInfo; + TPckgBuf ifq; - if((ret = GetInterfaceInfo(ifInfo,aIapId)) != KErrNone) + TInt ret = KErrNone; + ATOMICSOCKETOP( ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl), ret = KErrBadHandle ) + if (ret != KErrNone) { - return ret; + return KErrGeneral; } + + ifreq *ifr = (ifreq *)aParam; + *(ifr->ifr_addr.sa_data) = '\0'; - switch(aType) + TPckgBuf info; + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info), ret = KErrBadHandle ) + while( ret == KErrNone) { - case EACTIVE_GETIP : - if(ifInfo.iState == EIfUp) - { - ret = ConvertTInetToSockAddr(ifInfo.iAddress,&ifr->ifr_addr); - return ret; - } - break; - case EACCESS_GETMETRIC: - if(ifInfo.iState == EIfUp) - { - ifr->ifr_metric = ifInfo.iSpeedMetric; - return KErrNone; - } - break; - case EACCESS_GETMTU: - if(ifInfo.iState == EIfUp) + if(info().iName != _L("") && info().iName != _L("loop6") && info().iName != _L("loop4")) + { + TDes16& aName = info().iName; + TName aBuf; + TBuf8 ipAddr; + if( ((aFlag == 0 ) && ( aName.FindC(_L("WLAN")) != KErrNotFound )) || + ((aFlag == 1) && (aName.FindC(_L("Generic")) != KErrNotFound )) ) { - ifr->ifr_mtu = ifInfo.iMtu; - return KErrNone; - } - break; - case EACCESS_GETNETMASK : - // Presently netmask address is NULL - if(ifInfo.iState == EIfUp) - { - ret = ConvertTInetToSockAddr(ifInfo.iNetMask,&ifr->ifr_addr); - return ret; - } - break; - case EACCESS_GETBROADCAST : - // Presently Breaodcast address is NULL - if(ifInfo.iState == EIfUp) - { - ret = ConvertTInetToSockAddr(ifInfo.iBrdAddr,&ifr->ifr_broadaddr); - return ret; - } - break; - case EACCESS_GETDNSSUFFIX: - { + switch(aType) + { + + case EACTIVE_GETIP : + if((info().iState == EIfUp) && (info().iAddress.Address() != NULL)) + { + if(!((info().iAddress.IsLinkLocal()) || (info().iAddress.IsSiteLocal()))) + { + info().iAddress.Output(aBuf); + if (CnvUtfConverter::ConvertFromUnicodeToUtf8( ipAddr, aBuf ) == KErrNone) + { + StrlCopy(ifr->ifr_addr.sa_data,(const char *) ipAddr.PtrZ(),ipAddr.Length()+1); + } + } + } + break; + case EACCESS_GETMETRIC: + ifr->ifr_metric = 0; + if (info().iState == EIfUp) + { + ifr->ifr_metric = info().iSpeedMetric; + } + break; + case EACCESS_GETMTU: + ifr->ifr_mtu = 0; + if (info().iState == EIfUp) + { + ifr->ifr_mtu = info().iMtu; + } + break; + case EACCESS_GETNETMASK : + *(ifr->ifr_addr.sa_data) = '\0'; + // Presently netmask address is NULL + if((info().iState == EIfUp) && (info().iNetMask.Address() != NULL)) + { + //anAddr = info().iNetMask.Address(); + info().iNetMask.Output(aBuf); + if (CnvUtfConverter::ConvertFromUnicodeToUtf8( ipAddr, aBuf ) == KErrNone) + { + StrlCopy(ifr->ifr_addr.sa_data,(const char *) ipAddr.PtrZ(),ipAddr.Length()+1); + } + } + break; + case EACCESS_GETBROADCAST : + *(ifr->ifr_broadaddr.sa_data) = '\0'; + // Presently Breaodcast address is NULL + if((info().iState == EIfUp) && (info().iBrdAddr.Address() != NULL)) + { - TInetSuffix data; - TPckgBuf opt(data); - // Set the option to start enumeration of domain suffix on the active interface - TInt err = KErrNone; - ATOMICSOCKETOP( err = iSocket.SetOpt(KSoInetEnumDomainSuffix, KSolInetIfCtrl), err = KErrBadHandle) - if(err != KErrNone) - { - return err; - } - struct if_dns_suffixes * dns_suffix = static_cast(aParam); - RPointerArray suffixArray; - ATOMICSOCKETOP (err = iSocket.GetOpt(KSoInetNextDomainSuffix, KSolInetIfCtrl, opt),err = KErrBadHandle) - while(err == KErrNone) - { - char *suffix = new char[opt().iSuffixName.Length()+1]; - if((ret = suffixArray.Append(suffix)) != KErrNone) - { - suffixArray.ResetAndDestroy(); - return ret; - } - TPtr8 ptr((unsigned char *)suffix,opt().iSuffixName.Length()+1); - ret = CnvUtfConverter::ConvertFromUnicodeToUtf8(ptr,opt().iSuffixName); - //ptr.Copy(opt().iSuffixName); - if(ret != KErrNone) - { - suffixArray.ResetAndDestroy(); - return ret; - } - ptr.ZeroTerminate(); - ATOMICSOCKETOP (err = iSocket.GetOpt(KSoInetNextDomainSuffix, KSolInetIfCtrl, opt),err = KErrBadHandle) - } + //anAddr = info().iBrdAddr.Address(); + info().iBrdAddr.Output(aBuf); + if (CnvUtfConverter::ConvertFromUnicodeToUtf8( ipAddr, aBuf ) == KErrNone) + { + StrlCopy(ifr->ifr_broadaddr.sa_data,(const char *) ipAddr.PtrZ(),ipAddr.Length()+1); + } + } + break; + case EACCESS_GETPHYSADDR : + ifr->ifr_phys = 0; + // Currently no imeplentation is given as KIfHasHardwareAddr is always + // set to 0 for wlan and GPRS + if(info().iFeatures&KIfHasHardwareAddr) + { + //nada. + } + break; + case EACCESS_GETFLAGS : + ifr->ifr_flags = 0; + ifr->ifr_flagshigh=0; + // Interface UP + if(info().iState == EIfUp) + { + ifr->ifr_flags |= IFF_UP; + ifr->ifr_flags |= IFF_DRV_RUNNING; + } + // Loopback + if(info().iFeatures&KIfIsLoopback) + { + ifr->ifr_flags |= IFF_LOOPBACK; + } - dns_suffix->suffixes = new char*[suffixArray.Count() + 1]; - for(int i = 0 ; i< suffixArray.Count(); i++) - { - dns_suffix->suffixes[i] = suffixArray[i]; - } - dns_suffix->suffixes[suffixArray.Count()] = NULL; - suffixArray.Close(); - return KErrNone; + // point to point support + if(info().iFeatures&KIfIsPointToPoint) + { + ifr->ifr_flags |= IFF_POINTOPOINT; + } + + // Broadcast + if(info().iFeatures&KIfCanBroadcast) + { + ifr->ifr_flags |= IFF_BROADCAST; + } - } - - case EACCESS_GETNAMESERVERS: - { - if_name_servers *name_server = static_cast(aParam); - if((ret = ConvertTInetToSockAddr(ifInfo.iNameSer1, &name_server->nameserver1)) != KErrNone) - { - return ret; + // Multicast + if(info().iFeatures&KIfCanMulticast) + { + ifr->ifr_flagshigh |= ((IFF_MULTICAST & 0xff00) >> 8); + } + //these flags details are available in symbian but not used by lib layer. + /* if(info().iFeatures&KIfCanSetMTU) + if(info().iFeatures&KIfHasHardwareAddr) + if(info().iFeatures&KIfCanSetHardwareAddr) */ + + break; + + } } - if((ret = ConvertTInetToSockAddr(ifInfo.iNameSer2, &name_server->nameserver2)) != KErrNone) - { - return ret; - } - return KErrNone; } - - case EACCESS_GETPHYSADDR : - ifr->ifr_phys = 0; - // Currently no imeplentation is given as KIfHasHardwareAddr is always - // set to 0 for wlan and GPRS - if(ifInfo.iFeatures&KIfHasHardwareAddr) - { - //nada. - } - return KErrNotSupported; - - case EACCESS_GETDEFGATEWAY: - if(ifInfo.iState == EIfUp) - { - ret = ConvertTInetToSockAddr(ifInfo.iDefGate,&ifr->ifr_defgatewayaddr); - return ret; - } - break; - - - case EACCESS_GETFLAGS : - ifr->ifr_flags = 0; - ifr->ifr_flagshigh=0; - // Interface UP - if(ifInfo.iState == EIfUp) - { - ifr->ifr_flags |= IFF_UP; - ifr->ifr_flags |= IFF_DRV_RUNNING; - } - // Loopback - if(ifInfo.iFeatures&KIfIsLoopback) - { - ifr->ifr_flags |= IFF_LOOPBACK; - } - - // point to point support - if(ifInfo.iFeatures&KIfIsPointToPoint) - { - ifr->ifr_flags |= IFF_POINTOPOINT; - } - - // Broadcast - if(ifInfo.iFeatures&KIfCanBroadcast) - { - ifr->ifr_flags |= IFF_BROADCAST; - } - - // Multicast - if(ifInfo.iFeatures&KIfCanMulticast) - { - ifr->ifr_flagshigh |= ((IFF_MULTICAST & 0xff00) >> 8); - } - return KErrNone; - - default: - return KErrArgument; + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info), ret = KErrBadHandle ) } - - return KErrNotFound; - + return KErrNone; } TInt CSocketDesc::Poll(TPollMode aMode,TBool& aReadyStatus,TInt& aErrno) @@ -1738,7 +1673,7 @@ { servFlag = 1; } - GetInterfaceDetails(ifr,servFlag,EACTIVE_GETIP,ref.iId); + GetInterfaceDetails(ifr,servFlag,EACTIVE_GETIP); } } ifc->ifc_len = sizeof(ifreq) * apIndex; @@ -2311,154 +2246,3 @@ ifr->ifr_index = opt().iZone[1]; //IAP_ID return KErrNone; } - - -TInt CSocketDesc::GetActiveInterfaceIAPIdByName(const char *aIapName,TInt& aIapId) - { - - TInt rcIndex = 0; - RConnection *rc; - TAccessPointRecord tempRecord; - char iapName[IFNAMSIZ]; - TInt ret = KErrNotFound; -// ifreq * ifr = static_cast (aParam); //may not work, will have to reinterper_cast - - while(((CFileTable*)iFids)->RConnectionAt(rcIndex++, rc) == KErrNone) - { - if( GetRConnectionDetails(rc, tempRecord) != KErrNone ) - { - continue; - } - TPtr8 ptr((TText8*)iapName, IFNAMSIZ-1); - - ret = CnvUtfConverter::ConvertFromUnicodeToUtf8(ptr, tempRecord.iName); - if(ret == KErrNone) - { - ptr.ZeroTerminate(); - if(StrCmp(iapName, aIapName) == 0) - { - aIapId = tempRecord.iId; - return KErrNone; - } - } - } - return ret; //is it okay? ret contains rite val? - } -//converts Symbian Inetaddres structure to posix sockaddr structure -TInt CSocketDesc::ConvertTInetToSockAddr(const TInetAddr& aInetAddr, sockaddr * aSockAddr ) - { - TUSockAddr addr(aInetAddr); - unsigned long len = sizeof(sockaddr); - addr.Get(aSockAddr,&len); - return addr.iError; - } - -//converts posix sockaddr structure to Symbian Inetaddres structure -TInt CSocketDesc::ConvertSockToTInetAddr(const sockaddr * aSockAddr, TInetAddr& aInetAddr) - { - unsigned int len = sizeof(sockaddr); - TUSockAddr addr(aSockAddr,len); - aInetAddr = addr; - return addr.iError; - } - -//Gets the Iap id by IAP name and using iap id gets the interface details -TInt CSocketDesc::GetInterfaceAttributes(void *aParam, int aFlag) - { - ifreq * ifr = static_cast (aParam); //may not work, will have to reinterper_cast - TInt ret = KErrGeneral, iapId; - ret = GetActiveInterfaceIAPIdByName(ifr->ifr_name,iapId); - if(ret == KErrNone) - { - ret = GetInterfaceDetails( ifr ,0, aFlag, iapId); //what to do with return value - } - return ret; - - } - -//Gets the Iap id by IAP name and using iap id sets the interface details -TInt CSocketDesc::SetInterfaceAttributes(void *aParam, int aFlag) - { - ifreq * ifr = static_cast (aParam); //access of only if_name guaranteed to work. - TInt ret = KErrGeneral, iapId; - ret = GetActiveInterfaceIAPIdByName(ifr->ifr_name,iapId); - if(ret == KErrNone) - { - ret = SetInterfaceDetails( aParam ,0, aFlag, iapId); //what to do with return value - } - return ret; - } - -//Enumerates the routes configured on the system -TInt CSocketDesc::EnumerateRoutes(void *aParam) - { - TInt ret = KErrNone; - rtconf *rtc = (rtconf*)aParam; - TInt routeCount = (rtc->rt_len) /sizeof (route_entry); - route_entry *rtentry = rtc->rtc_rtcu.rtcu_entry; - ATOMICSOCKETOP(ret = iSocket.SetOpt(KSoInetEnumRoutes, KSolInetRtCtrl),ret = KErrBadHandle) - if(ret != KErrNone ) - { - return ret; - } - //If the length is zero, we fill the number of routes available information - TInt count = 0; - TPckgBuf route; - if(routeCount <=0 || rtc->rtc_buf ==NULL) - { - ATOMICSOCKETOP(ret = iSocket.GetOpt(KSoInetNextRoute, KSolInetRtCtrl, route), ret = KErrBadHandle) - while(ret == KErrNone) - { - count++; - ATOMICSOCKETOP(ret = iSocket.GetOpt(KSoInetNextRoute, KSolInetRtCtrl, route), ret = KErrBadHandle) - } - rtc->rt_len = count * sizeof(route_entry) ; - return KErrNone; - } - for(TInt i=0; i (aParam); //access of only if_name guaranteed to work. - TInt iapId; - TInt ret = GetActiveInterfaceIAPIdByName(dns_server->if_name, iapId); - if(ret == KErrNone) - { - ret = SetInterfaceDetails( aParam ,0, aFlag, iapId); //what to do with return value - } - return ret; - } - -//Gets the nameserver of an interface -TInt CSocketDesc::GetNameServer(void *aParam, int aFlag) - { - if_name_servers * dns_server = static_cast (aParam); //access of only if_name guaranteed to work. - TInt iapId; - TInt ret = GetActiveInterfaceIAPIdByName(dns_server->if_name, iapId); - if(ret == KErrNone) - { - ret = GetInterfaceDetails( dns_server ,0, aFlag, iapId); //what to do with return value - } - return ret; - } diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/backend/src/corebackend/usocketbase.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/usocketbase.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/usocketbase.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -114,7 +114,7 @@ { ATOMICSOCKETOP(iSocket.Send(aBuf.Mid(bytesWritten), 0, tempStatus, len),Complete(tempStatus,KErrBadHandle)) User::WaitForRequest(tempStatus); - if (len() == 0 || tempStatus.Int() == KErrDisconnected ) + if (len() == 0) { break; } diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/group/openenv.iby --- a/genericopenlibs/openenvcore/group/openenv.iby Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/group/openenv.iby Wed Oct 13 16:27:53 2010 +0300 @@ -19,8 +19,8 @@ // libc.dll has a dependancy on Timezone Server #include "timezonelocalization.iby" -file=ABI_DIR\BUILD_DIR\liblogger.dll sys\bin\LibLogger.dll -file=ABI_DIR\BUILD_DIR\libcipcserver.exe sys\bin\LibCIpcServer.exe +file=ABI_DIR\BUILD_DIR\LibLogger.dll sys\bin\LibLogger.dll +file=ABI_DIR\BUILD_DIR\LibCIpcServer.exe sys\bin\LibCIpcServer.exe file=ABI_DIR\BUILD_DIR\backend.dll sys\bin\backend.dll file=ABI_DIR\BUILD_DIR\libm.dll sys\bin\libm.dll file=ABI_DIR\BUILD_DIR\libc.dll sys\bin\libc.dll @@ -34,7 +34,6 @@ data = EPOCROOT##epoc32\winscw\c\resource\pips\services \resource\pips\services data = EPOCROOT##epoc32\data\z\system\install\openc_stdlibs_stub.sis \system\install\openc_stdlibs_stub.sis data = EPOCROOT##epoc32\data\z\system\install\openc_signalserver_stub.sis \system\install\openc_signalserver_stub.sis - #include /* StdC++ library*/ #ifdef SYMBIAN_OE_POSIX_SIGNALS diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/include/net/if.h --- a/genericopenlibs/openenvcore/include/net/if.h Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/include/net/if.h Wed Oct 13 16:27:53 2010 +0300 @@ -277,8 +277,7 @@ struct sockaddr ifru_addr; struct sockaddr ifru_dstaddr; struct sockaddr ifru_broadaddr; - struct sockaddr ifru_hwaddr; - struct sockaddr ifru_defgatewayaddr; + struct sockaddr ifru_hwaddr; short ifru_flags[2]; short ifru_index; int ifru_metric; @@ -305,7 +304,6 @@ #define ifr_reqcap ifr_ifru.ifru_cap[0] /* requested capabilities */ #define ifr_curcap ifr_ifru.ifru_cap[1] /* current capabilities */ #define ifr_index ifr_ifru.ifru_index /* interface index */ -#define ifr_defgatewayaddr ifr_ifru.ifru_defgatewayaddr /* default gateway address*/ }; #define _SIZEOF_ADDR_IFREQ(ifr) \ @@ -410,25 +408,6 @@ IMPORT_C int unsetdefaultif(); #endif -#ifdef __SYMBIAN32__ - -#define MAXDNSSUFFIXES 16 - -struct if_dns_suffixes -{ -char if_name[IFNAMSIZ]; -char ** suffixes; -}; - -void freednssuffixes(struct if_dns_suffixes *); -struct if_name_servers - { - char if_name[IFNAMSIZ]; - struct sockaddr nameserver1; - struct sockaddr nameserver2; - }; -#endif - #ifdef __SYMBIAN32__ #ifdef __cplusplus } diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/include/net/route.h --- a/genericopenlibs/openenvcore/include/net/route.h Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/include/net/route.h Wed Oct 13 16:27:53 2010 +0300 @@ -138,36 +138,6 @@ #endif //__SYMBIAN32__ }; -#ifdef __SYMBIAN32__ -struct rtconf - { - int rt_len; //size of the allocated buffer - union - { - caddr_t rtcu_buf; - struct route_entry * rtcu_entry; - }rtc_rtcu; -#define rtc_buf rtc_rtcu.rtcu_buf /* buffer address */ -#define rtc_req rtc_rtcu.rtcu_entry /* array of structures returned */ - }; - -struct route_entry - { - struct sockaddr ifaddr; //address of the interface - struct sockaddr dst_addr; //destination address - struct sockaddr gateway_addr; - struct sockaddr dst_netmask; - struct - { - int state; - int type; - }rt_flags; - short int rt_metric; - char rt_dev[IFNAMSIZ]; //name of the interface - }; -#endif - - #define RTF_UP 0x1 /* route usable */ #define RTF_GATEWAY 0x2 /* destination is a gateway */ #define RTF_HOST 0x4 /* host entry (net otherwise) */ diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/include/sys/sockio.dosc --- a/genericopenlibs/openenvcore/include/sys/sockio.dosc Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/include/sys/sockio.dosc Wed Oct 13 16:27:53 2010 +0300 @@ -98,76 +98,3 @@ @released */ -/** @def SIOCGIFFLAGS -Socket Ioctl option. Gets MAC address. - -@publishedAll -@released -*/ - -/** @def SIOCGIFMTU - -Socket Ioctl option. Gets IF MTU . - -@publishedAll -@released -*/ - - -/** @def SIOCGIFNETMASK -Socket Ioctl option. Gets net addr mask . - -@publishedAll -@released -*/ - -/** @def SIOCGIFDEFGATEWAY -Socket Ioctl option. Gets the default gateway of the interface . - -@publishedAll -@released -*/ - - -/** @def SIOCSIFMTU -Socket Ioctl option. set IF mtu . - -@publishedAll -@released -*/ - -/** @def SIOCENUMROUTES -Socket Ioctl option. Enumerate routes . - -@publishedAll -@released -*/ - -/** @def SIOCSETDNSSUFFIX -Socket Ioctl option. Sets the dns suffixes of the interface . - -@publishedAll -@released -*/ - -/** @def SIOCGETDNSSUFFIX -Socket Ioctl option. Gets the dns suffixes of the interface . - -@publishedAll -@released -*/ - -/** @def SIOCSNAMESERVER -Socket Ioctl option. Sets the name server on the interface . - -@publishedAll -@released -*/ - - -/** @def SIOCGNAMESERVER -Socket Ioctl option. Get the name server on the interface . - -@publishedAll -@released -*/ \ No newline at end of file diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/include/sys/sockio.h --- a/genericopenlibs/openenvcore/include/sys/sockio.h Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/include/sys/sockio.h Wed Oct 13 16:27:53 2010 +0300 @@ -53,20 +53,7 @@ #define SIOCGIFNUM _IOR('i', 87, int) /* get interface numbers */ #define SIOCADDRT _IOW('r', 12, struct rtentry) /* add route */ #define SIOCDELRT _IOW('r', 13, struct rtentry) /* delete route */ -#define SIOCENUMROUTES _IOWR('r', 14, struct rtentry) /*enumerate routes*/ #define SIOCGIFHWADDR _IOW('s', 14, struct ifreq) /* get MAC address*/ -#define SIOCGIFFLAGS _IOWR('i', 17, struct ifreq) /* get ifnet flags */ -#define SIOCGIFMTU _IOWR('i', 51, struct ifreq) /* get IF mtu */ -#define SIOCGIFNETMASK _IOWR('i', 37, struct ifreq) /* get net addr mask */ -#define SIOCSIFADDR _IOW('i', 12, struct ifreq) /* set ifnet address */ -#define SIOCSIFFLAGS _IOW('i', 16, struct ifreq) /* set ifnet flags */ -#define SIOCSIFMTU _IOW('i', 52, struct ifreq) /* set IF mtu */ -#define SIOCSIFNETMASK _IOW('i', 22, struct ifreq) /* set net addr mask */ -#define SIOCGIFDEFGATEWAY _IOWR('i',123,struct ifreq) /* get the default gateway of the interface */ -#define SIOCSETDNSSUFFIX _IOWR('i',124,struct if_dns_suffixes) /* set the dns suffixes of the interface */ -#define SIOCGETDNSSUFFIX _IOWR('i',125,struct if_dns_suffixes) /* get the dns suffixes of the interface */ -#define SIOCSNAMESERVER _IOWR('i', 41, struct if_name_servers) /*Set the name server on the interface */ -#define SIOCGNAMESERVER _IOWR('i', 42, struct if_name_servers) /*Get the name server on the interface*/ #else // __SYMBIAN32__ #define SIOCSHIWAT _IOW('s', 0, int) /* set high watermark */ #define SIOCGHIWAT _IOR('s', 1, int) /* get high watermark */ diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/bwins/libcu.def --- a/genericopenlibs/openenvcore/libc/bwins/libcu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/bwins/libcu.def Wed Oct 13 16:27:53 2010 +0300 @@ -595,6 +595,4 @@ set_fmode @ 594 NONAME get_fmode @ 595 NONAME sigenable @ 596 NONAME - unsetdefaultif @ 597 NONAME - freednssuffixes @ 598 NONAME - + unsetdefaultif @ 597 NONAME diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/bwins/old_libcu.def --- a/genericopenlibs/openenvcore/libc/bwins/old_libcu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/bwins/old_libcu.def Wed Oct 13 16:27:53 2010 +0300 @@ -595,6 +595,4 @@ set_fmode @ 594 NONAME get_fmode @ 595 NONAME sigenable @ 596 NONAME - unsetdefaultif @ 597 NONAME - freednssuffixes @ 598 NONAME - + unsetdefaultif @ 597 NONAME diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/eabi/libcu.def --- a/genericopenlibs/openenvcore/libc/eabi/libcu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/eabi/libcu.def Wed Oct 13 16:27:53 2010 +0300 @@ -595,6 +595,4 @@ set_fmode @ 594 NONAME get_fmode @ 595 NONAME sigenable @ 596 NONAME - unsetdefaultif @ 597 NONAME - freednssuffixes @ 598 NONAME - + unsetdefaultif @ 597 NONAME diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/eabi/old_libcu.def --- a/genericopenlibs/openenvcore/libc/eabi/old_libcu.def Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/eabi/old_libcu.def Wed Oct 13 16:27:53 2010 +0300 @@ -595,6 +595,4 @@ set_fmode @ 594 NONAME get_fmode @ 595 NONAME sigenable @ 596 NONAME - unsetdefaultif @ 597 NONAME - freednssuffixes @ 598 NONAME - + unsetdefaultif @ 597 NONAME diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/src/Fmscalls.cpp --- a/genericopenlibs/openenvcore/libc/src/Fmscalls.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/src/Fmscalls.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -333,10 +333,6 @@ } -EXPORT_C void freednssuffixes(if_dns_suffixes * suffixes) - { - return Backend()->freednssuffixes(suffixes); - } /* Gets the path name of the current working directory. diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/src/clock_funcs.cpp --- a/genericopenlibs/openenvcore/libc/src/clock_funcs.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/src/clock_funcs.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -80,8 +80,10 @@ switch(clock_id) { case CLOCK_REALTIME: - //We use TTime::UniversalTime() call to get the Universal time - t.UniversalTime(); + //Since Symbian OS is not realtime,we simulate the same using + //the available wall clock.We use TTime::HomeTime() call to get + //the wall clock time + t.HomeTime(); err = t.SecondsFrom(UNIX_BASE, iSeconds); t-=iSeconds;//extracting seconds info into iSeconds if (!err) diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/src/timefuncs.cpp --- a/genericopenlibs/openenvcore/libc/src/timefuncs.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/src/timefuncs.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -221,12 +221,7 @@ TDateTime tdt = time.DateTime(); //enable the cache - TInt status = KErrNone; - RTz& rtzServer = Backend()->TZServer(status); - if(status != KErrNone) - User::Leave(status); - - CTzConverter* ctzConverter = CTzConverter::NewL(rtzServer); + CTzConverter* ctzConverter = CTzConverter::NewL(Backend()->TZServer()); CleanupStack::PushL(ctzConverter); if(ctzConverter->ConvertToLocalTime(time) == KErrNone) @@ -248,7 +243,7 @@ CleanupStack::PushL(zoneid); atmStruct->tm_isdst = -1; - UpdateDstAndTznameL(rtzServer, *zoneid, atmStruct, time, Utime, tdt, ETzWallTimeReference); + UpdateDstAndTznameL(Backend()->TZServer(), *zoneid, atmStruct, time, Utime, tdt, ETzWallTimeReference); CleanupStack::PopAndDestroy(zoneid); } @@ -285,12 +280,8 @@ return; } - TInt status = KErrNone; - RTz& rtzServer = Backend()->TZServer(status); - if(status != KErrNone) - User::Leave(status); - CTzConverter* ctzConverter = CTzConverter::NewL(rtzServer); + CTzConverter* ctzConverter = CTzConverter::NewL(Backend()->TZServer()); CleanupStack::PushL(ctzConverter); /* Following fields are updated if successful: * tm_wday @@ -314,7 +305,7 @@ CleanupStack::PushL(zoneid); aTmStruct->tm_isdst = -1; - UpdateDstAndTznameL(rtzServer, *zoneid, aTmStruct, oldTime, time, tdt, ETzUtcTimeReference); + UpdateDstAndTznameL(Backend()->TZServer(), *zoneid, aTmStruct, oldTime, time, tdt, ETzUtcTimeReference); CleanupStack::PopAndDestroy(zoneid); } cachetm = *aTmStruct; diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/data/tifioctls.ini --- a/genericopenlibs/openenvcore/libc/test/testifioctls/data/tifioctls.ini Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/data/tifioctls.ini Wed Oct 13 16:27:53 2010 +0300 @@ -41,17 +41,3 @@ Param1 = eth[0x000000] [SectionNullIFName] Param1 = \0 - -[SectionIAPDetails] -IAPName = Ethernet with Daemon Dynamic IP - -[SectionSetIfDNSSuffix] -DNSSuffix0 = noe.nokia.com -DNSSuffix1 = apac.nokia.com -DNSSuffix2 = symbian.intra -Hostname1 = uklondabs02 -Hostname2 = uklondabs02.symbian.intra - -[SectionSetIfNameServer] -NameServer1 = 172.30.251.135 -NameServer2 = 172.30.251.142 diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/group/bld.inf --- a/genericopenlibs/openenvcore/libc/test/testifioctls/group/bld.inf Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/group/bld.inf Wed Oct 13 16:27:53 2010 +0300 @@ -20,8 +20,6 @@ ../scripts/tifioctls_hw.script /epoc32/winscw/c/tstdapis/tifioctls_hw.script ../scripts/tifioctls_hw_manual.script /epoc32/winscw/c/tstdapis/tifioctls_hw_manual.script ../data/tifioctls.ini /epoc32/winscw/c/tstdapis/tifioctls.ini -../utils/tifioctlstest.bat /epoc32/winscw/c/tstdapis/tifioctlstest.bat -../utils/tifioctlstest_hw.bat /epoc32/winscw/c/tstdapis/tifioctlstest_hw.bat //ethernetced_dynamicIP.xml /epoc32/winscw/c/CommDb/ethernetced_dynamicip.xml //eth_dyn.bat /epoc32/winscw/c/CommDb/eth_dyn.bat //autoexec.bat /epoc32/winscw/c/CommDb/autoexec.bat diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/inc/tifioctls.h --- a/genericopenlibs/openenvcore/libc/test/testifioctls/inc/tifioctls.h Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/inc/tifioctls.h Wed Oct 13 16:27:53 2010 +0300 @@ -43,15 +43,6 @@ _LIT(KTestMacAddressNegative1, "TestMacAddressNegative1"); _LIT(KTestioctlfile, "Testioctlfile"); _LIT(KTestioctl1, "Testioctl1"); -_LIT(KTestioctlGetIfIpAddr, "TestGetIfIPAddr"); -_LIT(KTestioctlGetIfAttributes, "TestGetIfAttributes"); -_LIT(KTestioctlSetIfAttributes, "TestSetIfAttributes"); -_LIT(KTestioctlSetIfDNSSuffix, "TestSetIfDNSSuffix"); -_LIT(KTestioctlGetIfDNSSuffix, "TestGetIfDNSSuffix"); -_LIT(KTestRouteIoctl, "TestRouteIoctl"); -_LIT(KTestNumberOfRoutesIoctl, "TestNumberOfRoutesIoctl"); -_LIT(KTestSetNameServers, "TestSetNameServers"); -_LIT(KTestGetNameServers, "TestGetNameServers"); class CTestIfioctls : public CTestStep @@ -84,20 +75,7 @@ TInt TestMacAddressNegative1(); TInt Testioctlfile(); TInt Testioctl1(); - TInt TestGetIfIPAddr(); - TInt GetIapName(char * aIapName,int len); - TInt StartIap(const char *aIapName, int &fd); - TInt TestGetIfAttributes(); - void printFlags(TInt flags); - TInt TestSetIfAttributes(); - void FreeDnsSuffixes(char ** suffixes); - TInt TestSetIfDNSSuffix(); - TInt TestGetIfDNSSuffix(); - TInt TestRouteIoctl(); - TInt TestNumberOfRoutesIoctl(); - TInt TestSetNameServers(); - TInt TestGetNameServers(); - + // util function void ReadStringParam(char* aString); public: diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/scripts/tifioctls.script --- a/genericopenlibs/openenvcore/libc/test/testifioctls/scripts/tifioctls.script Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/scripts/tifioctls.script Wed Oct 13 16:27:53 2010 +0300 @@ -112,71 +112,3 @@ RUN_TEST_STEP !Result=0 50 tifioctls Testioctl1 END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0021 -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0022 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0022 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetIfIPAddr \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0022 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0023 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0023 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetIfAttributes \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0023 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0024 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0024 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestSetIfAttributes \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0024 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0025 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0025 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 100 tifioctls TestSetIfDNSSuffix \tstdapis\tifioctls.ini SectionSetIfDNSSuffix -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0025 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0026 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0026 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetIfDNSSuffix \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0026 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0027 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0027 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestRouteIoctl \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0027 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0028 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0028 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestNumberOfRoutesIoctl \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0028 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0029 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0029 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetNameServers \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0029 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0030 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0030 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestSetNameServers \tstdapis\tifioctls.ini SectionSetIfNameServer -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0030 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0031 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0031 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetNameServers \tstdapis\tifioctls.ini SectionSetIfNameServer -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0031 - - - - - - - - - diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/scripts/tifioctls_hw.script --- a/genericopenlibs/openenvcore/libc/test/testifioctls/scripts/tifioctls_hw.script Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/scripts/tifioctls_hw.script Wed Oct 13 16:27:53 2010 +0300 @@ -53,31 +53,31 @@ START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0008 //! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLSHW-0008 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 10 tifioctls TestIfNameIndex +RUN_TEST_STEP !Result=0 5 tifioctls TestIfNameIndex END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0008 START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0009 //! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLSHW-0009 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 10 tifioctls TestIfIndexToName \tstdapis\tifioctls.ini SectionTestIfIndexToName_1 +RUN_TEST_STEP !Result=0 5 tifioctls TestIfIndexToName \tstdapis\tifioctls.ini SectionTestIfIndexToName_1 END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0009 START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0010 //! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLSHW-0010 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 10 tifioctls TestIfIndexToName \tstdapis\tifioctls.ini SectionTestIfIndexToName_2 +RUN_TEST_STEP !Result=0 5 tifioctls TestIfIndexToName \tstdapis\tifioctls.ini SectionTestIfIndexToName_2 END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0010 START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0011 //! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLSHW-0011 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 10 tifioctls TestIfNameToIndex \tstdapis\tifioctls.ini SectionTestIfNameToIndex_1 +RUN_TEST_STEP !Result=0 5 tifioctls TestIfNameToIndex \tstdapis\tifioctls.ini SectionTestIfNameToIndex_1 END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0011 START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0012 //! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLSHW-0012 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 10 tifioctls TestSiocGIfIndex \tstdapis\tifioctls.ini SectionTestSiocGIfIndex +RUN_TEST_STEP !Result=0 5 tifioctls TestSiocGIfIndex \tstdapis\tifioctls.ini SectionTestSiocGIfIndex END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0012 START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0013 @@ -92,63 +92,3 @@ RUN_TEST_STEP !Result=0 50 tifioctls Testioctl1 END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLSHW-0014 -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0015 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0015 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetIfIPAddr \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0015 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0016 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0016 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetIfAttributes \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0016 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0017 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0017 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestSetIfAttributes \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0017 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0018 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0018 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 100 tifioctls TestSetIfDNSSuffix \tstdapis\tifioctls.ini SectionSetIfDNSSuffix -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0018 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0019 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0019 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetIfDNSSuffix \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0019 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0020 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0020 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestRouteIoctl \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0020 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0021 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0021 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestNumberOfRoutesIoctl \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0021 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0022 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0022 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetNameServers \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0022 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0023 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0023 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestSetNameServers \tstdapis\tifioctls.ini SectionSetIfNameServer -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0023 - -START_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0024 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TIFIOCTLS-0024 -//! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tifioctls TestGetNameServers \tstdapis\tifioctls.ini -END_TESTCASE OPENENV-LIBC-CIT-TIFIOCTLS-0024 - diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctls.cpp --- a/genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctls.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctls.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -181,65 +181,7 @@ err = Testioctl1(); SetTestStepResult(err ? static_cast(err) : EPass); } - else if(TestStepName() == KTestioctlGetIfIpAddr) - { - INFO_PRINTF1(_L("TestGetIfIPAddr():")); - err = TestGetIfIPAddr(); - SetTestStepResult(err ? static_cast(err) : EPass); - - } - else if(TestStepName() == KTestioctlGetIfAttributes) - { - INFO_PRINTF1(_L("TestGetIfAttributes():")); - err = TestGetIfAttributes(); - SetTestStepResult(err ? static_cast(err) : EPass); - - } - else if(TestStepName() == KTestioctlSetIfAttributes) - { - INFO_PRINTF1(_L("TestSetIfAttributes():")); - err = TestSetIfAttributes(); - SetTestStepResult(err ? static_cast(err) : EPass); - - } - else if(TestStepName() == KTestioctlSetIfDNSSuffix) - { - INFO_PRINTF1(_L("TestSetIfDNSSuffix():")); - err = TestSetIfDNSSuffix(); - SetTestStepResult(err ? static_cast(err) : EPass); - - } - else if(TestStepName() == KTestioctlGetIfDNSSuffix) - { - INFO_PRINTF1(_L("TestGetIfDNSSuffix():")); - err = TestGetIfDNSSuffix(); - SetTestStepResult(err ? static_cast(err) : EPass); - } - else if(TestStepName() == KTestRouteIoctl) - { - INFO_PRINTF1(_L("TestRouteIoctl():")); - err = TestRouteIoctl(); - SetTestStepResult(err ? static_cast(err) : EPass); - } - else if(TestStepName() == KTestNumberOfRoutesIoctl) - { - INFO_PRINTF1(_L("TestNumberOfRoutesIoctl():")); - err = TestNumberOfRoutesIoctl(); - SetTestStepResult(err ? static_cast(err) : EPass); - } - else if(TestStepName() == KTestSetNameServers) - { - INFO_PRINTF1(_L("TestSetNameServers():")); - err = TestSetNameServers(); - SetTestStepResult(err ? static_cast(err) : EPass); - } - else if(TestStepName() == KTestGetNameServers) - { - INFO_PRINTF1(_L("TestGetNameServers():")); - err = TestGetNameServers(); - SetTestStepResult(err ? static_cast(err) : EPass); - } - return TestStepResult(); + return TestStepResult(); } diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctlsblocks.cpp --- a/genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctlsblocks.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctlsblocks.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -1188,608 +1188,5 @@ res=KErrGeneral; } - return res; - } - -TInt CTestIfioctls::GetIapName(char * aIapName, int len) - { - _LIT(KIAPSectionName, "SectionIAPDetails"); - _LIT(KIAPName,"IAPName"); - TPtrC iapName; - TBool res = GetStringFromConfig(KIAPSectionName, KIAPName, iapName); - if (!res) - { - INFO_PRINTF1(_L("Unable to read the iapname fro the ini file.")) ; - return KErrGeneral; - } - TPtr8 iap((unsigned char *)aIapName, len); - iap.Copy(iapName); - iap.ZeroTerminate(); - return KErrNone; - } - -TInt CTestIfioctls::StartIap(const char *aIapName, int &fd) - { - TPtr8 iapName8((TUint8 * )aIapName,strlen(aIapName),strlen(aIapName)+1); - TBuf iapName16; - iapName16.Copy(iapName8); - INFO_PRINTF2(_L("starting iap = %S"), &iapName16); - - if((fd = socket(AF_INET, SOCK_DGRAM , 0)) < 0) - { - INFO_PRINTF2(_L("Error creating scocket errno = %d\n "),errno); - return -1; - } - - if(ioctl(fd,SIOCSIFNAME,aIapName) == -1) - { - INFO_PRINTF2(_L("unable to set the interface name, reason = %d\n"), errno); - close(fd); - return -1; - } - - if(ioctl(fd,SIOCIFSTART,aIapName) == -1) - { - INFO_PRINTF2(_L("unable to start the interface, reason = %d\n"),errno); - close(fd); - return -1; - } - return KErrNone; - } - -TInt CTestIfioctls::TestGetIfIPAddr() - { - char iapName[IFNAMSIZ]; - GetIapName(iapName, sizeof(iapName)); - int fd; - ifreq ifr; - - - if(StartIap(iapName, fd) != KErrNone) - { - INFO_PRINTF2(_L("unable to start the iap, reason = %d\n"),errno); - return -1; - } - strcpy(ifr.ifr_name,iapName); - if(ioctl(fd,SIOCGIFADDR,&ifr) == -1) //getting the interface ip - { - INFO_PRINTF2(_L("unable to get ip of the interface, reason = %d\n"),errno); - close(fd); - return -1; - } - char address[50]; - - if(inet_ntop(ifr.ifr_ifru.ifru_addr.sa_family,&(ifr.ifr_ifru.ifru_addr.sa_data),address,sizeof(address)) == NULL) - { - INFO_PRINTF2(_L("cannot convert to address to string, reason = %d \n"), errno); - close(fd); - return -1; - } - TPtr8 ipAddr8((TUint8*)address,strlen(address),strlen(address)+1); - TBuf<50> ipAddr16; - ipAddr16.Copy(ipAddr8); - INFO_PRINTF3(_L("family = %d, ipaddr = %S\n"),ifr.ifr_ifru.ifru_addr.sa_family,&ipAddr16); - - sockaddr_in addr; - memcpy(&addr,&ifr.ifr_ifru.ifru_addr,sizeof(sockaddr_in)); - addr.sin_port = 12346; - - if (bind(fd,(sockaddr*)&addr,sizeof(addr)) < 0) - { - INFO_PRINTF2(_L("Error binding to socket, errno = %d\n"),errno); - close(fd); - return -1; - } - close(fd); - return KErrNone; - - } - -void CTestIfioctls::printFlags(TInt flags) - { - if(flags & IFF_UP) - { - INFO_PRINTF1(_L("\t\tThe inteface is up\n")); - } - else - { - INFO_PRINTF1(_L("\t\tThe inteface is down\n")); - } - if(flags & IFF_LOOPBACK) - { - INFO_PRINTF1(_L("\t\tThe inteface a loopback\n")); - } - if(flags & IFF_POINTOPOINT) - { - INFO_PRINTF1(_L("\t\tThe inteface a P2P\n")); - } - if(flags & IFF_BROADCAST) - { - INFO_PRINTF1(_L("\t\tThe inteface a Broadcast\n")); - } - } - -TInt CTestIfioctls::TestGetIfAttributes() - { - char iapName[IFNAMSIZ]; - GetIapName(iapName, sizeof(iapName)); - int fd; - ifreq ifr; - - - if(StartIap(iapName, fd) != KErrNone) - { - INFO_PRINTF2(_L("unable to start the iap, reason = %d\n"),errno); - return -1; - } - strcpy(ifr.ifr_name,iapName); - - if(ioctl(fd,SIOCGIFFLAGS,&ifr) == -1) - { - INFO_PRINTF2(_L("unable to get the flags for iap , reason = %d\n"),errno); - close(fd); - return -1; - } - - printFlags(*((int *)ifr.ifr_ifru.ifru_flags)); - - if(ioctl(fd,SIOCGIFMTU,&ifr) == -1) - { - INFO_PRINTF2(_L("unable to get the mtu for the iap, reason = %d"),errno); - close(fd); - return -1; - } - INFO_PRINTF2(_L("The current MTU = %d\n"),ifr.ifr_ifru.ifru_mtu); - - if(ioctl(fd,SIOCGIFNETMASK,&ifr) == -1) - { - INFO_PRINTF2(_L("unable to get the netmask for the iap reason = %d\n"), errno); - close(fd); - return -1; - } - char addr[50]; - addr[0] = '\0'; - - if(inet_ntop(ifr.ifr_ifru.ifru_addr.sa_family,&(ifr.ifr_ifru.ifru_addr.sa_data),addr,sizeof(addr)) == NULL) - { - INFO_PRINTF2(_L("cannot convert to address to string, error no = %d\n"),errno); - close(fd); - return -1; - } - TPtr8 addr8((TUint8 *)addr, strlen(addr), strlen(addr)+1); - TBuf<50> addr16; - addr16.Copy(addr8); - INFO_PRINTF2(_L("netmask for the iap = %S \n"),&addr16); - - if(ioctl(fd,SIOCGIFDEFGATEWAY,&ifr) == -1) - { - INFO_PRINTF2(_L("unable to get the gateway for the iap, reason = %d\n"),errno); - close(fd); - return -1; - } - addr[0] = '\0'; - if(inet_ntop(ifr.ifr_ifru.ifru_addr.sa_family,&(ifr.ifr_ifru.ifru_defgatewayaddr),addr,sizeof(addr)) == NULL) - { - INFO_PRINTF2(_L("cannot convert to address to string, error no = %d\n"),errno); - close(fd); - return -1; - } - addr8.Set((TUint8 *)addr, strlen(addr), strlen(addr)+1); - addr16.Copy(addr8); - INFO_PRINTF2(_L("gateway for the iap = %S\n"),&addr16); - close(fd); - return KErrNone; - } - -TInt CTestIfioctls::TestSetIfAttributes() - { - char iapName[IFNAMSIZ]; - GetIapName(iapName, sizeof(iapName)); - int fd; - ifreq ifr; - - - if(StartIap(iapName, fd) != KErrNone) - { - INFO_PRINTF2(_L("unable to start the iap, reason = %d\n"),errno); - return -1; - } - strcpy(ifr.ifr_name,iapName); - - - ifreq ifr1; - strcpy(ifr1.ifr_name,iapName); - - if(ioctl(fd,SIOCGIFMTU,&ifr) == -1) - { - INFO_PRINTF2(_L("unable to get the mtu for the iap, reason = %d"),errno); - close(fd); - return -1; - } - ifr.ifr_ifru.ifru_mtu++; - - if(ioctl(fd,SIOCSIFMTU,&ifr) == -1) - { - INFO_PRINTF2(_L("unable to set the mtu for the iap, reason = %d"),errno); - close(fd); - return -1; - } - - if(ioctl(fd,SIOCGIFMTU,&ifr1) == -1) - { - INFO_PRINTF2(_L("unable to get the mtu for the iap , reason = %d"),errno); - close(fd); - return -1; - } - - if(ifr.ifr_ifru.ifru_mtu != ifr1.ifr_ifru.ifru_mtu) - { - INFO_PRINTF2(_L("unable to set the mtu for the iap = %s"),ifr.ifr_name); - close(fd); - return -1; - } - close(fd); - return KErrNone; - } - -void CTestIfioctls::FreeDnsSuffixes(char ** suffixes) - { - for(int i = 0; suffixes[i]; i++) - { - delete [] suffixes[i]; - } - delete []suffixes; - } - -#define MAX_SUFFIXES 3 -#define SUFFIXLEN 50 -TInt CTestIfioctls::TestSetIfDNSSuffix() - { - char iapName[IFNAMSIZ]; - // ifreq ifr1; - GetIapName(iapName, sizeof(iapName)); - int fd; - - struct if_dns_suffixes dns_suffixes; - strcpy(dns_suffixes.if_name,iapName); - - if(StartIap(iapName, fd) != KErrNone) - { - INFO_PRINTF2(_L("unable to start the iap, reason = %d\n"),errno); - return -1; - } - - char **&suffixes = dns_suffixes.suffixes; - - suffixes = new char*[MAX_SUFFIXES+1]; - suffixes[MAX_SUFFIXES] = NULL; - - _LIT(KDNSSuffix, "DNSSuffix"); - - for(int i = 0; i < MAX_SUFFIXES; i++) - { - TPtrC suffix16; - TBuf<20> suffixTag(KDNSSuffix); - suffixTag.AppendNum(i); - suffixes[i] = NULL; - TBool res = GetStringFromConfig(ConfigSection(), suffixTag, suffix16); - if (!res) - { - INFO_PRINTF1(_L("Unable to read the iapname from the ini file.")) ; - FreeDnsSuffixes(suffixes); - close(fd); - return KErrGeneral; - } - suffixes[i] = new char[suffix16.Length() + 1]; - TPtr8 suffix8((TUint8*)suffixes[i],suffix16.Length() + 1); - suffix8.Copy(suffix16); - suffix8.ZeroTerminate(); - } - - if(ioctl(fd,SIOCSETDNSSUFFIX,&dns_suffixes) == -1) - { - INFO_PRINTF2(_L("unable to set the dbs suffixes , reason = %d\n"),errno); - close(fd); - FreeDnsSuffixes(suffixes); - return -1; - } - _LIT(KHostname1, "Hostname1"); - TPtrC hostname16; - char hostname[50]; - TPtr8 hostname8((TUint8*)hostname, sizeof(hostname)); - - TBool res = GetStringFromConfig(ConfigSection(), KHostname1, hostname16); - if (!res) - { - INFO_PRINTF1(_L("Unable to read the hostname from the ini file.")) ; - FreeDnsSuffixes(suffixes); - close(fd); - return KErrGeneral; - } - hostname8.Copy(hostname16); - hostname8.ZeroTerminate(); - hostent * hentry; - ifreq defaultif; - strcpy(defaultif.ifr_name, iapName); - if(setdefaultif(&defaultif) != KErrNone) - { - INFO_PRINTF2(_L("setdefaultif failed, reason = %d "),errno) ; - FreeDnsSuffixes(suffixes); - close(fd); - return KErrGeneral; - } - - if((hentry = gethostbyname(hostname)) == NULL) - { - INFO_PRINTF3(_L("getbyhostname failed for %S with errno = %d"),&hostname16,errno) ; - // FreeDnsSuffixes(suffixes); - // close(fd); - // return KErrGeneral; - - } - _LIT(KHostname2, "Hostname2"); - - res = GetStringFromConfig(ConfigSection(), KHostname2, hostname16); - if (!res) - { - INFO_PRINTF1(_L("Unable to read the hostname from the ini file.")) ; - FreeDnsSuffixes(suffixes); - close(fd); - return KErrGeneral; - } - hostname8.Copy(hostname16); - hostname8.ZeroTerminate(); - if((hentry = gethostbyname(hostname)) == NULL) - { - INFO_PRINTF3(_L("getbyhostname failed for %S with errno = %d "),&hostname16,errno) ; - // FreeDnsSuffixes(suffixes); - // close(fd); - // return KErrGeneral; - - } - - hostname8.Copy(_L8("2IND04966")); - hostname8.ZeroTerminate(); - if((hentry = gethostbyname(hostname)) == NULL) - { - INFO_PRINTF3(_L("getbyhostname failed for %s, errno = %d "),&hostname8, errno) ; - } - - - FreeDnsSuffixes(suffixes); - close(fd); - return KErrNone; - - } - - -TInt CTestIfioctls::TestGetIfDNSSuffix() - { - char iapName[IFNAMSIZ]; - GetIapName(iapName, sizeof(iapName)); - int fd; - - if(StartIap(iapName, fd) != KErrNone) - { - INFO_PRINTF2(_L("unable to start the iap, reason = %d\n"),errno); - return -1; - } - - struct if_dns_suffixes dns_suffixes; - strcpy(dns_suffixes.if_name,iapName); - - if(ioctl(fd,SIOCGETDNSSUFFIX,&dns_suffixes) == -1) - { - INFO_PRINTF2(_L("unable to get the dns suffixes , reason = %d\n"),errno); - close(fd); - return -1; - } - - INFO_PRINTF1(_L("printing dns suffixes")); - for(int i = 0; dns_suffixes.suffixes[i]; i++) - { - TPtr8 suffix8((TUint8 *)dns_suffixes.suffixes[i],strlen(dns_suffixes.suffixes[i]),strlen(dns_suffixes.suffixes[i])+1); - TBuf suffix16; - suffix16.Copy(suffix8); - INFO_PRINTF3(_L("suffixes %d = %S"),i,&suffix16); - } - freednssuffixes(&dns_suffixes); - close(fd); - return KErrNone; - } - -TInt CTestIfioctls::TestGetNameServers() - { - if_name_servers dns_server; - char iapName[IFNAMSIZ]; - GetIapName(iapName, sizeof(iapName)); - int sockfd; - strcpy(dns_server.if_name, iapName); - - if(StartIap(iapName, sockfd) != KErrNone) - { - INFO_PRINTF2(_L("unable to start the iap, reason = %d\n"),errno); - return -1; - } - - TInt ret = ioctl(sockfd, SIOCGNAMESERVER, &dns_server); - if(ret == -1) - { - INFO_PRINTF2(_L("IOCTL option failed with errno =%d"), errno); - close(sockfd); - return errno; - } - char addr[50]; - addr[0] = '\0'; - - if(inet_ntop(dns_server.nameserver1.sa_family,&(dns_server.nameserver1.sa_data),addr,sizeof(addr)) == NULL) - { - INFO_PRINTF2(_L("cannot convert to address to string, error no = %d\n"),errno); - close(sockfd); - return -1; - } - TPtr8 addr8((TUint8 *)addr, strlen(addr), strlen(addr)+1); - TBuf<50> addr16; - addr16.Copy(addr8); - INFO_PRINTF2(_L("nameserver2 for the iap = %S \n"),&addr16); - if(inet_ntop(dns_server.nameserver2.sa_family,&(dns_server.nameserver2.sa_data),addr,sizeof(addr)) == NULL) - { - INFO_PRINTF2(_L("cannot convert to address to string, error no = %d\n"),errno); - close(sockfd); - return -1; - } - addr8.Set((TUint8 *)addr, strlen(addr), strlen(addr)+1 ); - addr16.Copy(addr8); - INFO_PRINTF2(_L("nameserver2 for the iap = %S \n"),&addr16); - close(sockfd); - - return KErrNone; - } - -TInt CTestIfioctls::TestSetNameServers() - { - if_name_servers dns_server; - - char iapName[IFNAMSIZ]; - GetIapName(iapName, sizeof(iapName)); - - memset(&dns_server,0, sizeof(dns_server)); - strcpy(dns_server.if_name, iapName); - TPtrC nameServer16; - _LIT(KNameSrv1, "NameServer1"); - _LIT(KNameSrv2, "NameServer2"); - - TBool res = GetStringFromConfig(ConfigSection(), KNameSrv1, nameServer16); - if (!res) - { - INFO_PRINTF1(_L("Unable to read the nameserver1 from the ini file.")) ; - return KErrGeneral; - } - char nameServer1[50]; - TPtr8 nameServer8((TUint8 *)nameServer1, sizeof(nameServer1)); - nameServer8.Copy(nameServer16); - nameServer8.ZeroTerminate(); - res = GetStringFromConfig(ConfigSection(), KNameSrv2, nameServer16); - if (!res) - { - INFO_PRINTF1(_L("Unable to read nameserver2 from the ini file.")) ; - return KErrGeneral; - } - - char nameServer2[50]; - nameServer8.Set((TUint8 *)nameServer2, 0, sizeof(nameServer2)); - nameServer8.Copy(nameServer16); - nameServer8.ZeroTerminate(); - - dns_server.nameserver1.sa_family = AF_INET; - dns_server.nameserver2.sa_family = AF_INET; - TInt addr1 = inet_addr(nameServer1); - TInt addr2 = inet_addr(nameServer2); - unsigned char * ptr = (unsigned char *)&addr1; - dns_server.nameserver1.sa_data[0] = ptr[0]; - dns_server.nameserver1.sa_data[1] = ptr[1]; - dns_server.nameserver1.sa_data[2] = ptr[2]; - dns_server.nameserver1.sa_data[3] = ptr[3]; - - ptr = (unsigned char *)&addr2; - dns_server.nameserver2.sa_data[0] = ptr[0]; - dns_server.nameserver2.sa_data[1] = ptr[1]; - dns_server.nameserver2.sa_data[2] = ptr[2]; - dns_server.nameserver2.sa_data[3] = ptr[3]; - - TInt sockfd; - if(StartIap(iapName, sockfd) != KErrNone) - { - INFO_PRINTF2(_L("unable to start the iap, reason = %d\n"),errno); - return -1; - } - - - TInt ret = ioctl(sockfd, SIOCSNAMESERVER, &dns_server); - if(ret == -1) - { - INFO_PRINTF2(_L("IOCTL option failed with errno =%d"), errno); - close(sockfd); - return errno; - } - - return KErrNone; - - } - -//Testcase added to enumerate routes configured on the device. -//Use Ioctl option SIOCENUMROUTES to get the route details. -//PreCondition: User needs to allocate space for the buffer. -TInt CTestIfioctls::TestRouteIoctl() - { - rtconf rtc; - TInt ret = 0; - rtc.rt_len = 0; - TInt sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP); - if(sockfd < 0) - { - INFO_PRINTF2(_L("Unable to create the socket errno =%d"), errno); - return -1; - } - if((ret = ioctl (sockfd, SIOCENUMROUTES,&rtc)) == -1) - { - INFO_PRINTF2(_L("Unable to get the routes configured, errno = %d"), errno); - close(sockfd); - return -1; - } - - if (rtc.rt_len == 0) - { - INFO_PRINTF1(_L("No routes were found,")); - close(sockfd); - return KErrNone; - } - if((rtc.rtc_buf = (caddr_t)malloc( rtc.rt_len )) == NULL) - { - INFO_PRINTF1(_L("Unable to allocate memory ")); - close(sockfd); - return KErrNoMemory; - } - - INFO_PRINTF1(_L("Now will fetch the routes!\n")); - if((ret = ioctl (sockfd, SIOCENUMROUTES,&rtc)) == -1) - { - INFO_PRINTF2(_L("Unable to get the routs configured, errno = %d"), errno); - close(sockfd); - free(rtc.rtc_buf); - return -1; - } - close(sockfd); - free(rtc.rtc_buf); - return KErrNone; - } - - -//With the route_entry buffer size zero, it should return the number of routes present on the system -//To use this ioctl effectively, we can find the number of routes by passing length as Zero and then -//pass the count*sizeof(route_entry) as the len the next time to fecth the route information. -TInt CTestIfioctls::TestNumberOfRoutesIoctl() - { - rtconf rtc; - rtc.rt_len = 0; - TInt ret = 0; - - TInt sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP); - if(sockfd < 0) - { - INFO_PRINTF2(_L("Unable to create the socket errno =%d"), errno); - return -1; - } - if((ret = ioctl (sockfd, SIOCENUMROUTES,&rtc)) == -1) - { - INFO_PRINTF2(_L("Unable to get the routs configures, errno = %d"), errno); - return -1; - } - - INFO_PRINTF2(_L("The number of routes available is %d\n"), rtc.rt_len/sizeof(route_entry)); - close(sockfd); - return KErrNone; - - } - - + return res; + } diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctlsserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctlsserver.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctlsserver.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -202,42 +202,6 @@ { testStep = new CTestIfioctls(aStepName); } - if(aStepName == KTestioctlGetIfIpAddr) - { - testStep = new CTestIfioctls(aStepName); - } - if(aStepName == KTestioctlGetIfAttributes) - { - testStep = new CTestIfioctls(aStepName); - } - if(aStepName == KTestioctlSetIfAttributes) - { - testStep = new CTestIfioctls(aStepName); - } - if(aStepName == KTestioctlSetIfDNSSuffix) - { - testStep = new CTestIfioctls(aStepName); - } - if(aStepName == KTestioctlGetIfDNSSuffix) - { - testStep = new CTestIfioctls(aStepName); - } - if(aStepName == KTestRouteIoctl) - { - testStep = new CTestIfioctls(aStepName); - } - if(aStepName == KTestNumberOfRoutesIoctl) - { - testStep = new CTestIfioctls(aStepName); - } - if(aStepName == KTestSetNameServers) - { - testStep = new CTestIfioctls(aStepName); - } - if(aStepName == KTestGetNameServers) - { - testStep = new CTestIfioctls(aStepName); - } return testStep; } diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/utils/tifioctlstest.bat --- a/genericopenlibs/openenvcore/libc/test/testifioctls/utils/tifioctlstest.bat Wed Sep 15 14:02:55 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -CED -i C:\tstdapis\gosethernetced.xml \ No newline at end of file diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testifioctls/utils/tifioctlstest_hw.bat --- a/genericopenlibs/openenvcore/libc/test/testifioctls/utils/tifioctlstest_hw.bat Wed Sep 15 14:02:55 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -CED -i z:\tstdapis\gosethernetced.xml \ No newline at end of file diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testlocalsocket/group/bld.inf --- a/genericopenlibs/openenvcore/libc/test/testlocalsocket/group/bld.inf Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlocalsocket/group/bld.inf Wed Oct 13 16:27:53 2010 +0300 @@ -20,8 +20,6 @@ PRJ_TESTEXPORTS ../data/tlocalsocket.ini /epoc32/winscw/c/tstdapis/tlocalsocket.ini ../scripts/tlocalsocket.script /epoc32/winscw/c/tstdapis/tlocalsocket.script -../utils/localsocketsettings.bat /epoc32/winscw/c/tstdapis/localsocketsettings.bat -../utils/localsocketsettings_hw.bat /epoc32/winscw/c/tstdapis/localsocketsettings_hw.bat PRJ_TESTMMPFILES diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings.bat --- a/genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings.bat Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings.bat Wed Oct 13 16:27:53 2010 +0300 @@ -14,5 +14,4 @@ @rem Description: @rem -copy \epoc32\release\WINSCW\udeb\tsample.exe \epoc32\release\WINSCW\udeb\Z\sys\bin\tsample.exe -CED -i C:\tstdapis\gosethernetced.xml \ No newline at end of file +copy \epoc32\release\WINSCW\udeb\tsample.exe \epoc32\release\WINSCW\udeb\Z\sys\bin\tsample.exe \ No newline at end of file diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings_hw.bat --- a/genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings_hw.bat Wed Sep 15 14:02:55 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -CED -i z:\tstdapis\gosethernetced.xml \ No newline at end of file diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testsocket/group/bld.inf --- a/genericopenlibs/openenvcore/libc/test/testsocket/group/bld.inf Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/group/bld.inf Wed Oct 13 16:27:53 2010 +0300 @@ -21,7 +21,6 @@ ../data/tsocket.ini /epoc32/winscw/c/tstdapis/tsocket.ini ../data/socketmorethan16k.txt /epoc32/winscw/c/socketmorethan16k.txt ../utils/tsockettest.bat /epoc32/winscw/c/tstdapis/tsockettest.bat -../utils/tsockettest_hw.bat /epoc32/winscw/c/tstdapis/tsockettest_hw.bat PRJ_TESTMMPFILES diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testsocket/inc/tsocket.h --- a/genericopenlibs/openenvcore/libc/test/testsocket/inc/tsocket.h Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/inc/tsocket.h Wed Oct 13 16:27:53 2010 +0300 @@ -135,7 +135,6 @@ _LIT(KTestSockIoctl, "TestSockIoctl"); _LIT(KSockErrnoTest, "SockErrnoTest"); _LIT(KSockSendOnClosedConn,"SockSendOnClosedConn"); -_LIT(KSockWriteOnClosedConn,"SockWriteOnClosedConn"); class CTestSocket : public CTestStep { public: @@ -233,6 +232,5 @@ TInt close_socket(int fd); TInt SockErrnoTest(); TInt SockSendOnClosedConn(); - TInt SockWriteOnClosedConn(); }; #endif diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket.script --- a/genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket.script Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket.script Wed Oct 13 16:27:53 2010 +0300 @@ -16,500 +16,500 @@ PRINT Run all tsocket LOAD_SUITE tsocket -//CED -i \tstdapis\gosethernetced.xml +CED -i \tstdapis\gosethernetced.xml CONSECUTIVE START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0001 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0001 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ExampleL \tstdapis\tsocket.ini Section_ExampleL +RUN_TEST_STEP !Result=0 5 tsocket ExampleL \tstdapis\tsocket.ini Section_ExampleL END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0001 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0002 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0002 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_1 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0002 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0004 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0004 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_3 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_3 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0004 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0005 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0005 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_4 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_4 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0005 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0006 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0006 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_5 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_5 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0006 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0007 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0007 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_6 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_6 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0007 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0008 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0008 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindTest \tstdapis\tsocket.ini Section_BindTest +RUN_TEST_STEP !Result=0 5 tsocket BindTest \tstdapis\tsocket.ini Section_BindTest END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0008 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0009 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0009 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindInvalidAddress \tstdapis\tsocket.ini Section_BindInvalidAddress +RUN_TEST_STEP !Result=0 5 tsocket BindInvalidAddress \tstdapis\tsocket.ini Section_BindInvalidAddress END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0009 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0010 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0010 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindUsingFileDescriptor \tstdapis\tsocket.ini Section_BindUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket BindUsingFileDescriptor \tstdapis\tsocket.ini Section_BindUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0010 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0011 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0011 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindUsingInvalidSocketDescriptor \tstdapis\tsocket.ini Section_BindUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket BindUsingInvalidSocketDescriptor \tstdapis\tsocket.ini Section_BindUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0011 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0012 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0012 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindFailCases +RUN_TEST_STEP !Result=0 5 tsocket BindFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0012 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0013 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0013 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ListenTest \tstdapis\tsocket.ini Section_ListenTest +RUN_TEST_STEP !Result=0 5 tsocket ListenTest \tstdapis\tsocket.ini Section_ListenTest END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0013 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0014 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0014 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ListenUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ListenUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0014 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0015 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0015 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ListenUdp +RUN_TEST_STEP !Result=0 5 tsocket ListenUdp END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0015 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0016 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0016 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ListenUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ListenUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0016 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0017 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0017 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_1 +RUN_TEST_STEP !Result=0 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0017 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0018 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0018 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_2 +RUN_TEST_STEP !Result=0 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0018 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0019 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0019 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_3 +RUN_TEST_STEP !Result=0 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_3 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0019 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0020 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0020 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownDisconnectedSocket \tstdapis\tsocket.ini Section_ShutdownDisconnectedSocket +RUN_TEST_STEP !Result=0 5 tsocket ShutdownDisconnectedSocket \tstdapis\tsocket.ini Section_ShutdownDisconnectedSocket END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0020 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0021 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0021 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutDownTestWithInvalidShutdownOption +RUN_TEST_STEP !Result=0 5 tsocket ShutDownTestWithInvalidShutdownOption END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0021 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0022 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0022 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ShutdownUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0022 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0023 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0023 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ShutdownUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0023 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0024 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0024 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketName \tstdapis\tsocket.ini Section_GetSocketName +RUN_TEST_STEP !Result=0 5 tsocket GetSocketName \tstdapis\tsocket.ini Section_GetSocketName END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0024 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0025 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0025 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketNameUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket GetSocketNameUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0025 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0026 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0026 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketNameUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket GetSocketNameUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0026 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0027 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0027 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketNameInvalidLength \tstdapis\tsocket.ini Section_GetSocketNameInvalidLength +RUN_TEST_STEP !Result=0 5 tsocket GetSocketNameInvalidLength \tstdapis\tsocket.ini Section_GetSocketNameInvalidLength END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0027 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0028 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0028 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketNameInvalidSocketBuffer \tstdapis\tsocket.ini Section_GetSocketNameInvalidSocketBuffer +RUN_TEST_STEP !Result=0 5 tsocket GetSocketNameInvalidSocketBuffer \tstdapis\tsocket.ini Section_GetSocketNameInvalidSocketBuffer END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0028 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0029 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0029 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_1 +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0029 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0030 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0030 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_2 +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0030 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0031 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0031 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketNameUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketNameUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0031 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0032 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0032 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketNameUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketNameUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0032 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0033 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0033 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketNameforUnconnectedSocket +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketNameforUnconnectedSocket END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0033 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0034 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0034 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketNameInvalidLengthSockAddr +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketNameInvalidLengthSockAddr END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0034 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0035 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0035 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket UDP +RUN_TEST_STEP !Result=0 5 tsocket UDP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0035 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0036 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0036 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TCP +RUN_TEST_STEP !Result=0 5 tsocket TCP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0036 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0037 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0037 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptTest \tstdapis\tsocket.ini Section_AcceptTest +RUN_TEST_STEP !Result=0 5 tsocket AcceptTest \tstdapis\tsocket.ini Section_AcceptTest END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0037 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0038 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0038 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket UDPAccept +RUN_TEST_STEP !Result=0 5 tsocket UDPAccept END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0038 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0039 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0039 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket AcceptUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0039 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0040 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0040 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket AcceptUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0040 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0041 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0041 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptFailCases +RUN_TEST_STEP !Result=0 5 tsocket AcceptFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0041 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0096 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0096 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptTestZeroAddrLen +RUN_TEST_STEP !Result=0 5 tsocket AcceptTestZeroAddrLen END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0096 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0097 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0097 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptTestNullAddr +RUN_TEST_STEP !Result=0 5 tsocket AcceptTestNullAddr END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0097 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0042 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0042 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_1 +RUN_TEST_STEP !Result=0 5 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0042 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0043 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0043 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_2 +RUN_TEST_STEP !Result=0 5 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0043 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0044 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0044 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ConnectUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ConnectUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0044 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0045 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0045 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ConnectUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ConnectUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0045 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0046 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0046 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket RecvFromTestFailCases \tstdapis\tsocket.ini Section_RecvFromTestFailCases +RUN_TEST_STEP !Result=0 5 tsocket RecvFromTestFailCases \tstdapis\tsocket.ini Section_RecvFromTestFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0046 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0047 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0047 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket RecvUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket RecvUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0047 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0048 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0048 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket RecvUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket RecvUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0048 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0049 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0049 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket RecvTestFailCases \tstdapis\tsocket.ini Section_RecvTestFailCases +RUN_TEST_STEP !Result=0 5 tsocket RecvTestFailCases \tstdapis\tsocket.ini Section_RecvTestFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0049 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0050 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0050 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_1 +RUN_TEST_STEP !Result=0 5 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0050 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0051 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0051 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_2 +RUN_TEST_STEP !Result=0 5 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0051 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0052 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0052 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket SendUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0052 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0053 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0053 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket SendUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0053 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0054 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0054 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_1 +RUN_TEST_STEP !Result=0 5 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0054 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0055 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0055 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_2 +RUN_TEST_STEP !Result=0 5 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0055 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0056 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0056 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendToUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket SendToUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0056 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0057 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0057 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendToUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket SendToUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0057 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0058 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0058 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSendReturnValue +RUN_TEST_STEP !Result=0 5 tsocket TestSendReturnValue END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0058 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0059 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0059 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_1 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0059 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0060 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0060 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSockOptFailCases +RUN_TEST_STEP !Result=0 5 tsocket GetSockOptFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0060 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0061 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0061 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SetSockOptFailCases +RUN_TEST_STEP !Result=0 5 tsocket SetSockOptFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0061 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0062 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0062 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_2 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0062 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0063 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0063 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_3 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_3 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0063 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0064 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0064 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_4 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_4 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0064 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0065 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0065 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_5 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_5 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0065 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0066 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0066 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_6 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_6 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0066 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0067 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0067 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=-2 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_7 +RUN_TEST_STEP !Result=-2 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_7 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0067 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0068 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0068 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=-2 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_8 +RUN_TEST_STEP !Result=-2 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_8 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0068 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0069 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0069 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=-2 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_9 +RUN_TEST_STEP !Result=-2 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_9 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0069 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0070 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0070 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindResvPort \tstdapis\tsocket.ini Section_BindResvPort +RUN_TEST_STEP !Result=0 5 tsocket BindResvPort \tstdapis\tsocket.ini Section_BindResvPort END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0070 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0071 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0071 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindResvPortFailCases +RUN_TEST_STEP !Result=0 5 tsocket BindResvPortFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0071 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0072 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0072 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket HErrNoLocation +RUN_TEST_STEP !Result=0 5 tsocket HErrNoLocation END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0072 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0073 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0073 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendMsgRecvMsg +RUN_TEST_STEP !Result=0 5 tsocket SendMsgRecvMsg END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0073 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0074 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0074 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetHostName +RUN_TEST_STEP !Result=0 5 tsocket GetHostName END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0074 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0075 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0075 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetHostNameZero +RUN_TEST_STEP !Result=0 5 tsocket GetHostNameZero END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0075 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0076 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0076 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetHostNameNull +RUN_TEST_STEP !Result=0 5 tsocket GetHostNameNull END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0076 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0077 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0077 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSockAfLocal +RUN_TEST_STEP !Result=0 5 tsocket TestSockAfLocal END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0077 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0078 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0078 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSktlseek +RUN_TEST_STEP !Result=0 5 tsocket TestSktlseek END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0078 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0079 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0079 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSktfstat +RUN_TEST_STEP !Result=0 5 tsocket TestSktfstat END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0079 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0080 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0080 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSktfsync +RUN_TEST_STEP !Result=0 5 tsocket TestSktfsync END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0080 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0081 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0081 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestGreaterThan16kReadWrite +RUN_TEST_STEP !Result=0 15 tsocket TestGreaterThan16kReadWrite END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0081 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0082 @@ -527,89 +527,89 @@ START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0084 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0084 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestNotify \tstdapis\tsocket.ini Section_TestSelect +RUN_TEST_STEP !Result=0 25 tsocket TestNotify \tstdapis\tsocket.ini Section_TestSelect END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0084 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0085 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0085 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestNotify \tstdapis\tsocket.ini Section_TestIoctl +RUN_TEST_STEP !Result=0 25 tsocket TestNotify \tstdapis\tsocket.ini Section_TestIoctl END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0085 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0086 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0086 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestSmallUDP +RUN_TEST_STEP !Result=0 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestSmallUDP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0086 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0087 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0087 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestMediumUDP +RUN_TEST_STEP !Result=0 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestMediumUDP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0087 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0088 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0088 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestLargeUDP +RUN_TEST_STEP !Result=0 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestLargeUDP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0088 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0089 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0089 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestFionread +RUN_TEST_STEP !Result=0 15 tsocket TestFionread END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0089 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0090 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0090 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestBind1 +RUN_TEST_STEP !Result=0 15 tsocket TestBind1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0090 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0091 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0091 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestConnectNonBlocking +RUN_TEST_STEP !Result=0 20 tsocket TestConnectNonBlocking END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0091 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0092 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0092 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TCP1 +RUN_TEST_STEP !Result=0 5 tsocket TCP1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0092 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0093 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0093 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestV4MappedAddress +RUN_TEST_STEP !Result=0 5 tsocket TestV4MappedAddress END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0093 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0094 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0094 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ReadTestFailCase +RUN_TEST_STEP !Result=0 15 tsocket ReadTestFailCase END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0094 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0095 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0095 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestNotify1 +RUN_TEST_STEP !Result=0 15 tsocket TestNotify1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0095 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0098 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0098 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSockFcntl +RUN_TEST_STEP !Result=0 15 tsocket TestSockFcntl END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0098 // To be uncommented when COM-DB is enabled -//RUN_TEST_STEP !Result=0 50 tsocket TestSockIoctl +//RUN_TEST_STEP !Result=0 15 tsocket TestSockIoctl START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0099 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0099 //! @SYMTestStatus 3.Released //commeneted because of network test -//RUN_TEST_STEP !Result=0 50 tsocket SockErrnoTest +//RUN_TEST_STEP !Result=0 30 tsocket SockErrnoTest END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0099 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0099 @@ -617,13 +617,5 @@ //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-00100 //! @SYMTestStatus 3.Released //commeneted because of network test -RUN_TEST_STEP !Result=0 50 tsocket SockSendOnClosedConn +RUN_TEST_STEP !Result=0 30 tsocket SockSendOnClosedConn END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00100 - - -START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00101 -//! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-00101 -//! @SYMTestStatus 3.Released -//commeneted because of network test -RUN_TEST_STEP !Result=0 50 tsocket SockWriteOnClosedConn -END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00101 diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket_hw.script --- a/genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket_hw.script Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket_hw.script Wed Oct 13 16:27:53 2010 +0300 @@ -16,613 +16,608 @@ PRINT Run all tsocket LOAD_SUITE tsocket -//CED -i \tstdapis\gosethernetced.xml +CED -i \tstdapis\gosethernetced.xml CONSECUTIVE START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0001 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0001 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ExampleL \tstdapis\tsocket.ini Section_ExampleL +RUN_TEST_STEP !Result=0 5 tsocket ExampleL \tstdapis\tsocket.ini Section_ExampleL END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0001 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0002 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0002 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_1 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0002 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0004 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0004 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_3 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_3 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0004 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0005 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0005 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_4 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_4 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0005 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0006 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0006 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_5 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_5 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0006 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0007 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0007 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_6 +RUN_TEST_STEP !Result=0 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_6 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0007 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0008 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0008 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindTest \tstdapis\tsocket.ini Section_BindTest +RUN_TEST_STEP !Result=0 5 tsocket BindTest \tstdapis\tsocket.ini Section_BindTest END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0008 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0009 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0009 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket MultipleBindOnSameSocket \tstdapis\tsocket.ini Section_MultipleBindOnSameSocket +RUN_TEST_STEP !Result=0 5 tsocket MultipleBindOnSameSocket \tstdapis\tsocket.ini Section_MultipleBindOnSameSocket END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0009 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0010 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0010 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindInvalidAddress \tstdapis\tsocket.ini Section_BindInvalidAddress +RUN_TEST_STEP !Result=0 5 tsocket BindInvalidAddress \tstdapis\tsocket.ini Section_BindInvalidAddress END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0010 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0011 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0011 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindUsingFileDescriptor \tstdapis\tsocket.ini Section_BindUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket BindUsingFileDescriptor \tstdapis\tsocket.ini Section_BindUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0011 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0012 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0012 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindUsingInvalidSocketDescriptor \tstdapis\tsocket.ini Section_BindUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket BindUsingInvalidSocketDescriptor \tstdapis\tsocket.ini Section_BindUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0012 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0013 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0013 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindFailCases +RUN_TEST_STEP !Result=0 5 tsocket BindFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0013 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0014 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0014 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ListenTest \tstdapis\tsocket.ini Section_ListenTest +RUN_TEST_STEP !Result=0 5 tsocket ListenTest \tstdapis\tsocket.ini Section_ListenTest END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0014 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0015 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0015 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ListenUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ListenUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0015 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0016 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0016 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ListenUdp +RUN_TEST_STEP !Result=0 5 tsocket ListenUdp END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0016 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0017 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0017 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ListenUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ListenUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0017 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0018 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0018 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_1 +RUN_TEST_STEP !Result=0 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0018 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0019 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0019 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_2 +RUN_TEST_STEP !Result=0 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0019 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0020 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0020 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_3 +RUN_TEST_STEP !Result=0 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_3 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0020 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0021 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0021 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownDisconnectedSocket \tstdapis\tsocket.ini Section_ShutdownDisconnectedSocket +RUN_TEST_STEP !Result=0 5 tsocket ShutdownDisconnectedSocket \tstdapis\tsocket.ini Section_ShutdownDisconnectedSocket END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0021 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0022 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0022 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutDownTestWithInvalidShutdownOption +RUN_TEST_STEP !Result=0 5 tsocket ShutDownTestWithInvalidShutdownOption END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0022 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0023 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0023 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ShutdownUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0023 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0024 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0024 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ShutdownUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ShutdownUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0024 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0025 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0025 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketName \tstdapis\tsocket.ini Section_GetSocketName +RUN_TEST_STEP !Result=0 5 tsocket GetSocketName \tstdapis\tsocket.ini Section_GetSocketName END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0025 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0026 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0026 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketNameUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket GetSocketNameUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0026 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0027 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0027 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketNameUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket GetSocketNameUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0027 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0028 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0028 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketNameInvalidLength \tstdapis\tsocket.ini Section_GetSocketNameInvalidLength +RUN_TEST_STEP !Result=0 5 tsocket GetSocketNameInvalidLength \tstdapis\tsocket.ini Section_GetSocketNameInvalidLength END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0028 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0029 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0029 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSocketNameInvalidSocketBuffer \tstdapis\tsocket.ini Section_GetSocketNameInvalidSocketBuffer +RUN_TEST_STEP !Result=0 5 tsocket GetSocketNameInvalidSocketBuffer \tstdapis\tsocket.ini Section_GetSocketNameInvalidSocketBuffer END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0029 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0030 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0030 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_1 +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0030 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0031 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0031 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_2 +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0031 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0032 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0032 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketNameUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketNameUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0032 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0033 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0033 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketNameUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketNameUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0033 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0034 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0034 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketNameforUnconnectedSocket +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketNameforUnconnectedSocket END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0034 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0035 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0035 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetPeerSocketNameInvalidLengthSockAddr +RUN_TEST_STEP !Result=0 5 tsocket GetPeerSocketNameInvalidLengthSockAddr END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0035 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0036 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0036 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket UDP +RUN_TEST_STEP !Result=0 5 tsocket UDP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0036 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0037 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0037 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TCP +RUN_TEST_STEP !Result=0 5 tsocket TCP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0037 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0038 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0038 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptTest \tstdapis\tsocket.ini Section_AcceptTest +RUN_TEST_STEP !Result=0 5 tsocket AcceptTest \tstdapis\tsocket.ini Section_AcceptTest END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0038 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0039 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0039 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket UDPAccept +RUN_TEST_STEP !Result=0 5 tsocket UDPAccept END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0039 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0040 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0040 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket AcceptUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0040 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0041 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0041 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket AcceptUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0041 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0042 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0042 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptFailCases +RUN_TEST_STEP !Result=0 5 tsocket AcceptFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0042 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0098 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0098 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptTestZeroAddrLen +RUN_TEST_STEP !Result=0 5 tsocket AcceptTestZeroAddrLen END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0098 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0099 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0099 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket AcceptTestNullAddr +RUN_TEST_STEP !Result=0 5 tsocket AcceptTestNullAddr END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0099 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0043 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0043 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_1 +RUN_TEST_STEP !Result=0 5 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0043 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0044 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0044 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_2 +RUN_TEST_STEP !Result=0 5 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0044 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0045 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0045 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ConnectUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ConnectUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0045 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0046 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0046 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ConnectUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket ConnectUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0046 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0047 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0047 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket RecvFromTestFailCases \tstdapis\tsocket.ini Section_RecvFromTestFailCases +RUN_TEST_STEP !Result=0 5 tsocket RecvFromTestFailCases \tstdapis\tsocket.ini Section_RecvFromTestFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0047 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0048 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0048 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket RecvUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket RecvUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0048 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0049 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0049 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket RecvUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket RecvUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0049 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0050 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0050 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket RecvTestFailCases \tstdapis\tsocket.ini Section_RecvTestFailCases +RUN_TEST_STEP !Result=0 5 tsocket RecvTestFailCases \tstdapis\tsocket.ini Section_RecvTestFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0050 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0051 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0051 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_1 +RUN_TEST_STEP !Result=0 5 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0051 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0052 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0052 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_2 +RUN_TEST_STEP !Result=0 5 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0052 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0053 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0053 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket SendUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0053 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0054 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0054 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket SendUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0054 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0055 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0055 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_1 +RUN_TEST_STEP !Result=0 5 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0055 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0056 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0056 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_2 +RUN_TEST_STEP !Result=0 5 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0056 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0057 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0057 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendToUsingFileDescriptor +RUN_TEST_STEP !Result=0 5 tsocket SendToUsingFileDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0057 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0058 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0058 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendToUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 5 tsocket SendToUsingInvalidSocketDescriptor END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0058 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0059 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0059 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_1 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0059 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0060 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0060 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetSockOptFailCases +RUN_TEST_STEP !Result=0 5 tsocket GetSockOptFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0060 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0061 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0061 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SetSockOptFailCases +RUN_TEST_STEP !Result=0 5 tsocket SetSockOptFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0061 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0062 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0062 //! @SYMTestStatus 3.Released -//RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_hw +//RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_hw PRINT This test case is for SO_OOBINLINE which is not supported in Symbian OS END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0062 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0063 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0063 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_2 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_2 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0063 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0064 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0064 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_3 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_3 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0064 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0065 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0065 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_4 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_4 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0065 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0066 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0066 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_5 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_5 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0066 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0067 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0067 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_6 +RUN_TEST_STEP !Result=0 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_6 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0067 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0068 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0068 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=-2 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_7 +RUN_TEST_STEP !Result=-2 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_7 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0068 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0069 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0069 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=-2 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_8 +RUN_TEST_STEP !Result=-2 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_8 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0069 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0070 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0070 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=-2 50 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_9 +RUN_TEST_STEP !Result=-2 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_9 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0070 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0071 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0071 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SockAtMark +RUN_TEST_STEP !Result=0 5 tsocket SockAtMark END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0071 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0072 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0072 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindResvPort \tstdapis\tsocket.ini Section_BindResvPort +RUN_TEST_STEP !Result=0 5 tsocket BindResvPort \tstdapis\tsocket.ini Section_BindResvPort END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0072 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0073 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0073 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket BindResvPortFailCases +RUN_TEST_STEP !Result=0 5 tsocket BindResvPortFailCases END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0073 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0074 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0074 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket HErrNoLocation +RUN_TEST_STEP !Result=0 5 tsocket HErrNoLocation END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0074 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0075 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0075 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket SendMsgRecvMsg +RUN_TEST_STEP !Result=0 5 tsocket SendMsgRecvMsg END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0075 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0076 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0076 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetHostName +RUN_TEST_STEP !Result=0 5 tsocket GetHostName END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0076 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0077 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0077 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetHostNameZero +RUN_TEST_STEP !Result=0 5 tsocket GetHostNameZero END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0077 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0078 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0078 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket GetHostNameNull +RUN_TEST_STEP !Result=0 5 tsocket GetHostNameNull END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0078 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0079 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0079 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSktlseek +RUN_TEST_STEP !Result=0 5 tsocket TestSktlseek END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0079 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0080 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0080 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSktfstat +RUN_TEST_STEP !Result=0 5 tsocket TestSktfstat END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0080 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0081 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0081 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSktfsync +RUN_TEST_STEP !Result=0 5 tsocket TestSktfsync END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0081 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0082 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0082 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestRecvMsgPeekTCP +RUN_TEST_STEP !Result=0 10 tsocket TestRecvMsgPeekTCP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0082 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0083 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0083 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestRecvMsgPeekUDP +RUN_TEST_STEP !Result=0 10 tsocket TestRecvMsgPeekUDP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0083 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0084 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0084 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestNotify \tstdapis\tsocket.ini Section_TestSelect +RUN_TEST_STEP !Result=0 15 tsocket TestNotify \tstdapis\tsocket.ini Section_TestSelect END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0084 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0085 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0085 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestNotify \tstdapis\tsocket.ini Section_TestIoctl +RUN_TEST_STEP !Result=0 15 tsocket TestNotify \tstdapis\tsocket.ini Section_TestIoctl END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0085 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0086 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0086 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestGreaterThan16kReadWrite +RUN_TEST_STEP !Result=0 20 tsocket TestGreaterThan16kReadWrite END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0086 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0087 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0087 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestSmallUDP +RUN_TEST_STEP !Result=0 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestSmallUDP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0087 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0088 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0088 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestMediumUDP +RUN_TEST_STEP !Result=0 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestMediumUDP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0088 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0089 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0089 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestLargeUDP +RUN_TEST_STEP !Result=0 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestLargeUDP END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0089 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0090 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0090 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestFionread +RUN_TEST_STEP !Result=0 15 tsocket TestFionread END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0090 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0091 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0091 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestBind1 +RUN_TEST_STEP !Result=0 15 tsocket TestBind1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0091 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0092 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0092 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestConnectNonBlocking +RUN_TEST_STEP !Result=0 20 tsocket TestConnectNonBlocking END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0092 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0093 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0093 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TCP1 +RUN_TEST_STEP !Result=0 5 tsocket TCP1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0093 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0094 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0094 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSendReturnValue +RUN_TEST_STEP !Result=0 5 tsocket TestSendReturnValue END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0094 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0095 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0095 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestV4MappedAddress +RUN_TEST_STEP !Result=0 5 tsocket TestV4MappedAddress END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0095 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0096 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0096 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket ReadTestFailCase +RUN_TEST_STEP !Result=0 15 tsocket ReadTestFailCase END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0096 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0097 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0097 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestNotify1 +RUN_TEST_STEP !Result=0 15 tsocket TestNotify1 END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0097 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0100 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKETHW-0100 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 50 tsocket TestSockFcntl +RUN_TEST_STEP !Result=0 15 tsocket TestSockFcntl END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0100 // To be uncommented when COM-DB is enabled -//RUN_TEST_STEP !Result=0 50 tsocket TestSockIoctl +//RUN_TEST_STEP !Result=0 15 tsocket TestSockIoctl START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00101 -RUN_TEST_STEP !Result=0 50 tsocket SockSendOnClosedConn +RUN_TEST_STEP !Result=0 30 tsocket SockSendOnClosedConn END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00101 - -START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00102 -RUN_TEST_STEP !Result=0 50 tsocket SockWriteOnClosedConn -END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00101 - diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testsocket/src/tsocket.cpp --- a/genericopenlibs/openenvcore/libc/test/testsocket/src/tsocket.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/src/tsocket.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -637,13 +637,6 @@ err = SockSendOnClosedConn(); SetTestStepResult(err ? static_cast(err) : EPass); } - if(TestStepName() == KSockWriteOnClosedConn ) - { - INFO_PRINTF1(_L("SockWriteOnClosedConn():")); - err = SockWriteOnClosedConn(); - SetTestStepResult(err ? static_cast(err) : EPass); - } - return TestStepResult(); diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testsocket/src/tsocketblocks.cpp --- a/genericopenlibs/openenvcore/libc/test/testsocket/src/tsocketblocks.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/src/tsocketblocks.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -5204,100 +5204,6 @@ return ret; } - -void* createNwrite_socket(TAny* aParam) - { - sockaddr_in serv_addr; - int err1; - int ret = 0; - char *msg ="testing socket send"; - int sock_fd; - serv_addr.sin_family = AF_INET; - serv_addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - serv_addr.sin_port = (int)aParam; - sock_fd = socket(AF_INET,SOCK_STREAM,0); - if (sock_fd < 0) - { - ret = -1; - goto close; - } - if (connect(sock_fd,(sockaddr*)&serv_addr,sizeof(serv_addr)) < 0) - { - ret = -1; - goto close; - } - sleep(5); - err1 = write(sock_fd, msg, strlen(msg)+1); - if(err1 < 0) - { - ret = -1; - goto close; - } - sleep(5); - err1 = write(sock_fd, msg,strlen(msg)+1); - if(err1 == -1 ) - { - printf("write() failed returned errno = %d", errno); - } - else - { - ret = -1; - } - close: - close(sock_fd); - return (void*)ret; - - } -TInt CTestSocket::SockWriteOnClosedConn() - { - - int sock_fd,newsock_fd; - unsigned int addr_len; - sockaddr_in serv_addr,new_socket; - TInt ret = KErrNone; - int threadRetVal = 0; - void *threadRetValPtr = (void*)&threadRetVal; - sock_fd = socket(AF_INET,SOCK_STREAM,0); - if (sock_fd < 0) - { - return KErrSocket; - } - serv_addr.sin_family = AF_INET; - serv_addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - serv_addr.sin_port = htons(12350); - pthread_t clientThread; - if (bind(sock_fd,(sockaddr*)&serv_addr,sizeof(serv_addr)) < 0) - { - INFO_PRINTF2(_L("bind return with errno = %d"), errno); - return KErrBind; - } - if(-1 == listen(sock_fd, 1)) - { - printf("error listen failed"); - close(sock_fd); - return -1; - } - pthread_create(&clientThread, NULL, &createNwrite_socket, (void*)(serv_addr.sin_port)); - addr_len = sizeof(new_socket); - newsock_fd = accept(sock_fd,(sockaddr*)&new_socket,&addr_len); - if (errno != 0 ) - { - INFO_PRINTF2(_L("Accept return with errno = %d"), errno); - ret = -1; - } - - close(newsock_fd); - close(sock_fd); - pthread_join(clientThread, &threadRetValPtr ); - if (threadRetVal < 0) - { - INFO_PRINTF1(_L("SockWriteOnClosedConn failed")); - ret = threadRetVal; - } - return ret; - } - - // ========================== OTHER EXPORTED FUNCTIONS ========================= // None diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testsocket/src/tsocketserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testsocket/src/tsocketserver.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/src/tsocketserver.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -455,10 +455,6 @@ { testStep = new CTestSocket(aStepName); } - if(aStepName == KSockWriteOnClosedConn ) - { - testStep = new CTestSocket(aStepName); - } return testStep; } diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest.bat --- a/genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest.bat Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest.bat Wed Oct 13 16:27:53 2010 +0300 @@ -15,5 +15,4 @@ @rem copy \epoc32\release\WINSCW\udeb\greaterthan16kreadwriteserver.exe \epoc32\release\WINSCW\udeb\Z\sys\bin\greaterthan16kreadwriteserver.exe -copy \epoc32\release\WINSCW\urel\greaterthan16kreadwriteserver.exe \epoc32\release\WINSCW\urel\Z\sys\bin\greaterthan16kreadwriteserver.exe -CED -i C:\tstdapis\gosethernetced.xml \ No newline at end of file +copy \epoc32\release\WINSCW\urel\greaterthan16kreadwriteserver.exe \epoc32\release\WINSCW\urel\Z\sys\bin\greaterthan16kreadwriteserver.exe \ No newline at end of file diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest_hw.bat --- a/genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest_hw.bat Wed Sep 15 14:02:55 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -CED -i z:\tstdapis\gosethernetced.xml \ No newline at end of file diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/test/utils/OEtests_hw.bat --- a/genericopenlibs/openenvcore/test/utils/OEtests_hw.bat Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/test/utils/OEtests_hw.bat Wed Oct 13 16:27:53 2010 +0300 @@ -26,8 +26,6 @@ copy z:\tstdapis\data.txt c:\data.txt copy z:\tstdapis\10202be9\*.* c:\private\10202be9\ copy z:\input c:\data\input - -CED -i z:\tstdapis\gosethernetced.xml testexecute z:\tstdapis\tprogname.script testexecute z:\tstdapis\tlibcwchar.script @@ -162,4 +160,3 @@ del e:\sys$rom.zip del c:\logs\testexecute\TestResults.htm copy c:\logs\testexecute\*.* e:\ -copy c:\ced.log e:\ diff -r c44f36bb61a3 -r 254b651f304e genericopenlibs/openenvcore/test/utils/new_tests.txt --- a/genericopenlibs/openenvcore/test/utils/new_tests.txt Wed Sep 15 14:02:55 2010 +0300 +++ b/genericopenlibs/openenvcore/test/utils/new_tests.txt Wed Oct 13 16:27:53 2010 +0300 @@ -4,7 +4,7 @@ # Configuration 1 -testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 6000, UDEB,\epoc32\winscw\c\tstdapis\tsockettest.bat, +testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 800, UDEB,\epoc32\winscw\c\tstdapis\tsockettest.bat, # testexecute, \logs\testexecute\twaitsignal.htm,, c:\tstdapis\twaitsignal.script, 3100, UDEB,\epoc32\winscw\c\tstdapis\waitsignalsettings.bat, # testexecute, \logs\testexecute\twaitsignal1.htm,, c:\tstdapis\twaitsignal1.script, 4630, UDEB,\epoc32\winscw\c\tstdapis\waitsignalsettings.bat, @@ -22,7 +22,7 @@ testexecute, \logs\testexecute\tsyscallsfcntl.htm,, c:\tstdapis\tsyscallsfcntl.script, 200, UDEB,, testexecute, \logs\testexecute\tsyscalls1.htm,, c:\tstdapis\tsyscalls1.script, 400, UDEB,, testexecute, \logs\testexecute\tsyscalls2.htm,, c:\tstdapis\tsyscalls2.script, 400, UDEB,, -testexecute, \logs\testexecute\tifioctls.htm,, c:\tstdapis\tifioctls.script, 1200, UDEB,\epoc32\winscw\c\tstdapis\tifioctlstest.bat, +testexecute, \logs\testexecute\tifioctls.htm,, c:\tstdapis\tifioctls.script, 1200, UDEB,, testexecute, \logs\testexecute\tstdlib.htm,, c:\tstdapis\tstdlib.script, 1200, UDEB,\epoc32\winscw\c\tstdapis\stdlibsettings.bat, testexecute, \logs\testexecute\tstdio_auto.htm,, c:\tstdapis\tstdio_auto.script, 5400, UDEB,, testexecute, \logs\testexecute\tstdio_filemode.htm,, c:\tstdapis\tstdio_filemode.script, 50, UDEB,, @@ -103,7 +103,7 @@ # UREL TEsts -testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 6000, UREL,\epoc32\winscw\c\tstdapis\tsockettest.bat, +testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 800, UREL,\epoc32\winscw\c\tstdapis\tsockettest.bat, # testexecute, \logs\testexecute\twaitsignal.htm,, c:\tstdapis\twaitsignal.script, 3100, UREL,\epoc32\winscw\c\tstdapis\waitsignalsettings.bat, # testexecute, \logs\testexecute\twaitsignal1.htm,, c:\tstdapis\twaitsignal1.script, 4630, UREL,\epoc32\winscw\c\tstdapis\waitsignalsettings.bat, @@ -122,7 +122,7 @@ testexecute, \logs\testexecute\tsyscallsfcntl.htm,, c:\tstdapis\tsyscallsfcntl.script, 200, UREL,, testexecute, \logs\testexecute\tsyscalls1.htm,, c:\tstdapis\tsyscalls1.script, 400, UREL,, testexecute, \logs\testexecute\tsyscalls2.htm,, c:\tstdapis\tsyscalls2.script, 400, UREL,, -testexecute, \logs\testexecute\tifioctls.htm,, c:\tstdapis\tifioctls.script, 1200, UREL,\epoc32\winscw\c\tstdapis\tifioctlstest.bat, +testexecute, \logs\testexecute\tifioctls.htm,, c:\tstdapis\tifioctls.script, 1200, UREL,, testexecute, \logs\testexecute\tstdlib.htm,, c:\tstdapis\tstdlib.script, 1200, UREL,, testexecute, \logs\testexecute\tstdio_auto.htm,, c:\tstdapis\tstdio_auto.script, 5400, UREL,, testexecute, \logs\testexecute\tstdio_filemode.htm,, c:\tstdapis\tstdio_filemode.script, 50, UREL,, diff -r c44f36bb61a3 -r 254b651f304e genericservices/httputils/group/INetProtUtil.iby --- a/genericservices/httputils/group/INetProtUtil.iby Wed Sep 15 14:02:55 2010 +0300 +++ b/genericservices/httputils/group/INetProtUtil.iby Wed Oct 13 16:27:53 2010 +0300 @@ -17,7 +17,7 @@ #ifndef __INETPROTUTIL_IBY__ #define __INETPROTUTIL_IBY__ -file=ABI_DIR\BUILD_DIR\inetprotutil.dll System\Libs\INetProtUtil.dll +file=ABI_DIR\BUILD_DIR\INetProtUtil.dll System\Libs\INetProtUtil.dll #endif diff -r c44f36bb61a3 -r 254b651f304e genericservices/taskscheduler/SCHSVR/SchTimer.cpp --- a/genericservices/taskscheduler/SCHSVR/SchTimer.cpp Wed Sep 15 14:02:55 2010 +0300 +++ b/genericservices/taskscheduler/SCHSVR/SchTimer.cpp Wed Oct 13 16:27:53 2010 +0300 @@ -404,7 +404,6 @@ CPropertyNotifier::~CPropertyNotifier() { Cancel(); - iProperty.Close(); } void CPropertyNotifier::AttachL() @@ -417,10 +416,7 @@ void CPropertyNotifier::SetPropertyL(const TUid& aCategory, TUint aKey) { if (IsActive()) - { Cancel(); - iProperty.Close(); - } iCategory = aCategory; iKey = aKey; AttachL(); diff -r c44f36bb61a3 -r 254b651f304e lowlevellibsandfws/apputils/group/bafl.iby --- a/lowlevellibsandfws/apputils/group/bafl.iby Wed Sep 15 14:02:55 2010 +0300 +++ b/lowlevellibsandfws/apputils/group/bafl.iby Wed Oct 13 16:27:53 2010 +0300 @@ -21,9 +21,9 @@ file=ABI_DIR\BUILD_DIR\baksrv.dll System\Libs\baksrv.dll file=ABI_DIR\BUILD_DIR\baksrvs.exe System\Programs\baksrvs.exe -data=ZPRIVATE\100048aa\backup_registration.xml private\100048aa\backup_registration.xml +data=ZPRIVATE\100048AA\backup_registration.xml private\100048aa\backup_registration.xml -#include "initialiselocale.iby" +#include "initialiseLocale.iby" #include #include diff -r c44f36bb61a3 -r 254b651f304e lowlevellibsandfws/pluginfw/Framework/MMPFiles/errorrsc.mmp --- a/lowlevellibsandfws/pluginfw/Framework/MMPFiles/errorrsc.mmp Wed Sep 15 14:02:55 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/MMPFiles/errorrsc.mmp Wed Oct 13 16:27:53 2010 +0300 @@ -23,7 +23,7 @@ // generated for the system error // resolver, // must eventually end up in Z:\System\Errors SOURCEPATH ../../Framework/frame -START RESOURCE ecomerr.rss +START RESOURCE EComErr.rss TARGETPATH /resource/errors diff -r c44f36bb61a3 -r 254b651f304e lowlevellibsandfws/pluginfw/Group/ECom.iby --- a/lowlevellibsandfws/pluginfw/Group/ECom.iby Wed Sep 15 14:02:55 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Group/ECom.iby Wed Oct 13 16:27:53 2010 +0300 @@ -23,16 +23,16 @@ #define __ECOM_IBY__ // Make sure the error strings appear in the ROM -data=MULTI_LINGUIFY(RSC ZRESOURCE\errors\ecomerr Resource\Errors\ecomerr) +data=MULTI_LINGUIFY(RSC ZRESOURCE\Errors\ECOMERR Resource\Errors\ecomerr) // Framework Components -file=ABI_DIR\BUILD_DIR\ecom.dll System\Libs\ECom.dll -file=ABI_DIR\BUILD_DIR\ecomserver.exe System\Libs\EComServer.exe -file=ABI_DIR\BUILD_DIR\ecompatchdata.dll System\Libs\EComPatchData.dll +file=ABI_DIR\BUILD_DIR\ECOM.dll System\Libs\ECom.dll +file=ABI_DIR\BUILD_DIR\ECOMSERVER.exe System\Libs\EComServer.exe +file=ABI_DIR\BUILD_DIR\EComPatchData.dll System\Libs\EComPatchData.dll // // ECOM uses a custom scheme to do patchable constants. Licensees are instructed to -// edit EPOCROOT##epoc32\rom\include\ecompatchconstants.hby if they want to patch anyone of +// edit \epoc32\rom\include\ecompatchconstants.hby if they want to patch anyone of // the patchable constants below. Direct use of the patchdata command outside here // is not supported because ECOM may change which binaries need the patches. //