Changeset 859 for pjproject/trunk

Timestamp:

Dec 25, 2006 6:36:23 AM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #49: When socket is signaled for readability, recv()/recvfrom is called with flags set to zero. It should use the flags as specified when ioqueue_recv()/ioqueue_recvfrom() was called.

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c (modified) (2 diffs)

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

@@ -418 +418 @@
         if ((read_op->op == PJ_IOQUEUE_OP_RECV_FROM)) {
             read_op->op = 0;
-            rc = pj_sock_recvfrom(h->fd, read_op->buf, &bytes_read, 0,
+            rc = pj_sock_recvfrom(h->fd, read_op->buf, &bytes_read, 
+                                  read_op->flags,
                                   read_op->rmt_addr, 
                                   read_op->rmt_addrlen);
         } else if ((read_op->op == PJ_IOQUEUE_OP_RECV)) {
             read_op->op = 0;
-            rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read, 0);
+            rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read, 
+                              read_op->flags);
         } else {
             pj_assert(read_op->op == PJ_IOQUEUE_OP_READ);
@@ -441 +443 @@
 #           if defined(PJ_WIN32) && PJ_WIN32 != 0 || \
                defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE != 0
-                rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read, 0);
+                rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read, 
+                                  read_op->flags);
                 //rc = ReadFile((HANDLE)h->fd, read_op->buf, read_op->size,
                 //              &bytes_read, NULL);