Changeset 5597 for pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

Timestamp:

Jun 3, 2017 9:22:34 AM (7 years ago)

Author:

nanang

Message:

Re #2018: Initial version of DTLS-SRTP implementation.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c (modified) (11 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -56 +56 @@
     unsigned            media_options;  /**< Transport media options.       */
     void               *user_data;      /**< Only valid when attached       */
-    pj_bool_t           attached;       /**< Has attachment?                */
+    //pj_bool_t         attached;       /**< Has attachment?                */
     pj_sockaddr         rem_rtp_addr;   /**< Remote RTP address             */
+    unsigned            rem_rtp_cnt;    /**< How many pkt from this addr.   */
     pj_sockaddr         rem_rtcp_addr;  /**< Remote RTCP address            */
     int                 addr_len;       /**< Length of addresses.           */
@@ -480 +481 @@
                 /* We're still receiving from rem_rtp_addr. Don't switch. */
                 udp->rtp_src_cnt = 0;
+                udp->rem_rtp_cnt++;
             } else {
                 udp->rtp_src_cnt++;
 
                 if (udp->rtp_src_cnt < PJMEDIA_RTP_NAT_PROBATION_CNT) {
-                    discard = PJ_TRUE;
+                    /* Only discard if we have ever received packet from
+                     * remote address (rem_rtp_addr).
+                     */
+                    //discard = PJ_TRUE;
+                    discard = (udp->rem_rtp_cnt != 0);
                 } else {
                 
@@ -530 +536 @@
         }
 
-        if (!discard && udp->attached && cb)
+        //if (!discard && udp->attached && cb)
+        if (!discard && cb)
             (*cb)(user_data, udp->rtp_pkt, bytes_read);
 
@@ -566 +573 @@
         user_data = udp->user_data;
 
-        if (udp->attached && cb)
+        //if (udp->attached && cb)
+        if (cb)
             (*cb)(user_data, udp->rtcp_pkt, bytes_read);
 
@@ -650 +658 @@
 
     /* Must not be "attached" to existing application */
-    PJ_ASSERT_RETURN(!udp->attached, PJ_EINVALIDOP);
+    //PJ_ASSERT_RETURN(!udp->attached, PJ_EINVALIDOP);
 
     /* Lock the ioqueue keys to make sure that callbacks are
@@ -686 +694 @@
 
     /* Last, mark transport as attached */
-    udp->attached = PJ_TRUE;
+    //udp->attached = PJ_TRUE;
 
     /* Reset source RTP & RTCP addresses and counter */
@@ -693 +701 @@
     udp->rtp_src_cnt = 0;
     udp->rtcp_src_cnt = 0;
+    udp->rem_rtp_cnt = 0;
 
     /* Set buffer size for RTP socket */
@@ -752 +761 @@
     pj_assert(tp);
 
-    if (udp->attached) {
+    //if (udp->attached) {
+    if (1) {
         int i;
 
@@ -768 +778 @@
 
         /* First, mark transport as unattached */
-        udp->attached = PJ_FALSE;
+        //udp->attached = PJ_FALSE;
 
         /* Clear up application infos from transport */
@@ -801 +811 @@
 
     /* Must be attached */
-    PJ_ASSERT_RETURN(udp->attached, PJ_EINVALIDOP);
+    //PJ_ASSERT_RETURN(udp->attached, PJ_EINVALIDOP);
 
     /* Check that the size is supported */
@@ -862 +872 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(udp->attached, PJ_EINVALIDOP);
+    //PJ_ASSERT_RETURN(udp->attached, PJ_EINVALIDOP);
 
     if (addr == NULL) {