Changeset 162 for pjproject/trunk/pjsip/src/pjsua/pjsua_core.c

Timestamp:

Feb 9, 2006 12:13:40 AM (18 years ago)

Author:

bennylp

Message:

Integration of pjmedia and pjsip error subsystem to pjlib

File:

• pjproject/trunk/pjsip/src/pjsua/pjsua_core.c (modified) (14 diffs)

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

@@ -22 +22 @@
 #define THIS_FILE   "pjsua.c"
 
-struct pjsua_t pjsua;
-
+struct pjsua pjsua;
+
+/* 
+ * Default local URI, if not specified in cmd-line 
+ */
 #define PJSUA_LOCAL_URI     "<sip:user@127.0.0.1>"
 
-static char *PJSUA_DUMMY_SDP_OFFER = 
-            "v=0\r\n"
-            "o=offer 2890844526 2890844526 IN IP4 127.0.0.1\r\n"
-            "s= \r\n"
-            "c=IN IP4 127.0.0.1\r\n"
-            "t=0 0\r\n"
-            "m=audio 49170 RTP/AVP 0\r\n"
-            "a=rtpmap:0 PCMU/8000\r\n";
-
-static char *PJSUA_DUMMY_SDP_ANSWER = 
-            "v=0\r\n"
-            "o=answer 2890844730 2890844730 IN IP4 127.0.0.1\r\n"
-            "s= \r\n"
-            "c=IN IP4 127.0.0.1\r\n"
-            "t=0 0\r\n"
-            "m=audio 49920 RTP/AVP 0\r\n"
-            "a=rtpmap:0 PCMU/8000\r\n";
+
 
 /*
@@ -75 +62 @@
 
     pjsua.local_uri = pj_str(PJSUA_LOCAL_URI);
+
+    /* Init route set list: */
+
+    pj_list_init(&pjsua.route_set);
 }
 
@@ -144 +135 @@
              */
             pjsip_inv_session *inv;
+            struct pjsua_inv_data *inv_data;
             pjmedia_sdp_session *answer;
 
-            /* Create dummy SDP answer: */
-
-
-            status = pjmedia_sdp_parse(pjsua.pool, PJSUA_DUMMY_SDP_ANSWER,
-                                       pj_native_strlen(PJSUA_DUMMY_SDP_ANSWER),
-                                       &answer);
+
+            /* Get media capability from media endpoint: */
+
+            status = pjmedia_endpt_create_sdp( pjsua.med_endpt, rdata->tp_info.pool,
+                                               1, &pjsua.med_skinfo, &answer );
             if (status != PJ_SUCCESS) {
 
@@ -181 +172 @@
 
             }
+
+
+            /* Create and attach pjsua data to the dialog: */
+
+            inv_data = pj_pool_zalloc(dlg->pool, sizeof(struct pjsua_inv_data));
+            dlg->mod_data[pjsua.mod.id] = inv_data;
+
 
             /* Answer with 100 (using the dialog, not invite): */
@@ -223 +221 @@
 static void pjsua_inv_on_state_changed(pjsip_inv_session *inv, pjsip_event *e)
 {
+
+    /* Destroy media session when invite session is disconnected. */
+    if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
+        struct pjsua_inv_data *inv_data;
+
+        inv_data = inv->dlg->mod_data[pjsua.mod.id];
+        if (inv_data && inv_data->session) {
+            pjmedia_session_destroy(inv_data->session);
+            inv_data->session = NULL;
+        }
+
+    }
+
     pjsua_ui_inv_on_state_changed(inv, e);
 }
@@ -237 +248 @@
 
     PJ_TODO(HANDLE_FORKED_DIALOG);
+}
+
+/*
+ *
+ */
+static void pjsua_inv_on_media_update(pjsip_inv_session *inv, 
+                                      pj_status_t status)
+{
+    struct pjsua_inv_data *inv_data;
+    const pjmedia_sdp_session *local_sdp;
+    const pjmedia_sdp_session *remote_sdp;
+
+    if (status != PJ_SUCCESS) {
+
+        pjsua_perror("SDP negotiation has failed", status);
+        return;
+
+    }
+
+    /* Destroy existing media session, if any. */
+
+    inv_data = inv->dlg->mod_data[pjsua.mod.id];
+    if (inv_data && inv_data->session) {
+        pjmedia_session_destroy(inv_data->session);
+        inv_data->session = NULL;
+    }
+
+    /* Get local and remote SDP */
+
+    status = pjmedia_sdp_neg_get_active_local(inv->neg, &local_sdp);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror("Unable to retrieve currently active local SDP", status);
+        return;
+    }
+
+
+    status = pjmedia_sdp_neg_get_active_remote(inv->neg, &remote_sdp);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror("Unable to retrieve currently active remote SDP", status);
+        return;
+    }
+
+
+    /* Create new media session. 
+     * The media session is active immediately.
+     */
+
+    status = pjmedia_session_create( pjsua.med_endpt, 1, &pjsua.med_skinfo,
+                                     local_sdp, remote_sdp, &inv_data->session );
+    if (status != PJ_SUCCESS) {
+        pjsua_perror("Unable to create media session", status);
+        return;
+    }
+
 }
 
@@ -364 +429 @@
     pjsua.sip_sock = sock[SIP_SOCK];
     pj_memcpy(&pjsua.sip_sock_name, &mapped_addr[SIP_SOCK], sizeof(pj_sockaddr_in));
