Changeset 806 for pjproject/branches/symbian/pjlib/src/pjlib-test/sock.c

Timestamp:

Nov 19, 2006 2:59:13 PM (17 years ago)

Author:

bennylp

Message:

Fixes for S60 3rd edition:

• it seems there is a problem with sending UDP packet inside connected UDP socket. This (still) causes pjlib-test to fail. No workaround yet.
• fixed bug in Symbian's ioqueue when data is immediately available.
• UDP connect()/getsockname() doesn't return the correct interface IP address, causing pj_gethostip() to fail, and subsequently SIP transport's name determination to fail. Because of this, for now SIP transport's name must be initialized properly (see sipstateless.c)

File:

• pjproject/branches/symbian/pjlib/src/pjlib-test/sock.c (modified) (6 diffs)

pjproject/branches/symbian/pjlib/src/pjlib-test/sock.c

@@ -67 +67 @@
 #define UDP_PORT        51234
 #define TCP_PORT        (UDP_PORT+10)
-#define BIG_DATA_LEN    9000
+#define BIG_DATA_LEN    8192
 #define ADDRESS         "127.0.0.1"
 
@@ -350 +350 @@
         rc = -121; goto on_error;
     }
-            
+
     /* Test send/recv, with sendto */
     rc = send_recv_test(PJ_SOCK_DGRAM, ss, cs, &dstaddr, NULL, 
@@ -362 +362 @@
     if (rc != 0)
         goto on_error;
-
+    
+// This test will fail on S60 3rd Edition MR2
+#if 1
     /* connect() the sockets. */
     rc = pj_sock_connect(cs, &dstaddr, sizeof(dstaddr));
@@ -380 +382 @@
     if (rc != 0)
         goto on_error;
+#endif
 
 on_error:
@@ -437 +440 @@
 }
 
+#if 0
+#include "../pj/os_symbian.h"
+static int connect_test()
+{
+        RSocketServ rSockServ;
+        RSocket rSock;
+        TInetAddr inetAddr;
+        TRequestStatus reqStatus;
+        char buffer[16];
+        TPtrC8 data((const TUint8*)buffer, (TInt)sizeof(buffer));
+        int rc;
+        
+        rc = rSockServ.Connect();
+        if (rc != KErrNone)
+                return rc;
+        
+        rc = rSock.Open(rSockServ, KAfInet, KSockDatagram, KProtocolInetUdp);
+        if (rc != KErrNone) 
+        {               
+                rSockServ.Close();
+                return rc;
+        }
+        
+        inetAddr.Init(KAfInet);
+        inetAddr.Input(_L("127.0.0.1"));
+        inetAddr.SetPort(80);
+        
+        rSock.Connect(inetAddr, reqStatus);
+        User::WaitForRequest(reqStatus);
+
+        if (reqStatus != KErrNone) {
+                rSock.Close();
+                rSockServ.Close();
+                return rc;
+        }
+    
+        rSock.Send(data, 0, reqStatus);
+        User::WaitForRequest(reqStatus);
+        
+        if (reqStatus!=KErrNone) {
+                rSock.Close();
+                rSockServ.Close();
+                return rc;
+        }
+        
+        rSock.Close();
+        rSockServ.Close();
+        return KErrNone;
+}
+#endif
+
 int sock_test()
 {
@@ -443 +497 @@
     pj_create_random_string(bigdata, BIG_DATA_LEN);
 
+// Enable this to demonstrate the error witn S60 3rd Edition MR2
+#if 0
+    rc = connect_test();
+    if (rc != 0)
+        return rc;
+#endif
+    
     rc = format_test();
     if (rc != 0)