Changeset 683 for pjproject/trunk

Timestamp:

Aug 15, 2006 1:11:22 PM (18 years ago)

Author:

bennylp

Message:

Added initial PUBLISH client support, and also default account selection in pjsua/pjsua-lib

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)
• pjsip/build/pjsip_simple.dsp (modified) (2 diffs)
• pjsip/include/pjsip-simple/publish.h (added)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsip-simple/publishc.c (added)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -65 +65 @@
 
 
-static pjsua_acc_id     current_acc;
+//static pjsua_acc_id   current_acc;
+#define current_acc     pjsua_acc_get_default()
 static pjsua_call_id    current_call;
 static pj_str_t         uri_arg;
@@ -1920 +1921 @@
             i = my_atoi(buf);
             if (pjsua_acc_is_valid(i)) {
-                current_acc = i;
+                pjsua_acc_set_default(i);
                 PJ_LOG(3,(THIS_FILE, "Current account changed to %d", i));
             } else {
@@ -2378 +2379 @@
 
         /* Add local account */
-        pjsua_acc_add_local(transport_id, PJ_TRUE, &current_acc);
+        pjsua_acc_add_local(transport_id, PJ_TRUE, NULL);
         pjsua_acc_set_online_status(current_acc, PJ_TRUE);
 
@@ -2393 +2394 @@
 
         /* Add local account */
-        pjsua_acc_add_local(transport_id, PJ_TRUE, &current_acc);
+        pjsua_acc_add_local(transport_id, PJ_TRUE, NULL);
         pjsua_acc_set_online_status(current_acc, PJ_TRUE);
     }
@@ -2406 +2407 @@
     /* Add accounts */
     for (i=0; i<app_config.acc_cnt; ++i) {
-        status = pjsua_acc_add(&app_config.acc_cfg[i], PJ_TRUE, &current_acc);
+        status = pjsua_acc_add(&app_config.acc_cfg[i], PJ_TRUE, NULL);
         if (status != PJ_SUCCESS)
             goto on_error;

pjproject/trunk/pjsip/build/pjsip_simple.dsp

@@ -110 +110 @@
 # Begin Source File
 
+SOURCE="..\src\pjsip-simple\publishc.c"
+
+!IF  "$(CFG)" == "pjsip_simple - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "pjsip_simple - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE="..\src\pjsip-simple\xpidf.c"
 # End Source File
@@ -146 +159 @@
 # Begin Source File
 
+SOURCE="..\include\pjsip-simple\publish.h"
+# End Source File
+# Begin Source File
+
 SOURCE="..\include\pjsip-simple\types.h"
 # End Source File

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

@@ -1161 +1161 @@
  */
 PJ_DECL(pj_bool_t) pjsua_acc_is_valid(pjsua_acc_id acc_id);
+
+
+/**
+ * Set default account to be used when incoming and outgoing
+ * requests doesn't match any accounts.
+ *
+ * @param acc_id        The account ID to be used as default.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_set_default(pjsua_acc_id acc_id);
+
+
+/**
+ * Get default account.
+ *
+ * @return              The default account ID, or PJSUA_INVALID_ID if no
+ *                      default account is configured.
+ */
+PJ_DECL(pjsua_acc_id) pjsua_acc_get_default(void);
 
 

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

@@ -44 +44 @@
 
 /*
+ * Set default account
+ */
+PJ_DEF(pj_status_t) pjsua_acc_set_default(pjsua_acc_id acc_id)
+{
+    pjsua_var.default_acc = acc_id;
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Get default account.
+ */
+PJ_DEF(pjsua_acc_id) pjsua_acc_get_default(void)
+{
+    return pjsua_var.default_acc;
+}
+
+
+/*
  * Copy account configuration.
  */
@@ -725 +744 @@
     sip_uri = pjsip_uri_get_uri(uri);
 
+    /* See if default acc match */
+    if (pjsua_var.default_acc != PJSUA_INVALID_ID &&
+        pj_stricmp(&pjsua_var.acc[pjsua_var.default_acc].srv_domain, &sip_uri->host)==0 &&
+        pjsua_var.acc[pjsua_var.default_acc].srv_port == sip_uri->port) 
+    {
+        acc_id = pjsua_var.default_acc;
+    } else {
+        acc_id = PJ_ARRAY_SIZE(pjsua_var.acc);
+    }
+
     /* Find matching domain AND port */
-    for (acc_id=0; acc_id<PJ_ARRAY_SIZE(pjsua_var.acc); ++acc_id) {
-        if (!pjsua_var.acc[acc_id].valid)
-            continue;
-        if (pj_stricmp(&pjsua_var.acc[acc_id].srv_domain, &sip_uri->host)==0 &&
-            pjsua_var.acc[acc_id].srv_port == sip_uri->port)
-            break;
+    if (acc_id == PJ_ARRAY_SIZE(pjsua_var.acc)) {
+        for (acc_id=0; acc_id<PJ_ARRAY_SIZE(pjsua_var.acc); ++acc_id) {
+            if (!pjsua_var.acc[acc_id].valid)
+                continue;
+            if (pj_stricmp(&pjsua_var.acc[acc_id].srv_domain, &sip_uri->host)==0 &&
+                pjsua_var.acc[acc_id].srv_port == sip_uri->port)
+                break;
+        }
     }
 

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

@@ -544 +544 @@
     status = pjsip_pres_notify( sub, PJSIP_EVSUB_STATE_ACTIVE, NULL,
                                 NULL, &tdata);
-    if (status == PJ_SUCCESS)
+    if (status == PJ_SUCCESS) {
+        pjsua_process_msg_data(tdata, NULL);
         status = pjsip_pres_send_request( sub, tdata);
+    }
 
     if (status != PJ_SUCCESS) {
@@ -612 +614 @@
             pjsip_pres_set_status(uapres->sub, &pres_status);
 
-            if (pjsip_pres_current_notify(uapres->sub, &tdata)==PJ_SUCCESS)
+            if (pjsip_pres_current_notify(uapres->sub, &tdata)==PJ_SUCCESS) {
+                pjsua_process_msg_data(tdata, NULL);
                 pjsip_pres_send_request(uapres->sub, tdata);
+            }
         }
 
@@ -836 +840 @@
     }
 
+    pjsua_process_msg_data(tdata, NULL);
+
     status = pjsip_pres_send_request(buddy->sub, tdata);
     if (status != PJ_SUCCESS) {
@@ -865 +871 @@
 
     status = pjsip_pres_initiate( buddy->sub, 0, &tdata);
-    if (status == PJ_SUCCESS)
+    if (status == PJ_SUCCESS) {
+        pjsua_process_msg_data(tdata, NULL);
         status = pjsip_pres_send_request( buddy->sub, tdata );
+    }
 
     if (status != PJ_SUCCESS) {