Changeset 1122 for pjproject

Timestamp:

Apr 2, 2007 11:22:49 AM (18 years ago)

Author:

bennylp

Message:

Added PJSUA API to create request using account config

Location:

pjproject/branches/pjproject-0.5-stable

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)

pjproject/branches/pjproject-0.5-stable/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2082 +2082 @@
     pjsip_method method;
     pjsip_tx_data *tdata;
-    pjsua_acc_info acc_info;
     pjsip_endpoint *endpt;
     pj_status_t status;
@@ -2091 +2090 @@
     pjsip_method_init_np(&method, &str_method);
 
-    pjsua_acc_get_info(current_acc, &acc_info);
-
-    status = pjsip_endpt_create_request(endpt, &method, dst_uri, 
-                                        &acc_info.acc_uri, dst_uri,
-                                        NULL, NULL, -1, NULL, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create request", status);
-        return;
-    }
+    status = pjsua_acc_create_request(current_acc, &method, dst_uri, &tdata);
 
     status = pjsip_endpt_send_request(endpt, tdata, -1, NULL, NULL);

pjproject/branches/pjproject-0.5-stable/pjsip/include/pjsua-lib/pjsua.h

@@ -2289 +2289 @@
 
 /**
+ * Create arbitrary requests using the account. Application should only use
+ * this function to create auxiliary requests outside dialog, such as
+ * OPTIONS, and use the call or presence API to create dialog related
+ * requests.
+ *
+ * @param acc_id        The account ID.
+ * @param method        The SIP method of the request.
+ * @param target        Target URI.
+ * @param p_tdata       Pointer to receive the request.
+ *
+ * @return              PJ_SUCCESS or the error code.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_create_request(pjsua_acc_id acc_id,
+                                              const pjsip_method *method,
+                                              const pj_str_t *target,
+                                              pjsip_tx_data **p_tdata);
+
+
+/**
  * Create a suitable URI to be put as Contact based on the specified
  * target URI for the specified account.

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

@@ -926 +926 @@
 
 
+/*
+ * Create arbitrary requests for this account. 
+ */
+PJ_DEF(pj_status_t) pjsua_acc_create_request(pjsua_acc_id acc_id,
+                                             const pjsip_method *method,
+                                             const pj_str_t *target,
+                                             pjsip_tx_data **p_tdata)
+{
+    pjsip_tx_data *tdata;
+    pjsua_acc *acc;
+    pjsip_route_hdr *r;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(method && target && p_tdata, PJ_EINVAL);
+    PJ_ASSERT_RETURN(pjsua_acc_is_valid(acc_id), PJ_EINVAL);
+
+    acc = &pjsua_var.acc[acc_id];
+
+    status = pjsip_endpt_create_request(pjsua_var.endpt, method, target, 
+                                        &acc->cfg.id, target,
+                                        NULL, NULL, -1, NULL, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create request", status);
+        return status;
+    }
+
+    /* Copy routeset */
+    r = acc->route_set.next;
+    while (r != &acc->route_set) {
+        pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, r));
+        r = r->next;
+    }
+    
+    /* Done */
+    *p_tdata = tdata;
+    return PJ_SUCCESS;
+}
+
+
 PJ_DEF(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool,
                                                   pj_str_t *contact,