Changeset 1545 for pjproject/trunk

Timestamp:

Nov 3, 2007 10:43:23 PM (17 years ago)

Author:

bennylp

Message:

Removed pjsua requirement to have consecutive RTCP mapped ports, and instead just print log message if mapped RTCP port is not adjacent to mapped RTP port

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -23 +23 @@
 #define THIS_FILE               "pjsua_media.c"
 
-#define DEFAULT_RTP_PORT    4000
+#define DEFAULT_RTP_PORT                        4000
+
+#ifndef PJSUA_REQUIRE_CONSECUTIVE_RTCP_PORT
+#   define PJSUA_REQUIRE_CONSECUTIVE_RTCP_PORT  0
+#endif
+
 
 /* Next RTP port to be used */
@@ -300 +305 @@
             }
 
+#if PJSUA_REQUIRE_CONSECUTIVE_RTCP_PORT
             if (pj_ntohs(mapped_addr[1].sin_port) == 
                 pj_ntohs(mapped_addr[0].sin_port)+1)
@@ -312 +318 @@
             pj_sock_close(sock[1]); 
             sock[1] = PJ_INVALID_SOCKET;
+#else
+            if (pj_ntohs(mapped_addr[1].sin_port) != 
+                pj_ntohs(mapped_addr[0].sin_port)+1)
+            {
+                PJ_LOG(4,(THIS_FILE, 
+                          "Note: STUN mapped RTCP port %d is not adjacent"
+                          " to RTP port %d",
+                          pj_ntohs(mapped_addr[1].sin_port),
+                          pj_ntohs(mapped_addr[0].sin_port)));
+            }
+            /* Success! */
+            break;
+#endif
 
         } else if (cfg->public_addr.slen) {