Changeset 780 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

Timestamp:

Oct 18, 2006 5:16:34 PM (18 years ago)

Author:

bennylp

Message:

Some changes to REFER handling in PJSUA-LIB:

• added callback to report call transfer progress
• changed the call transfer request callback name in pjsua
• added "--norefersub" option in pjsua.
• fixed bug when call transfer is done more than once in the same dialog (dialog usage can not be added)

Also removed 7xx status from the SIP status codes.

And added pjsip_parse_status_line() to parse sipfrag.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -794 +794 @@
     for (index=0; index<dlg->usage_cnt; ++index) {
         if (dlg->usage[index] == mod) {
-            pj_assert(!"This module is already registered");
+            /* Module may be registered more than once in the same dialog.
+             * For example, when call transfer fails, application may retry
+             * call transfer on the same dialog.
+             * So return PJ_SUCCESS here.
+             */
+            PJ_LOG(4,(dlg->obj_name, 
+                      "Module %.*s already registered as dialog usage, "
+                      "updating the data %p",
+                      (int)mod->name.slen, mod->name.ptr, mod_data));
+            dlg->mod_data[mod->id] = mod_data;
+
             pjsip_dlg_dec_lock(dlg);
-            return PJSIP_ETYPEEXISTS;
+            return PJ_SUCCESS;
+
+            //pj_assert(!"This module is already registered");
+            //pjsip_dlg_dec_lock(dlg);
+            //return PJSIP_ETYPEEXISTS;
         }