Changeset 6039

Timestamp:

Jul 17, 2019 7:22:00 AM (5 years ago)

Author:

riza

Message:

Fix #2213: First packet for TURN over TCP might get dropped.

File:

• pjproject/trunk/pjnath/src/pjnath/turn_sock.c (modified) (1 diff)

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -1358 +1358 @@
     }
 
-    if (conn->state == DATACONN_STATE_READY) {
-        /* Application data */
-        if (turn_sock->cb.on_rx_data) {
-            (*turn_sock->cb.on_rx_data)(turn_sock, data, size,
-                                        &conn->peer_addr,
-                                        conn->peer_addr_len);
-        }
-    } else if (conn->state == DATACONN_STATE_CONN_BINDING) {
-        /* Waiting for ConnectionBind response */
-        pj_bool_t is_stun;
-        pj_turn_session_on_rx_pkt_param prm;
-        
-        /* Ignore if this is not a STUN message */
-        is_stun = ((((pj_uint8_t*)data)[0] & 0xC0) == 0);
-        if (!is_stun)
-            goto on_return;
-
-        pj_bzero(&prm, sizeof(prm));
-        prm.pkt = data;
-        prm.pkt_len = size;
-        prm.src_addr = &conn->peer_addr;
-        prm.src_addr_len = conn->peer_addr_len;
-        pj_turn_session_on_rx_pkt2(conn->turn_sock->sess, &prm);
-        /* Got remainder? */
-        if (prm.parsed_len < size) {
-            *remainder = size - prm.parsed_len;
-            if (prm.parsed_len) {
-                pj_memmove(data, (pj_uint8_t*)data+prm.parsed_len,
+    *remainder = size;
+    while (*remainder > 0) {
+        if (conn->state == DATACONN_STATE_READY) {
+            /* Application data */
+            if (turn_sock->cb.on_rx_data) {
+                (*turn_sock->cb.on_rx_data)(turn_sock, data, *remainder,
+                                            &conn->peer_addr,
+                                            conn->peer_addr_len);
+            }
+            *remainder = 0;
+        } else if (conn->state == DATACONN_STATE_CONN_BINDING) {
+            /* Waiting for ConnectionBind response */
+            pj_bool_t is_stun;
+            pj_turn_session_on_rx_pkt_param prm;
+
+            /* Ignore if this is not a STUN message */
+            is_stun = ((((pj_uint8_t*)data)[0] & 0xC0) == 0);
+            if (!is_stun)
+                goto on_return;
+
+            pj_bzero(&prm, sizeof(prm));
+            prm.pkt = data;
+            prm.pkt_len = *remainder;
+            prm.src_addr = &conn->peer_addr;
+            prm.src_addr_len = conn->peer_addr_len;
+            pj_turn_session_on_rx_pkt2(conn->turn_sock->sess, &prm);
+            /* Got remainder? */
+            if (prm.parsed_len < *remainder && prm.parsed_len > 0) {
+                pj_memmove(data, (pj_uint8_t*)data + prm.parsed_len,
                            *remainder);
             }
-        }
+            *remainder -= prm.parsed_len;
+        } else
+            goto on_return;
     }