Changeset 2968 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Oct 26, 2009 11:21:37 AM (14 years ago)

Author:

bennylp

Message:

Implement ticket #982: Support for SIP Message Summary/Message? Waiting Indication (MWI, RFC 3842)

• PJSIP-SIMPLE:
  • implement MWI
• PJSUA-LIB:
  • added "mwi_enabled" flag in account config
  • added "on_mwi_info" callback
• pjsua app:
  • added "--mwi" option to enable MWI on account
  • added simple callback to log the NOTIFY message
• other:
  • added SIPp scenario files to simulate UAS side
• build:
  • added MWI support on VS6, VS2005, MMP, and Makefile

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (7 diffs)

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

@@ -194 +194 @@
     puts  ("  --password=string   Set authentication password");
     puts  ("  --publish           Send presence PUBLISH for this account");
+    puts  ("  --mwi               Subscribe to message summary/waiting indication");
     puts  ("  --use-100rel        Require reliable provisional response (100rel)");
     puts  ("  --use-timer         Require SIP session timers");
@@ -484 +485 @@
            OPT_BOUND_ADDR, OPT_CONTACT_PARAMS, OPT_CONTACT_URI_PARAMS,
            OPT_100REL, OPT_USE_IMS, OPT_REALM, OPT_USERNAME, OPT_PASSWORD,
-           OPT_NAMESERVER, OPT_STUN_SRV,
+           OPT_MWI, OPT_NAMESERVER, OPT_STUN_SRV,
            OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
            OPT_AUTO_ANSWER, OPT_AUTO_PLAY, OPT_AUTO_PLAY_HANGUP, OPT_AUTO_LOOP,
@@ -536 +537 @@
         { "reg-timeout",1, 0, OPT_REG_TIMEOUT},
         { "publish",    0, 0, OPT_PUBLISH},
+        { "mwi",        0, 0, OPT_MWI},
         { "use-100rel", 0, 0, OPT_100REL},
         { "use-ims",    0, 0, OPT_USE_IMS},
@@ -834 +836 @@
             break;
 
+        case OPT_MWI:   /* mwi */
+            cur_acc->mwi_enabled = PJ_TRUE;
+            break;
+
         case OPT_100REL: /** 100rel */
             cur_acc->require_100rel = PJ_TRUE;
@@ -1551 +1557 @@
     }
 
+    /* Publish */
+    if (acc_cfg->publish_enabled)
+        pj_strcat2(result, "--publish\n");
+
+    /* MWI */
+    if (acc_cfg->mwi_enabled)
+        pj_strcat2(result, "--mwi\n");
 }
 
@@ -2740 +2753 @@
         PJ_LOG(3, (THIS_FILE, "NAT detected as %s", res->nat_type_name));
     }
+}
+
+
+/*
+ * MWI indication
+ */
+static void on_mwi_info(pjsua_acc_id acc_id, pjsua_mwi_info *mwi_info)
+{
+    pj_str_t body;
+    
+    PJ_LOG(3,(THIS_FILE, "Received MWI for acc %d:", acc_id));
+
+    if (mwi_info->rdata->msg_info.ctype) {
+        const pjsip_ctype_hdr *ctype = mwi_info->rdata->msg_info.ctype;
+
+        PJ_LOG(3,(THIS_FILE, " Content-Type: %.*s/%.*s",
+                  (int)ctype->media.type.slen,
+                  ctype->media.type.ptr,
+                  (int)ctype->media.subtype.slen,
+                  ctype->media.subtype.ptr));
+    }
+
+    if (!mwi_info->rdata->msg_info.msg->body) {
+        PJ_LOG(3,(THIS_FILE, "  no message body"));
+        return;
+    }
+
+    body.ptr = mwi_info->rdata->msg_info.msg->body->data;
+    body.slen = mwi_info->rdata->msg_info.msg->body->len;
+
+    PJ_LOG(3,(THIS_FILE, " Body:\n%.*s", (int)body.slen, body.ptr));
 }
 
@@ -4338 +4382 @@
     app_config.cfg.cb.on_call_replaced = &on_call_replaced;
     app_config.cfg.cb.on_nat_detect = &on_nat_detect;
+    app_config.cfg.cb.on_mwi_info = &on_mwi_info;
 
     /* Set sound device latency */