Changeset 5710 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Dec 5, 2017 7:11:08 AM (7 years ago)

Author:

riza

Message:

Close #2072: Call on_call_transfer_status() callback when REFER is responded with failure response.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

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

@@ -4410 +4410 @@
     }
     /*
-     * On incoming NOTIFY, notify application about call transfer progress.
+     * On incoming NOTIFY or an error response, notify application about call 
+     * transfer progress.
      */
     else if (pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_ACTIVE ||
@@ -4438 +4439 @@
             goto on_return;
         }
-
-        /* This better be a NOTIFY request */
+        
         if (event->type == PJSIP_EVENT_TSX_STATE &&
             event->body.tsx_state.type == PJSIP_EVENT_RX_MSG)
@@ -4446 +4446 @@
 
             rdata = event->body.tsx_state.src.rdata;
-
-            /* Check if there's body */
             msg = rdata->msg_info.msg;
-            body = msg->body;
-            if (!body) {
-                PJ_LOG(2,(THIS_FILE,
-                          "Warning: received NOTIFY without message body"));
-                goto on_return;
+
+            /* This better be a NOTIFY request */
+            if (pjsip_method_cmp(&msg->line.req.method, 
+                                 pjsip_get_notify_method()) == 0) 
+            {
+                /* Check if there's body */
+                body = msg->body;
+                if (!body) {
+                    PJ_LOG(2, (THIS_FILE,
+                               "Warning: received NOTIFY without message "
+                               "body"));
+                    goto on_return;
+                }
+
+                /* Check for appropriate content */
+                if (pj_stricmp2(&body->content_type.type, "message") != 0 ||
+                    pj_stricmp2(&body->content_type.subtype, "sipfrag") != 0)
+                {
+                    PJ_LOG(2, (THIS_FILE,
+                               "Warning: received NOTIFY with non "
+                               "message/sipfrag content"));
+                    goto on_return;
+                }
+
+                /* Try to parse the content */
+                status = pjsip_parse_status_line((char*)body->data, body->len,
+                                                 &status_line);
+                if (status != PJ_SUCCESS) {
+                    PJ_LOG(2, (THIS_FILE,
+                               "Warning: received NOTIFY with invalid "
+                               "message/sipfrag content"));
+                    goto on_return;
+                }
+            } else {
+                status_line.code = msg->line.status.code;
+                status_line.reason = msg->line.status.reason;
             }
-
-            /* Check for appropriate content */
-            if (pj_stricmp2(&body->content_type.type, "message") != 0 ||
-                pj_stricmp2(&body->content_type.subtype, "sipfrag") != 0)
-            {
-                PJ_LOG(2,(THIS_FILE,
-                          "Warning: received NOTIFY with non message/sipfrag "
-                          "content"));
-                goto on_return;
-            }
-
-            /* Try to parse the content */
-            status = pjsip_parse_status_line((char*)body->data, body->len,
-                                             &status_line);
-            if (status != PJ_SUCCESS) {
-                PJ_LOG(2,(THIS_FILE,
-                          "Warning: received NOTIFY with invalid "
-                          "message/sipfrag content"));
-                goto on_return;
-            }
-
         } else {
             status_line.code = 500;