Changeset 17

Timestamp:

Nov 6, 2005 7:46:48 PM (18 years ago)

Author:

bennylp

Message:

Tested UDP echo server on Win2K

Location:

pjproject/main/pjlib

Files:

• build/pjlib.dsp (modified) (1 diff)
• build/pjlib_test.dsp (modified) (1 diff)
• src/pj/ioqueue_common_abs.c (modified) (4 diffs)
• src/pjlib-test/echo_srv.c (deleted)
• src/pjlib-test/list.c (modified) (1 diff)
• src/pjlib-test/test.c (modified) (1 diff)
• src/pjlib-test/udp_echo_srv_ioqueue.c (modified) (7 diffs)

pjproject/main/pjlib/build/pjlib.dsp

@@ -217 +217 @@
 
 SOURCE=..\src\pj\ioqueue_select.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=..\src\pj\ioqueue_winnt.c
-# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File

pjproject/main/pjlib/build/pjlib_test.dsp

@@ -96 +96 @@
 # Begin Source File
 
-SOURCE="..\src\pjlib-test\echo_srv.c"
-# End Source File
-# Begin Source File
-
 SOURCE="..\src\pjlib-test\errno.c"
 # End Source File

pjproject/main/pjlib/src/pj/ioqueue_common_abs.c

@@ -288 +288 @@
         /* Done. */
     } else {
-        pj_assert(!"Descriptor is signaled but key "
-                   "has no pending operation!");
-
+        /*
+         * This is normal; execution may fall here when multiple threads
+         * are signalled for the same event, but only one thread eventually
+         * able to process the event.
+         */
         pj_mutex_unlock(h->mutex);
     }
@@ -417 +419 @@
 
     } else {
+        /*
+         * This is normal; execution may fall here when multiple threads
+         * are signalled for the same event, but only one thread eventually
+         * able to process the event.
+         */
         pj_mutex_unlock(h->mutex);
     }
@@ -617 +624 @@
     write_op = (struct write_operation*)op_key;
     write_op->op = PJ_IOQUEUE_OP_SEND;
-    write_op->buf = NULL;
+    write_op->buf = (void*)data;
     write_op->size = *length;
     write_op->written = 0;
@@ -695 +702 @@
     write_op = (struct write_operation*)op_key;
     write_op->op = PJ_IOQUEUE_OP_SEND_TO;
-    write_op->buf = NULL;
+    write_op->buf = (void*)data;
     write_op->size = *length;
     write_op->written = 0;

pjproject/main/pjlib/src/pjlib-test/list.c

@@ -34 +34 @@
 typedef struct list_node
 {
-    PJ_DECL_LIST_MEMBER(struct list_node)
+    PJ_DECL_LIST_MEMBER(struct list_node);
     int value;
 } list_node;

pjproject/main/pjlib/src/pjlib-test/test.c

@@ -133 +133 @@
 #if INCLUDE_ECHO_SERVER
     //echo_server();
-    echo_srv_sync();
+    //echo_srv_sync();
+    udp_echo_srv_ioqueue();
+
 #elif INCLUDE_ECHO_CLIENT
     if (param_echo_sock_type == 0)

pjproject/main/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c

@@ -15 +15 @@
     int                  is_pending;
     pj_status_t          last_err;
+    pj_sockaddr_in       addr;
+    int                  addrlen;
 };
 
@@ -29 +31 @@
 
         if (bytes_received < 0) {
-            PJ_LOG(3,("","...error receiving data, received=%d", 
-                      bytes_received));
+            if (-bytes_received != recv_rec->last_err) {
+                recv_rec->last_err = -bytes_received;
+                app_perror("...error receiving data", -bytes_received);
+            }
         } else if (bytes_received == 0) {
             /* note: previous error, or write callback */
@@ -39 +43 @@
                 pj_ssize_t sent = bytes_received;
                 pj_memcpy(send_rec->buffer, recv_rec->buffer, bytes_received);
-                rc = pj_ioqueue_send(key, &send_rec->op_key_, 
-                                     send_rec->buffer, &sent, 0);
+                pj_memcpy(&send_rec->addr, &recv_rec->addr, recv_rec->addrlen);
+                send_rec->addrlen = recv_rec->addrlen;
+                rc = pj_ioqueue_sendto(key, &send_rec->op_key_, 
+                                       send_rec->buffer, &sent, 0,
+                                       &send_rec->addr, send_rec->addrlen);
                 send_rec->is_pending = (rc==PJ_EPENDING);
 
                 if (rc!=PJ_SUCCESS && rc!=PJ_EPENDING) {
-                    app_perror("...send error", rc);
+                    app_perror("...send error(1)", rc);
                 }
             }
@@ -51 +58 @@
         if (!send_rec->is_pending) {
             bytes_received = recv_rec->size;
-            rc = pj_ioqueue_recv(key, &recv_rec->op_key_, 
-                                 recv_rec->buffer, &bytes_received, 0);
+            rc = pj_ioqueue_recvfrom(key, &recv_rec->op_key_, 
+                                     recv_rec->buffer, &bytes_received, 0,
+                                     &recv_rec->addr, &recv_rec->addrlen);
             recv_rec->is_pending = (rc==PJ_EPENDING);
             if (rc == PJ_SUCCESS) {
@@ -81 +89 @@
 
     if (bytes_sent <= 0) {
-        pj_status_t rc = pj_get_netos_error();
-        app_perror("...send error", rc);
+        pj_status_t rc = -bytes_sent;
+        if (rc != send_rec->last_err) {
+            send_rec->last_err = rc;
+            app_perror("...send error(2)", rc);
+        }
     }
 
@@ -102 +113 @@
     read_op.buffer = recv_buf;
     read_op.size = sizeof(recv_buf);
+    read_op.addrlen = sizeof(read_op.addr);
+
     write_op.peer = &read_op;
     write_op.is_pending = 0;
@@ -109 +122 @@
 
     length = sizeof(recv_buf);
-    rc = pj_ioqueue_recv(key, &read_op.op_key_, recv_buf, &length, 0);
+    rc = pj_ioqueue_recvfrom(key, &read_op.op_key_, recv_buf, &length, 0,
+                             &read_op.addr, &read_op.addrlen);
     if (rc == PJ_SUCCESS) {
         read_op.is_pending = 1;