Changeset 6003

Timestamp:

May 23, 2019 5:47:55 PM (4 years ago)

Author:

riza

Message:

Close #2201: Restart UDP transport after replace_udp_socket fail when sending data.

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ioqueue_common_abs.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transport_udp.c (modified) (5 diffs)

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

@@ -1030 +1030 @@
             PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
                 /* Special treatment for dead UDP sockets here, see ticket #1107 */
-                if (status==PJ_STATUS_FROM_OS(EPIPE) && !IS_CLOSING(key) &&
-                    key->fd_type==pj_SOCK_DGRAM() && !restart_retry)
+                if (status == PJ_STATUS_FROM_OS(EPIPE) && !IS_CLOSING(key) &&
+                    key->fd_type == pj_SOCK_DGRAM())
                 {
-                    PJ_PERROR(4,(THIS_FILE, status,
-                                 "Send error for socket %d, retrying",
-                                 key->fd));
-                    replace_udp_sock(key);
-                    restart_retry = PJ_TRUE;
-                    goto retry_on_restart;
+                    if (!restart_retry) {
+                        PJ_PERROR(4, (THIS_FILE, status,
+                                      "Send error for socket %d, retrying",
+                                      key->fd));
+                        replace_udp_sock(key);
+                        restart_retry = PJ_TRUE;
+                        goto retry_on_restart;
+                    } else {
+                        status = PJ_ESOCKETSTOP;
+                    }
                 }
 #endif

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -143 +143 @@
         goto on_return;
 
-#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
-            PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
     if (-bytes_read == PJ_ESOCKETSTOP) {
         --tp->read_loop_spin;
@@ -162 +160 @@
         return;
     }
-#endif
 
     /*
@@ -325 +322 @@
     tdata_op_key->tdata = NULL;
 
-#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
-            PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
     if (-bytes_sent == PJ_ESOCKETSTOP) {
         pj_status_t status;
@@ -344 +339 @@
         return;
     }
-#endif
 
     if (tdata_op_key->callback) {
@@ -386 +380 @@
                                rem_addr, addr_len);
 
-    if (status != PJ_EPENDING)
+    if (status != PJ_EPENDING) {
+        if (status == PJ_ESOCKETSTOP) {
+            /* Try to recover by restarting the transport. */
+            PJ_LOG(4,(tp->base.obj_name, "Restarting SIP UDP transport"));
+            status = pjsip_udp_transport_restart2(
+                                &tp->base,
+                                PJSIP_UDP_TRANSPORT_DESTROY_SOCKET,
+                                PJ_INVALID_SOCKET,
+                                &tp->base.local_addr,
+                                &tp->base.local_name);
+
+            if (status != PJ_SUCCESS) {
+                PJ_PERROR(1,(THIS_FILE, status,
+                             "Error restarting SIP UDP transport"));
+            }
+        }
         tdata->op_key.tdata = NULL;
+    }
 
     return status;