--- 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;
}