-    pjsua.rtp_sock = sock[RTP_SOCK];
-    pj_memcpy(&pjsua.rtp_sock_name, &mapped_addr[RTP_SOCK], sizeof(pj_sockaddr_in));
-    pjsua.rtcp_sock = sock[RTCP_SOCK];
-    pj_memcpy(&pjsua.rtcp_sock_name, &mapped_addr[RTCP_SOCK], sizeof(pj_sockaddr_in));
+
+    pjsua.med_skinfo.rtp_sock = sock[RTP_SOCK];
+    pj_memcpy(&pjsua.med_skinfo.rtp_addr_name, 
+              &mapped_addr[RTP_SOCK], sizeof(pj_sockaddr_in));
+
+    pjsua.med_skinfo.rtcp_sock = sock[RTCP_SOCK];
+    pj_memcpy(&pjsua.med_skinfo.rtcp_addr_name, 
+              &mapped_addr[RTCP_SOCK], sizeof(pj_sockaddr_in));
 
     PJ_LOG(4,(THIS_FILE, "SIP UDP socket reachable at %s:%d",
@@ -373 +442 @@
               pj_ntohs(pjsua.sip_sock_name.sin_port)));
     PJ_LOG(4,(THIS_FILE, "RTP socket reachable at %s:%d",
-              pj_inet_ntoa(pjsua.rtp_sock_name.sin_addr), 
-              pj_ntohs(pjsua.rtp_sock_name.sin_port)));
+              pj_inet_ntoa(pjsua.med_skinfo.rtp_addr_name.sin_addr), 
+              pj_ntohs(pjsua.med_skinfo.rtp_addr_name.sin_port)));
     PJ_LOG(4,(THIS_FILE, "RTCP UDP socket reachable at %s:%d",
-              pj_inet_ntoa(pjsua.rtcp_sock_name.sin_addr), 
-              pj_ntohs(pjsua.rtcp_sock_name.sin_port)));
+              pj_inet_ntoa(pjsua.med_skinfo.rtcp_addr_name.sin_addr), 
+              pj_ntohs(pjsua.med_skinfo.rtcp_addr_name.sin_port)));
 
     return PJ_SUCCESS;
@@ -479 +548 @@
         inv_cb.on_state_changed = &pjsua_inv_on_state_changed;
         inv_cb.on_new_session = &pjsua_inv_on_new_session;
+        inv_cb.on_media_update = &pjsua_inv_on_media_update;
 
         /* Initialize invite session module: */
@@ -552 +622 @@
         pj_caching_pool_destroy(&pjsua.cp);
         pjsua_perror("Stack initialization has returned error", status);
+        return status;
+    }
+
+
+    /* Init media endpoint: */
+
+    status = pjmedia_endpt_create(&pjsua.cp.factory, &pjsua.med_endpt);
+    if (status != PJ_SUCCESS) {
+        pj_caching_pool_destroy(&pjsua.cp);
+        pjsua_perror("Media stack initialization has returned error", status);
         return status;
     }
@@ -677 +757 @@
     }
 
-    /* Initialize global route_set: */
-
-    PJ_TODO(INIT_GLOBAL_ROUTE_SET);
+    /* If outbound_proxy is specified, put it in the route_set: */
+
+    if (pjsua.outbound_proxy.slen) {
+
+        pjsip_route_hdr *route;
+        const pj_str_t hname = { "Route", 5 };
+        int parsed_len;
+
+        route = pjsip_parse_hdr( pjsua.pool, &hname, 
+                                 pjsua.outbound_proxy.ptr, 
+                                 pjsua.outbound_proxy.slen,
+                                   &parsed_len);
+        if (route == NULL) {
+            pjsua_perror("Invalid outbound proxy URL", PJSIP_EINVALIDURI);
+            return PJSIP_EINVALIDURI;
+        }
+
+        pj_list_push_back(&pjsua.route_set, route);
+    }
 
 
@@ -770 +866 @@
     pjmedia_sdp_session *offer;
     pjsip_inv_session *inv;
+    struct pjsua_inv_data *inv_data;
     pjsip_tx_data *tdata;
     pj_status_t status;
@@ -787 +884 @@
     }
 
-    /* Create dummy SDP for offer: */
-
-    status = pjmedia_sdp_parse(dlg->pool, PJSUA_DUMMY_SDP_OFFER,
-                               pj_native_strlen(PJSUA_DUMMY_SDP_OFFER),
-                               &offer);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror("Dummy SDP offer parsing failed", status);
+    /* Get media capability from media endpoint: */
+
+    status = pjmedia_endpt_create_sdp( pjsua.med_endpt, dlg->pool,
+                                       1, &pjsua.med_skinfo, &offer);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror("pjmedia unable to create SDP", status);
         goto on_error;
     }
@@ -806 +902 @@
 
 
+    /* Create and associate our data in the session. */
+
+    inv_data = pj_pool_zalloc( dlg->pool, sizeof(struct pjsua_inv_data));
+    dlg->mod_data[pjsua.mod.id] = inv_data;
+
+
     /* Set dialog Route-Set: */
 
-    PJ_TODO(INIT_DIALOG_ROUTE_SET);
+    if (!pj_list_empty(&pjsua.route_set))
+        pjsip_dlg_set_route_set(dlg, &pjsua.route_set);
+
 
     /* Set credentials: */