Changeset 1134 for pjproject/trunk

Timestamp:

Apr 2, 2007 7:51:21 PM (18 years ago)

Author:

bennylp

Message:

When STUN is used with ICE, SDP media line should show the public IP address

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (2 diffs)
• src/pjsua-lib/pjsua_media.c (modified) (5 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -50 +50 @@
     pjsip_evsub         *xfer_sub;  /**< Xfer server subscription, if this
                                          call was triggered by xfer.        */
-    pjmedia_sock_info    skinfo;    /**< Preallocated media sockets.        */
     pjmedia_transport   *med_tp;    /**< Media transport.                   */
     pj_timer_entry       refresh_tm;/**< Timer to send re-INVITE.           */

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

@@ -2174 +2174 @@
     pjmedia_sdp_conn *conn;
     pjmedia_sdp_attr *attr;
+    pjmedia_sock_info skinfo;
     pjmedia_sdp_session *sdp;
+
+    /* Get media socket info */
+    pjmedia_transport_get_info(call->med_tp, &skinfo);
 
     /* Create new offer */
     status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, pjsua_var.pool, 1,
-                                      &call->skinfo, &sdp);
+                                      &skinfo, &sdp);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create local SDP", status);

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

@@ -142 +142 @@
     pjsip_tx_data *tdata;
     pjsip_response_addr res_addr;
+    pjmedia_sock_info skinfo;
     pjmedia_sdp_session *sdp;
     const pjsip_hdr *cap_hdr;
@@ -196 +197 @@
     }
 
+    /* Get media socket info */
+    pjmedia_transport_get_info(pjsua_var.calls[0].med_tp, &skinfo);
+
     /* Add SDP body, using call0's RTP address */
     status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, tdata->pool, 1,
-                                      &pjsua_var.calls[0].skinfo, &sdp);
+                                      &skinfo, &sdp);
     if (status == PJ_SUCCESS) {
         pjsip_create_sdp_body(tdata->pool, sdp, &tdata->msg->body);

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

@@ -506 +506 @@
 {
     unsigned i;
+    pjmedia_sock_info skinfo;
     pj_status_t status;
 
@@ -511 +512 @@
     for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
 
-        status = create_rtp_rtcp_sock(cfg, &pjsua_var.calls[i].skinfo);
+        status = create_rtp_rtcp_sock(cfg, &skinfo);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to create RTP/RTCP socket",
@@ -518 +519 @@
         }
         status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
-                                              &pjsua_var.calls[i].skinfo, 0,
+                                              &skinfo, 0,
                                               &pjsua_var.calls[i].med_tp);
         if (status != PJ_SUCCESS) {
@@ -606 +607 @@
         }
 
-        /* Get transport info */
-        pjmedia_transport_get_info(pjsua_var.calls[i].med_tp,
-                                   &pjsua_var.calls[i].skinfo);
-
     }
 
@@ -695 +692 @@
 {
     pjmedia_sdp_session *sdp;
+    pjmedia_sock_info skinfo;
     pjsua_call *call = &pjsua_var.calls[call_id];
     pj_status_t status;
 
+    /* Get media socket info */
+    pjmedia_transport_get_info(call->med_tp, &skinfo);
+
+    /* Create SDP */
     status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, pool, 1,
-                                      &call->skinfo, &sdp);
+                                      &skinfo, &sdp);
     if (status != PJ_SUCCESS)
         goto on_error;