Changeset 167

Timestamp:

Feb 9, 2006 9:30:09 AM (18 years ago)

Author:

bennylp

Message:

Setting svn:eol-style attribute

Location:

pjproject/trunk/pjsip

Files:

• build/pjsua.dsp (modified) (1 diff)
• include/pjsip-ua/sip_regc.h (modified) (2 diffs, 1 prop)
• include/pjsip/print_util.h (modified) (1 prop)
• src/pjsip-ua/sip_reg.c (modified) (4 diffs, 1 prop)
• src/pjsua/getopt.c (modified) (1 prop)
• src/pjsua/getopt.h (modified) (1 prop)
• src/pjsua/main.c (modified) (2 diffs, 1 prop)
• src/pjsua/misc.c (deleted)
• src/pjsua/pjsua.h (modified) (4 diffs)
• src/pjsua/pjsua_core.c (modified) (5 diffs)
• src/pjsua/pjsua_inv.c (added)
• src/pjsua/pjsua_reg.c (modified) (2 diffs)

pjproject/trunk/pjsip/build/pjsua.dsp

@@ -99 +99 @@
 # Begin Source File
 
-SOURCE=..\src\pjsua\main_old.c
-# PROP Exclude_From_Build 1
+SOURCE=..\src\pjsua\pjsua_core.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\pjsua\misc.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjsua\pjsua_core.c
+SOURCE=..\src\pjsua\pjsua_inv.c
 # End Source File
 # Begin Source File

pjproject/trunk/pjsip/include/pjsip-ua/sip_regc.h

@@ -142 +142 @@
  * Set authentication credentials to use by this registration.
  *
- * @param dlg       The registration structure.
+ * @param regc      The registration structure.
  * @param count     Number of credentials in the array.
  * @param cred      Array of credentials.
@@ -153 +153 @@
 
 /**
+ * Set route set to be used for outgoing requests.
+ *
+ * @param regc      The client registration structure.
+ * @param route_set List containing Route headers.
+ *
+ * @return          PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_regc_set_route_set(pjsip_regc *regc,
+                                              const pjsip_route_hdr*route_set);
+
+/**
  * Create REGISTER request for the specified client registration structure.
  *

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

@@ -42 +42 @@
 struct pjsip_regc
 {
-    pj_pool_t           *pool;
-    pjsip_endpoint      *endpt;
-    pj_bool_t            _delete_flag;
-    int                  pending_tsx;
-
-    void                *token;
-    pjsip_regc_cb       *cb;
-
-    pj_str_t             str_srv_url;
-    pjsip_uri           *srv_url;
-    pjsip_cid_hdr       *cid_hdr;
-    pjsip_cseq_hdr      *cseq_hdr;
-    pjsip_from_hdr      *from_hdr;
-    pjsip_to_hdr        *to_hdr;
-    char                *contact_buf;
+    pj_pool_t                   *pool;
+    pjsip_endpoint              *endpt;
+    pj_bool_t                    _delete_flag;
+    int                          pending_tsx;
+
+    void                        *token;
+    pjsip_regc_cb               *cb;
+
+    pj_str_t                     str_srv_url;
+    pjsip_uri                   *srv_url;
+    pjsip_cid_hdr               *cid_hdr;
+    pjsip_cseq_hdr              *cseq_hdr;
+    pjsip_from_hdr              *from_hdr;
+    pjsip_to_hdr                *to_hdr;
+    char                        *contact_buf;
     pjsip_generic_string_hdr    *contact_hdr;
-    pjsip_expires_hdr   *expires_hdr;
-    pjsip_contact_hdr   *unreg_contact_hdr;
-    pjsip_expires_hdr   *unreg_expires_hdr;
-    pj_uint32_t          expires;
+    pjsip_expires_hdr           *expires_hdr;
+    pjsip_contact_hdr           *unreg_contact_hdr;
+    pjsip_expires_hdr           *unreg_expires_hdr;
+    pj_uint32_t                  expires;
+    pjsip_route_hdr              route_set;
 
     /* Authorization sessions. */
