Changeset 5513 for pjproject/branches/projects/uwp/pjsip-apps/src/samples/simpleua.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip-apps/src/samples/simpleua.c (modified) (3 diffs)

pjproject/branches/projects/uwp/pjsip-apps/src/samples/simpleua.c

@@ -726 +726 @@
      * Create UAS dialog.
      */
-    status = pjsip_dlg_create_uas( pjsip_ua_instance(), 
-                                   rdata,
-                                   &local_uri, /* contact */
-                                   &dlg);
+    status = pjsip_dlg_create_uas_and_inc_lock( pjsip_ua_instance(),
+                                                rdata,
+                                                &local_uri, /* contact */
+                                                &dlg);
     if (status != PJ_SUCCESS) {
         pjsip_endpt_respond_stateless(g_endpt, rdata, 500, NULL,
@@ -742 +742 @@
     status = pjmedia_endpt_create_sdp( g_med_endpt, rdata->tp_info.pool,
                                        MAX_MEDIA_CNT, g_sock_info, &local_sdp);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, PJ_TRUE);
+    pj_assert(status == PJ_SUCCESS);
+    if (status != PJ_SUCCESS) {
+        pjsip_dlg_dec_lock(dlg);
+        return PJ_TRUE;
+    }
 
 
@@ -750 +754 @@
      */
     status = pjsip_inv_create_uas( dlg, rdata, local_sdp, 0, &g_inv);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, PJ_TRUE);
+    pj_assert(status == PJ_SUCCESS);
+    if (status != PJ_SUCCESS) {
+        pjsip_dlg_dec_lock(dlg);
+        return PJ_TRUE;
+    }
+
+    /*
+     * Invite session has been created, decrement & release dialog lock.
+     */
+    pjsip_dlg_dec_lock(dlg);