Changeset 284 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

Timestamp:

Mar 5, 2006 11:54:02 AM (18 years ago)

Author:

bennylp

Message:

Added complexity and quality argument, and terminate dialog properly on failures

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c (modified) (8 diffs)

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

@@ -116 +116 @@
     status = pjsip_pres_create_uas( dlg, &pres_cb, rdata, &sub);
     if (status != PJ_SUCCESS) {
-        PJ_TODO(DESTROY_DIALOG);
+        pjsip_dlg_terminate(dlg);
         pjsua_perror(THIS_FILE, "Unable to create server subscription", 
                      status);
@@ -145 +145 @@
                      status);
         pj_list_erase(uapres);
+        pjsip_pres_terminate(sub, PJ_FALSE);
         return PJ_FALSE;
     }
@@ -169 +170 @@
                      status);
         pj_list_erase(uapres);
+        pjsip_pres_terminate(sub, PJ_FALSE);
         return PJ_FALSE;
     }
@@ -328 +330 @@
         pjsua_perror(THIS_FILE, "Unable to create presence client", 
                      status);
+        pjsip_dlg_terminate(dlg);
         return;
     }
@@ -336 +339 @@
     status = pjsip_pres_initiate(pjsua.buddies[index].sub, -1, &tdata);
     if (status != PJ_SUCCESS) {
+        pjsip_pres_terminate(pjsua.buddies[index].sub, PJ_FALSE);
         pjsua.buddies[index].sub = NULL;
         pjsua_perror(THIS_FILE, "Unable to create initial SUBSCRIBE", 
@@ -344 +348 @@
     status = pjsip_pres_send_request(pjsua.buddies[index].sub, tdata);
     if (status != PJ_SUCCESS) {
+        pjsip_pres_terminate(pjsua.buddies[index].sub, PJ_FALSE);
         pjsua.buddies[index].sub = NULL;
         pjsua_perror(THIS_FILE, "Unable to send initial SUBSCRIBE", 
@@ -349 +354 @@
         return;
     }
-
-    PJ_TODO(DESTROY_DIALOG_ON_ERROR);
 }
 
@@ -374 +377 @@
         status = pjsip_pres_send_request( pjsua.buddies[index].sub, tdata );
 
-    if (status == PJ_SUCCESS) {
-
-        //pjsip_evsub_set_mod_data(pjsua.buddies[index].sub, pjsua.mod.id,
-        //                               NULL);
-        //pjsua.buddies[index].sub = NULL;
-
-    } else {
+    if (status != PJ_SUCCESS) {
+
+        pjsip_pres_terminate(pjsua.buddies[index].sub, PJ_FALSE);
+        pjsua.buddies[index].sub = NULL;
         pjsua_perror(THIS_FILE, "Unable to unsubscribe presence", 
                      status);