-    pjsip_auth_clt_sess  auth_sess;
+    pjsip_auth_clt_sess          auth_sess;
 
     /* Auto refresh registration. */
-    pj_bool_t            auto_reg;
-    pj_timer_entry       timer;
+    pj_bool_t                    auto_reg;
+    pj_timer_entry               timer;
 };
 
@@ -99 +100 @@
     if (status != PJ_SUCCESS)
         return status;
+
+    pj_list_init(&regc->route_set);
 
     /* Done */
@@ -247 +250 @@
     PJ_ASSERT_RETURN(regc && count && cred, PJ_EINVAL);
     return pjsip_auth_clt_set_credentials(&regc->auth_sess, count, cred);
+}
+
+PJ_DEF(pj_status_t) pjsip_regc_set_route_set( pjsip_regc *regc,
+                                              const pjsip_route_hdr *route_set)
+{
+    const pjsip_route_hdr *chdr;
+
+    PJ_ASSERT_RETURN(regc && route_set, PJ_EINVAL);
+
+    pj_list_init(&regc->route_set);
+
+    chdr = route_set->next;
+    while (chdr != route_set) {
+        pj_list_push_back(&regc->route_set, pjsip_hdr_clone(regc->pool, chdr));
+        chdr = chdr->next;
+    }
+
+    return PJ_SUCCESS;
 }
 
@@ -273 +294 @@
     /* Add cached authorization headers. */
     pjsip_auth_clt_init_req( &regc->auth_sess, tdata );
+
+    /* Add Route headers from route set, ideally after Via header */
+    if (!pj_list_empty(&regc->route_set)) {
+        pjsip_hdr *route_pos;
+        const pjsip_route_hdr *route;
+
+        route_pos = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
+        if (!route_pos)
+            route_pos = &tdata->msg->hdr;
+
+        route = regc->route_set.next;
+        while (route != &regc->route_set) {
+            pjsip_hdr *new_hdr = pjsip_hdr_shallow_clone(tdata->pool, route);
+            pj_list_insert_after(route_pos, new_hdr);
+            route_pos = new_hdr;
+            route = route->next;
+        }
+    }
 
     /* Done. */

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

@@ -62 +62 @@
     puts("");
     puts("Console keys:");
-    puts("  m    Make a call");
+    puts("  m    Make a call/another call");
     puts("  a    Answer incoming call");
     puts("  h    Hangup current call");
@@ -353 +353 @@
     puts("  --use-stun2=host[:port]  Use STUN and set host name and port of STUN servers");
     puts("");
-    puts("SIMPLE options (may be specified more than once):");
-    puts("  --add-buddy url     Add the specified URL to the buddy list.");
-    puts("  --offer-x-ms-msg    Offer \"x-ms-message\" in outgoing INVITE");
-    puts("  --no-presence       Do not subscribe presence of buddies");
+    //puts("SIMPLE options (may be specified more than once):");
+    //puts("  --add-buddy url     Add the specified URL to the buddy list.");
+    //puts("  --offer-x-ms-msg    Offer \"x-ms-message\" in outgoing INVITE");
+    //puts("  --no-presence     Do not subscribe presence of buddies");
     puts("");
     fflush(stdout);

pjproject/trunk/pjsip/src/pjsua/pjsua.h

@@ -129 +129 @@
 
 /*****************************************************************************
- * PJSUA API.
+ * PJSUA API (defined in pjsua_core.c).
  */
 
@@ -172 +172 @@
 
 
+/*****************************************************************************
+ * PJSUA Invite session API (defined in pjsua_inv.c).
+ */
+
 /**
  * Make outgoing call.
@@ -179 +183 @@
 
 
-/*****************************************************************************
- * PJSUA Client Registration API.
+/**
+ * Handle incoming invite request.
+ */
+pj_bool_t pjsua_inv_on_incoming(pjsip_rx_data *rdata);
+
+
+/**
+ * Callback to be called by session when invite session's state has changed.
+ */
+void pjsua_inv_on_state_changed(pjsip_inv_session *inv, pjsip_event *e);
+
+
+/**
+ * Callback to be called by session when outgoing dialog has forked.
+ * This function will create a forked dialog.
+ */
+void pjsua_inv_on_new_session(pjsip_inv_session *inv, pjsip_event *e);
+
+
+/**
+ * Callback to be called when SDP offer/answer negotiation has just completed
+ * in the session. This function will start/update media if negotiation
+ * has succeeded.
+ */
+void pjsua_inv_on_media_update(pjsip_inv_session *inv, pj_status_t status);
+
+
+/*****************************************************************************
+ * PJSUA Client Registration API (defined in pjsua_reg.c).
  */
 
