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

Timestamp:

Nov 20, 2009 11:33:07 PM (14 years ago)

Author:

bennylp

Message:

More ticket #982 (MWI): support for Asterisk unsolicited MWI requests:

• undo r3019 which put unsolicited MWI support in pjsua app only
• put the unsolicited MWI support in PJSUA-LIB instead
• unsolicited MWI is by default enabled
• on_mwi_info() callback will be called just as the solicited MWI version

File:

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

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

@@ -102 +102 @@
     unsigned                auto_answer;
     unsigned                duration;
-    pj_bool_t               unsolicited_mwi;
 
 #ifdef STEREO_DEMO
@@ -146 +145 @@
 static pj_status_t create_ipv6_media_transports(void);
 pj_status_t app_destroy(void);
-static void enable_unsolicited_mwi(void);
 
 static void ringback_start(pjsua_call_id call_id);
@@ -197 +195 @@
     puts  ("  --publish           Send presence PUBLISH for this account");
     puts  ("  --mwi               Subscribe to message summary/waiting indication");
-    puts  ("  --unsolicited-mwi   Handle unsolicited MWI requests");
     puts  ("  --use-100rel        Require reliable provisional response (100rel)");
     puts  ("  --use-timer         Require SIP session timers");
@@ -488 +485 @@
            OPT_BOUND_ADDR, OPT_CONTACT_PARAMS, OPT_CONTACT_URI_PARAMS,
            OPT_100REL, OPT_USE_IMS, OPT_REALM, OPT_USERNAME, OPT_PASSWORD,
-           OPT_MWI, OPT_UNSOLICITED_MWI, 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,
@@ -541 +538 @@
         { "publish",    0, 0, OPT_PUBLISH},
         { "mwi",        0, 0, OPT_MWI},
-        { "unsolicited-mwi", 0, 0, OPT_UNSOLICITED_MWI},
         { "use-100rel", 0, 0, OPT_100REL},
         { "use-ims",    0, 0, OPT_USE_IMS},
@@ -844 +840 @@
             break;
 
-        case OPT_UNSOLICITED_MWI:
-            cfg->unsolicited_mwi = PJ_TRUE;
-            break;
-
         case OPT_100REL: /** 100rel */
             cur_acc->require_100rel = PJ_TRUE;
@@ -1999 +1991 @@
     {
         pj_strcat2(&cfg, "--use-compact-form\n");
-    }
-
-    if (config->unsolicited_mwi) {
-        pj_strcat2(&cfg, "--unsolicited-mwi\n");
     }
 
@@ -4408 +4396 @@
         return status;
 
-    /* Initialize unsolicited MWI */
-    if (app_config.unsolicited_mwi)
-        enable_unsolicited_mwi();
-
     /* Initialize our module to handle otherwise unhandled request */
     status = pjsip_endpt_register_module(pjsua_get_pjsip_endpt(),
@@ -5016 +5000 @@
 }
 
-/*****************************************************************************
- * Asterisk unsolicited MWI module
- */
-static pj_bool_t mwi_on_rx_request(pjsip_rx_data *rdata)
-{
-    pjsip_msg *msg = rdata->msg_info.msg;
-    pj_str_t EVENT_HDR  = { "Event", 5 };
-    pj_str_t MWI = { "message-summary", 15 };
-    pjsip_event_hdr *eh;
-    pj_str_t body;
-
-    if (pjsip_method_cmp(&msg->line.req.method, &pjsip_notify_method)!=0) {
-        /* Only interested with NOTIFY request */
-        return PJ_FALSE;
-    }
-
-    eh = (pjsip_event_hdr*) pjsip_msg_find_hdr_by_name(msg, &EVENT_HDR, NULL);
-    if (!eh) {
-        /* Something wrong with the request, it has no Event hdr */
-        return PJ_FALSE;
-    }
-
-    if (pj_stricmp(&eh->event_type, &MWI) != 0) {
-        /* Not MWI event */
-        return PJ_FALSE;
-    }
-
-    /* Got unsolicited MWI request, respond with 200/OK first */
-    pjsip_endpt_respond(pjsua_get_pjsip_endpt(), NULL, rdata, 200, NULL,
-                        NULL, NULL, NULL);
-
-
-    PJ_LOG(3,(THIS_FILE, "Received MWI info:"));
-
-    if (rdata->msg_info.ctype) {
-        const pjsip_ctype_hdr *ctype = 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 (!rdata->msg_info.msg->body) {
-        PJ_LOG(3,(THIS_FILE, "  no message body"));
-        return PJ_TRUE;
-    }
-
-    body.ptr = rdata->msg_info.msg->body->data;
-    body.slen = rdata->msg_info.msg->body->len;
-
-    PJ_LOG(3,(THIS_FILE, " Body:\n%.*s", (int)body.slen, body.ptr));
-    
-    return PJ_TRUE;
-}
-
-/* The module instance. */
-static pjsip_module pjsua_mwi_mod = 
-{
-    NULL, NULL,                         /* prev, next.          */
-    { "mod-unsolicited-mwi", 19 },      /* Name.                */
-    -1,                                 /* Id                   */
-    PJSIP_MOD_PRIORITY_UA_PROXY_LAYER-1,/* Priority             */
-    NULL,                               /* load()               */
-    NULL,                               /* start()              */
-    NULL,                               /* stop()               */
-    NULL,                               /* unload()             */
-    &mwi_on_rx_request,                 /* on_rx_request()      */
-    NULL,                               /* on_rx_response()     */
-    NULL,                               /* on_tx_request.       */
-    NULL,                               /* on_tx_response()     */
-    NULL,                               /* on_tsx_state()       */
-};
-
-static void enable_unsolicited_mwi(void)
-{
-    pj_status_t status;
-
-    status = pjsip_endpt_register_module(pjsua_get_pjsip_endpt(), 
-                                         &pjsua_mwi_mod);
-    if (status != PJ_SUCCESS)
-        pjsua_perror(THIS_FILE, "Error registering MWI module", status);
-}
-