Changeset 592 for pjproject/trunk/pjlib/src/pjlib-test/ioq_tcp.c

Timestamp:

Jul 8, 2006 7:46:43 PM (18 years ago)

Author:

bennylp

Message:

Attempted to fix epoll for Linux

File:

• pjproject/trunk/pjlib/src/pjlib-test/ioq_tcp.c (modified) (4 diffs)

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

@@ -39 +39 @@
 
 #define THIS_FILE           "test_tcp"
-#define PORT                50000
 #define NON_EXISTANT_PORT   50123
 #define LOOP                100
@@ -258 +257 @@
 
     // Bind server socket.
-    memset(&addr, 0, sizeof(addr));
-    addr.sin_family = PJ_AF_INET;
-    addr.sin_port = pj_htons(PORT);
-    if (pj_sock_bind(ssock, &addr, sizeof(addr))) {
+    pj_sockaddr_in_init(&addr, 0, 0);
+    if ((rc=pj_sock_bind(ssock, &addr, sizeof(addr))) != 0 ) {
         app_perror("...bind error", rc);
         status=-10; goto on_error;
     }
+
+    // Get server address.
+    client_addr_len = sizeof(addr);
+    rc = pj_sock_getsockname(ssock, &addr, &client_addr_len);
+    if (rc != PJ_SUCCESS) {
+        app_perror("...ERROR in pj_sock_getsockname()", rc);
+        status=-15; goto on_error;
+    }
+    addr.sin_addr = pj_inet_addr(pj_cstr(&s, "127.0.0.1"));
 
     // Create I/O Queue.
@@ -302 +308 @@
         ++pending_op;
     }
-
-    // Initialize remote address.
-    memset(&addr, 0, sizeof(addr));
-    addr.sin_family = PJ_AF_INET;
-    addr.sin_port = pj_htons(PORT);
-    addr.sin_addr = pj_inet_addr(pj_cstr(&s, "127.0.0.1"));
 
     // Client socket connect()
@@ -462 +462 @@
 
     // Initialize remote address.
-    memset(&addr, 0, sizeof(addr));
-    addr.sin_family = PJ_AF_INET;
-    addr.sin_port = pj_htons(NON_EXISTANT_PORT);
-    addr.sin_addr = pj_inet_addr(pj_cstr(&s, "127.0.0.1"));
+    pj_sockaddr_in_init(&addr, pj_cstr(&s, "127.0.0.1"), NON_EXISTANT_PORT);
 
     // Client socket connect()