@@ -199 +230 @@
 /*****************************************************************************
  * User Interface API.
+ *
  * The UI API specifies functions that will be called by pjsua upon
  * occurence of various events.

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

@@ -19 +19 @@
 #include "pjsua.h"
 
-
-#define THIS_FILE   "pjsua.c"
-
+/*
+ * pjsua_core.c
+ *
+ * Core application functionalities.
+ */
+
+#define THIS_FILE   "pjsua_core.c"
+
+
+/* 
+ * Global variable.
+ */
 struct pjsua pjsua;
 
+
 /* 
- * Default local URI, if not specified in cmd-line 
+ * Default local URI, if none is specified in cmd-line 
  */
 #define PJSUA_LOCAL_URI     "<sip:user@127.0.0.1>"
@@ -93 +103 @@
 static pj_bool_t mod_pjsua_on_rx_request(pjsip_rx_data *rdata)
 {
-    pjsip_dialog *dlg = pjsip_rdata_get_dlg(rdata);
-    pjsip_transaction *tsx = pjsip_rdata_get_tsx(rdata);
-    pjsip_msg *msg = rdata->msg_info.msg;
-
-    /*
-     * Handle incoming INVITE outside dialog.
-     */
-    if (dlg == NULL && tsx == NULL &&
-        msg->line.req.method.id == PJSIP_INVITE_METHOD)
-    {
-        pj_status_t status;
-        pjsip_tx_data *response = NULL;
-        unsigned options = 0;
-
-        /* Verify that we can handle the request. */
-        status = pjsip_inv_verify_request(rdata, &options, NULL, NULL,
-                                          pjsua.endpt, &response);
-        if (status != PJ_SUCCESS) {
-
-            /*
-             * No we can't handle the incoming INVITE request.
-             */
-
-            if (response) {
-                pjsip_response_addr res_addr;
-
-                pjsip_get_response_addr(response->pool, rdata, &res_addr);
-                pjsip_endpt_send_response(pjsua.endpt, &res_addr, response, 
-                                          NULL, NULL);
-
-            } else {
-
-                /* Respond with 500 (Internal Server Error) */
-                pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL,
-                                              NULL, NULL);
-            }
-
-        } else {
-            /*
-             * Yes we can handle the incoming INVITE request.
-             */
-            pjsip_inv_session *inv;
-            struct pjsua_inv_data *inv_data;
-            pjmedia_sdp_session *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) {
-
-                pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL,
-                                              NULL, NULL);
-                return PJ_TRUE;
-            }
-
-            /* Create dialog: */
-
-            status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata,
-                                           &pjsua.contact_uri, &dlg);
-            if (status != PJ_SUCCESS)
-                return PJ_TRUE;
-
-
-            /* Create invite session: */
-
-            status = pjsip_inv_create_uas( dlg, rdata, answer, 0, &inv);
-            if (status != PJ_SUCCESS) {
-
-                status = pjsip_dlg_create_response( dlg, rdata, 500, NULL,
-                                                    &response);
-                if (status == PJ_SUCCESS)
-                    status = pjsip_dlg_send_response(dlg, 
-                                                     pjsip_rdata_get_tsx(rdata),
-                                                     response);
-                return PJ_TRUE;
-
-            }
-
-
-            /* 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): */
-
-            status = pjsip_dlg_create_response(dlg, rdata, 100, NULL, &response);
-            if (status == PJ_SUCCESS)
-                status = pjsip_dlg_send_response(dlg, pjsip_rdata_get_tsx(rdata), response);
-        }
-
-        /* This INVITE request has been handled. */
-        return PJ_TRUE;
-    }
-
-    
+
+    if (rdata->msg_info.msg->line.req.method.id == PJSIP_INVITE_METHOD) {
+
+        return pjsua_inv_on_incoming(rdata);
+
+    }
 
     return PJ_FALSE;
