Changeset 311 for pjproject/trunk

Timestamp:

Mar 8, 2006 10:05:19 AM (19 years ago)

Author:

bennylp

Message:

RTP server NAT support and removed rtp_port

Location:

pjproject/trunk/pjmedia

Files:

• build/pjmedia.dsp (modified) (2 diffs)
• include/pjmedia/rtp_port.h (deleted)
• src/pjmedia/rtp_port.c (deleted)
• src/pjmedia/stream.c (modified) (5 diffs)

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -146 +146 @@
 # Begin Source File
 
-SOURCE=..\src\pjmedia\rtp_port.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\pjmedia\sdp.c
 # End Source File
@@ -231 +227 @@
 
 SOURCE=..\include\pjmedia\rtp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\pjmedia\rtp_port.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -42 +42 @@
 #define PJMEDIA_MAX_MTU                 1500
 #define PJMEDIA_DTMF_DURATION           1600    /* in timestamp */
+#define PJMEDIA_RTP_NAT_PROBATION_CNT   10
 
 
@@ -98 +99 @@
     pj_sockaddr_in           rem_rtcp_addr; /**< Remote RTCP address.       */
 
+    pj_sockaddr_in           rem_src_rtp;   /**< addr of src pkt from remote*/
+    unsigned                 rem_src_cnt;   /**< if different, # of pkt rcv */
+
     pj_rtcp_session          rtcp;          /**< RTCP for incoming RTP.     */
 
@@ -451 +455 @@
         const void *payload;
         unsigned payloadlen;
+        int addrlen;
         int status;
 
@@ -474 +479 @@
         /* Get packet from socket. */
         len = channel->in_pkt_size;
-        status = pj_sock_recv(stream->skinfo.rtp_sock, 
-                              channel->in_pkt, &len, 0);
+        addrlen = sizeof(stream->rem_src_rtp);
+        status = pj_sock_recvfrom(stream->skinfo.rtp_sock, 
+                                  channel->in_pkt, &len, 0,
+                                  &stream->rem_src_rtp, &addrlen);
         if (len < 1 || status != PJ_SUCCESS) {
             if (pj_get_netos_error() == PJ_STATUS_FROM_OS(OSERR_ECONNRESET)) {
@@ -521 +528 @@
         stream->stat.dec.pkt++;
         stream->stat.dec.bytes += len;
+
+        /* See if source address of RTP packet is different than the 
+         * configured address.
+         */
+        if ((stream->rem_rtp_addr.sin_addr.s_addr != 
+             stream->rem_src_rtp.sin_addr.s_addr) ||
+            (stream->rem_rtp_addr.sin_port != stream->rem_src_rtp.sin_port))
+        {
+            stream->rem_src_cnt++;
+
+            if (stream->rem_src_cnt >= PJMEDIA_RTP_NAT_PROBATION_CNT) {
+            
+                stream->rem_rtp_addr = stream->rem_src_rtp;
+                stream->rem_src_cnt = 0;
+
+                PJ_LOG(4,(THIS_FILE,"Remote RTP address switched to %s:%d",
+                          pj_inet_ntoa(stream->rem_src_rtp.sin_addr),
+                          pj_ntohs(stream->rem_src_rtp.sin_port)));
+            }
+        }
 
         /* Put to jitter buffer. */