Changeset 1519 for pjproject/trunk

Timestamp:

Oct 24, 2007 9:37:50 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #402: Endless error loop when TCP accept() continuously returns error

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -139 +139 @@
                                 pj_status_t status);
 
+/* Handle accept() completion */
+static pj_status_t handle_accept(pj_ioqueue_key_t *key, 
+                                 pj_ioqueue_op_key_t *op_key, 
+                                 pj_sock_t sock, 
+                                 pj_status_t status);
+
 /* This callback is called by transport manager to destroy listener */
 static pj_status_t lis_destroy(pjsip_tpfactory *factory);
@@ -359 +365 @@
         listener->accept_op[i]->index = i;
 
-        on_accept_complete(listener->key, &listener->accept_op[i]->op_key,
-                           listener->sock, PJ_EPENDING);
+        status = handle_accept(listener->key, &listener->accept_op[i]->op_key,
+                               listener->sock, PJ_EPENDING);
+        if (status != PJ_SUCCESS)
+            goto on_error;
     }
 
@@ -903 +911 @@
                                 pj_status_t status)
 {
+    handle_accept(key, op_key, sock, status);
+}
+
+
+/* Handle accept() completion */
+static pj_status_t handle_accept(pj_ioqueue_key_t *key, 
+                                 pj_ioqueue_op_key_t *op_key, 
+                                 pj_sock_t sock, 
+                                 pj_status_t status)
+{
     struct tcp_listener *listener;
     struct tcp_transport *tcp;
@@ -936 +954 @@
              */
             ++err_cnt;
-            if (err_cnt >= 10) {
+            if (err_cnt >= 20) {
                 PJ_LOG(1, (listener->factory.obj_name, 
-                           "Too many errors, listener stopping"));
+                           "Too many errors, LISTENER IS STOPPING!"));
+                return status;
             }
 
@@ -1021 +1040 @@
 
     } while (status != PJ_EPENDING);
+
+    return PJ_SUCCESS;
 }