@@ -214 +131 @@
 }
 
-
-/*
- * This callback receives notification from invite session when the
- * session state has changed.
- */
-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;
-
-            PJ_LOG(3,(THIS_FILE,"Media session is destroyed"));
-        }
-
-    }
-
-    pjsua_ui_inv_on_state_changed(inv, e);
-}
-
-
-/*
- * This callback is called by invite session framework when UAC session
- * has forked.
- */
-static void pjsua_inv_on_new_session(pjsip_inv_session *inv, pjsip_event *e)
-{
-    PJ_UNUSED_ARG(inv);
-    PJ_UNUSED_ARG(e);
-
-    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;
-    }
-
-    PJ_LOG(3,(THIS_FILE,"Media has been started successfully"));
-}
 
 /* 
@@ -846 +671 @@
 
     /* Destroy endpoint. */
+
     pjsip_endpt_destroy(pjsua.endpt);
     pjsua.endpt = NULL;
 
     /* Destroy caching pool. */
+
     pj_caching_pool_destroy(&pjsua.cp);
 
@@ -858 +685 @@
 }
 
-
-/**
- * Make outgoing call.
- */
-pj_status_t pjsua_invite(const char *cstr_dest_uri,
-                         pjsip_inv_session **p_inv)
-{
-    pj_str_t dest_uri;
-    pjsip_dialog *dlg;
-    pjmedia_sdp_session *offer;
-    pjsip_inv_session *inv;
-    struct pjsua_inv_data *inv_data;
-    pjsip_tx_data *tdata;
-    pj_status_t status;
-
-    /* Convert cstr_dest_uri to dest_uri */
-    
-    dest_uri = pj_str((char*)cstr_dest_uri);
-
-    /* Create outgoing dialog: */
-
-    status = pjsip_dlg_create_uac( pjsip_ua_instance(), &pjsua.local_uri,
-                                   &pjsua.contact_uri, &dest_uri, &dest_uri,
-                                   &dlg);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror("Dialog creation failed", status);
-        return 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;
-    }
-
-    /* Create the INVITE session: */
-
-    status = pjsip_inv_create_uac( dlg, offer, 0, &inv);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror("Invite session creation failed", status);
-        goto on_error;
-    }
-
-
-    /* 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: */
-
-    if (!pj_list_empty(&pjsua.route_set))
-        pjsip_dlg_set_route_set(dlg, &pjsua.route_set);
-
-
-    /* Set credentials: */
-
-    pjsip_auth_clt_set_credentials( &dlg->auth_sess, pjsua.cred_count, 
-                                    pjsua.cred_info);
-
-
-    /* Create initial INVITE: */
-
-    status = pjsip_inv_invite(inv, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror("Unable to create initial INVITE request", status);
-        goto on_error;
-    }
-
-
-    /* Send initial INVITE: */
-
-    status = pjsip_inv_send_msg(inv, tdata, NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror("Unable to send initial INVITE request", status);
-        goto on_error;
-    }
-
-
-    /* Done. */
-
-    *p_inv = inv;
-
-    return PJ_SUCCESS;
-
-
-on_error:
-
-    PJ_TODO(DESTROY_DIALOG_ON_FAIL);
-    return status;
-}
-

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

@@ -19 +19 @@
 #include "pjsua.h"
 
+
+/*
+ * pjsua_reg.c
+ *
+ * Client registration handler.
+ */
+
 #define THIS_FILE   "pjsua_reg.c"
 
+
+/*
+ * This callback is called by pjsip_regc when outgoing register
+ * request has completed.
+ */
 static void regc_cb(struct pjsip_regc_cbparam *param)
 {
@@ -98 +110 @@
         pjsip_regc_set_credentials( pjsua.regc, pjsua.cred_count, 
                                     pjsua.cred_info );
+
+        pjsip_regc_set_route_set( pjsua.regc, &pjsua.route_set );
     }