Changeset 2824

Timestamp:

Jun 30, 2009 1:53:47 PM (15 years ago)

Author:

bennylp

Message:

Related to #911:

• added subscription state name string in pjsua_buddy_info and display this in pjsua

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2534 +2534 @@
     pjsua_buddy_get_info(buddy_id, &info);
 
-    PJ_LOG(3,(THIS_FILE, "%.*s status is %.*s",
+    PJ_LOG(3,(THIS_FILE, "%.*s status is %.*s (subscription state is %s)",
               (int)info.uri.slen,
               info.uri.ptr,
               (int)info.status_text.slen,
-              info.status_text.ptr));
+              info.status_text.ptr,
+              info.sub_state_name));
 }
 

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

@@ -2897 +2897 @@
 
     /**
+     * String representation of subscription state.
+     */
+    const char         *sub_state_name;
+
+    /**
      * Specifies the last presence subscription terminatino reason. If 
      * presence subscription is currently active, the value will be empty.

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

@@ -196 +196 @@
     if (buddy->sub) {
         info->sub_state = pjsip_evsub_get_state(buddy->sub);
+        info->sub_state_name = pjsip_evsub_get_state_name(buddy->sub);
         if (info->sub_state == PJSIP_EVSUB_STATE_TERMINATED &&
             total < sizeof(info->buf_)) 
@@ -208 +209 @@
         }
     } else if (total < sizeof(info->buf_)) {
+        info->sub_state_name = "NULL";
         info->sub_term_reason.ptr = info->buf_ + total;
         pj_strncpy(&info->sub_term_reason, &buddy->term_reason,
@@ -213 +215 @@
         total += info->sub_term_reason.slen;
     } else {
+        info->sub_state_name = "NULL";
         info->sub_term_reason = pj_str("");
     }