Changeset 6071 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

Timestamp:

Sep 23, 2019 7:25:41 AM (5 years ago)

Author:

ming

Message:

Fixed #2229: Limitations in ICE data sending

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -292 +292 @@
                             PJMEDIA_TRANSPORT_SO_SNDBUF_SIZE;
     }
+    if (ice_st_cfg.send_buf_size == 0)
+        ice_st_cfg.send_buf_size = PJMEDIA_MAX_MTU;
 
     /* Create ICE */
@@ -1888 +1890 @@
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
+    pj_status_t status;
 
     /* Simulate packet lost on TX direction */
@@ -1899 +1902 @@
     }
 
-    return pj_ice_strans_sendto(tp_ice->ice_st, 1, 
-                                pkt, size, &tp_ice->remote_rtp,
-                                tp_ice->addr_len);
+    status = pj_ice_strans_sendto2(tp_ice->ice_st, 1, 
+                                   pkt, size, &tp_ice->remote_rtp,
+                                   tp_ice->addr_len);
+    if (status == PJ_EPENDING)
+        status = PJ_SUCCESS;
+
+    return status;
 }
 
@@ -1921 +1928 @@
 
     if (tp_ice->comp_cnt > 1 || tp_ice->use_rtcp_mux) {
+        pj_status_t status;
         unsigned comp_id = (tp_ice->use_rtcp_mux? 1: 2);
+
         if (addr == NULL) {
             addr = &tp_ice->remote_rtcp;
             addr_len = pj_sockaddr_get_len(addr);
         }         
-        return pj_ice_strans_sendto(tp_ice->ice_st, comp_id, pkt, size,
-                                    addr, addr_len);
+
+        status = pj_ice_strans_sendto2(tp_ice->ice_st, comp_id, pkt, size,
+                                       addr, addr_len);
+        if (status == PJ_EPENDING)
+            status = PJ_SUCCESS;
+
+        return status;
     } else {
         return PJ_SUCCESS;