Changeset 6003 for pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

Timestamp:

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

Author:

riza

Message:

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

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c (modified) (1 diff)

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