# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282206825 -10800 # Node ID 4332f0f7be537f897c1ce54ab812253896111619 # Parent 9d9daa0f4b62cc446919a0203a47bebc915a38a1 Revision: 201021 Kit: 201033 diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/cppstdlib/bwins/libstdcppv5u.def --- a/genericopenlibs/cppstdlib/bwins/libstdcppv5u.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/cppstdlib/bwins/libstdcppv5u.def Thu Aug 19 11:33:45 2010 +0300 @@ -461,4 +461,6 @@ ?what@__Named_exception@std@@UBEPBDXZ @ 460 NONAME ; char const * std::__Named_exception::what(void) const ?xalloc@ios_base@std@@SAHXZ @ 461 NONAME ; int std::ios_base::xalloc(void) ?nothrow@std@@3Unothrow_t@1@B @ 462 NONAME ; struct std::nothrow_t const std::nothrow - + ?backend_allocate@@YAPAXI@Z @ 463 NONAME ; void * backend_allocate(unsigned int) + ?backend_free@@YAXPAX@Z @ 464 NONAME ; void backend_free(void *) + diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def --- a/genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def Thu Aug 19 11:33:45 2010 +0300 @@ -776,5 +776,6 @@ _ZNK9stlp_priv9_Messages6do_getEiiiRKSs @ 775 NONAME _ZNK9stlp_priv9_Messages7do_openERKSsRKSt6locale @ 776 NONAME _ZNK9stlp_priv9_Messages8do_closeEi @ 777 NONAME - + _Z12backend_freePv @ 778 NONAME + _Z16backend_allocatej @ 779 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/cppstdlib/eabi/libstdcppv5u.def --- a/genericopenlibs/cppstdlib/eabi/libstdcppv5u.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/cppstdlib/eabi/libstdcppv5u.def Thu Aug 19 11:33:45 2010 +0300 @@ -776,5 +776,6 @@ _ZNK9stlp_priv9_Messages6do_getEiiiRKSs @ 775 NONAME _ZNK9stlp_priv9_Messages7do_openERKSsRKSt6locale @ 776 NONAME _ZNK9stlp_priv9_Messages8do_closeEi @ 777 NONAME + _Z12backend_freePv @ 778 NONAME + _Z16backend_allocatej @ 779 NONAME - diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/cppstdlib/group/libstdcpp.mmp --- a/genericopenlibs/cppstdlib/group/libstdcpp.mmp Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/cppstdlib/group/libstdcpp.mmp Thu Aug 19 11:33:45 2010 +0300 @@ -88,6 +88,7 @@ LIBRARY libpthread.lib LIBRARY libm.lib LIBRARY euser.lib +LIBRARY backend.lib // TODO: temporarily adding. A problem with SBSv2 in adding stdnew automatically? #ifndef WINSCW LIBRARY stdnew.lib @@ -98,7 +99,7 @@ OPTION ARMCC --diag_remark 3017 #else #ifdef ARMCC_2_2 - DEFFILE ../eabi/libstdcpp_rvct2_2.def +DEFFILE ../eabi/libstdcpp_rvct2_2.def #endif #endif diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/cppstdlib/stl/src/allocators.cpp --- a/genericopenlibs/cppstdlib/stl/src/allocators.cpp Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/src/allocators.cpp Thu Aug 19 11:33:45 2010 +0300 @@ -39,6 +39,7 @@ #include "lock_free_slist.h" + #if defined(__SYMBIAN32__WSD__) #include "libstdcppwsd.h" @@ -52,8 +53,47 @@ #define _S_free_per_thread_states get_S_free_per_thread_states() #define _S_key get_S_key() #define _S_key_initialized get_S_key_initialized() +#endif + +#ifdef __SYMBIAN32__ +extern "C" +{ +IMPORT_C void* BackendAlloc(size_t ); +IMPORT_C void BackendFree(void* ); +} +EXPORT_C void* backend_allocate(size_t __n) + { + for (;;) + { + void* p = BackendAlloc(__n); + + if (p) + { + return p; + } + + // set_new_handler uses Dll::Tls. So only this threads new handler will be changed + // for the time it is set back. No problems for other threads. + std::new_handler nh_func = std::set_new_handler(NULL); + std::set_new_handler(nh_func); + + if (nh_func) + { + nh_func(); + } + else + { + __THROW(std::bad_alloc()); + } + } + } + +EXPORT_C void backend_free(void* __p) + { + BackendFree(__p); + } #endif #if defined (__WATCOMC__) @@ -84,8 +124,13 @@ inline void* __stlp_chunk_malloc(size_t __bytes) { _STLP_CHECK_NULL_ALLOC(_STLP_VENDOR_CSTD::malloc(__bytes)); } inline void __stlp_chunck_free(void* __p) { _STLP_VENDOR_CSTD::free(__p); } # else -inline void* __stlp_chunk_malloc(size_t __bytes) { return _STLP_STD::__stl_new(__bytes); } -inline void __stlp_chunck_free(void* __p) { _STLP_STD::__stl_delete(__p); } +inline void* __stlp_chunk_malloc(size_t __bytes) { + return _STLP_STD::__stl_new(__bytes); +} +inline void __stlp_chunck_free(void* __p) { + _STLP_STD::__stl_delete(__p); +} + # endif #endif // !_DEBUG @@ -173,7 +218,13 @@ #define _STLP_NFREELISTS 16 -#if defined (_STLP_LEAKS_PEDANTIC) && defined (_STLP_USE_DYNAMIC_LIB) +/* + * On Symbian, the stlport is built as a dll and also dynamically linked against + * by the applications. The _STLP_USE_DYNAMIC_LIB should always be defined. + * _STLP_LEAKS_PEDANTIC is defined to prevent the memory leaks in __node_alloc + * when the library is dynamically loaded and unloaded. + */ +#if defined (_STLP_LEAKS_PEDANTIC) && ( defined (_STLP_USE_DYNAMIC_LIB) || defined (__SYMBIAN32__) ) /* * We can only do cleanup of the node allocator memory pool if we are * sure that the STLport library is used as a shared one as it guaranties @@ -324,6 +375,7 @@ #endif /* _STLP_DO_CLEAN_NODE_ALLOC */ public: + /* __n must be > 0 */ static void* _M_allocate(size_t& __n); /* __p may not be 0 */ @@ -336,6 +388,7 @@ #if !defined (_STLP_USE_LOCK_FREE_IMPLEMENTATION) void* __node_alloc_impl::_M_allocate(size_t& __n) { + __n = _S_round_up(__n); _Obj * _STLP_VOLATILE * __my_free_list = _S_free_list + _S_FREELIST_INDEX(__n); _Obj *__r; @@ -358,6 +411,7 @@ } void __node_alloc_impl::_M_deallocate(void *__p, size_t __n) { + _Obj * _STLP_VOLATILE * __my_free_list = _S_free_list + _S_FREELIST_INDEX(__n); _Obj * __pobj = __STATIC_CAST(_Obj*, __p); @@ -498,7 +552,8 @@ _S_chunks = 0; _S_start_free = _S_end_free = 0; _S_heap_size = 0; - memset(__REINTERPRET_CAST(char*, &_S_free_list[0]), 0, _STLP_NFREELISTS * sizeof(_Obj*)); + // Reinterprest cast cant remove volatileness. So using C style cast + memset((char*)(&_S_free_list[0]), 0, _STLP_NFREELISTS * sizeof(_Obj*)); } # endif /* _STLP_DO_CLEAN_NODE_ALLOC */ @@ -714,7 +769,9 @@ #if defined (_STLP_DO_CLEAN_NODE_ALLOC) struct __node_alloc_cleaner { ~__node_alloc_cleaner() - { __node_alloc_impl::_S_dealloc_call(); } + { + __node_alloc_impl::_S_dealloc_call(); + } }; # if defined (_STLP_USE_LOCK_FREE_IMPLEMENTATION) diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/cppstdlib/stl/stlport/stl/_new.h --- a/genericopenlibs/cppstdlib/stl/stlport/stl/_new.h Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_new.h Thu Aug 19 11:33:45 2010 +0300 @@ -16,6 +16,7 @@ #ifndef _STLP_INTERNAL_NEW #define _STLP_INTERNAL_NEW + #ifndef _STLP_INTERNAL_CSTDDEF // size_t # include @@ -138,14 +139,34 @@ # define _STLP_CHECK_NULL_ALLOC(__x) return __x # endif +#ifdef __SYMBIAN32__ +IMPORT_C void* backend_allocate(size_t); +IMPORT_C void backend_free(void*); +#endif + + _STLP_BEGIN_NAMESPACE # if ((defined (__IBMCPP__) || defined (__OS400__) || defined (__xlC__) || defined (qTidyHeap)) && defined (__DEBUG_ALLOC__)) inline void* _STLP_CALL __stl_new(size_t __n) { _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n, __FILE__, __LINE__)); } inline void _STLP_CALL __stl_delete(void* __p) { ::operator delete(__p, __FILE__, __LINE__); } # else -inline void* _STLP_CALL __stl_new(size_t __n) { _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n)); } -inline void _STLP_CALL __stl_delete(void* __p) { ::operator delete(__p); } +inline void* _STLP_CALL __stl_new(size_t __n) + { +#ifdef __SYMBIAN32__ + return backend_allocate(__n); +#else + _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n)); +#endif + } +inline void _STLP_CALL __stl_delete(void* __p) + { +#ifdef __SYMBIAN32__ + backend_free(__p); +#else + ::operator delete(__p); +#endif + } # endif _STLP_END_NAMESPACE diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/cppstdlib/stl/stlport/stl/config/host.h --- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/host.h Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/host.h Thu Aug 19 11:33:45 2010 +0300 @@ -109,9 +109,9 @@ * its internal memory pool but only if STLport is used as a dynamic library * under Win32 (using MSVC like compilers). */ -/* + #define _STLP_LEAKS_PEDANTIC 1 -*/ + /* * Uncomment _STLP_USE_NEWALLOC to force allocator to use plain "new" diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/bwins/backendu.def --- a/genericopenlibs/openenvcore/backend/bwins/backendu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/bwins/backendu.def Thu Aug 19 11:33:45 2010 +0300 @@ -170,4 +170,4 @@ _memcpy_r @ 169 NONAME _memmove_r @ 170 NONAME _lstat_r @ 171 NONAME - + _unsetdefaultif_r @ 172 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def --- a/genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def Thu Aug 19 11:33:45 2010 +0300 @@ -170,4 +170,4 @@ _memcpy_r @ 169 NONAME _memmove_r @ 170 NONAME _lstat_r @ 171 NONAME - + _unsetdefaultif_r @ 172 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/bwins/old_backendu.def --- a/genericopenlibs/openenvcore/backend/bwins/old_backendu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/bwins/old_backendu.def Thu Aug 19 11:33:45 2010 +0300 @@ -170,4 +170,4 @@ _memcpy_r @ 169 NONAME _memmove_r @ 170 NONAME _lstat_r @ 171 NONAME - + _unsetdefaultif_r @ 172 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/eabi/backendu.def --- a/genericopenlibs/openenvcore/backend/eabi/backendu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/eabi/backendu.def Thu Aug 19 11:33:45 2010 +0300 @@ -174,4 +174,4 @@ _memcpy_r @ 173 NONAME _memmove_r @ 174 NONAME _lstat_r @ 175 NONAME - + _unsetdefaultif_r @ 176 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def --- a/genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def Thu Aug 19 11:33:45 2010 +0300 @@ -174,4 +174,4 @@ _memcpy_r @ 173 NONAME _memmove_r @ 174 NONAME _lstat_r @ 175 NONAME - + _unsetdefaultif_r @ 176 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/eabi/old_backendu.def --- a/genericopenlibs/openenvcore/backend/eabi/old_backendu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/eabi/old_backendu.def Thu Aug 19 11:33:45 2010 +0300 @@ -174,4 +174,4 @@ _memcpy_r @ 173 NONAME _memmove_r @ 174 NONAME _lstat_r @ 175 NONAME - + _unsetdefaultif_r @ 176 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/inc/fdesc.h --- a/genericopenlibs/openenvcore/backend/inc/fdesc.h Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/inc/fdesc.h Thu Aug 19 11:33:45 2010 +0300 @@ -22,6 +22,7 @@ #define _FDESC_H #include +#include #include #include #include @@ -64,6 +65,22 @@ #endif //SYMBIAN_OE_LARGE_FILE_SUPPORT && !SYMBIAN_OE_NO_LFS +// Atomic socket operations support + +#define ATOMICSOCKETOP(realcall,on_error) \ + { \ + if (__e32_atomic_tau_ord32((void *)&iCount, 0x8000, 0, 1) >= 0x8000) \ + { \ + on_error; \ + } \ + else \ + { \ + realcall; \ + __e32_atomic_tas_ord32((void *)&iCount, 0, -1, 0); \ + } \ + } + +#define NOP //Enumarations for Polling enum TPollMode @@ -511,10 +528,20 @@ iIoctlLock.Signal(); return iSelectEvents(); } - inline int CreateLock() + + inline TInt CreateLock() { - return (iIoctlLock.CreateLocal(1)|| iReadLock.CreateLocal() || iWriteLock.CreateLocal()); + TInt err = iIoctlLock.CreateLocal(1) || iReadLock.CreateLocal() || iWriteLock.CreateLocal(); + if (err != KErrNone) + { + // closes on unopened handles are safe + iIoctlLock.Close(); + iReadLock.Close(); + iWriteLock.Close(); + } + return err; } + inline RSemaphore& GetIoctlLock() { return iIoctlLock; @@ -531,9 +558,9 @@ protected: //rearrange these - CSockDescBase():iAddrFamily(-1),iProtocol(KUndefinedProtocol),iIoctlFlag(EFalse) + CSockDescBase():iAddrFamily(-1),iProtocol(KUndefinedProtocol),iIoctlFlag(EFalse),iCount(0) { - + } RSocket iSocket; TSockXfrLength iLength; @@ -545,8 +572,10 @@ // For preventing simultaneous ioctl calls. // No native support. RSemaphore iIoctlLock; + // Is this required? TBool iIoctlFlag; - + // Safeguard against issue of a second Read/Write request while the first is pending. + // The iReadLock also guards OpenUsingPreference //For locking the descriptor before any operation. //To make it thread safe. RFastLock iReadLock; @@ -555,6 +584,7 @@ //Flag to mark the connect status of a non-blocking socket as "in progress" //to prevent duplicate connection request TBool iConnectInProgress; + volatile TInt iCount; protected: inline TInt isStream() const // inline, but private @@ -659,6 +689,22 @@ TInt GetInterfaceDetails( void *aParam ,TInt aFlag, TInt aType ); TInt SetInterafceParamInfo( void *aParam,TInt aType); TInt SetInterfaceDetails( void *aParam ,TInt aFlag, TInt aType ); + + TInt maybe_reopen_socket() + { + TInt err = KErrNone; + if (!__e32_atomic_load_acq32(&iSocketPtr)) + { + iReadLock.Wait(); + if (!iSocketPtr) + { + err = OpenUsingPreference(); + } + iReadLock.Signal(); + } + return err; + } + enum InterfaceType { EACCESS_POINT, diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/inc/sysif.h --- a/genericopenlibs/openenvcore/backend/inc/sysif.h Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/inc/sysif.h Thu Aug 19 11:33:45 2010 +0300 @@ -114,7 +114,7 @@ */ { public: - void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock) + void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock,RFastLock* aDefConnLock,RFastLock* aAESelectLock) { iHeap = aHeap; iFs = aFs; @@ -122,6 +122,8 @@ iCs = aCs; iSsLock = aSsLock; iCsLock = aCsLock; + iDefConnLock = aDefConnLock; + iAESelectLock = aAESelectLock; } ~TCLSICleanup() @@ -132,6 +134,8 @@ iCs->Close(); iCsLock->Close(); iHeap->Close(); + iDefConnLock->Close(); + iAESelectLock->Close(); } private: RHeap* iHeap; @@ -140,6 +144,8 @@ RCommServ* iCs; RFastLock* iSsLock; RFastLock* iCsLock; + RFastLock* iDefConnLock; + RFastLock* iAESelectLock; }; @@ -506,7 +512,7 @@ int aselect(int maxfd, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, struct timeval *tvptr, TRequestStatus* requeststatus,int& anErrno); - int cancelaselect(TRequestStatus* requeststatus,int& anErrno,int performcleanup = 0); + int cancelaselect(TRequestStatus* requeststatus, int& anErrno, TBool perform_cleanup = EFalse); int eselect(int maxfd, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, struct timeval *tvptr, int arraycount,TRequestStatus* waitarray,int& anErrno); @@ -552,6 +558,7 @@ //Set the default interface for network operations int setdefaultif(const struct ifreq* aIfReq); + int unsetdefaultif(TBool allow_bringup = ETrue); IMPORT_C CFileDescBase* GetDesc(int aFid); @@ -669,6 +676,10 @@ RConnection iDefConnection; //Protect the iDefConnection from concurrent GetDefaultConnection calls RFastLock iDefConnLock; + //Calling unsetdefaultif(), instead of setdefaultif(NULL) ensures that the torn down + //connection is not brought back up again, by subsequent socket/network calls. + //This variable enables this facility. It is reset to default (ETrue) by setdefaultif() + TBool iDefConnResurrect; //Lock for protecting iASelectRequest across threads RFastLock iASelectLock; diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/inc/sysreent.h --- a/genericopenlibs/openenvcore/backend/inc/sysreent.h Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/inc/sysreent.h Thu Aug 19 11:33:45 2010 +0300 @@ -243,6 +243,7 @@ struct ifreq; IMPORT_C int _setdefaultif_r(int *aErrno, const struct ifreq* aIfReq); +IMPORT_C int _unsetdefaultif_r(int *aErrno); IMPORT_C void *_memcpy_r(void *dst0, const void *src0, size_t length); IMPORT_C void *_memmove_r(void *dst0, const void *src0, size_t length); diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/src/corebackend/fdesc.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/fdesc.cpp Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/fdesc.cpp Thu Aug 19 11:33:45 2010 +0300 @@ -333,7 +333,7 @@ if (!socketBase) { err=KErrNoMemory; - return 0; + return NULL; } err = socketBase->Socket(aSs,family,style,protocol); diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Thu Aug 19 11:33:45 2010 +0300 @@ -82,7 +82,7 @@ // Construction of Backend Object which is going to be singleton object for the process EXPORT_C CLocalSystemInterface::CLocalSystemInterface() : iOpenDirList(CLocalSystemInterface::KDirGran), -iTLDInfoList(CLocalSystemInterface::KTLDInfoListGran), iDefConnPref(NULL) +iTLDInfoList(CLocalSystemInterface::KTLDInfoListGran), iDefConnResurrect(ETrue), iDefConnPref(NULL) { #ifdef SYMBIAN_OE_POSIX_SIGNALS iSignalsInitialized = EFalse; @@ -183,7 +183,7 @@ User::Panic(KEstlibInit, err); } - iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock); + iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock,&iDefConnLock,&iASelectLock); } @@ -194,10 +194,6 @@ { iTLDListLock.Close(); iSessionPathLock.Close(); - // Close the aselect lock - iASelectLock.Close(); - // Close the default connection lock - iDefConnLock.Close(); //close the default RConnection if(iDefConnection.SubSessionHandle() != 0) @@ -1588,37 +1584,50 @@ if(!err) { - // Check if a connection request is already in progress - // for a non-blocking socket. - if(f->GetConnectionProgress()) + // Check if a connection request is already in progress for a non-blocking socket. + if (f->GetConnectionProgress()) { - // Poll to see if the connect() is completed - err = f->Poll( EReadyForWriting ); - - // The above Poll is common for all descriptors. - // In case of socket-descriptors, Poll will either return "KErrNone" - // or any of the requested events. To check for Poll error in case of - // socket-descriptors, "iPollErr" should be checked. - if( (err < 0) || (f->iPollErr < 0) ) //Error in poll - (err < 0) ? (mapErr = err):(mapErr = f->iPollErr); - else if( err == 0 ) //Connect still in progress - mapErr = EALREADY; - else if( err & EReadyForWriting ) //Connect has completed - f->SetConnectionProgress(EFalse); + mapErr = f->iPollErr; + + if (f->iPollErr < 0) + { + mapErr = f->iPollErr; + f->iPollErr = 0; + f->SetConnectionProgress(EFalse); + } + else + { + // Poll to see if the connect() is completed + err = f->Poll(EReadyForWriting); + // The above Poll is common for all descriptors. + // In case of socket-descriptors, Poll will either return "KErrNone" + // or any of the requested events. To check for Poll error in case of + // socket-descriptors, "iPollErr" should be checked. + if (f->iPollErr < 0) + { + mapErr = f->iPollErr; + f->iPollErr = 0; + } + else if (err == 0) //Connect still in progress + mapErr = EALREADY; + else if (err & EReadyForWriting) + { + mapErr = EISCONN; + } + } } if(!mapErr) { TRequestStatus status; f->Connect(addr,size,status); - err=status.Int(); + err = status.Int(); if (err == KErrWouldBlock) { - f->SetConnectionProgress(ETrue); mapErr = EINPROGRESS; } - else if(err == KErrAlreadyExists) + else if (err == KErrAlreadyExists) { mapErr = EISCONN; } @@ -1786,26 +1795,25 @@ // CLocalSystemInterface::aselect // ----------------------------------------------------------------------------- // -int CLocalSystemInterface::cancelaselect(TRequestStatus* requeststatus,int& anErrno,int performcleanup) +int CLocalSystemInterface::cancelaselect(TRequestStatus* requeststatus, int& anErrno, TBool perform_cleanup) { iASelectLock.Wait(); // Search for the aselect request entry in the aselect request array - for ( TInt i=0; iTweakReadyEvents((*reqarray[i]).Int()); - if (readfds && FD_ISSET(reqfds[i], readfds) && (readyevents & EReadyForReading) ) + TInt event_marked = EFalse; + if (readfds && FD_ISSET(reqfds[i], readfds) && (readyevents & EReadyForReading)) { FD_SET(reqfds[i], &retreadfds); - ++nDescriptorsSet; + ++nDescriptorsSet; + event_marked = ETrue; + } if(writefds && FD_ISSET(reqfds[i], writefds) && (readyevents & EReadyForWriting) ) { FD_SET(reqfds[i], &retwritefds); + + event_marked = ETrue; ++nDescriptorsSet; } if(exceptfds && FD_ISSET(reqfds[i], exceptfds) && (readyevents & EAnyException)) { + if (!fdesc->GetConnectionProgress() || !event_marked) + { FD_SET(reqfds[i], &retexceptfds); ++nDescriptorsSet; + } } } else @@ -3771,8 +3780,8 @@ // ----------------------------------------------------------------------------- // CLocalSystemInterface::StartDefConnection // -// Helper function for the setdefaultif() API to restart the -// default RConnection with the new settings. +// Helper function for the setdefaultif() API to start the +// default RConnection with/without preferences // ----------------------------------------------------------------------------- // TInt CLocalSystemInterface::StartDefConnection() @@ -3794,6 +3803,42 @@ return err; } +TInt CLocalSystemInterface::unsetdefaultif(TBool allow_bringup) + { + iDefConnLock.Wait(); + if (iDefConnection.SubSessionHandle() != 0) + { + TUint count = iSocketArray.Count(); + for (TInt i = 0; i < count; ++i) + { + iSocketArray[i]->TempClose(); + } + iDefConnection.Close(); + } + + RHeap* oheap = User::SwitchHeap(iPrivateHeap); + iSocketArray.Reset(); + + if (iDefConnPref) + { + if (iDefConnPref->ExtensionId() == TConnPref::EConnPrefSnap) + { + delete (TCommSnapPref*)iDefConnPref; + } + else + { + delete (TCommDbConnPref*)iDefConnPref; + } + } + User::SwitchHeap(oheap); + + iDefConnPref = NULL; + iDefConnResurrect = allow_bringup; + iDefConnLock.Signal(); + return KErrNone; + } + + // ----------------------------------------------------------------------------- // CLocalSystemInterface::setdefaultif // @@ -3802,147 +3847,78 @@ // int CLocalSystemInterface::setdefaultif(const struct ifreq* aIfReq) { - //If the argument is NULL, close the existing connection - if(aIfReq == NULL ) - { - // Obtain lock on the iDefConnection - iDefConnLock.Wait(); - - if (iDefConnection.SubSessionHandle() != 0) + // Do this in any case - whether the argument be a valid pref or NULL + iDefConnResurrect = ETrue; + + // If the argument is NULL, tear down existing connection + if (aIfReq == NULL) { - TUint count = iSocketArray.Count(); - for (TInt i = 0; i < count; ++i) - { - iSocketArray[i]->TempClose(); - } - iDefConnection.Close(); - RHeap* oheap = User::SwitchHeap(iPrivateHeap); - iSocketArray.Reset(); - User::SwitchHeap(oheap); - } - - if( iDefConnPref ) - { - switch( iDefConnPref->ExtensionId() ) - { - case TConnPref::EConnPrefSnap: - { - RHeap* oldHeap = User::SwitchHeap(iPrivateHeap); - delete (TCommSnapPref*)iDefConnPref; - // Switch back to old heap - User::SwitchHeap(oldHeap); - iDefConnPref = NULL; - } - break; - - case TConnPref::EConnPrefCommDb: - { - RHeap* oldHeap = User::SwitchHeap(iPrivateHeap); - delete (TCommDbConnPref*)iDefConnPref; - // Switch back to old heap - User::SwitchHeap(oldHeap); - iDefConnPref = NULL; - } - break; - - default: - { - iDefConnLock.Signal(); - // Unknown type of Connection Pref - return KErrUnknown; - } - } - } - // Release lock on the iDefConnection - iDefConnLock.Signal(); - return KErrNone; + return unsetdefaultif(); } TPtrC8 namePtr((TText8*)aIfReq->ifr_name); TBuf name; - TInt err = CnvUtfConverter::ConvertToUnicodeFromUtf8(name,namePtr); - if( err != KErrNone ) + + TInt err = CnvUtfConverter::ConvertToUnicodeFromUtf8(name, namePtr); + if (err != KErrNone) return err; - - if( iDefConnPref ) + + if (name.Length() == 0) { - switch( iDefConnPref->ExtensionId() ) + // interface name is an empty string, SNAP id is specified in ifr_ifru.snap_id + if (iDefConnPref && iDefConnPref->ExtensionId() == TConnPref::EConnPrefSnap) { - case TConnPref::EConnPrefSnap: - { - RHeap* oldHeap = User::SwitchHeap(iPrivateHeap); - delete (TCommSnapPref*)iDefConnPref; - // Switch back to old heap - User::SwitchHeap(oldHeap); - iDefConnPref = NULL; - } - break; - - case TConnPref::EConnPrefCommDb: - { - RHeap* oldHeap = User::SwitchHeap(iPrivateHeap); - delete (TCommDbConnPref*)iDefConnPref; - // Switch back to old heap - User::SwitchHeap(oldHeap); - iDefConnPref = NULL; - } - break; - - default: - { - // Unknown type of Connection Pref - return KErrUnknown; - } + ((TCommSnapPref*)iDefConnPref)->SetSnap(aIfReq->ifr_ifru.snap_id); + return KErrNone; } - } - - // If the interface name is an empty string, the SNAP id is to be set - if(name.Length() == 0) - { - // Switch to backend heap + RHeap* oldHeap = User::SwitchHeap(iPrivateHeap); + delete (TCommDbConnPref*)iDefConnPref; // may be a delete(NULL) iDefConnPref = new TCommSnapPref; - // Switch back to old heap User::SwitchHeap(oldHeap); - if( iDefConnPref == NULL ) + + if (!iDefConnPref) { return KErrNoMemory; } - TCommSnapPref* snapprefptr = (TCommSnapPref*)iDefConnPref; - snapprefptr->SetSnap(aIfReq->ifr_ifru.snap_id); + + ((TCommSnapPref*)iDefConnPref)->SetSnap(aIfReq->ifr_ifru.snap_id); return KErrNone; } - else //Set the IAP name + + CTrapCleanup *cleanupStack = NULL; + + // Create a cleanup stack if one doesn't exist + if (User::TrapHandler() == NULL) { - CTrapCleanup *cleanupStack = NULL; - //Create a clean up stack if it is not existing. - if(User::TrapHandler() == NULL) - { - cleanupStack = CTrapCleanup::New(); //This will be deleted after use - if(cleanupStack == NULL) - return KErrNoMemory; - } - - // Switch to backend heap - RHeap* oldHeap = User::SwitchHeap(iPrivateHeap); + cleanupStack = CTrapCleanup::New(); + if (cleanupStack == NULL) + return KErrNoMemory; + } + + if (iDefConnPref && iDefConnPref->ExtensionId() == TConnPref::EConnPrefCommDb) + { + TRAP(err, (err = GetConnectionPreferencesL(name, *(TCommDbConnPref*)iDefConnPref))); + } + else + { + RHeap *oldHeap = User::SwitchHeap(iPrivateHeap); + delete (TCommSnapPref*)iDefConnPref; iDefConnPref = new TCommDbConnPref; - // Switch back to old heap User::SwitchHeap(oldHeap); - if( iDefConnPref == NULL ) + + if (iDefConnPref) { - if( cleanupStack != NULL ) - delete cleanupStack; - return KErrNoMemory; + TRAP(err, (err = GetConnectionPreferencesL(name, *(TCommDbConnPref*)iDefConnPref))); } - TRAP(err, (err = GetConnectionPreferencesL(name,*(TCommDbConnPref*)iDefConnPref))) - - if( cleanupStack != NULL ) - delete cleanupStack; - - return err; } + + delete cleanupStack; + + return (iDefConnPref ? KErrNone : KErrNoMemory); } + // ----------------------------------------------------------------------------- // CLocalSystemInterface::GetDefaultConnection // @@ -3953,16 +3929,16 @@ RConnection& CLocalSystemInterface::GetDefaultConnection() { // If GetDefaultConnection is called without calling - // setdefaultif then the connection started without any preferences + // setdefaultif then the connection is started without any preferences // Obtain lock on the iDefConnection iDefConnLock.Wait(); - if(iDefConnection.SubSessionHandle() == 0) + if(iDefConnection.SubSessionHandle() == 0 && iDefConnResurrect) { StartDefConnection(); } // Release lock on the iDefConnection iDefConnLock.Signal(); - return iDefConnection; + return iDefConnection; } // ----------------------------------------------------------------------------- diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/src/corebackend/usocket.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/usocket.cpp Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/usocket.cpp Thu Aug 19 11:33:45 2010 +0300 @@ -76,7 +76,7 @@ // We have to deal with the network byte ordering of AF_INET addresses // { - if (aBuf==0) + if (!aBuf) { iError = EFAULT; SetLength(0); @@ -194,10 +194,10 @@ } } +/* + * Extract a struct sockaddr from a TSockAddr + */ EXPORT_C void TUSockAddr::Get(TAny* addr, unsigned long* len) -// -// Extract a struct sockaddr from a TSockAddr -// { if (addr==0) { @@ -393,18 +393,15 @@ void CSocketDesc::Write (TDes8& aBuf, TRequestStatus& aStatus) { - //Acquire the Lock before write and release it later - iWriteLock.Wait(); - if (iSocketPtr == NULL) - { - TInt ret = OpenUsingPreference(); - if (ret != KErrNone) // Error in open - { - Complete(aStatus,ret); - iWriteLock.Signal(); - return; - } - } + + TInt err = maybe_reopen_socket(); + if (err != KErrNone) + { + Complete(aStatus, err); + return; + } + + iWriteLock.Wait(); CSockDescBase::Write(aBuf, aStatus); iWriteLock.Signal(); } @@ -427,52 +424,43 @@ { return addr.iError; } - - if (iSocketPtr == NULL) - { - ret = OpenUsingPreference(); - if (ret != KErrNone) // Error in open - { - return ret; - } - } - return iSocket.Bind(addr); + + ret = maybe_reopen_socket(); + if (ret != KErrNone) + return ret; + ATOMICSOCKETOP(ret = iSocket.Bind(addr),return KErrBadHandle) + return ret; } TInt CSocketDesc::Listen(TUint qSize) { + + TInt ret; if (iStyle == SOCK_DGRAM) // Listen on UDP socket, crashing at RSocket::Listen(). { return EOPNOTSUPP; } - if (iSocketPtr == NULL) - { - TInt ret = OpenUsingPreference(); - if (ret != KErrNone) // Error in open - { - return ret; - } - } + + ret = maybe_reopen_socket(); + if (ret != KErrNone) + return ret; + return CSockDescBase::Listen(qSize); } TInt CSocketDesc::SockName(int anEnd, struct sockaddr* anAddr,unsigned long* aSize) { - TInt ret; - if (iSocketPtr == NULL) + + + if (!anAddr) { - ret = OpenUsingPreference(); - if (ret != KErrNone) // Error in open - { - return ret; - } - } - - if ( anAddr == 0 ) // if the sockaddr passed is NULL return EFAULT. - { - return EFAULT; + return EFAULT; } + TInt ret = maybe_reopen_socket(); + if (ret != KErrNone) + return ret; + struct sockaddr temp; unsigned long len = sizeof( temp ); @@ -503,24 +491,19 @@ { return EINVAL; } - if (iSocketPtr == NULL) - { - ret = OpenUsingPreference(); - if (ret != KErrNone) // Error in open - { - return ret; - } - } + + ret = maybe_reopen_socket(); + if (ret != KErrNone) + return ret; if (SO_TYPE == anOptionName && SOL_SOCKET == anOptionLevel) { TProtocolDesc protocolInfo; - ret = iSocket.Info(protocolInfo); + ATOMICSOCKETOP(ret = iSocket.Info(protocolInfo), ret = KErrBadHandle) if (KErrNone == ret ) { - //Copy the Socket Type to the buffer - TInt size; - size = (anOption.Length() < sizeof(protocolInfo.iSockType))? anOption.Length(): sizeof(protocolInfo.iSockType); + // Copy the Socket Type to the buffer + TInt size = (anOption.Length() < sizeof(protocolInfo.iSockType))? anOption.Length(): sizeof(protocolInfo.iSockType); Mem::Copy((unsigned char*)anOption.Ptr(), &protocolInfo.iSockType, size); anOption.SetLength(size); } @@ -532,20 +515,16 @@ TUSockAddr addr; struct sockaddr_in sockAddress; sockAddress.sin_family = AF_INET; - sockAddress.sin_port = iSocket.LocalPort(); - iSocket.LocalName(addr); - + ATOMICSOCKETOP(sockAddress.sin_port = iSocket.LocalPort(),return KErrBadHandle) + ATOMICSOCKETOP(iSocket.LocalName(addr);,return KErrBadHandle) TInt a = sizeof(sockAddress); addr.Get(&sockAddress,(unsigned long*)&a); - TInt size; - size = (anOption.Length() < sizeof(sockAddress.sin_addr))? anOption.Length(): sizeof(sockAddress.sin_addr); + TInt size = (anOption.Length() < sizeof(sockAddress.sin_addr))? anOption.Length(): sizeof(sockAddress.sin_addr); Mem::Copy((unsigned char*)anOption.Ptr(), &(sockAddress.sin_addr), size); anOption.SetLength(size); return KErrNone; } - - switch(anOptionLevel) { case IPPROTO_TCP: @@ -583,8 +562,8 @@ anOptionName=KSoIp6MulticastLoop; break; } - - return iSocket.GetOpt(anOptionName,anOptionLevel,anOption); + ATOMICSOCKETOP(ret = iSocket.GetOpt(anOptionName,anOptionLevel,anOption), return KErrBadHandle) + return ret; } TInt CSocketDesc::GetInterfaceIndex(TUint32 anAddr) @@ -598,12 +577,14 @@ } else { - TInt ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl); + TInt ret = KErrNone; + ATOMICSOCKETOP(ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl), ret = KErrBadHandle) if (ret != KErrNone) return KErrGeneral; TPckgBufiface; - while(iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, iface) == KErrNone) + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, iface), ret = KErrBadHandle ) + while(ret == KErrNone) { TSoInetInterfaceInfo &info = iface(); TInt result; @@ -612,13 +593,13 @@ if (anAddr == info.iAddress.Address()) { ifq().iName = info.iName; - result = iSocket.GetOpt(KSoInetIfQueryByName, KSolInetIfQuery, ifq); + ATOMICSOCKETOP( result = iSocket.GetOpt(KSoInetIfQueryByName, KSolInetIfQuery, ifq), result = KErrBadHandle ) if (result == KErrNone) aIndex = ifq().iIndex; } } - + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, iface), ret = KErrBadHandle ) } } return aIndex; @@ -635,14 +616,10 @@ { return EINVAL; } - if (iSocketPtr == NULL) - { - ret = OpenUsingPreference(); - if (ret != KErrNone) // Error in open - { - return ret; - } - } + + ret = maybe_reopen_socket(); + if (ret != KErrNone) + return ret; switch(anOptionLevel) { @@ -694,30 +671,26 @@ maddr=(from[0]<<24)+(from[1]<<16)+(from[2]<<8)+from[3]; multiAddr.SetAddress( maddr); multiAddr.ConvertToV4Mapped(); - if(multiAddr.IsMulticast()){ - req().iAddr = multiAddr.Ip6Address(); - req().iInterface = aIndex; - } - return iSocket.SetOpt(anOptionName, anOptionLevel, req); + if (multiAddr.IsMulticast()) + { + req().iAddr = multiAddr.Ip6Address(); + req().iInterface = aIndex; + } + ATOMICSOCKETOP( ret = iSocket.SetOpt(anOptionName, anOptionLevel, req), return KErrBadHandle ) + return ret; case IP_MULTICAST_TTL: anOptionLevel=KSolInetIp; anOptionName=KSoIp6MulticastHops; Option = (TInt*)anOption.Ptr(); ttlValue = *Option; - return iSocket.SetOpt(anOptionName,anOptionLevel,ttlValue); - + ATOMICSOCKETOP( ret = iSocket.SetOpt(anOptionName,anOptionLevel,ttlValue), return KErrBadHandle ) + return ret; + case SO_BROADCAST: //check if user is trying to disable broadcast Option = (TInt*)anOption.Ptr(); - if (*Option == 0) - { - return KErrNotSupported; - } - else - { - return KErrNone; - } + return (*Option == 0 ? KErrNotSupported : KErrNone); case IP_MULTICAST_IF: { @@ -726,10 +699,11 @@ struct in_addr *inAddress = (struct in_addr*)anOption.Ptr(); struct sockaddr_in sockAddress; sockAddress.sin_family = AF_INET; - sockAddress.sin_port = iSocket.LocalPort(); + ATOMICSOCKETOP(sockAddress.sin_port = iSocket.LocalPort();,return KErrBadHandle) sockAddress.sin_addr.s_addr = inAddress->s_addr; - TUSockAddr ifAddress(&sockAddress, sizeof(sockAddress)); - return iSocket.Bind(ifAddress); + TUSockAddr ifAddress(&sockAddress, sizeof(sockAddress)); + ATOMICSOCKETOP( ret = iSocket.Bind(ifAddress), return KErrBadHandle ) + return ret; } case IP_MULTICAST_LOOP: @@ -737,11 +711,11 @@ anOptionName=KSoIp6MulticastLoop; break; - default: - break; + } - return iSocket.SetOpt(anOptionName,anOptionLevel,anOption); + ATOMICSOCKETOP( ret = iSocket.SetOpt(anOptionName,anOptionLevel,anOption), return KErrBadHandle ) + return ret; } void CSocketDesc::Sync (TRequestStatus& aStatus) @@ -752,19 +726,14 @@ void CSocketDesc::RecvFrom(TDes8& aDesc, TSockAddr& from, int flags, TRequestStatus& aStatus) { + TInt err = maybe_reopen_socket(); + if (err != KErrNone) + { + Complete(aStatus, err); + return; + } + iReadLock.Wait(); - // RSocket::Open() is postponed from socket() - if (iSocketPtr == NULL) - { - TInt ret = OpenUsingPreference(); - if (ret != KErrNone) - { - Complete(aStatus,ret); // Error in open - iReadLock.Signal(); - return; - } - } - CSockDescBase::RecvFrom(aDesc, from, flags, aStatus); iReadLock.Signal(); } @@ -780,25 +749,23 @@ void CSocketDesc::SendTo(TDes8& aDesc, const struct sockaddr* anAddr, unsigned long aAddrLen, int flags, TRequestStatus& aStatus) { - iWriteLock.Wait(); - - if (iSocketPtr == NULL) - { - TInt ret = OpenUsingPreference(); - if (ret != KErrNone) - { - Complete(aStatus,ret); // Error in open - iWriteLock.Signal(); - return; - } - } - TUSockAddr toAddr(anAddr,aAddrLen); + TInt err = maybe_reopen_socket(); + if (err != KErrNone) + { + Complete(aStatus, err); + return; + } + + TUSockAddr toAddr(anAddr, aAddrLen); + + iWriteLock.Wait(); CSockDescBase::SendTo(aDesc, toAddr, flags, aStatus); iWriteLock.Signal(); } void CSocketDesc::SendToCancel() { +// Should we use atomic loads here? if (iSocketPtr != NULL) { CSockDescBase::SendToCancel(); @@ -807,7 +774,8 @@ void CSocketDesc::Shutdown(TUint aHow,TRequestStatus& aStatus) { - if (iSocketPtr == NULL) // Not opened at all. Nothing to do. + + if (__e32_atomic_load_acq32(&iSocketPtr) == NULL) // Not opened at all. Nothing to do. { Complete(aStatus,KErrNone); return; @@ -819,52 +787,61 @@ void CSocketDesc::Accept(CFileDescBase*& aNewSocket, TRequestStatus& aStatus, RSocketServ& aSs, TSockAddr * /*aAddr*/) { - //Acquire the Lock before accept and release it later + aNewSocket = NULL; + TInt err = maybe_reopen_socket(); + if (err != KErrNone) + { + Complete(aStatus, err); + return; + } + iReadLock.Wait(); - - TInt err = KErrNone; - if (iSocketPtr == NULL) - { - err = OpenUsingPreference(); - if (err != KErrNone) // Error in open - { - Complete(aStatus,err); - iReadLock.Signal(); - return; - } - } - + // what are the below coverity thingummichs? //coverity[alloc_fn] //coverity[assign] CSocketDesc *newSocket = new CSocketDesc; - if (newSocket!=0) + if (!newSocket) + { + Complete(aStatus, KErrNoMemory); + iReadLock.Signal(); + return; + } + + err = newSocket->CreateLock(); + if (err) { - err = newSocket->CreateLock(); - if (err) - { - Complete(aStatus, KErrNoMemory); - delete newSocket; - aNewSocket = NULL; - iReadLock.Signal(); - //coverity[memory_leak] - return; - } + Complete(aStatus, KErrNoMemory); + delete newSocket; + iReadLock.Signal(); + //coverity[memory_leak] + return; + } - err=newSocket->iSocket.Open(aSs); - } - if (newSocket ==0 || err!=KErrNone) + err = newSocket->iSocket.Open(aSs); + if (err) { - Complete(aStatus,KErrNoMemory); + Complete(aStatus, err); + newSocket->FinalClose(); // this will Close locks delete newSocket; - aNewSocket = NULL; + iReadLock.Signal(); //coverity[memory_leak] return; } newSocket->iSocketPtr = &newSocket->iSocket; newSocket->iStyle = iStyle; - iSocket.Accept(newSocket->iSocket,aStatus); - aNewSocket = newSocket; + err = KErrNone; + ATOMICSOCKETOP( iSocket.Accept(newSocket->iSocket,aStatus), err = KErrBadHandle ) + if( err ) + { + Complete(aStatus, err); + newSocket->FinalClose(); // this will Close locks + delete newSocket; + } + else + { + aNewSocket = newSocket; + } iReadLock.Signal(); } @@ -872,7 +849,7 @@ { if (iSocketPtr != NULL) { - iSocket.CancelAccept(); + ATOMICSOCKETOP( iSocket.CancelAccept(), NOP ) } } @@ -885,56 +862,63 @@ aStatus = addr.iError; return; } - if (iSocketPtr == NULL) - { - // RSocket::Open() is postponed from socket() - TInt ret = OpenUsingPreference(); - if (ret != KErrNone) // error in open - { - aStatus = ret; - return; - } - } - - iSocket.Connect(addr,aStatus); - User::WaitForRequest(aStatus); + + TInt err = maybe_reopen_socket(); + if (err != KErrNone) + { + aStatus = err; + return; + } + + iWriteLock.Wait(); + if( GetConnectionProgress() == EFalse ) + { + ATOMICSOCKETOP(iSocket.Connect(addr, aStatus), Complete(aStatus,KErrBadHandle)) + User::WaitForRequest(aStatus); + if( aStatus.Int() == KErrWouldBlock ) + SetConnectionProgress(ETrue); + } + else + { + aStatus = EALREADY; + } + iWriteLock.Signal(); } void CSocketDesc::ConnectCancel() { if (iSocketPtr != NULL) { - iSocket.CancelConnect(); + ATOMICSOCKETOP(iSocket.CancelConnect(),NOP) } } void CSocketDesc::Ioctl(int aCmd, void* aParam, TRequestStatus& aStatus) { - TInt ret=KErrNone; + TInt ret = KErrNone; int* param = reinterpret_cast(aParam); - if (iSocketPtr == NULL) - { - ret = OpenUsingPreference(); - if (ret != KErrNone) // Error in open - { - Complete(aStatus,ret); - return; - } - } + ret = maybe_reopen_socket(); + if (ret != KErrNone) + { + Complete(aStatus, ret); + return; + } switch ((unsigned)aCmd) { case FIONREAD: case E32IONREAD: - ret=iSocket.GetOpt(KSOReadBytesPending,KSOLSocket,*param); + { + ATOMICSOCKETOP( ret=iSocket.GetOpt(KSOReadBytesPending,KSOLSocket,*param), ret = KErrBadHandle ) + } break; case E32IOSELECT: { iIoctlBuf.Set((TText8*)aParam,4,4); iIoctlLock.Wait(); iIoctlFlag = ETrue; - iSocket.Ioctl(KIOctlSelect,aStatus,&iIoctlBuf,KSOLSocket); + ATOMICSOCKETOP(iSocket.Ioctl(KIOctlSelect,aStatus,&iIoctlBuf,KSOLSocket), Complete(aStatus,KErrBadHandle)) } return; case SIOCGIFCONF: @@ -969,7 +953,7 @@ ret = StopInterface(aParam); break; case SIOCATMARK: - ret=iSocket.GetOpt(KSoTcpRcvAtMark,KSolInetTcp,*param); + ATOMICSOCKETOP(ret=iSocket.GetOpt(KSoTcpRcvAtMark,KSolInetTcp,*param), ret = KErrBadHandle) break; case SIOCGIFADDR: ret = GetIpAddress(aParam); @@ -1011,7 +995,7 @@ { if (iSocketPtr && iIoctlFlag) { - iSocket.CancelIoctl(); + ATOMICSOCKETOP(iSocket.CancelIoctl(), NOP) iIoctlLock.Signal(); iIoctlFlag = EFalse; } @@ -1026,27 +1010,25 @@ // TInt CSocketDesc::Fcntl(TUint anArg, TUint aCmd) { - if (iSocketPtr == NULL) - { - TInt ret = OpenUsingPreference(); - if (ret != KErrNone) // Error in open - { - return ret; - } - } - return CSockDescBase::Fcntl(anArg, aCmd); + + TInt err = maybe_reopen_socket(); + if (err != KErrNone) + return err; + + return CSockDescBase::Fcntl(anArg, aCmd); } TInt CSocketDesc :: GetIpAddress( void *aParam ) { TInetAddr myAddr; - iSocket.LocalName(myAddr); + ATOMICSOCKETOP( iSocket.LocalName(myAddr), return KErrBadHandle ) TUint32 myIP = myAddr.Address(); - ifreq *ifr = (ifreq *)aParam; - if(myIP == 0) + if (myIP == 0) { return KErrGeneral; } + + ifreq *ifr = (ifreq *)aParam; ((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr.s_addr = myIP; return KErrNone; } @@ -1054,13 +1036,14 @@ TInt CSocketDesc :: GetRemoteIpAddress( void *aParam ) { TInetAddr remoteAddr; - iSocket.RemoteName(remoteAddr); + ATOMICSOCKETOP( iSocket.RemoteName(remoteAddr), return KErrBadHandle ) TUint32 remoteIP = remoteAddr.Address(); - ifreq *ifr = (ifreq *)aParam; - if(remoteIP == 0) + + if (remoteIP == 0) { return KErrGeneral; } + ifreq *ifr = (ifreq *)aParam; ((struct sockaddr_in *)&ifr->ifr_dstaddr)->sin_addr.s_addr = remoteIP; return KErrNone; } @@ -1208,16 +1191,16 @@ TPckgBuf ifq; TBuf8 <25> ipBuf8; TName aBuf; - - TInt ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl); + TInt ret = KErrNone; + ATOMICSOCKETOP( ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl), ret = KErrBadHandle ) if (ret != KErrNone) { return KErrGeneral; } TPckgBuf info; TSoInet6InterfaceInfo &in = info(); - - while(iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info) == KErrNone) + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info), ret = KErrBadHandle ) + while(ret == KErrNone) { if(info().iName != _L("") && info().iName != _L("loop6") && info().iName != _L("loop4")) { @@ -1324,28 +1307,33 @@ } } - } + } + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info), ret = KErrBadHandle ) } setout: TPckgBuf changeToNew(info()); - return iSocket.SetOpt(KSoInetConfigInterface, KSolInetIfCtrl,changeToNew); + ATOMICSOCKETOP(ret = iSocket.SetOpt(KSoInetConfigInterface, KSolInetIfCtrl,changeToNew), return KErrBadHandle ) + return ret; } #endif // __SYMBIAN_COMPILE_UNUSED__ TInt CSocketDesc::GetInterfaceDetails( void *aParam ,TInt aFlag, TInt aType ) { - ifreq *ifr = (ifreq *)aParam; TPckgBuf ifq; - TInt ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl); + TInt ret = KErrNone; + ATOMICSOCKETOP( ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl), ret = KErrBadHandle ) if (ret != KErrNone) { return KErrGeneral; } + + ifreq *ifr = (ifreq *)aParam; *(ifr->ifr_addr.sa_data) = '\0'; TPckgBuf info; - while(iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info) == KErrNone) + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info), ret = KErrBadHandle ) + while( ret == KErrNone) { if(info().iName != _L("") && info().iName != _L("loop6") && info().iName != _L("loop4")) @@ -1460,12 +1448,12 @@ if(info().iFeatures&KIfCanSetHardwareAddr) */ break; - default: - break; + } } - } + } + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info), ret = KErrBadHandle ) } return KErrNone; @@ -1473,19 +1461,14 @@ TInt CSocketDesc::Poll(TPollMode aMode,TBool& aReadyStatus,TInt& aErrno) { - TInt ret; - - if (iSocketPtr == NULL) - { - ret = OpenUsingPreference(); - if (ret != KErrNone) // Error in open - { - return ret; - } - } + TInt ret = maybe_reopen_socket(); + if (ret != KErrNone) + { + return ret; + } TInt status; - ret = iSocket.GetOpt(KSOSelectPoll, KSOLSocket, status); + ATOMICSOCKETOP(ret = iSocket.GetOpt(KSOSelectPoll, KSOLSocket, status), ret = KErrBadHandle) if (ret == KErrNone) { aReadyStatus = status & aMode; @@ -1497,16 +1480,11 @@ /* The synchronous - non-blocking Poll */ TInt CSocketDesc::Poll(TUint aEvents) { - TInt err = 0; - if (iSocketPtr == NULL) - { - err = OpenUsingPreference(); - if (err != KErrNone) // Error in open - { - return err; - } - } + TInt err = maybe_reopen_socket(); + if (err != KErrNone) + return err; + return CSockDescBase::Poll(aEvents); } @@ -1567,6 +1545,8 @@ TInt ifCount = ifc.ifc_len / sizeof(ifreq); TInt i = 0; + // We wouldn't need this if we were using a StrNcmp below + ifrQuery->ifr_name[IFNAMSIZ-1] = 0; // don't assume NULL terminated input // Search for the interface name for (; i < ifCount; i++, ifr++) { @@ -1612,11 +1592,10 @@ ret = KErrArgument; } - if (ret != KErrNone) - { - return ret; - } - ifc->ifc_len = sizeof(ifreq) * count; + if (ret == KErrNone) + { + ifc->ifc_len = sizeof(ifreq) * count; + } return ret; } @@ -1656,7 +1635,7 @@ for (apIndex = 0; apIndex < length; apIndex++,ifr++) { TAccessPointRecord& ref = (*apArray)[apIndex]; - // Catch the character pointer + ifr->ifr_name[IFNAMSIZ-1] = 0; // don't assume NULL terminated input TPtr8 ptr((TText8*)ifr->ifr_name, IFNAMSIZ); ret = CnvUtfConverter::ConvertFromUnicodeToUtf8(ptr, ref.iName); @@ -1705,12 +1684,12 @@ TInt CSocketDesc::SetInterfaceByName(void *aParam) { ifreq *ifr = (ifreq *)aParam; - if (ifr == NULL) + if (!ifr) { return KErrArgument; } - // Copy the null terminated interface name + ifr->ifr_name[IFNAMSIZ-1] = 0; // don't assume NULL terminated input TPtrC8 ptr((TText8*)ifr->ifr_name); TInt ret = CnvUtfConverter::ConvertToUnicodeFromUtf8(iConnPref.iName,ptr); if(ret > KErrNone ) @@ -1773,20 +1752,34 @@ } else // No connection preference is set { - ret = iSocket.Open(*iSockServPtr,addrfamily,iStyle,iProtocol); - } - } - - if(KErrNone == ret) - { - iSocketPtr = &iSocket; - } - iConnectInProgress = EFalse; - return ret; - } + ret = ECONNABORTED; + } + } + + if (ret == KErrNone) + { + __e32_atomic_store_rel32(&iSocketPtr, (unsigned long)&iSocket); + } + + iConnectInProgress = EFalse; + + return ret; + } void CSocketDesc::TempClose() { + TUint32 ret = __e32_atomic_ior_ord32((void *)&iCount,0x8000); + if( ret >= 0x8000 ) + { + // This indicates a TempClose has already been done from one of the threads + return; + } + // loop and yeild till no more references are held to the iSocket + while( iCount != 0x8000 ) + { + // Yeild for 1 ms + User::After(1000); + } if (iSocket.SubSessionHandle() != 0) { iSocketPtr = NULL; @@ -2125,7 +2118,8 @@ ConvertRtEntry(iroute(), rt); //add the entry - return iSocket.SetOpt(aReq, KSolInetRtCtrl, iroute); + ATOMICSOCKETOP( ret = iSocket.SetOpt(aReq, KSolInetRtCtrl, iroute),return KErrBadHandle ) + return ret; } return KErrUnknown; @@ -2175,22 +2169,23 @@ TInt CSocketDesc::GetInterfaceByName(const TDesC& aIfName, TPckgBuf& aIface) { - TInt ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl); + TInt ret = KErrNone; + ATOMICSOCKETOP(ret = iSocket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl), ret = KErrBadHandle) if (ret != KErrNone) { return ret; } TPckgBuf iface; - while((ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, iface)) == KErrNone) + ATOMICSOCKETOP(ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, iface), ret = KErrBadHandle) + while(ret == KErrNone) { - if(!iface().iAddress.IsUnspecified() - && iface().iName.CompareF(aIfName) == 0) + if (!iface().iAddress.IsUnspecified() && iface().iName.CompareF(aIfName) == 0) { aIface = iface; return ret; } + ATOMICSOCKETOP( ret = iSocket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, iface), ret = KErrBadHandle ) } - return KErrUnknown; } @@ -2203,27 +2198,25 @@ return KErrArgument; } - if (ifr->ifr_name[0]!='\0') + if (ifr->ifr_name[0] != '\0') { - TPckgBuf iface; - TFileName name; - name.Copy(TPtrC8((TText8*)ifr->ifr_name)); - - TInt ret = GetInterfaceByName(name, iface); - - if (ret != KErrNone) - { - return ret; - } - - if(iface().iHwAddr.Length() > sizeof(SSockAddr)) - { - Mem::Copy(&(ifr->ifr_hwaddr.sa_data[0]),&(iface().iHwAddr[sizeof(SSockAddr)]), 6); - ifr->ifr_hwaddr.sa_family = (TUint16)iface().iHwAddr.Family(); - ifr->ifr_hwaddr.sa_port = ByteOrder::Swap16(iface().iHwAddr.Port()); - return ret; + TPckgBuf iface; + TFileName name; + ifr->ifr_name[IFNAMSIZ-1] = 0; // don't assume NULL terminated input + name.Copy(TPtrC8((TText8*)ifr->ifr_name)); + + TInt ret = GetInterfaceByName(name, iface); + if (ret != KErrNone) + return ret; + + if (iface().iHwAddr.Length() > sizeof(SSockAddr)) + { + Mem::Copy(&(ifr->ifr_hwaddr.sa_data[0]),&(iface().iHwAddr[sizeof(SSockAddr)]), 6); + ifr->ifr_hwaddr.sa_family = (TUint16)iface().iHwAddr.Family(); + ifr->ifr_hwaddr.sa_port = ByteOrder::Swap16(iface().iHwAddr.Port()); + return ret; + } } - } return KErrUnknown; } @@ -2236,14 +2229,15 @@ TInt CSocketDesc::GetActiveInterface( void *aParam) { TInt ifindex = -1; - TInt ret = iSocket.GetOpt(KSoInterfaceIndex, KSolInetIp , ifindex); + TInt ret = KErrNone; + ATOMICSOCKETOP(ret = iSocket.GetOpt(KSoInterfaceIndex, KSolInetIp , ifindex), ret = KErrBadHandle) if(ret!=KErrNone) { return ret; } TPckgBuf opt; opt().iIndex = ifindex; - ret = iSocket.GetOpt(KSoInetIfQueryByIndex, KSolInetIfQuery, opt); + ATOMICSOCKETOP(ret = iSocket.GetOpt(KSoInetIfQueryByIndex, KSolInetIfQuery, opt), ret = KErrBadHandle) if(ret!=KErrNone) { return ret; diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/src/corebackend/usocketbase.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/usocketbase.cpp Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/usocketbase.cpp Thu Aug 19 11:33:45 2010 +0300 @@ -37,12 +37,12 @@ TUint flags = iFcntlFlag; if( anArg & O_NONBLOCK ) { - retVal = iSocket.SetOpt(KSONonBlockingIO, KSOLSocket); + ATOMICSOCKETOP(retVal = iSocket.SetOpt(KSONonBlockingIO, KSOLSocket),retVal = EBADF;) flags |= O_NONBLOCK; } else { - retVal = iSocket.SetOpt(KSOBlockingIO, KSOLSocket); + ATOMICSOCKETOP(retVal = iSocket.SetOpt(KSOBlockingIO, KSOLSocket),retVal = EBADF;) flags &= ~O_NONBLOCK; } if (retVal == KErrNone) @@ -91,7 +91,8 @@ TSockXfrLength len; TRequestStatus tempStatus; - iSocket.RecvOneOrMore(aBuf, 0, tempStatus, len); // needs a completion which returns the length + ATOMICSOCKETOP(iSocket.RecvOneOrMore(aBuf, 0, tempStatus, len),Complete(tempStatus,KErrBadHandle)) + // needs a completion which returns the length User::WaitForRequest(tempStatus); if (tempStatus.Int() != KErrNone) { @@ -108,10 +109,10 @@ TRequestStatus tempStatus; TInt bytesWritten = 0; TInt bufLength = aBuf.Length(); - TSockXfrLength len; + TSockXfrLength len = 0; do { - iSocket.Send(aBuf.Mid(bytesWritten), 0, tempStatus, len); + ATOMICSOCKETOP(iSocket.Send(aBuf.Mid(bytesWritten), 0, tempStatus, len),Complete(tempStatus,KErrBadHandle)) User::WaitForRequest(tempStatus); if (len() == 0) { @@ -155,20 +156,21 @@ // recvfrom on a stream ignores the from address - get the peername if (from.Length()) SockName(1,from); - - iSocket.RecvOneOrMore(aDesc,rSockFlags,tempStatus,len); + + ATOMICSOCKETOP(iSocket.RecvOneOrMore(aDesc,rSockFlags,tempStatus,len),Complete(tempStatus,KErrBadHandle)) break; case SOCK_SEQPACKET: // get the peername (as above) if (from.Length()) SockName(1,from); - iSocket.Recv(aDesc, rSockFlags, tempStatus); + ATOMICSOCKETOP(iSocket.Recv(aDesc, rSockFlags, tempStatus),Complete(tempStatus,KErrBadHandle)) + break; default: // including SOCK_RAW, SOCK_DGRAM // assume datagram, as per behavior of original stdlib code: - iSocket.RecvFrom(aDesc,from,rSockFlags,tempStatus,len); + ATOMICSOCKETOP(iSocket.RecvFrom(aDesc,from,rSockFlags,tempStatus,len),Complete(tempStatus,KErrBadHandle)) } User::WaitForRequest(tempStatus); @@ -196,8 +198,8 @@ if (to.Length()==0) { - iSocket.Send(aDesc,flags,tempStatus,len); - sendflg = ETrue; + ATOMICSOCKETOP(iSocket.Send(aDesc,flags,tempStatus,len),Complete(tempStatus,KErrBadHandle)) + sendflg = ETrue; } else { @@ -205,7 +207,7 @@ Complete(aStatus,KErrNotSupported); // can't sendto a stream else { - iSocket.SendTo(aDesc,to,flags,tempStatus,len); + ATOMICSOCKETOP(iSocket.SendTo(aDesc,to,flags,tempStatus,len),Complete(tempStatus,KErrBadHandle)) sendflg = ETrue; } } @@ -242,21 +244,23 @@ TInt CSockDescBase::Poll(TUint aEvents) { TInt status = 0; - TInt err = 0; TInt readyEvents = 0; - err = iSocket.GetOpt(KSOSelectPoll, KSOLSocket, status); + TInt err = KErrNone; + ATOMICSOCKETOP(err = iSocket.GetOpt(KSOSelectPoll, KSOLSocket, status),err = KErrBadHandle) if (err != KErrNone) { // Poll should return any of the requested events. // In case of any error, the error will be set, and can be later checked by the descriptor. - - iPollErr = err; + + // For non-blocking socket, ensure to reset "iConnectInProgress" flag for a non-connected // socket on which a connection is pending. if(GetConnectionProgress()) { - SetConnectionProgress(EFalse); + iPollErr = err; + + SetConnectionProgress(EFalse); } // set all the events that has been requested for @@ -292,8 +296,14 @@ if (status & KSockSelectExcept) { - if(GetConnectionProgress()) - { + + if (GetConnectionProgress()) + { + TInt val = -1; + TInt ret = KErrNone; + ATOMICSOCKETOP(ret = iSocket.GetOpt(KSOSelectLastError, KSOLSocket, val),ret = KErrBadHandle) + + (iPollErr = ret) || (iPollErr = val); TBool setExceptFd = ETrue; // Some special checks for non-blocking sockets. if(aEvents & EReadyForWriting) @@ -360,8 +370,7 @@ { iSelectEvents() |= KSockSelectExcept; } - - iSocket.Ioctl(KIOctlSelect, aRequest, &iSelectEvents, KSOLSocket); + ATOMICSOCKETOP(iSocket.Ioctl(KIOctlSelect, aRequest, &iSelectEvents, KSOLSocket),Complete(aRequest,KErrBadHandle)) return KErrNone; } @@ -392,7 +401,7 @@ // TInt CSockDescBase::TweakReadyEvents(TInt errval) { - int errno_local=0; + TInt returnEvents = 0; if( errval >= KErrNone ) { @@ -415,8 +424,16 @@ // waitforNrequest only after a event if(GetConnectionProgress()) { + + TInt val = -1; + TInt ret = KErrNone; + ATOMICSOCKETOP(ret = iSocket.GetOpt(KSOSelectLastError, KSOLSocket, val),ret = KErrBadHandle) + (iPollErr = ret) || (iPollErr = val); + + returnEvents |= EReadyForReading; - returnEvents |= EReadyForWriting; + returnEvents |= EReadyForWriting; + returnEvents |= EAnyException; } else { @@ -429,7 +446,12 @@ if( GetConnectionProgress() ) { // Dummy call to retrieve select events also unlocks the socket - const TUint events = GetSelectEvents(); + const TUint events = GetSelectEvents(); + + TInt val = -1; + TInt ret = KErrNone; + ATOMICSOCKETOP(ret = iSocket.GetOpt(KSOSelectLastError, KSOLSocket, val),ret = KErrBadHandle) + (iPollErr = ret) || (iPollErr = val); // set all the events that has been requested for // This handles a scenario where connect fails( in loopback ) // here all the events requested should be ready ready @@ -449,18 +471,20 @@ void CSockDescBase::CancelNotify() { - iSocket.CancelIoctl(); + ATOMICSOCKETOP(iSocket.CancelIoctl(),NOP) iIoctlLock.Signal(); } TInt CSockDescBase::Listen(TUint qSize) - { - return iSocket.Listen(qSize); + { + TInt ret = KErrNone; + ATOMICSOCKETOP(ret = iSocket.Listen(qSize), return KErrBadHandle) + return ret; } void CSockDescBase::ReadCancel() { - iSocket.CancelRecv(); + ATOMICSOCKETOP(iSocket.CancelRecv(),NOP) } TInt CSockDescBase::ReadCompletion(TDes8& /*aBuf*/, TInt aStatus) @@ -474,17 +498,17 @@ void CSockDescBase::RecvFromCancel() { - iSocket.CancelRecv(); + ATOMICSOCKETOP(iSocket.CancelRecv(),NOP) } void CSockDescBase::SendToCancel() { - iSocket.CancelSend(); + ATOMICSOCKETOP(iSocket.CancelSend(),NOP) } void CSockDescBase::WriteCancel() { - iSocket.CancelWrite(); + ATOMICSOCKETOP(iSocket.CancelWrite(),NOP) } TInt CSockDescBase::SockName(int anEnd, TSockAddr& anAddr) @@ -501,9 +525,9 @@ anAddr.SetFamily(KBadFamily); if (anEnd==0) - iSocket.LocalName(anAddr); + ATOMICSOCKETOP(iSocket.LocalName(anAddr),NOP) else - iSocket.RemoteName(anAddr); + ATOMICSOCKETOP(iSocket.RemoteName(anAddr),NOP) if (anAddr.Family()==KBadFamily) return ENOTCONN; // assume that the call failed, but there is no way to find out why return KErrNone; @@ -528,6 +552,6 @@ Complete(aStatus,KErrArgument); // Invalid argument return; } - iSocket.Shutdown(how,aStatus); + ATOMICSOCKETOP(iSocket.Shutdown(how,aStatus),Complete(aStatus,KErrBadHandle)) return; } diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/backend/src/syscall/handlenms.cpp --- a/genericopenlibs/openenvcore/backend/src/syscall/handlenms.cpp Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/syscall/handlenms.cpp Thu Aug 19 11:33:45 2010 +0300 @@ -143,9 +143,7 @@ } RHostResolver hr; - /* Get the default RConnection instance and use it if configured. - NOTE: This RConnection, if configured, would be created using the - socket server on backend. The same server has to be used here */ + /* Get the default RConnection instance and use it */ RConnection& defConnection = Backend()->GetDefaultConnection(); if(defConnection.SubSessionHandle() != 0) { @@ -153,7 +151,7 @@ } else { - err = hr.Open(ss, AF_INET, IPPROTO_UDP); + err = ECONNABORTED; } if (err == KErrNone) @@ -173,8 +171,9 @@ } } + + hr.Close(); } - hr.Close(); return MapError(err, *aErrno); } @@ -321,9 +320,7 @@ if (err == KErrNone) { RHostResolver r; - /* Get the default RConnection instance and use it if configured. - NOTE: This RConnection, if configured, would be created using the - socket server on backend. The same server has to be used here */ + /* Get the default RConnection instance and use it */ RConnection& defConnection = Backend()->GetDefaultConnection(); if(defConnection.SubSessionHandle() != 0) { @@ -331,7 +328,7 @@ } else { - err=r.Open(ss, format, IPPROTO_UDP); + err = -ECONNABORTED; // needs to be negative for logic below to return NO_RECOVERY to caller } if (err == KErrNone) @@ -375,6 +372,11 @@ } err = r.Next(entry); } + + if (err == -5121) // KErrDndAddrNotFound, equivalent to a KErrNotFound? + { + err = HOST_NOT_FOUND; + } } if (err == KErrNone) { @@ -415,9 +417,7 @@ } RHostResolver r; - /* Get the default RConnection instance and use it if configured. - NOTE: This RConnection, if configured, would be created using the - socket server on backend. The same server has to be used here */ + /* Get the default RConnection instance and use it */ RConnection& defConnection = Backend()->GetDefaultConnection(); if (defConnection.SubSessionHandle() != 0) { @@ -425,7 +425,7 @@ } else { - err = r.Open(ss, AF_INET, IPPROTO_UDP); + err = -ECONNABORTED; // needs to be negative for logic below to return NO_RECOVERY to caller } if (err == KErrNone) @@ -457,7 +457,7 @@ break; } - if (addr.Family() == KAfInet6 && (addr.IsV4Compat() || addr.IsV4Mapped())) + if (addr.Family() == KAfInet6 && addr.IsV4Mapped()) { addr.ConvertToV4(); entry().iAddr = addr; @@ -466,6 +466,11 @@ } err = r.Next(entry); } + + if (err == -5120) // KErrDndNameNotFound, equivalent to a KErrNotFound + { + err = HOST_NOT_FOUND; + } } if (err == KErrNone) @@ -520,6 +525,11 @@ return 0; } +EXPORT_C int _unsetdefaultif_r(int* /*aErrno*/) + { + return Backend()->unsetdefaultif(EFalse); + } + /* * Helper function to create an addrinfo node and fill it. * @param aRec The name details to be used to fill the addrinfo node @@ -634,14 +644,16 @@ //Open the host resolver RHostResolver resolver; - /* Get the default RConnection instance and use it if configured. - NOTE: This RConnection, if configured, would be created using the - socket server on backend. The same server has to be used here */ + /* Get the default RConnection instance and use it */ RConnection& defConnection = Backend()->GetDefaultConnection(); - if(defConnection.SubSessionHandle() != 0) + if (defConnection.SubSessionHandle() != 0) + { err = resolver.Open(sockServ, KAfInet, KProtocolInetUdp, defConnection); + } else - err = resolver.Open(sockServ, KAfInet, KProtocolInetUdp); + { + err = ECONNABORTED; + } if (err != KErrNone) { @@ -663,48 +675,70 @@ //Create a list of addrinfo nodes from the result *aRes = NULL; struct addrinfo** curr = aRes; - do - { - nameRec = nameEntry(); - TInetAddr inetAddr(nameRec.iAddr); - //Create the node if the address is valid, and the family matches that of hints - if(!inetAddr.IsUnspecified()) - { - if (inetAddr.Family() == KAfInet) - { - err = CreateAddrInfoNode(nameRec, aHints, curr); - } - else if (inetAddr.Family() == KAfInet6) - { - err = CreateAddrInfoNode(nameRec, aHints, curr); - if (err != 0) - break; - - curr = &((*curr)->ai_next); - if (inetAddr.IsV4Mapped()) - { - inetAddr.ConvertToV4(); - nameRec.iAddr = inetAddr; - err = CreateAddrInfoNode(nameRec, aHints, curr); - - if(err != 0) - break; - - if (err == 0) - { - (*curr)->ai_flags |= AI_V4MAPPED; - curr = &((*curr)->ai_next); - } - } - } - } - err = resolver.Next(nameEntry); //Get the next record - if(err != KErrNone) - {//No more records. Not an error, just stop iterating - err = KErrNone; - break; - } - } while(err == KErrNone); + do + { + nameRec = nameEntry(); + TInetAddr inetAddr(nameRec.iAddr); + + + //Create the node if the address is valid, and the family matches that of hints + if (!inetAddr.IsUnspecified()) + { + if (inetAddr.Family() == KAfInet) + { + err = CreateAddrInfoNode(nameRec, aHints, curr); + if (err != 0) + { + break; + } + + curr = &((*curr)->ai_next); + + inetAddr.ConvertToV4Mapped(); + nameRec.iAddr = inetAddr; + + err = CreateAddrInfoNode(nameRec, aHints, curr); + if (err != 0) + { + break; + } + + (*curr)->ai_flags |= AI_V4MAPPED; + curr = &((*curr)->ai_next); + } + else if (inetAddr.Family() == KAfInet6) + { + err = CreateAddrInfoNode(nameRec, aHints, curr); + if (err != 0) + { + break; + } + + curr = &((*curr)->ai_next); + if (inetAddr.IsV4Mapped()) + { + inetAddr.ConvertToV4(); + nameRec.iAddr = inetAddr; + + err = CreateAddrInfoNode(nameRec, aHints, curr); + if (err != 0) + { + break; + } + + (*curr)->ai_flags |= AI_V4CONVERTED; + curr = &((*curr)->ai_next); + } + } + } + + err = resolver.Next(nameEntry); //Get the next record + if (err != KErrNone) + {//No more records. Not an error, just stop iterating + err = KErrNone; + break; + } + } while(err == KErrNone); //If no nodes are created even when the operation is succes, it's an error @@ -719,6 +753,7 @@ if(err != 0 && err != EAI_MEMORY) err = EAI_FAIL; resolver.Close(); + return err; } diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/group/openenv.iby --- a/genericopenlibs/openenvcore/group/openenv.iby Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/group/openenv.iby Thu Aug 19 11:33:45 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,6 +34,7 @@ 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 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/include/net/if.h --- a/genericopenlibs/openenvcore/include/net/if.h Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/include/net/if.h Thu Aug 19 11:33:45 2010 +0300 @@ -404,7 +404,8 @@ * Symbian specific APIs */ #ifdef __SYMBIAN32__ -IMPORT_C int setdefaultif( const struct ifreq* ); +IMPORT_C int setdefaultif(const struct ifreq*); +IMPORT_C int unsetdefaultif(); #endif #ifdef __SYMBIAN32__ diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/include/netdb.h --- a/genericopenlibs/openenvcore/include/netdb.h Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/include/netdb.h Thu Aug 19 11:33:45 2010 +0300 @@ -211,6 +211,9 @@ #define AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */ #define AI_ADDRCONFIG 0x00000400 /* only if any address is assigned */ #define AI_V4MAPPED 0x00000800 /* accept IPv4-mapped IPv6 address */ +#ifdef __SYMBIAN32__ +#define AI_V4CONVERTED 0x00001000 +#endif /* special recommended flags for getipnodebyname */ #define AI_DEFAULT (AI_V4MAPPED_CFG | AI_ADDRCONFIG) diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/bwins/libcu.def --- a/genericopenlibs/openenvcore/libc/bwins/libcu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/bwins/libcu.def Thu Aug 19 11:33:45 2010 +0300 @@ -595,4 +595,4 @@ set_fmode @ 594 NONAME get_fmode @ 595 NONAME sigenable @ 596 NONAME - + unsetdefaultif @ 597 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/bwins/old_libcu.def --- a/genericopenlibs/openenvcore/libc/bwins/old_libcu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/bwins/old_libcu.def Thu Aug 19 11:33:45 2010 +0300 @@ -595,4 +595,4 @@ set_fmode @ 594 NONAME get_fmode @ 595 NONAME sigenable @ 596 NONAME - + unsetdefaultif @ 597 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/eabi/libcu.def --- a/genericopenlibs/openenvcore/libc/eabi/libcu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/eabi/libcu.def Thu Aug 19 11:33:45 2010 +0300 @@ -595,4 +595,4 @@ set_fmode @ 594 NONAME get_fmode @ 595 NONAME sigenable @ 596 NONAME - + unsetdefaultif @ 597 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/eabi/old_libcu.def --- a/genericopenlibs/openenvcore/libc/eabi/old_libcu.def Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/eabi/old_libcu.def Thu Aug 19 11:33:45 2010 +0300 @@ -595,4 +595,4 @@ set_fmode @ 594 NONAME get_fmode @ 595 NONAME sigenable @ 596 NONAME - + unsetdefaultif @ 597 NONAME diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/src/Nmscalls.cpp --- a/genericopenlibs/openenvcore/libc/src/Nmscalls.cpp Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/src/Nmscalls.cpp Thu Aug 19 11:33:45 2010 +0300 @@ -296,5 +296,10 @@ { return _setdefaultif_r(&errno,ifReq); } + +EXPORT_C int unsetdefaultif() + { + return _unsetdefaultif_r(&errno); + } } // extern "C" diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/src/clock_funcs.cpp --- a/genericopenlibs/openenvcore/libc/src/clock_funcs.cpp Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/src/clock_funcs.cpp Thu Aug 19 11:33:45 2010 +0300 @@ -80,10 +80,8 @@ switch(clock_id) { case CLOCK_REALTIME: - //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(); + //We use TTime::UniversalTime() call to get the Universal time + t.UniversalTime(); err = t.SecondsFrom(UNIX_BASE, iSeconds); t-=iSeconds;//extracting seconds info into iSeconds if (!err) diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/src/net/getaddrinfo.c --- a/genericopenlibs/openenvcore/libc/src/net/getaddrinfo.c Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/src/net/getaddrinfo.c Thu Aug 19 11:33:45 2010 +0300 @@ -1117,7 +1117,7 @@ if (IN6_IS_ADDR_SITELOCAL(&sa6->sin6_addr)) return(5); /* site-local scope */ return(14); /* global scope */ - break; + #endif case AF_INET: /* @@ -1139,7 +1139,6 @@ if (((u_char *)&sa4->sin_addr)[0] == 127) return(2); return(14); - break; default: errno = EAFNOSUPPORT; /* is this a good error? */ return(-1); @@ -1682,6 +1681,206 @@ } #endif +#ifdef __SYMBIAN32__ +static long int +explore_hostname(pai, hostname, servname, res, hints) + struct addrinfo *pai; + const char *hostname; + const char *servname; + struct addrinfo **res; + const struct addrinfo *hints; + { + const struct afd *afd; + struct addrinfo *cur; + struct addrinfo sentinel; + int error; + int family_flag=0; + *res = NULL; + + sentinel.ai_next = NULL; + cur = &sentinel; + + /* + * if the servname does not match socktype/protocol, ignore it. + */ + + if (get_portmatch(pai, servname) != 0) + return 0; + if (pai->ai_family == PF_UNSPEC) + { +#ifdef PF_INET6 +#ifdef __SYMBIAN32__ + // XXX: Fix this + pai->ai_family = PF_INET; +#else + pai->ai_family = PF_INET6; +#endif // __SYMBIAN32__ +#else + pai->ai_family = PF_INET; +#endif + family_flag=1; + } + + afd = find_afd(pai->ai_family); + if (afd == NULL && family_flag) + { + if (pai->ai_family == PF_INET6) + { + pai->ai_family = PF_INET; + } + else + { + pai->ai_family = PF_INET6; + } + afd = find_afd(pai->ai_family); + } + + if (afd == NULL) + { + return 0; + } + + if (pai->ai_family == PF_UNSPEC || pai->ai_family == afd->a_af) + { + struct addrinfo *resNative; + struct addrinfo *currNative; + int haveV6asV4 = 0; + int haveV4asV6 = 0; + /* Get the list of addresses using the native api */ + int ret = getaddrinfo_private(hostname, pai, &resNative); + if (ret != 0) + { + ERR(ret); + } + + /* copy the addresses to the local list */ + currNative = resNative; + while (currNative) + { + if (currNative->ai_family == PF_INET && (hints->ai_family == PF_INET || hints->ai_family == PF_UNSPEC)) + { + if (currNative->ai_flags & AI_V4CONVERTED) + { + haveV6asV4 = 1; + } + else + { + struct sockaddr_in* sAddrTmp = (struct sockaddr_in*) (currNative->ai_addr); + GET_AI(cur->ai_next, afd, (char*)&(sAddrTmp->sin_addr)); + cur->ai_next->ai_addr->sa_family = cur->ai_next->ai_family = PF_INET; + GET_PORT(cur->ai_next, servname); + + if (pai->ai_flags & AI_CANONNAME) + { + GET_CANONNAME(cur->ai_next, currNative->ai_canonname); + } + + cur = cur->ai_next; + } + } + + if (currNative->ai_family == PF_INET6 && (hints->ai_family == PF_INET6 || hints->ai_family == PF_UNSPEC)) + { + if (currNative->ai_flags & AI_V4MAPPED) + { + haveV4asV6 = 1; + } + else + { + struct sockaddr_in6* sAddrTmp = (struct sockaddr_in6*) (currNative->ai_addr); + GET_AI(cur->ai_next, afd, (char*)&(sAddrTmp->sin6_addr)); + cur->ai_next->ai_addr->sa_family = cur->ai_next->ai_family = PF_INET6; + GET_PORT(cur->ai_next, servname); + + if (pai->ai_flags & AI_CANONNAME) + { + GET_CANONNAME(cur->ai_next, currNative->ai_canonname); + } + + cur = cur->ai_next; + } + } + + currNative = currNative->ai_next; + } + + if (hints->ai_family == PF_INET6 && hints->ai_flags & AI_V4MAPPED && !sentinel.ai_next && haveV4asV6) + { + currNative = resNative; + while (currNative) + { + // check for addresses converted from v4 to v6 + if (currNative->ai_flags & AI_V4MAPPED) + { + struct sockaddr_in6* sAddrTmp = (struct sockaddr_in6*) (currNative->ai_addr); + GET_AI(cur->ai_next, afd, (char*)&(sAddrTmp->sin6_addr)); + cur->ai_next->ai_addr->sa_family = cur->ai_next->ai_family = PF_INET6; + GET_PORT(cur->ai_next, servname); + currNative->ai_flags &= ~AI_V4MAPPED; + + if (pai->ai_flags & AI_CANONNAME) + { + GET_CANONNAME(cur->ai_next, currNative->ai_canonname); + } + + cur = cur->ai_next; + } + + currNative = currNative->ai_next; + } + } + + if (haveV6asV4) + { + if ((hints->ai_family == PF_INET && !sentinel.ai_next) || (hints->ai_flags & (AI_V4MAPPED|AI_ALL))) + { + currNative = resNative; + while (currNative) + { + // check for addresses converted from v6 to v4 + if (currNative->ai_flags & AI_V4CONVERTED) + { + struct sockaddr_in* sAddrTmp = (struct sockaddr_in*) (currNative->ai_addr); + GET_AI(cur->ai_next, afd, (char*)&(sAddrTmp->sin_addr)); + cur->ai_next->ai_addr->sa_family = cur->ai_next->ai_family = PF_INET; + GET_PORT(cur->ai_next, servname); + currNative->ai_flags &= ~AI_V4CONVERTED; + + if (pai->ai_flags & AI_CANONNAME) + { + GET_CANONNAME(cur->ai_next, currNative->ai_canonname); + } + + cur = cur->ai_next; + } + + currNative = currNative->ai_next; + } + } + } + + /* free the address list returned by native api */ + freeaddrinfo_private(resNative); + } + else + { + ERR(EAI_FAMILY); + } + + *res = sentinel.ai_next; + return 0; + +free: +bad: + if (sentinel.ai_next) + { + freeaddrinfo(sentinel.ai_next); + } + return error; + } + +#endif//__SYMBIAN32__ + /* * FQDN hostname, DNS lookup */ @@ -1741,12 +1940,13 @@ return error; } #endif + +#ifndef __SYMBIAN32__ #ifdef DEBUG static const char AskedForGot[] = "gethostby*.getanswer: asked for \"%s\", got \"%s\""; #endif -#ifndef __SYMBIAN32__ static struct addrinfo * getanswer(answer, anslen, qname, qtype, pai) const querybuf *answer; @@ -2730,150 +2930,3 @@ } #endif /*__SYMBIAN32__*/ -#ifdef __SYMBIAN32__ -static long int -explore_hostname(pai, hostname, servname, res, hints) - struct addrinfo *pai; - const char *hostname; - const char *servname; - struct addrinfo **res; - const struct addrinfo *hints; -{ - const struct afd *afd; - struct addrinfo *cur; - struct addrinfo sentinel; - int error; - int family_flag=0; - *res = NULL; - - sentinel.ai_next = NULL; - cur = &sentinel; - - /* - * if the servname does not match socktype/protocol, ignore it. - */ - - if (get_portmatch(pai, servname) != 0) - return 0; - if (pai->ai_family == PF_UNSPEC) { -#ifdef PF_INET6 -#ifdef __SYMBIAN32__ -// XXX: Fix this - pai->ai_family = PF_INET; -#else - pai->ai_family = PF_INET6; -#endif // __SYMBIAN32__ -#else - pai->ai_family = PF_INET; -#endif - family_flag=1; - } - - afd = find_afd(pai->ai_family); - if( afd==NULL && family_flag ) - { - if(pai->ai_family==PF_INET6) - { - pai->ai_family=PF_INET; - } - else - { - pai->ai_family=PF_INET6; - } - afd=find_afd(pai->ai_family); - } - - if (afd == NULL) - { - return 0; - } - - if ( pai->ai_family == PF_UNSPEC ||pai->ai_family == afd->a_af) - { - struct addrinfo *resNative; - struct addrinfo *currNative; - int haveV4Mapped = 0; - /* Get the list of addresses using the native api */ - int ret = getaddrinfo_private(hostname, pai, &resNative); - if(ret != 0) - ERR(ret); - - /* copy the addresses to the local list */ - currNative = resNative; - while(currNative) - { - if(currNative->ai_family == PF_INET && (hints->ai_family == PF_INET || hints->ai_family == PF_UNSPEC)) - { - if(currNative->ai_flags & AI_V4MAPPED) - { - haveV4Mapped = 1; - } - else - { - struct sockaddr_in* sAddrTmp = (struct sockaddr_in*) (currNative->ai_addr); - GET_AI(cur->ai_next, afd, (char*)&(sAddrTmp->sin_addr)); - cur->ai_next->ai_addr->sa_family = cur->ai_next->ai_family = PF_INET; - GET_PORT(cur->ai_next, servname); - - if((pai->ai_flags & AI_CANONNAME)) - GET_CANONNAME(cur->ai_next, currNative->ai_canonname); - - cur = cur->ai_next; - } - } - - if(currNative->ai_family == PF_INET6 && (hints->ai_family == PF_INET6 || hints->ai_family == PF_UNSPEC)) - { - struct sockaddr_in6* sAddrTmp = (struct sockaddr_in6*) (currNative->ai_addr); - GET_AI(cur->ai_next, afd, (char*)&(sAddrTmp->sin6_addr)); - cur->ai_next->ai_addr->sa_family = cur->ai_next->ai_family = PF_INET6; - GET_PORT(cur->ai_next, servname); - - if((pai->ai_flags & AI_CANONNAME)) - GET_CANONNAME(cur->ai_next, currNative->ai_canonname); - - cur = cur->ai_next; - } - - currNative = currNative->ai_next; - } - - if(hints->ai_family == PF_INET && !sentinel.ai_next && haveV4Mapped) - { - currNative = resNative; - while(currNative) - { - //This is the set of Mapped Addresses. - if(currNative->ai_flags & AI_V4MAPPED) - { - struct sockaddr_in* sAddrTmp = (struct sockaddr_in*) (currNative->ai_addr); - currNative->ai_flags &= ~AI_V4MAPPED; - GET_AI(cur->ai_next, afd, (char*)&(sAddrTmp->sin_addr)); - cur->ai_next->ai_addr->sa_family = cur->ai_next->ai_family = PF_INET; - GET_PORT(cur->ai_next, servname); - - if((pai->ai_flags & AI_CANONNAME)) - GET_CANONNAME(cur->ai_next, currNative->ai_canonname); - cur = cur->ai_next; - } - - currNative = currNative->ai_next; - } - } - /* free the address list returned by native api */ - freeaddrinfo_private(resNative); - } - else - ERR(EAI_FAMILY); - - *res = sentinel.ai_next; - return 0; - -free: -bad: - if (sentinel.ai_next) - freeaddrinfo(sentinel.ai_next); - return error; -} - -#endif//__SYMBIAN32__ diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testifioctls/group/bld.inf --- a/genericopenlibs/openenvcore/libc/test/testifioctls/group/bld.inf Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/group/bld.inf Thu Aug 19 11:33:45 2010 +0300 @@ -20,6 +20,8 @@ ../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 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testifioctls/utils/tifioctlstest.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/utils/tifioctlstest.bat Thu Aug 19 11:33:45 2010 +0300 @@ -0,0 +1,1 @@ +CED -i C:\tstdapis\gosethernetced.xml \ No newline at end of file diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testifioctls/utils/tifioctlstest_hw.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/utils/tifioctlstest_hw.bat Thu Aug 19 11:33:45 2010 +0300 @@ -0,0 +1,1 @@ +CED -i z:\tstdapis\gosethernetced.xml \ No newline at end of file diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testlocalsocket/group/bld.inf --- a/genericopenlibs/openenvcore/libc/test/testlocalsocket/group/bld.inf Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlocalsocket/group/bld.inf Thu Aug 19 11:33:45 2010 +0300 @@ -20,6 +20,8 @@ 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 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings.bat --- a/genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings.bat Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings.bat Thu Aug 19 11:33:45 2010 +0300 @@ -14,4 +14,5 @@ @rem Description: @rem -copy \epoc32\release\WINSCW\udeb\tsample.exe \epoc32\release\WINSCW\udeb\Z\sys\bin\tsample.exe \ No newline at end of file +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 diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings_hw.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/libc/test/testlocalsocket/utils/localsocketsettings_hw.bat Thu Aug 19 11:33:45 2010 +0300 @@ -0,0 +1,1 @@ +CED -i z:\tstdapis\gosethernetced.xml \ No newline at end of file diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testsocket/group/bld.inf --- a/genericopenlibs/openenvcore/libc/test/testsocket/group/bld.inf Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/group/bld.inf Thu Aug 19 11:33:45 2010 +0300 @@ -21,6 +21,7 @@ ../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 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket.script --- a/genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket.script Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket.script Thu Aug 19 11:33:45 2010 +0300 @@ -16,498 +16,500 @@ PRINT Run all tsocket LOAD_SUITE tsocket +//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 5 tsocket ExampleL \tstdapis\tsocket.ini Section_ExampleL +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_3 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_4 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_5 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_6 +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindTest \tstdapis\tsocket.ini Section_BindTest +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindInvalidAddress \tstdapis\tsocket.ini Section_BindInvalidAddress +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindUsingFileDescriptor \tstdapis\tsocket.ini Section_BindUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindUsingInvalidSocketDescriptor \tstdapis\tsocket.ini Section_BindUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket ListenTest \tstdapis\tsocket.ini Section_ListenTest +RUN_TEST_STEP !Result=0 50 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 5 tsocket ListenUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket ListenUdp +RUN_TEST_STEP !Result=0 50 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 5 tsocket ListenUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_3 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownDisconnectedSocket \tstdapis\tsocket.ini Section_ShutdownDisconnectedSocket +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutDownTestWithInvalidShutdownOption +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketName \tstdapis\tsocket.ini Section_GetSocketName +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketNameUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketNameUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketNameInvalidLength \tstdapis\tsocket.ini Section_GetSocketNameInvalidLength +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketNameInvalidSocketBuffer \tstdapis\tsocket.ini Section_GetSocketNameInvalidSocketBuffer +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketNameUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketNameUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketNameforUnconnectedSocket +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketNameInvalidLengthSockAddr +RUN_TEST_STEP !Result=0 50 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 5 tsocket UDP +RUN_TEST_STEP !Result=0 50 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 5 tsocket TCP +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptTest \tstdapis\tsocket.ini Section_AcceptTest +RUN_TEST_STEP !Result=0 50 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 5 tsocket UDPAccept +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptTestZeroAddrLen +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptTestNullAddr +RUN_TEST_STEP !Result=0 50 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 5 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ConnectUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket ConnectUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket RecvFromTestFailCases \tstdapis\tsocket.ini Section_RecvFromTestFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket RecvUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket RecvUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket RecvTestFailCases \tstdapis\tsocket.ini Section_RecvTestFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendToUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendToUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestSendReturnValue +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSockOptFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket SetSockOptFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_3 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_4 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_5 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_6 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_7 +RUN_TEST_STEP !Result=-2 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_8 +RUN_TEST_STEP !Result=-2 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_9 +RUN_TEST_STEP !Result=-2 50 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 5 tsocket BindResvPort \tstdapis\tsocket.ini Section_BindResvPort +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindResvPortFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket HErrNoLocation +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendMsgRecvMsg +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetHostName +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetHostNameZero +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetHostNameNull +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestSockAfLocal +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestSktlseek +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestSktfstat +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestSktfsync +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestGreaterThan16kReadWrite +RUN_TEST_STEP !Result=0 50 tsocket TestGreaterThan16kReadWrite END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0081 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0082 @@ -525,89 +527,89 @@ START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0084 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-0084 //! @SYMTestStatus 3.Released -RUN_TEST_STEP !Result=0 25 tsocket TestNotify \tstdapis\tsocket.ini Section_TestSelect +RUN_TEST_STEP !Result=0 50 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 25 tsocket TestNotify \tstdapis\tsocket.ini Section_TestIoctl +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestSmallUDP +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestMediumUDP +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestLargeUDP +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestFionread +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestBind1 +RUN_TEST_STEP !Result=0 50 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 20 tsocket TestConnectNonBlocking +RUN_TEST_STEP !Result=0 50 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 5 tsocket TCP1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestV4MappedAddress +RUN_TEST_STEP !Result=0 50 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 15 tsocket ReadTestFailCase +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestNotify1 +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestSockFcntl +RUN_TEST_STEP !Result=0 50 tsocket TestSockFcntl END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0098 // To be uncommented when COM-DB is enabled -//RUN_TEST_STEP !Result=0 15 tsocket TestSockIoctl +//RUN_TEST_STEP !Result=0 50 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 30 tsocket SockErrnoTest +//RUN_TEST_STEP !Result=0 50 tsocket SockErrnoTest END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0099 START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-0099 @@ -615,5 +617,5 @@ //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSOCKET-00100 //! @SYMTestStatus 3.Released //commeneted because of network test -RUN_TEST_STEP !Result=0 30 tsocket SockSendOnClosedConn +RUN_TEST_STEP !Result=0 50 tsocket SockSendOnClosedConn END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00100 diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket_hw.script --- a/genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket_hw.script Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/scripts/tsocket_hw.script Thu Aug 19 11:33:45 2010 +0300 @@ -16,607 +16,608 @@ PRINT Run all tsocket LOAD_SUITE tsocket +//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 5 tsocket ExampleL \tstdapis\tsocket.ini Section_ExampleL +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_3 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_4 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_5 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketTest \tstdapis\tsocket.ini Section_SocketTest_6 +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindTest \tstdapis\tsocket.ini Section_BindTest +RUN_TEST_STEP !Result=0 50 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 5 tsocket MultipleBindOnSameSocket \tstdapis\tsocket.ini Section_MultipleBindOnSameSocket +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindInvalidAddress \tstdapis\tsocket.ini Section_BindInvalidAddress +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindUsingFileDescriptor \tstdapis\tsocket.ini Section_BindUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindUsingInvalidSocketDescriptor \tstdapis\tsocket.ini Section_BindUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket ListenTest \tstdapis\tsocket.ini Section_ListenTest +RUN_TEST_STEP !Result=0 50 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 5 tsocket ListenUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket ListenUdp +RUN_TEST_STEP !Result=0 50 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 5 tsocket ListenUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownTest \tstdapis\tsocket.ini Section_ShutdownTest_3 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownDisconnectedSocket \tstdapis\tsocket.ini Section_ShutdownDisconnectedSocket +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutDownTestWithInvalidShutdownOption +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket ShutdownUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketName \tstdapis\tsocket.ini Section_GetSocketName +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketNameUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketNameUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketNameInvalidLength \tstdapis\tsocket.ini Section_GetSocketNameInvalidLength +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSocketNameInvalidSocketBuffer \tstdapis\tsocket.ini Section_GetSocketNameInvalidSocketBuffer +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketName \tstdapis\tsocket.ini Section_GetPeerSocketName_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketNameUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketNameUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketNameforUnconnectedSocket +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetPeerSocketNameInvalidLengthSockAddr +RUN_TEST_STEP !Result=0 50 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 5 tsocket UDP +RUN_TEST_STEP !Result=0 50 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 5 tsocket TCP +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptTest \tstdapis\tsocket.ini Section_AcceptTest +RUN_TEST_STEP !Result=0 50 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 5 tsocket UDPAccept +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptTestZeroAddrLen +RUN_TEST_STEP !Result=0 50 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 5 tsocket AcceptTestNullAddr +RUN_TEST_STEP !Result=0 50 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 5 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ConnectTestFailCases \tstdapis\tsocket.ini Section_ConnectTestFailCases_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket ConnectUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket ConnectUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket RecvFromTestFailCases \tstdapis\tsocket.ini Section_RecvFromTestFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket RecvUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket RecvUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket RecvTestFailCases \tstdapis\tsocket.ini Section_RecvTestFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendTestFailCases \tstdapis\tsocket.ini Section_SendTestFailCases_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendToTestFailCases \tstdapis\tsocket.ini Section_SendToTestFailCases_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendToUsingFileDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendToUsingInvalidSocketDescriptor +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetSockOptFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket SetSockOptFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_hw +//RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_2 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_3 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_4 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_5 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_6 +RUN_TEST_STEP !Result=0 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_7 +RUN_TEST_STEP !Result=-2 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_8 +RUN_TEST_STEP !Result=-2 50 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 5 tsocket SocketOptions \tstdapis\tsocket.ini Section_SocketOptions_9 +RUN_TEST_STEP !Result=-2 50 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 5 tsocket SockAtMark +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindResvPort \tstdapis\tsocket.ini Section_BindResvPort +RUN_TEST_STEP !Result=0 50 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 5 tsocket BindResvPortFailCases +RUN_TEST_STEP !Result=0 50 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 5 tsocket HErrNoLocation +RUN_TEST_STEP !Result=0 50 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 5 tsocket SendMsgRecvMsg +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetHostName +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetHostNameZero +RUN_TEST_STEP !Result=0 50 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 5 tsocket GetHostNameNull +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestSktlseek +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestSktfstat +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestSktfsync +RUN_TEST_STEP !Result=0 50 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 10 tsocket TestRecvMsgPeekTCP +RUN_TEST_STEP !Result=0 50 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 10 tsocket TestRecvMsgPeekUDP +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestNotify \tstdapis\tsocket.ini Section_TestSelect +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestNotify \tstdapis\tsocket.ini Section_TestIoctl +RUN_TEST_STEP !Result=0 50 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 20 tsocket TestGreaterThan16kReadWrite +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestSmallUDP +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestMediumUDP +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestLargeUDP \tstdapis\tsocket.ini Section_TestLargeUDP +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestFionread +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestBind1 +RUN_TEST_STEP !Result=0 50 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 20 tsocket TestConnectNonBlocking +RUN_TEST_STEP !Result=0 50 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 5 tsocket TCP1 +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestSendReturnValue +RUN_TEST_STEP !Result=0 50 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 5 tsocket TestV4MappedAddress +RUN_TEST_STEP !Result=0 50 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 15 tsocket ReadTestFailCase +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestNotify1 +RUN_TEST_STEP !Result=0 50 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 15 tsocket TestSockFcntl +RUN_TEST_STEP !Result=0 50 tsocket TestSockFcntl END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKETHW-0100 // To be uncommented when COM-DB is enabled -//RUN_TEST_STEP !Result=0 15 tsocket TestSockIoctl +//RUN_TEST_STEP !Result=0 50 tsocket TestSockIoctl START_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00101 -RUN_TEST_STEP !Result=0 30 tsocket SockSendOnClosedConn +RUN_TEST_STEP !Result=0 50 tsocket SockSendOnClosedConn END_TESTCASE OPENENV-LIBC-CIT-TESTSOCKET-00101 diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest.bat --- a/genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest.bat Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest.bat Thu Aug 19 11:33:45 2010 +0300 @@ -15,4 +15,5 @@ @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 \ No newline at end of file +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 diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest_hw.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/utils/tsockettest_hw.bat Thu Aug 19 11:33:45 2010 +0300 @@ -0,0 +1,1 @@ +CED -i z:\tstdapis\gosethernetced.xml \ No newline at end of file diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/test/group/OEtests.iby --- a/genericopenlibs/openenvcore/test/group/OEtests.iby Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/test/group/OEtests.iby Thu Aug 19 11:33:45 2010 +0300 @@ -22,7 +22,7 @@ #include "testexecute.iby" #include "ced.iby" -data=EPOCROOT##epoc32\WINSCW\c\ethernetced.xml \ethernetced.xml +data = EPOCROOT##epoc32\WINSCW\c\tstdapis\gosethernetced.xml \tstdapis\gosethernetced.xml file=ABI_DIR\BUILD_DIR\testharness.dll sys\bin\testharness.dll diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/test/group/bld.inf --- a/genericopenlibs/openenvcore/test/group/bld.inf Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/test/group/bld.inf Thu Aug 19 11:33:45 2010 +0300 @@ -34,6 +34,7 @@ oe_autotest.iby /epoc32/rom/include/oe_autotest.iby ../utils/OEtests.bat /epoc32/winscw/c/tstdapis/oetests.bat ../utils/OEtests_hw.bat /epoc32/winscw/c/tstdapis/oetests_hw.bat +../utils/gosethernetced.xml /epoc32/winscw/c/tstdapis/gosethernetced.xml ../utils/autoexec.bat /epoc32/winscw/c/tstdapis/autoexec.bat ../utils/cleanup_cdrive.bat /epoc32/winscw/c/tstdapis/cleanup_cdrive.bat diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/test/utils/OEtests_hw.bat --- a/genericopenlibs/openenvcore/test/utils/OEtests_hw.bat Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/test/utils/OEtests_hw.bat Thu Aug 19 11:33:45 2010 +0300 @@ -26,6 +26,8 @@ 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 diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/test/utils/gosethernetced.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/test/utils/gosethernetced.xml Thu Aug 19 11:33:45 2010 +0300 @@ -0,0 +1,2128 @@ + + + + + + + + + + + + + Intranet + + + mRouter + + + + + + NT RAS with Null Modem + DialOutISP.NT RAS + ModemBearer.Null Modem 115200bps + Network.Intranet + 0 + Location.Office + + + CSD IAP PlaceHolder01 + DialOutISP.ISP01 + ModemBearer.Null Modem 115200bps + Network.Intranet + 0 + Location.Office + + + CSD IAP PlaceHolder02 + DialOutISP.ISP02 + ModemBearer.Null Modem 115200bps + Network.Intranet + 0 + Location.Office + + + GPRS IAP PlaceHolder01 + OutgoingGPRS.GPRS01 + ModemBearer.GPRS Ericsson R520m/T68i via Serial + Network.Intranet + 0 + Location.Mobile + + + GPRS IAP PlaceHolder02 + OutgoingGPRS.GPRS02 + ModemBearer.GPRS Ericsson R520m/T68i via Serial + Network.Intranet + 0 + Location.Mobile + + + Ethernet No Daemon Static IP + LANService.Ethernet No Daemon + LANBearer.EKA2 Emulator Ethernet + Network.Intranet + 0 + Location.Office + + + Incorrect ethernet setup 1 + LANService.Ethernet Bad Daemon + LANBearer.EKA2 Emulator Ethernet + Network.mRouter + 0 + Location.Office + + + Incorrect ethernet setup 2 + LANService.Ethernet Static IP + LANBearer.EKA2 Emulator Ethernet + Network.mRouter + 0 + Location.Office + + + Ethernet with Daemon Static IP + LANService.Ethernet Static IP + LANBearer.EKA2 Emulator Ethernet + Network.Intranet + 0 + Location.Office + + + Incorrect ethernet setup 3 + LANService.Ethernet + LANBearer.EKA2 Emulator Ethernet + Network.mRouter + 0 + Location.Office + + + Ethernet with Daemon Dynamic IP + LANService.Ethernet + LANBearer.EKA2 Emulator Ethernet + Network.Intranet + 0 + Location.Office + + + + + + Default Modem + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 115200 + 0 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + Null Modem 115200bps + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + US Robotics Sportster + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 57600 + 244 + 0 + 0 + 0 + AUTO + AFTERDIALUNTILANSWER + QUIET + AT&F1 + AT + AT&d2 + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + Dacom Surfer + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 57600 + 244 + 0 + 0 + 0 + AUTO + AFTERDIALUNTILANSWER + QUIET + AT&F + AT + AT&d2 + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GSM Mobile Phone via Infrared + CSD.agt + PPP + IRCOMM::0 + MM + IRCOMM + 8 + 1 + NONE + 115200 + 196 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GSM Mobile Phone via Serial + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 19200 + 196 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GPRS Ericsson R520m via IR + PSD.agt + PPP + IRCOMM::0 + MM + IRCOMM + 8 + 1 + NONE + 115200 + 4 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GPRS Ericsson R520m/T68i via Serial + PSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 19200 + 4 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + *99***1# + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GPRS Motorola Mobile Phone via Serial + PSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 57600 + 4 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + WinTunnel Modem + null.agt + PPP + COMM::6 + MM + ECUART + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + mRouterWinsBearer + mRouterAgent.agt + PPP + WINS::0 + MM + WINSCSY + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + mRouterRs232Bearer + mRouterAgent.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + mRouterIrBearer + mRouterAgent.agt + PPP + IRCOMM::0 + MM + IRCOMM + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + mRouterBtBearer + mRouterAgent.agt + PPP + BTCOMM::0 + MM + BTCOMM + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + mRouterUsbBearer + mRouterAgent.agt + PPP + ACM::0 + MM + ECACM + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + + + + EKA1 Target Ethernet + nullagt.agt + ethint + ethercard + EtherCard + EtherSmc + EtherCard.Smc + EtherPkt.drv + -1 + -1 + -1 + + + + EKA2 Target Ethernet + nullagt.agt + ethint + enet + Ethernet + ethernet + Ethernet.Assabet + EtherPkt.drv + -1 + -1 + -1 + + + + EKA1 Emulator Ethernet + nullagt.agt + ethint + ethercard + Ethercard + etherwins + Ethercard.wins + EtherPkt.drv + -1 + -1 + -1 + + + + EKA2 Emulator Ethernet + nullagt.agt + ethint + enet + =Ethernet + ethernet + Ethernet.Wins + EtherPkt.drv + -1 + -1 + -1 + + + + + + Ethernet + ip + 255.255.255.0 + 10.32.194.254 + 10.32.194.251 + TRUE + TRUE + 194.72.6.51 + 194.72.6.52 + NetCfgExtnDhcp + !DhcpServ + + + Ethernet Static IP + ip + 255.255.255.0 + 192.168.20.2 + 192.168.20.13 + FALSE + TRUE + 194.72.6.51 + 194.72.6.52 + NetCfgExtnDhcp + !DhcpServ + + + Ethernet Bad Daemon + ip + 255.255.255.0 + 10.32.194.254 + 10.32.194.251 + FALSE + TRUE + 194.72.6.51 + 194.72.6.52 + NonExistingServ + NonExistingServ + + + Ethernet No Daemon + ip + 255.255.255.0 + 10.32.194.254 + 10.32.194.251 + FALSE + TRUE + 194.72.6.51 + 194.72.6.52 + + + + + + Default Dial In ISP + FALSE + TRUE + TRUE + Default Dial In ISP + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + + + Dial In ISP01 + FALSE + TRUE + TRUE + Dial In ISP01 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + + + + + + Default Dial Out ISP + TRUE + FALSE + TRUE + TRUE + TRUE + TRUE + Default Dial Out ISP + Default Dial Out ISP + TRUE + TRUE + FALSE + FALSE + FALSE + TRUE + TRUE + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + NT RAS + TRUE + TRUE + FALSE + FALSE + TRUE + TRUE + Test + INTERNETONLY + INTERNETONLY + CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n + FALSE + FALSE + FALSE + FALSE + ip + RasUser + pass + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP01 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP01 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP02 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP02 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP03 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP03 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP04 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP04 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP05 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP05 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + mRouterDialOutIsp + TRUE + FALSE + FALSE + FALSE + TRUE + TRUE + mRouterDialOutIsp + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + IfAuthPass= + AuthRetries=0 + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + + + + + + + test name cdma2000 + Test2000 + HIGHSPEEDCDMA2000DATA + IPV4 + PRIORITY04 + PRIORITY04 + 32KBPS + 32KBPS + LOSS1 + LOSS1 + 40MS + 40MS + 32KBPS + 32KBPS + LOSS2 + LOSS2 + 120MS + 120MS + FALSE + FALSE + FALSE + ip + RasUser + pass + FALSE + 1 + 0.255.255.255 + 10.0.0.1 + TRUE + TRUE + TRUE + TRUE + 2 + 1000000 + TRANSPARENT + FALSE + 10000000 + + + + + + + + + Dummy BT Chargecard + 144,12345678 + 0000 + HG + HFG + HEFG + + + Dummy Mercury Chargecard + 0500800800,,12345678 + **** + HG + J,K,0FG + HEFG + + + + + + ConnectionPreferencesTable1 + 0 + OUTGOING + DONOTPROMPT + LAN + IAP.Ethernet with Daemon Dynamic IP + + + ConnectionPreferencesTable2 + 1 + OUTGOING + DONOTPROMPT + LAN + IAP.Ethernet with Daemon Dynamic IP + + + + + + GlobalSettingsTable1 + WAPAccessPoint.Default Dial In ISP + 3 + 2 + 2 + 1 + 1 + 2 + 2 + 2 + Location.Office + Location.Office + GSM + Network.Intranet + mm + + + + + + Incoming GPRS Settings PlaceHolder + Test + IPV4 + 0.0.0.0 + FALSE + TRUE + TRUE + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + FALSE + FALSE + FALSE + ip + RasUser + pass + 1 + 0.0.0.0 + 0.0.0.0 + FALSE + FALSE + FALSE + + + + + + GPRS01 + gprs01APNPlaceHolder + IPV4 + FALSE + TRUE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + FALSE + ip + 1 + FALSE + FALSE + FALSE + 0 + 0 + + + GPRS02 + gprs02APNPlaceHolder + IPV4 + FALSE + TRUE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + FALSE + ip + 1 + FALSE + FALSE + FALSE + 0 + 0 + + + GPRS03 + gprs03APNPlaceHolder + IPV4 + FALSE + TRUE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + FALSE + ip + 1 + FALSE + FALSE + FALSE + 0 + 0 + + + + + + Dummy Default GPRS Settings + Access point name + IPV6 + www.wid.com + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + TRUE + TRUE + FALSE + TRUE + + + + + + ProxyTable1 + TRUE + http + 172.16.42.133 + 8080 + + + + + + Default Location + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + 44 + 44 + 44 + + + Office + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + 9, + 9, + + + Office Direct Dial + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + 171 + 171 + + + Mobile + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + 44 + 44 + 44 + + + Home + FALSE + TRUE + TRUE + 0 + 00 + 0 + 44 + 181 + 181 + 181 + + + + + + SecureSocketTable1 + ssl3.0 + ssladaptor.dll + + + SecureSocketTable2 + tls1.0 + ssladaptor.dll + + + + + + + + + + + + + + + + + + Default Dial In ISP + WAPIPBearer + + + Dummy WAP Settings + WAPIPBearer + www.wapstart.com + + + + + + WAPIPBearerTable1 + WAPAccessPoint.-1 + 0 + CONNECTIONLESS + FALSE + IAP.-1 + 0 + 0 + 0 + + + WAPIPBearerTable2 + WAPAccessPoint.Dummy WAP Settings + www.wapgateway.com + CONNECTIONORIENTED + FALSE + IAP.CSD IAP PlaceHolder01 + 1 + 1 + 1 + + + + + + WAPSMSBearerTable1 + WAPAccessPoint.-1 + 0 + CONNECTIONLESS + FALSE + 0 + + + WAPSMSBearerTable2 + WAPAccessPoint.Dummy WAP Settings + +4412345678901 + CONNECTIONORIENTED + FALSE + +442071234567 + + + + + + + + + + + diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/test/utils/new_tests.txt --- a/genericopenlibs/openenvcore/test/utils/new_tests.txt Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/test/utils/new_tests.txt Thu Aug 19 11:33:45 2010 +0300 @@ -3,6 +3,9 @@ # UDEB TESTS # # Configuration 1 + +testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 6000, 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, # testexecute, \logs\testexecute\twaitsignal2.htm,, c:\tstdapis\twaitsignal2.script, 3860, UDEB,\epoc32\winscw\c\tstdapis\waitsignalsettings.bat, @@ -19,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,, +testexecute, \logs\testexecute\tifioctls.htm,, c:\tstdapis\tifioctls.script, 1200, UDEB,\epoc32\winscw\c\tstdapis\tifioctlstest.bat, 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,, @@ -35,7 +38,7 @@ testexecute, \logs\testexecute\tregex.htm,, c:\tstdapis\tregex.script, 130, UDEB,, testexecute, \logs\testexecute\tsemaphore.htm,, c:\tstdapis\tsemaphore.script, 500, UDEB,, testexecute, \logs\testexecute\tshm.htm,, c:\tstdapis\tshm.script, 300, UDEB,, -testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 800, UDEB,\epoc32\winscw\c\tstdapis\tsockettest.bat, + testexecute, \logs\testexecute\tsyssim.htm,, c:\tstdapis\tsyssim.script, 140, UDEB,, testexecute, \logs\testexecute\tsysunistd.htm,, c:\tstdapis\tsysunistd.script, 200, UDEB,, testexecute, \logs\testexecute\ttime_blr.htm,, c:\tstdapis\ttime_blr.script, 200, UDEB,, @@ -100,6 +103,8 @@ # UREL TEsts +testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 6000, 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, # testexecute, \logs\testexecute\twaitsignal2.htm,, c:\tstdapis\twaitsignal2.script, 3860, UREL,\epoc32\winscw\c\tstdapis\waitsignalsettings.bat, @@ -117,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,, +testexecute, \logs\testexecute\tifioctls.htm,, c:\tstdapis\tifioctls.script, 1200, UREL,\epoc32\winscw\c\tstdapis\tifioctlstest.bat, 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,, @@ -133,7 +138,7 @@ testexecute, \logs\testexecute\tregex.htm,, c:\tstdapis\tregex.script, 130, UREL,, testexecute, \logs\testexecute\tsemaphore.htm,, c:\tstdapis\tsemaphore.script, 500, UREL,, testexecute, \logs\testexecute\tshm.htm,, c:\tstdapis\tshm.script, 300, UREL,, -testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 800, UREL,\epoc32\winscw\c\tstdapis\tsockettest.bat, + testexecute, \logs\testexecute\tsyssim.htm,, c:\tstdapis\tsyssim.script, 140, UREL,, testexecute, \logs\testexecute\tsysunistd.htm,, c:\tstdapis\tsysunistd.script, 200, UREL,, testexecute, \logs\testexecute\ttime_blr.htm,, c:\tstdapis\ttime_blr.script, 200, UREL,, diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/test/utils/new_tests_vfuture.txt --- a/genericopenlibs/openenvcore/test/utils/new_tests_vfuture.txt Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/test/utils/new_tests_vfuture.txt Thu Aug 19 11:33:45 2010 +0300 @@ -3,6 +3,8 @@ # UDEB TESTS # # Configuration 1 +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, #testexecute, \logs\testexecute\twaitsignal2.htm,, c:\tstdapis\twaitsignal2.script, 3860, UDEB,\epoc32\winscw\c\tstdapis\waitsignalsettings.bat, @@ -34,7 +36,7 @@ testexecute, \logs\testexecute\tregex.htm,, c:\tstdapis\tregex.script, 130, UDEB,, testexecute, \logs\testexecute\tsemaphore.htm,, c:\tstdapis\tsemaphore.script, 500, UDEB,, testexecute, \logs\testexecute\tshm.htm,, c:\tstdapis\tshm.script, 300, UDEB,, -testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 800, UDEB,\epoc32\winscw\c\tstdapis\tsockettest.bat, + testexecute, \logs\testexecute\tsyssim.htm,, c:\tstdapis\tsyssim.script, 140, UDEB,, testexecute, \logs\testexecute\tsysunistd.htm,, c:\tstdapis\tsysunistd.script, 200, UDEB,, testexecute, \logs\testexecute\ttime_blr.htm,, c:\tstdapis\ttime_blr.script, 200, UDEB,, @@ -103,6 +105,8 @@ testexecute, \logs\testexecute\tlargefile.htm,, c:\tstdapis\tlargefile.script, 5000, UDEB,\epoc32\winscw\c\tstdapis\largefilesettings.bat, #UREL TEsts +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, #testexecute, \logs\testexecute\twaitsignal2.htm,, c:\tstdapis\twaitsignal2.script, 3860, UREL,\epoc32\winscw\c\tstdapis\waitsignalsettings.bat, @@ -134,7 +138,7 @@ testexecute, \logs\testexecute\tregex.htm,, c:\tstdapis\tregex.script, 130, UREL,, testexecute, \logs\testexecute\tsemaphore.htm,, c:\tstdapis\tsemaphore.script, 500, UREL,, testexecute, \logs\testexecute\tshm.htm,, c:\tstdapis\tshm.script, 300, UREL,, -testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 800, UREL,\epoc32\winscw\c\tstdapis\tsockettest.bat, + testexecute, \logs\testexecute\tsyssim.htm,, c:\tstdapis\tsyssim.script, 140, UREL,, testexecute, \logs\testexecute\tsysunistd.htm,, c:\tstdapis\tsysunistd.script, 200, UREL,, testexecute, \logs\testexecute\ttime_blr.htm,, c:\tstdapis\ttime_blr.script, 200, UREL,, diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericopenlibs/openenvcore/test/utils/new_tests_wo_signals.txt --- a/genericopenlibs/openenvcore/test/utils/new_tests_wo_signals.txt Thu Jul 15 20:34:46 2010 +0300 +++ b/genericopenlibs/openenvcore/test/utils/new_tests_wo_signals.txt Thu Aug 19 11:33:45 2010 +0300 @@ -3,6 +3,7 @@ # UDEB TESTS # # Configuration 1 +testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 300, UDEB,\epoc32\winscw\c\tstdapis\tsockettest.bat, testexecute, \logs\testexecute\tloc_blr.htm,, c:\tstdapis\tloc_blr.script, 300, UDEB,, testexecute, \logs\testexecute\tprogname.htm,, c:\tstdapis\tprogname.script, 300, UDEB,, testexecute, \logs\testexecute\tlibcwchar.htm,, c:\tstdapis\tlibcwchar.script, 300, UDEB,, @@ -26,7 +27,7 @@ testexecute, \logs\testexecute\tregex.htm,, c:\tstdapis\tregex.script, 300, UDEB,, testexecute, \logs\testexecute\tsemaphore.htm,, c:\tstdapis\tsemaphore.script, 300, UDEB,, testexecute, \logs\testexecute\tshm.htm,, c:\tstdapis\tshm.script, 300, UDEB,, -testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 300, UDEB,\epoc32\winscw\c\tstdapis\tsockettest.bat, + testexecute, \logs\testexecute\tsyssim.htm,, c:\tstdapis\tsyssim.script, 300, UDEB,, testexecute, \logs\testexecute\tsysunistd.htm,, c:\tstdapis\tsysunistd.script, 300, UDEB,, testexecute, \logs\testexecute\ttime_blr.htm,, c:\tstdapis\ttime_blr.script, 300, UDEB,, @@ -90,6 +91,7 @@ #UREL TEsts +testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 300, UREL,\epoc32\winscw\c\tstdapis\tsockettest.bat, testexecute, \logs\testexecute\tloc_blr.htm,, c:\tstdapis\tloc_blr.script, 300, UREL,, testexecute, \logs\testexecute\tprogname.htm,, c:\tstdapis\tprogname.script, 300, UREL,, testexecute, \logs\testexecute\tlibcwchar.htm,, c:\tstdapis\tlibcwchar.script, 300, UREL,, @@ -113,7 +115,7 @@ testexecute, \logs\testexecute\tregex.htm,, c:\tstdapis\tregex.script, 300, UREL,, testexecute, \logs\testexecute\tsemaphore.htm,, c:\tstdapis\tsemaphore.script, 300, UREL,, testexecute, \logs\testexecute\tshm.htm,, c:\tstdapis\tshm.script, 300, UREL,, -testexecute, \logs\testexecute\tsocket.htm,, c:\tstdapis\tsocket.script, 300, UREL,\epoc32\winscw\c\tstdapis\tsockettest.bat, + testexecute, \logs\testexecute\tsyssim.htm,, c:\tstdapis\tsyssim.script, 300, UREL,, testexecute, \logs\testexecute\tsysunistd.htm,, c:\tstdapis\tsysunistd.script, 300, UREL,, testexecute, \logs\testexecute\ttime_blr.htm,, c:\tstdapis\ttime_blr.script, 300, UREL,, diff -r 9d9daa0f4b62 -r 4332f0f7be53 genericservices/httputils/group/INetProtUtil.iby --- a/genericservices/httputils/group/INetProtUtil.iby Thu Jul 15 20:34:46 2010 +0300 +++ b/genericservices/httputils/group/INetProtUtil.iby Thu Aug 19 11:33:45 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 9d9daa0f4b62 -r 4332f0f7be53 lowlevellibsandfws/apputils/group/bafl.iby --- a/lowlevellibsandfws/apputils/group/bafl.iby Thu Jul 15 20:34:46 2010 +0300 +++ b/lowlevellibsandfws/apputils/group/bafl.iby Thu Aug 19 11:33:45 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 9d9daa0f4b62 -r 4332f0f7be53 lowlevellibsandfws/pluginfw/Framework/MMPFiles/errorrsc.mmp --- a/lowlevellibsandfws/pluginfw/Framework/MMPFiles/errorrsc.mmp Thu Jul 15 20:34:46 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/MMPFiles/errorrsc.mmp Thu Aug 19 11:33:45 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 9d9daa0f4b62 -r 4332f0f7be53 lowlevellibsandfws/pluginfw/Group/ECom.iby --- a/lowlevellibsandfws/pluginfw/Group/ECom.iby Thu Jul 15 20:34:46 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Group/ECom.iby Thu Aug 19 11:33:45 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 \epoc32\rom\include\ecompatchconstants.hby if they want to patch anyone of +// edit EPOCROOT##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. //