Ticket #192: pjsua_on_incoming_subscribe_cb_test.diff

pjsip-apps/src/pjsua/pjsua_app.c

@@ -2250 +2250 @@
     // Log already written.
 }
 
+static int sub_pending_acc_id = PJSUA_INVALID_ID;
+static pjsua_srv_pres *sub_pending_pres = NULL;
 
 /*
+ * Handler on incoming SUBSCRIBE
+ */
+static void on_incoming_subscribe(pjsua_acc_id acc_id,
+                                  pjsua_srv_pres *srv_pres,
+                                  pjsua_buddy_id buddy_id,
+                                  const pj_str_t *from,
+                                  pjsip_rx_data *rdata,
+                                  pjsip_status_code *code,
+                                  pj_str_t *reason,
+                                  pjsua_msg_data *msg_data)
+{
+    PJ_UNUSED_ARG(acc_id);
+    PJ_UNUSED_ARG(srv_pres);
+    PJ_UNUSED_ARG(from);
+    PJ_UNUSED_ARG(rdata);
+    PJ_UNUSED_ARG(reason);
+    PJ_UNUSED_ARG(msg_data);
+
+    /* Accept immediately if incoming subscription is from friends */
+    if (buddy_id != PJSUA_INVALID_ID) {
+        *code = 200;
+        return;
+    }
+
+    PJ_LOG(3,(THIS_FILE, "Incoming subscription request from %.*s",
+              (int)from->slen, from->ptr));
+
+    *code = 202;
+
+    sub_pending_acc_id = acc_id;
+    sub_pending_pres = srv_pres;
+}
+
+/*
  * Handler on buddy state changed.
  */
 static void on_buddy_state(pjsua_buddy_id buddy_id)
 {
     pjsua_buddy_info info;
+
     pjsua_buddy_get_info(buddy_id, &info);
 
-    PJ_LOG(3,(THIS_FILE, "%.*s status is %.*s",
-              (int)info.uri.slen,
-              info.uri.ptr,
-              (int)info.status_text.slen,
-              info.status_text.ptr));
+    if (info.sub_state == PJSIP_EVSUB_STATE_TERMINATED) {
+        PJ_LOG(3,(THIS_FILE, "%.*s subscription terminated (reason=%.*s)",
+                  (int)info.uri.slen,
+                  info.uri.ptr,
+                  (int)info.sub_term_reason.slen,
+                  info.sub_term_reason.ptr));
+
+    } else if (info.sub_state != PJSIP_EVSUB_STATE_NULL) {
+        PJ_LOG(3,(THIS_FILE, "%.*s status is %.*s",
+                  (int)info.uri.slen,
+                  info.uri.ptr,
+                  (int)info.status_text.slen,
+                  info.status_text.ptr));
+    }
 }
 
 
@@ -3764 +3810 @@
         case 'q':
             goto on_exit;
 
+        case 'b':
+            if (!sub_pending_pres)
+                break;
 
+            if (menuin[1]=='a') {
+                pjsua_pres_notify(sub_pending_acc_id, sub_pending_pres, 
+                                  PJSIP_EVSUB_STATE_ACTIVE, NULL, NULL, 
+                                  PJ_TRUE, NULL);
+            } else {
+                pj_str_t reason = pj_str("unauthorized");
+                pjsua_pres_notify(sub_pending_acc_id, sub_pending_pres, 
+                                  PJSIP_EVSUB_STATE_TERMINATED, NULL, &reason,
+                                  PJ_TRUE, NULL);
+            }
+
+            sub_pending_pres = NULL;
+            sub_pending_acc_id = PJSUA_INVALID_ID;
+            break;
+
         default:
             if (menuin[0] != '\n' && menuin[0] != '\r') {
                 printf("Invalid input %s", menuin);
@@ -3813 +3877 @@
     app_config.cfg.cb.on_call_tsx_state = &on_call_tsx_state;
     app_config.cfg.cb.on_dtmf_digit = &call_on_dtmf_callback;
     app_config.cfg.cb.on_reg_state = &on_reg_state;
+    app_config.cfg.cb.on_incoming_subscribe = &on_incoming_subscribe;
     app_config.cfg.cb.on_buddy_state = &on_buddy_state;
     app_config.cfg.cb.on_pager = &on_pager;
     app_config.cfg.cb.on_typing = &on_typing;