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

Timestamp:

Dec 7, 2011 10:43:28 AM (12 years ago)

Author:

nanang

Message:

Re #1234: Initial version of keyframe request/response via SIP INFO.

File:

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

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

@@ -2634 +2634 @@
          * Handle INFO method.
          */
-        if (tsx->role == PJSIP_ROLE_UAC && 
+        const pj_str_t STR_APPLICATION = { "application", 11};
+        const pj_str_t STR_DTMF_RELAY  = { "dtmf-relay", 10 };
+        pjsip_msg_body *body = NULL;
+        pj_bool_t dtmf_info = PJ_FALSE;
+        
+        if (tsx->role == PJSIP_ROLE_UAC) {
+            if (e->body.tsx_state.type == PJSIP_EVENT_TX_MSG)
+                body = e->body.tsx_state.src.tdata->msg->body;
+            else
+                body = e->body.tsx_state.tsx->last_tx->msg->body;
+        } else {
+            if (e->body.tsx_state.type == PJSIP_EVENT_RX_MSG)
+                body = e->body.tsx_state.src.rdata->msg_info.msg->body;
+        }
+        
+        /* Check DTMF content in the INFO message */
+        if (body && body->len &&
+            pj_stricmp(&body->content_type.type, &STR_APPLICATION)==0 &&
+            pj_stricmp(&body->content_type.subtype, &STR_DTMF_RELAY)==0)
+        {
+            dtmf_info = PJ_TRUE;
+        }
+
+        if (dtmf_info && tsx->role == PJSIP_ROLE_UAC && 
             (tsx->state == PJSIP_TSX_STATE_COMPLETED ||
                (tsx->state == PJSIP_TSX_STATE_TERMINATED &&
@@ -2652 +2675 @@
                           tsx->status_text.ptr));
             }
-        } else if (tsx->role == PJSIP_ROLE_UAS &&
+        } else if (dtmf_info && tsx->role == PJSIP_ROLE_UAS &&
                    tsx->state == PJSIP_TSX_STATE_TRYING)
         {
@@ -2883 +2906 @@
         if (vid_idx == -1 || call_info.media[vid_idx].dir == PJMEDIA_DIR_NONE) {
             PJ_LOG(3,(THIS_FILE,
-                      "Just rejected incoming video offer on call %d"
-                      "use \"vid call add\" to enable video!",
-                      call_id));
+                      "Just rejected incoming video offer on call %d, "
+                      "use \"vid call enable %d\" or \"vid call add\" to enable video!",
+                      call_id, vid_idx));
         }
     }