Changeset 1065

Timestamp:

Mar 15, 2007 10:23:15 AM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #176: RTP port number is not reset in pjsua media (thanks Binu KS)

File:

• pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsua-lib/pjsua_media.c (modified) (10 diffs)

pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsua-lib/pjsua_media.c

@@ -27 +27 @@
 #define DEFAULT_RTP_PORT    4000
 
+/* Next RTP port to be used */
+static pj_uint16_t next_rtp_port;
 
 /* Close existing sound device */
@@ -209 +211 @@
     };
     int i;
-    static pj_uint16_t rtp_port;
     pj_sockaddr_in bound_addr;
     pj_sockaddr_in mapped_addr[2];
@@ -215 +216 @@
     pj_sock_t sock[2];
 
-    if (rtp_port == 0)
-        rtp_port = (pj_uint16_t)cfg->port;
+    if (next_rtp_port == 0)
+        next_rtp_port = (pj_uint16_t)cfg->port;
 
     for (i=0; i<2; ++i)
@@ -232 +233 @@
 
     /* Loop retry to bind RTP and RTCP sockets. */
-    for (i=0; i<RTP_RETRY; ++i, rtp_port += 2) {
+    for (i=0; i<RTP_RETRY; ++i, next_rtp_port += 2) {
 
         /* Create and bind RTP socket. */
@@ -242 +243 @@
 
         status = pj_sock_bind_in(sock[0], bound_addr.sin_addr.s_addr, 
-                                 rtp_port);
+                                 next_rtp_port);
         if (status != PJ_SUCCESS) {
             pj_sock_close(sock[0]); 
@@ -258 +259 @@
 
         status = pj_sock_bind_in(sock[1], bound_addr.sin_addr.s_addr, 
-                                 (pj_uint16_t)(rtp_port+1));
+                                 (pj_uint16_t)(next_rtp_port+1));
         if (status != PJ_SUCCESS) {
             pj_sock_close(sock[0]); 
@@ -300 +301 @@
 
             status = pj_sockaddr_in_init(&mapped_addr[0], &cfg->public_addr,
-                                         (pj_uint16_t)rtp_port);
+                                         (pj_uint16_t)next_rtp_port);
             if (status != PJ_SUCCESS)
                 goto on_error;
 
             status = pj_sockaddr_in_init(&mapped_addr[1], &cfg->public_addr,
-                                         (pj_uint16_t)(rtp_port+1));
+                                         (pj_uint16_t)(next_rtp_port+1));
             if (status != PJ_SUCCESS)
                 goto on_error;
@@ -322 +323 @@
                 mapped_addr[i].sin_addr = addr;
 
-            mapped_addr[0].sin_port=pj_htons((pj_uint16_t)rtp_port);
-            mapped_addr[1].sin_port=pj_htons((pj_uint16_t)(rtp_port+1));
+            mapped_addr[0].sin_port=pj_htons((pj_uint16_t)next_rtp_port);
+            mapped_addr[1].sin_port=pj_htons((pj_uint16_t)(next_rtp_port+1));
             break;
         }
@@ -350 +351 @@
               pj_ntohs(skinfo->rtcp_addr_name.sin_port)));
 
-    rtp_port += 2;
+    next_rtp_port += 2;
     return PJ_SUCCESS;
 
@@ -480 +481 @@
     /* Deinitialize sound subsystem */
     pjmedia_snd_deinit();
+
+    /* Reset RTP port */
+    next_rtp_port = 0;
 
     return PJ_SUCCESS;