Changeset 4461 for pjproject/trunk/pjlib/src/pj/activesock.c

Timestamp:

Apr 5, 2013 3:02:19 AM (12 years ago)

Author:

riza

Message:

Re #1643: Code restructure+add callback to support symbian gui app

File:

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

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

@@ -844 +844 @@
                                " operation, stopping further ioqueue accepts.",
                                asock->err_counter, asock->last_err));
+                
+                if ((status == PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) && 
+                    (asock->cb.on_accept_complete2)) 
+                {
+                    (*asock->cb.on_accept_complete2)(asock, 
+                                                     accept_op->new_sock,
+                                                     &accept_op->rem_addr,
+                                                     accept_op->rem_addr_len,
+                                                     PJ_ESOCKETSTOP);
+                }
                 return;
             }
@@ -851 +861 @@
         }
 
-        if (status==PJ_SUCCESS && asock->cb.on_accept_complete) {
+        if (status==PJ_SUCCESS && (asock->cb.on_accept_complete2 || 
+                                   asock->cb.on_accept_complete)) {
             pj_bool_t ret;
 
             /* Notify callback */
-            ret = (*asock->cb.on_accept_complete)(asock, accept_op->new_sock,
-                                                  &accept_op->rem_addr,
-                                                  accept_op->rem_addr_len);
+            if (asock->cb.on_accept_complete2) {
+                ret = (*asock->cb.on_accept_complete2)(asock, 
+                                                       accept_op->new_sock,
+                                                       &accept_op->rem_addr,
+                                                       accept_op->rem_addr_len,
+                                                       status);
+            } else {
+                ret = (*asock->cb.on_accept_complete)(asock, 
+                                                      accept_op->new_sock,
+                                                      &accept_op->rem_addr,
+                                                      accept_op->rem_addr_len);     
+            }
 
             /* If callback returns false, we have been destroyed! */