Changeset 5737 for pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

Timestamp:

Feb 15, 2018 1:57:11 PM (6 years ago)

Author:

riza

Message:

Fix #2091: On iOS11, replace_udp_sock() might fail and lead to unusable UDP transport.

File:

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

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;
+        /* 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"));
+        }
+        return;
+    }
+#endif
+
     /*
      * The idea of the loop is to process immediate data received by
@@ -262 +283 @@
                     status != PJ_STATUS_FROM_OS(OSERR_ECONNRESET)) 
                 {
-
                     PJSIP_ENDPT_LOG_ERROR((rdata->tp_info.transport->endpt,
                                            rdata->tp_info.transport->obj_name,
@@ -305 +325 @@
     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;
+        /* 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"));
+        }
+        return;
+    }
+#endif
+
     if (tdata_op_key->callback) {
         tdata_op_key->callback(&tp->base, tdata_op_key->token, bytes_sent);
@@ -562 +603 @@
 
     pj_assert(a_name->host.slen != 0);
+    
+    if (pj_strcmp(&tp->base.local_name.host, &a_name->host) == 0 &&
+        tp->base.local_name.port == a_name->port)
+    {
+        return;
+    }
+    
     pj_strdup_with_null(tp->base.pool, &tp->base.local_name.host, 
                         &a_name->host);
@@ -1133 +1181 @@
         /* Create the socket if it's not specified */
         if (sock == PJ_INVALID_SOCKET) {
-            status = create_socket(local->addr.sa_family, local, 
-                                   pj_sockaddr_get_len(local), &sock);
+            status = create_socket(local?local->addr.sa_family:pj_AF_UNSPEC(), 
+                                   local, local?pj_sockaddr_get_len(local):0, 
+                                   &sock);
             if (status != PJ_SUCCESS)
                 return status;