Changeset 4175 for pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

Timestamp:

Jun 22, 2012 8:53:11 AM (12 years ago)

Author:

nanang

Message:

Fix #1526:

• Fix incoming call without SDP by delaying media init in on_incoming_call() until call setting is set i.e: via call answer. Note that there is no need to delay the media init in the case of call replace request, the call setting is already set in the incoming call callback, i.e: via on_call_replace_request2() callback or just the current setting of the replaced call.
• Fix processing call replace request when the media init is performed asynchronously.

File:

• pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h (modified) (3 diffs)

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

@@ -109 +109 @@
     pj_str_t        *reason;        /**< Answer's reason phrase.      */
     unsigned         code;          /**< Answer's status code.        */
+    pjsua_call_setting *opt;        /**< Answer's call setting.       */
 } call_answer;
 
@@ -121 +122 @@
     unsigned             index;     /**< Index in pjsua array.              */
     pjsua_call_setting   opt;       /**< Call setting.                      */
+    pj_bool_t            opt_inited;/**< Initial call setting has been set,
+                                         to avoid different opt in answer.  */
     pjsip_inv_session   *inv;       /**< The invite session.                */
     void                *user_data; /**< User/application data.             */
@@ -171 +174 @@
             struct {
                 call_answer      answers;/**< A list of call answers.       */
+                pjsip_dialog    *replaced_dlg; /**< Replaced dialog.        */
             } inc_call;
         } call_var;