Changeset 2804 for pjproject/branches/1.0/pjlib/src/pj/sock_symbian.cpp

Timestamp:

Jun 25, 2009 12:26:15 PM (15 years ago)

Author:

bennylp

Message:

Ticket #759: Problem with TCP transport on Symbian

• backported changes in #758

File:

• pjproject/branches/1.0/pjlib/src/pj/sock_symbian.cpp (modified) (5 diffs)

pjproject/branches/1.0/pjlib/src/pj/sock_symbian.cpp

@@ -126 +126 @@
 void CPjSocketReader::ConstructL(unsigned max_len)
 {
-    TProtocolDesc aProtocol;
-    TInt err;
-
-    err = sock_.Socket().Info(aProtocol);
-    User::LeaveIfError(err);
-
-    isDatagram_ = (aProtocol.iSockType == KSockDatagram);
+    isDatagram_ = sock_.IsDatagram();
 
     TUint8 *ptr = new TUint8[max_len];
@@ -518 +512 @@
 
     /* Wrap Symbian RSocket into PJLIB's CPjSocket, and return to caller */
-    CPjSocket *pjSock = new CPjSocket(af, rSock);
+    CPjSocket *pjSock = new CPjSocket(af, type, rSock);
     *p_sock = (pj_sock_t)pjSock;
 
@@ -734 +728 @@
 
     CPjSocket *pjSock = (CPjSocket*)sock;
-    RSocket &rSock = pjSock->Socket();
 
     if (pjSock->Reader()) {
@@ -758 +751 @@
     TPtr8 data((TUint8*)buf, (TInt)*len, (TInt)*len);
 
-    rSock.Recv(data, flags, reqStatus, recvLen);
+    if (pjSock->IsDatagram()) {
+        pjSock->Socket().Recv(data, flags, reqStatus);
+    } else {
+        // Using static like this is not pretty, but we don't need to use
+        // the value anyway, hence doing it like this is probably most
+        // optimal.
+        static TSockXfrLength len;
+        pjSock->Socket().RecvOneOrMore(data, flags, reqStatus, len);
+    }
     User::WaitForRequest(reqStatus);
 
@@ -998 +999 @@
 
     // Create PJ socket
-    CPjSocket *newPjSock = new CPjSocket(pjSock->GetAf(), newSock);
+    CPjSocket *newPjSock = new CPjSocket(pjSock->GetAf(), pjSock->GetSockType(),
+                                         newSock);
     newPjSock->SetConnected(true);