Changeset 220

Timestamp:

Feb 22, 2006 10:23:22 PM (18 years ago)

Author:

bennylp

Message:

Fixed STUN error

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-ua/sip_inv.c (modified) (1 diff)
• pjsua/pjsua_core.c (modified) (7 diffs)
• pjsua/pjsua_inv.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -1275 +1275 @@
 
                 pjsip_tsx_terminate(inv->invite_tsx, 487);
-
-                return PJSIP_ETSXDESTROYED;
+                *p_tdata = NULL;
+                return PJ_SUCCESS;
             }
 

pjproject/trunk/pjsip/src/pjsua/pjsua_core.c

@@ -150 +150 @@
     };
     int i;
-    pj_uint16_t rtp_port;
+    static pj_uint16_t rtp_port = RTP_START_PORT;
     pj_sock_t sock[3];
     pj_sockaddr_in mapped_addr[3];
@@ -158 +158 @@
         sock[i] = PJ_INVALID_SOCKET;
 
+    /* Create and bind SIP UDP socket. */
+    status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sock[SIP_SOCK]);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "socket() error", status);
+        goto on_error;
+    }
+
     if (sip) {
-        /* Create and bind SIP UDP socket. */
-        status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sock[SIP_SOCK]);
-        if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "socket() error", status);
-            goto on_error;
-        }
-    
         status = pj_sock_bind_in(sock[SIP_SOCK], 0, pjsua.sip_port);
         if (status != PJ_SUCCESS) {
@@ -171 +171 @@
             goto on_error;
         }
-    }
-
-    /* Initialize start of RTP port to try. */
-    rtp_port = (pj_uint16_t)(RTP_START_PORT + (pj_rand() % RTP_RANDOM_START) / 2);
+    } else {
+        status = pj_sock_bind_in(sock[SIP_SOCK], 0, 0);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "bind() error", status);
+            goto on_error;
+        }
+    }
+
 
     /* Loop retry to bind RTP and RTCP sockets. */
@@ -235 +239 @@
             if (sip)
                 mapped_addr[SIP_SOCK].sin_port = pj_htons((pj_uint16_t)pjsua.sip_port);
-            else
-                mapped_addr[RTP_SOCK].sin_port = pj_htons((pj_uint16_t)rtp_port);
             mapped_addr[RTP_SOCK].sin_port = pj_htons((pj_uint16_t)rtp_port);
             mapped_addr[RTCP_SOCK].sin_port = pj_htons((pj_uint16_t)(rtp_port+1));
@@ -266 +268 @@
         pjsua.sip_sock = sock[SIP_SOCK];
         pj_memcpy(&pjsua.sip_sock_name, &mapped_addr[SIP_SOCK], sizeof(pj_sockaddr_in));
+    } else {
+        pj_sock_close(sock[0]);
     }
 
@@ -288 +292 @@
               pj_ntohs(skinfo->rtcp_addr_name.sin_port)));
 
+    rtp_port += 2;
     return PJ_SUCCESS;
 
@@ -455 +460 @@
     }
 
+    /* Init PJLIB-UTIL: */
+
+    status = pjlib_util_init();
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "pjlib_util_init() error", status);
+        return status;
+    }
+
     /* Init memory pool: */
 

pjproject/trunk/pjsip/src/pjsua/pjsua_inv.c

@@ -833 +833 @@
     }
 
+    /* pjsip_inv_end_session may return PJ_SUCCESS with NULL 
+     * as p_tdata when INVITE transaction has not been answered
+     * with any provisional responses.
+     */
+    if (tdata == NULL)
+        return;
+
     status = pjsip_inv_send_msg(inv_session->inv, tdata, NULL);
     if (status != PJ_SUCCESS) {
@@ -975 +982 @@
         next = inv_data->next;
 
-        if (pjsip_inv_end_session(inv_data->inv, 410, NULL, &tdata)==0)
-            pjsip_inv_send_msg(inv_data->inv, tdata, NULL);
+        if (pjsip_inv_end_session(inv_data->inv, 410, NULL, &tdata)==0) {
+            if (tdata)
+                pjsip_inv_send_msg(inv_data->inv, tdata, NULL);
+        }
 
         inv_data = next;