Changeset 283 for pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

Timestamp:

Mar 5, 2006 11:53:36 AM (18 years ago)

Author:

bennylp

Message:

Added API to terminate dialog prematurely. Affect: dialog, invite sessions, evsub, and presence

File:

• pjproject/trunk/pjsip/src/pjsip-simple/evsub.c (modified) (10 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -199 +199 @@
     unsigned              option;       /**< Options.                       */
     pjsip_evsub_user      user;         /**< Callback.                      */
+    pj_bool_t             call_cb;      /**< Notify callback?               */
     pjsip_role_e          role;         /**< UAC=subscriber, UAS=notifier   */
     pjsip_evsub_state     state;        /**< Subscription state.            */
@@ -510 +511 @@
                        const pj_str_t *state_str, pjsip_event *event)
 {
+    pjsip_evsub_state prev_state = sub->state;
     pj_str_t old_state_str = sub->state_str;
 
@@ -526 +528 @@
               sub->state_str.ptr));
 
-    if (sub->user.on_evsub_state)
+    if (sub->user.on_evsub_state && sub->call_cb)
         (*sub->user.on_evsub_state)(sub, event);
 
-    if (state == PJSIP_EVSUB_STATE_TERMINATED) {
-        
+    if (state == PJSIP_EVSUB_STATE_TERMINATED &&
+        prev_state != PJSIP_EVSUB_STATE_TERMINATED) 
+    {
         if (sub->pending_tsx == 0) {
             evsub_destroy(sub);
@@ -560 +563 @@
     case TIMER_TYPE_UAC_REFRESH:
         /* Time for UAC to refresh subscription */
-        if (sub->user.on_client_refresh) {
+        if (sub->user.on_client_refresh && sub->call_cb) {
             (*sub->user.on_client_refresh)(sub);
         } else {
@@ -577 +580 @@
     case TIMER_TYPE_UAS_TIMEOUT:
         /* Refresh from UAC has not been received */
-        if (sub->user.on_server_timeout) {
+        if (sub->user.on_server_timeout && sub->call_cb) {
             (*sub->user.on_server_timeout)(sub);
         } else {
@@ -653 +656 @@
     sub->pkg = pkg;
     sub->role = role;
+    sub->call_cb = PJ_TRUE;
     sub->option = option;
     sub->state = PJSIP_EVSUB_STATE_NULL;
@@ -838 +842 @@
 }
 
+
+/*
+ * Forcefully destroy subscription.
+ */
+PJ_DEF(pj_status_t) pjsip_evsub_terminate( pjsip_evsub *sub,
+                                           pj_bool_t notify )
+{
+    PJ_ASSERT_RETURN(sub, PJ_EINVAL);
+
+    pjsip_dlg_inc_lock(sub->dlg);
+
+    if (sub->pending_tsx) {
+        pj_assert(!"Unable to terminate when there's pending tsx");
+        pjsip_dlg_dec_lock(sub->dlg);
+        return PJ_EINVALIDOP;
+    }
+
+    sub->call_cb = notify;
+    set_state(sub, PJSIP_EVSUB_STATE_TERMINATED, NULL, NULL);
+
+    pjsip_dlg_dec_lock(sub->dlg);
+    return PJ_SUCCESS;
+}
 
 /*
@@ -1614 +1641 @@
          * if any.
          */
-        if (st_code==200 && sub->user.on_rx_notify) {
+        if (st_code==200 && sub->user.on_rx_notify && sub->call_cb) {
             (*sub->user.on_rx_notify)(sub, rdata, &st_code, &st_text, 
                                       &res_hdr, &body);
@@ -1782 +1809 @@
         pj_list_init(&res_hdr);
 
-        (*sub->user.on_rx_refresh)(sub, rdata, &st_code, &st_text, 
-                                   &res_hdr, &body);
+        if (sub->user.on_rx_refresh && sub->call_cb) {
+            (*sub->user.on_rx_refresh)(sub, rdata, &st_code, &st_text, 
+                                       &res_hdr, &body);
+        }
 
         /* Application MUST specify final response! */
@@ -1887 +1916 @@
 
     /* Call on_tsx_state callback, if any. */
-    if (sub->user.on_tsx_state)
+    if (sub->user.on_tsx_state && sub->call_cb)
         (*sub->user.on_tsx_state)(sub, tsx, event);