--- a/datacommsserver/esockserver/test/TE_EsockTestSteps/src/EsockTestBase.cpp	Thu May 27 14:07:49 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_EsockTestSteps/src/EsockTestBase.cpp	Fri Jun 11 14:52:21 2010 +0300
@@ -835,7 +835,7 @@
 		RConnection* c = iConns.Find(aParams.iConnectionName);
 		if (c==NULL)
 			return KErrNotFound;
-		error = s->Open(*ss, KAfInet, aParams.iSocketType, aParams.iProtocol, *c);
+		error = s->Open(*ss, aParams.iAddrFamily, aParams.iSocketType, aParams.iProtocol, *c);
 		}
 	else if (aParams.iSubconnectionName.Length()>0)
     	{
@@ -844,7 +844,7 @@
 			{
 			return KErrNotFound;
 			}
-		error = s->Open(*ss, KAfInet, aParams.iSocketType, aParams.iProtocol, *sc);
+		error = s->Open(*ss, aParams.iAddrFamily, aParams.iSocketType, aParams.iProtocol, *sc);
 		}
 	else if (aParams.iProtocolName.Length()>0)
 		{
@@ -852,17 +852,15 @@
 		}
 	else
 		{
-		error = s->Open(*ss, KAfInet, aParams.iSocketType, aParams.iProtocol);
+		error = s->Open(*ss, aParams.iAddrFamily, aParams.iSocketType, aParams.iProtocol);
 		}
 
 
 	return error;
 	}
 
-TInt CCEsockTestBase::BindSocket(const TRSocketParams& /*aParams*/)
+TInt CCEsockTestBase::BindSocket(TRSocketParams& aSockeSParams)
 	{
-    return KErrNotSupported;
-    /*
     RSocket* s = iSocks.Find(aSockeSParams.iSocketName);
 	if (s==NULL)
 		return KErrNotFound;
@@ -874,8 +872,8 @@
 		return error;
 
 	//bind to Local address for TCP or UDP
+	
 	return s->Bind(aSockeSParams.iLocalIP);
-	*/
 	}
 
 TInt CCEsockTestBase::ConnectSocket(TRSocketParams& aParams, TRequestStatus& aRequestStatus)
@@ -1483,7 +1481,7 @@
 	    User::WaitForRequest(ec->iEventReceived);
 	    }
 	aNifProgress = (ec->iEventReceived.Int()==KErrNone)? &ec->iProgressBuf() : NULL;
-	return ec->iEventReceived.Int();
+	return ec->iEventReceived.Int() == KRequestPending ? KErrNone : ec->iEventReceived.Int();
 	}