Changeset 126 for pjproject/trunk/pjlib/src/pjlib-test/ioq_udp.c

Timestamp:

Jan 20, 2006 9:03:36 PM (18 years ago)

Author:

bennylp

Message:

Completed testing for WinCE port

File:

• pjproject/trunk/pjlib/src/pjlib-test/ioq_udp.c (modified) (17 diffs)

pjproject/trunk/pjlib/src/pjlib-test/ioq_udp.c

@@ -119 +119 @@
 {
     pj_sock_t ssock=-1, csock=-1;
-    pj_sockaddr_in addr;
+    pj_sockaddr_in addr, dst_addr;
     int addrlen;
     pj_pool_t *pool = NULL;
@@ -155 +155 @@
     // Bind server socket.
     TRACE_("bind socket...");
-    memset(&addr, 0, sizeof(addr));
+    pj_memset(&addr, 0, sizeof(addr));
     addr.sin_family = PJ_AF_INET;
     addr.sin_port = pj_htons(PORT);
@@ -187 +187 @@
     }
 
-    // Set destination address to send the packet.
-    TRACE_("set destination address...");
-    temp = pj_str("127.0.0.1");
-    if ((rc=pj_sockaddr_in_init(&addr, &temp, PORT)) != 0) {
-        app_perror("...error: unable to resolve 127.0.0.1", rc);
-        status=-26; goto on_error;
-    }
-
     // Randomize send_buf.
     pj_create_random_string(send_buf, bufsize);
@@ -200 +192 @@
     // Register reading from ioqueue.
     TRACE_("start recvfrom...");
+    pj_memset(&addr, 0, sizeof(addr));
     addrlen = sizeof(addr);
     bytes = bufsize;
@@ -217 +210 @@
     }
 
+    // Set destination address to send the packet.
+    TRACE_("set destination address...");
+    temp = pj_str("127.0.0.1");
+    if ((rc=pj_sockaddr_in_init(&dst_addr, &temp, PORT)) != 0) {
+        app_perror("...error: unable to resolve 127.0.0.1", rc);
+        status=-290; goto on_error;
+    }
+
     // Write must return the number of bytes.
     TRACE_("start sendto...");
     bytes = bufsize;
-    rc = pj_ioqueue_sendto(ckey, &write_op, send_buf, &bytes, 0, &addr, 
-                           sizeof(addr));
+    rc = pj_ioqueue_sendto(ckey, &write_op, send_buf, &bytes, 0, &dst_addr, 
+                           sizeof(dst_addr));
     if (rc != PJ_SUCCESS && rc != PJ_EPENDING) {
         app_perror("...error: pj_ioqueue_sendto", rc);
@@ -269 +270 @@
             }
 
-            if (memcmp(send_buf, recv_buf, bufsize) != 0) {
-                status=-70; goto on_error;
+            if (pj_memcmp(send_buf, recv_buf, bufsize) != 0) {
+                status=-67; goto on_error;
+            }
+            if (addrlen != sizeof(pj_sockaddr_in)) {
+                status=-68; goto on_error;
+            }
+            if (addr.sin_family != PJ_AF_INET) {
+                status=-69; goto on_error;
             }
 
@@ -296 +303 @@
 
 on_error:
-    if (status != 0) {
-        char errbuf[128];
-        PJ_LOG(1, (THIS_FILE, 
-                   "...compliance test error: status=%d, os_err=%d (%s)", 
-                   status, pj_get_netos_error(),
-                   pj_strerror(pj_get_netos_error(), errbuf, sizeof(errbuf))));
-    }
     if (ssock)
         pj_sock_close(ssock);
@@ -432 +432 @@
 
     // Bind server socket.
-    memset(&addr, 0, sizeof(addr));
+    pj_memset(&addr, 0, sizeof(addr));
     addr.sin_family = PJ_AF_INET;
     addr.sin_port = pj_htons(PORT);
@@ -453 +453 @@
     inactive_read_op = (pj_ioqueue_op_key_t*)pj_pool_alloc(pool,
                               inactive_sock_count*sizeof(pj_ioqueue_op_key_t));
-    memset(&addr, 0, sizeof(addr));
+    pj_memset(&addr, 0, sizeof(addr));
     addr.sin_family = PJ_AF_INET;
     for (i=0; i<inactive_sock_count; ++i) {
@@ -480 +480 @@
         bytes = bufsize;
         rc = pj_ioqueue_recv(key, &inactive_read_op[i], recv_buf, &bytes, 0);
-        if ( rc < 0 && rc != PJ_EPENDING) {
+        if (rc != PJ_EPENDING) {
             pj_sock_close(inactive_sock[i]);
             inactive_sock[i] = PJ_INVALID_SOCKET;
@@ -520 +520 @@
         bytes = bufsize;
         rc = pj_ioqueue_recv(skey, &read_op, recv_buf, &bytes, 0);
-        if (rc < 0 && rc != PJ_EPENDING) {
+        if (rc != PJ_EPENDING) {
             app_perror("...error: pj_ioqueue_read()", rc);
             break;
@@ -531 +531 @@
         if (rc != PJ_SUCCESS && rc != PJ_EPENDING) {
             app_perror("...error: pj_ioqueue_write()", bytes);
-            rc = -1;
             break;
         }
@@ -549 +548 @@
         t_elapsed.u64 += (t2.u64 - t1.u64);
 
-        if (rc < 0)
+        if (rc < 0) {
+            app_perror("   error: pj_ioqueue_poll", -rc);
             break;
+        }
 
         // Compare recv buffer with send buffer.
         if (callback_read_size != bufsize || 
-            memcmp(send_buf, recv_buf, bufsize)) 
+            pj_memcmp(send_buf, recv_buf, bufsize)) 
         {
-            rc = -1;
+            rc = -10;
+            PJ_LOG(3,(THIS_FILE, "   error: size/buffer mismatch"));
             break;
         }
@@ -581 +583 @@
 
     } else {
-        PJ_LOG(2, (THIS_FILE, "...ERROR (buf:%d, fds:%d)", 
-                              bufsize, inactive_sock_count+2));
+        PJ_LOG(2, (THIS_FILE, "...ERROR rc=%d (buf:%d, fds:%d)", 
+                              rc, bufsize, inactive_sock_count+2));
     }
 
@@ -593 +595 @@
     pj_ioqueue_destroy(ioque);
     pj_pool_release( pool);
-    return 0;
+    return rc;
 
 on_error:
@@ -639 +641 @@
 
     for (bufsize=BUF_MIN_SIZE; bufsize <= BUF_MAX_SIZE; bufsize *= 2) {
-        if (bench_test(bufsize, SOCK_INACTIVE_MIN))
-            return -1;
+        if ((status=bench_test(bufsize, SOCK_INACTIVE_MIN)) != 0)
+            return status;
     }
     bufsize = 512;
@@ -648 +650 @@
     {
         //PJ_LOG(3,(THIS_FILE, "...testing with %d fds", sock_count));
-        if (bench_test(bufsize, sock_count-2))
-            return -1;
+        if ((status=bench_test(bufsize, sock_count-2)) != 0)
+            return status;
     }
     return 0;