sip-lab 1.15.0 → 1.16.0

package/src/sip.cpp

@@ -424,6 +424,8 @@ struct Call {
 
   pjmedia_sdp_session *active_local_sdp;
   pjmedia_sdp_session *active_remote_sdp;
+
+  bool local_sdp_answer_already_set;
 };
 
 #define MAX_TCP_DATA 4096
@@ -2071,9 +2073,9 @@ int pjw_call_respond(long call_id, const char *json) {
         set_error("pjsip_rx_data_free_cloned failed with status=%i", status);
         goto out;
       }
+      call->pending_rdata = 0;
 
       call->pending_request = -1;
-      call->pending_rdata = 0;
     }
 
     goto out;
@@ -2084,13 +2086,16 @@ int pjw_call_respond(long call_id, const char *json) {
 
     if (call->pending_rdata && call->pending_rdata->msg_info.msg->body &&
         call->pending_rdata->msg_info.msg->body->len) {
-      if (!process_media(call, call->inv->dlg, document, true)) {
-        goto out;
-      }
+      if(!call->local_sdp_answer_already_set) {
+        if (!process_media(call, call->inv->dlg, document, true)) {
+          goto out;
+        }
 
-      status = pjsip_inv_set_sdp_answer(call->inv, call->local_sdp);
+        status = pjsip_inv_set_sdp_answer(call->inv, call->local_sdp);
+        call->local_sdp_answer_already_set = true;
+      }
     } else {
-      // delayed media. we need to sned the offer
+      printf("delayed media. we need to send the offer\n");
       if (!process_media(call, call->inv->dlg, document, false)) {
         goto out;
       }
@@ -2114,15 +2119,17 @@ int pjw_call_respond(long call_id, const char *json) {
 
     call->inv_initial_answer_required = false;
 
-    if (code >= 200) {
+    if (code >= 200 && code < 300) {
       status = pjsip_rx_data_free_cloned(call->pending_rdata);
       if (status != PJ_SUCCESS) {
         set_error("pjsip_rx_data_free_cloned failed with status=%i", status);
         goto out;
       }
-
-      call->pending_request = -1;
       call->pending_rdata = 0;
+
+      if (code >= 200 && code < 300) {
+        call->pending_request = -1;
+      }
     }
   } else {
     status = pjsip_inv_answer(call->inv, code, &r,
@@ -2133,7 +2140,20 @@ int pjw_call_respond(long call_id, const char *json) {
       goto out;
     }
 
-    call->pending_request = -1;
+    if (code >= 200 && code < 300) {
+      if(call->pending_rdata) {
+        status = pjsip_rx_data_free_cloned(call->pending_rdata);
+        if (status != PJ_SUCCESS) {
+          set_error("pjsip_rx_data_free_cloned failed with status=%i", status);
+          goto out;
+        }
+        call->pending_rdata = 0;
+      }
+
+      if (code >= 200 && code < 300) {
+        call->pending_request = -1;
+      }
+    }
 
     if (!add_headers(call->inv->dlg->pool, tdata, document)) {
       goto out;
@@ -2145,6 +2165,10 @@ int pjw_call_respond(long call_id, const char *json) {
     set_error("pjsip_inv_send_msg failed with status=%i", status);
     goto out;
   }
+
+  if(code >= 200 && code < 300) {
+    call->local_sdp_answer_already_set = false;
+  }
 out:
   PJW_UNLOCK();
   if (pjw_errorstring[0]) {
@@ -4076,10 +4100,11 @@ int find_sdp_media_by_media_endpt(const pjmedia_sdp_session *sdp,
   printf("find_sdp_media_by_media_endpt %x\n", me);
   for (int i = 0; i < sdp->media_count; i++) {
     pjmedia_sdp_media *media = sdp->media[i];
-    printf("i=%d me->port=%i media->desc.port=%i me->media=%.*s media->desc.media=%.*s\n", i, me->port, media->desc.port, me->media.slen, me->media.ptr, media->desc.media.slen, media->desc.media.ptr);
+    printf("i=%d me->port=%i media->desc.port=%i me->media=%.*s media->desc.media=%.*s me->transport=%.*s media->desc.transport=%.*s\n", i, me->port, media->desc.port, me->media.slen, me->media.ptr, media->desc.media.slen, media->desc.media.ptr, me->transport.slen, me->transport.ptr, media->desc.transport.slen, media->desc.transport.ptr);
 
     if ((me->port == media->desc.port) &&
-        (pj_strcmp(&me->media, &media->desc.media) == 0)) {
+        (pj_strcmp(&me->media, &media->desc.media) == 0) &&
+        (pj_strcmp(&me->transport, &media->desc.transport) == 0)) {
       *media_out = media;
       printf("found\n");
       return i;
@@ -4128,10 +4153,10 @@ void gen_media_json(char *dest, int len, Call *call,
     if(!me->port) {
       switch (me->type) {
         case ENDPOINT_TYPE_AUDIO:
-          p += sprintf(p, "{\"type\": \"audio\", \"transport\": \"%.*s\", \"port\": 0}", me->transport.slen, me->transport.ptr);
+          p += sprintf(p, "{\"type\": \"audio\", \"protocol\": \"%.*s\", \"port\": 0}", me->transport.slen, me->transport.ptr);
           break;
         case ENDPOINT_TYPE_MRCP:
-          p += sprintf(p, "{\"type\": \"mrcp\", \"transport\": \"%.*s\", \"port\": 0}", me->transport.slen, me->transport.ptr);
+          p += sprintf(p, "{\"type\": \"mrcp\", \"protocol\": \"%.*s\", \"port\": 0}", me->transport.slen, me->transport.ptr);
           break;
         default:  
           p += sprintf(p, "{\"type\": \"unknown\", \"port\": 0}");
@@ -4163,7 +4188,7 @@ void gen_media_json(char *dest, int len, Call *call,
       pj_str_t *remote_addr = &remote_conn->addr;
 
       p += sprintf(p,
-                   "{\"type\": \"audio\", \"transport\": \"%.*s\", \"local\": {\"addr\": \"%.*s\", "
+                   "{\"type\": \"audio\", \"protocol\": \"%.*s\", \"local\": {\"addr\": \"%.*s\", "
                    "\"port\": %d, \"mode\": \"%s\"}, \"remote\": {\"addr\": "
                    "\"%.*s\", \"port\": %d, \"mode\": \"%s\"}, \"fmt\": [",
                    me->transport.slen, me->transport.ptr,
@@ -4188,7 +4213,7 @@ void gen_media_json(char *dest, int len, Call *call,
     }
     case ENDPOINT_TYPE_MRCP: {
       p += sprintf(p,
-                   "{\"type\": \"mrcp\", \"transport\": \"%.*s\", \"local\": {\"port\": %d}, "
+                   "{\"type\": \"mrcp\", \"protocol\": \"%.*s\", \"local\": {\"port\": %d}, "
                    "\"remote\": {\"port\": %d}}",
                    me->transport.slen, me->transport.ptr,
                    local_sdp->media[idx]->desc.port,
@@ -4414,18 +4439,24 @@ MediaEndpoint *find_media_endpt_by_sdp_media(Call *call,
 
     if (pj_strcmp2(&local_media->desc.media, "audio") == 0) {
       if (ENDPOINT_TYPE_AUDIO == me->type) {
-        in_use_chart[i] = true;
-        return me;
+        if (pj_strcmp(&local_media->desc.transport, &me->transport)) {
+          in_use_chart[i] = true;
+          return me;
+        }
       }
     } else if (pj_strcmp2(&local_media->desc.media, "video") == 0) {
       if (ENDPOINT_TYPE_VIDEO == me->type) {
-        in_use_chart[i] = true;
-        return me;
+        if (pj_strcmp(&local_media->desc.transport, &me->transport)) {
+          in_use_chart[i] = true;
+          return me;
+        } 
       }
     } else if (pj_strcmp2(&local_media->desc.media, "application") == 0) {
       if (ENDPOINT_TYPE_MRCP == me->type) {
-        in_use_chart[i] = true;
-        return me;
+        if (pj_strcmp(&local_media->desc.transport, &me->transport)) {
+          in_use_chart[i] = true;
+          return me;
+        }
       }
     } else {
       printf("local_media->desc.media=%.*s\n", local_media->desc.media.slen,