Changeset 998 for pjproject/trunk

Timestamp:

Feb 24, 2007 1:29:22 PM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #90: PUBLISH is rejected with 404 when REGISTER is challenged with 401/407

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• src/pjsua-lib/pjsua_pres.c (modified) (3 diffs)

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

@@ -303 +303 @@
 
 /**
+ * Send PUBLISH
+ */
+pj_status_t pjsua_pres_init_publish_acc(int acc_id);
+
+/**
  * Terminate server subscription for the account 
  */

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

@@ -469 +469 @@
                        (int)param->reason.slen, param->reason.ptr,
                        param->expiration));
+
+            /* Send initial PUBLISH if it is enabled */
+            if (acc->cfg.publish_enabled && acc->publish_sess==NULL)
+                pjsua_pres_init_publish_acc(acc->index);
         }
 

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

@@ -672 +672 @@
 
 /* Create client publish session */
-static pj_status_t create_publish(int acc_id)
+pj_status_t pjsua_pres_init_publish_acc(int acc_id)
 {
     const pj_str_t STR_PRESENCE = { "presence", 8 };
@@ -723 +723 @@
     pj_list_init(&acc->pres_srv_list);
 
-
-    return create_publish(acc_id);
+    return PJ_SUCCESS;
 }
 
@@ -804 +803 @@
     }
 
-    /* Send PUBLISH if required */
-    if (acc_cfg->publish_enabled) {
-        if (acc->publish_sess == NULL)
-            create_publish(acc_id);
-
-        if (acc->publish_sess && acc->publish_state != acc->online_status) {
+    /* Send PUBLISH if required. We only do this when we have a PUBLISH
+     * session. If we don't have a PUBLISH session, then it could be
+     * that we're waiting until registration has completed before we
+     * send the first PUBLISH. 
+     */
+    if (acc_cfg->publish_enabled && acc->publish_sess) {
+        if (acc->publish_state != acc->online_status) {
             send_publish(acc_id, PJ_TRUE);
         }