sip-lab 1.13.0 → 1.14.0

package/src/sip.cpp

@@ -433,7 +433,7 @@ struct AsockUserData {
   MediaEndpoint *media_endpt;
   Call *call;
   char buf[MAX_TCP_DATA];
-  char len;
+  pj_size_t len;
 };
 
 bool init_media_ports(Call *c, AudioEndpoint *ae, unsigned sampling_rate,
@@ -841,18 +841,20 @@ static pj_bool_t on_data_read(pj_activesock_t *asock, void *data,
   AsockUserData *ud = (AsockUserData*)pj_activesock_get_user_data(asock);
   if(!ud) return PJ_FALSE;
 
-  printf("%.*s\n", size, data);
   if (size == 0) {
     // TODO: destroy the activesock.
     return PJ_FALSE;
   }
 
-  assert(size + ud->len < MAX_TCP_DATA);
+  assert(ud->len >= 0);
+
+  assert(size >= 0);
+  assert(size + ud->len + 1 < MAX_TCP_DATA);
 
   memcpy(&ud->buf[ud->len], data, size);
-  ud->len = size + ud->len;
+  ud->len = ud->len + size;
   ud->buf[ud->len] = '\0';
-  
+
   char *sep = strstr(ud->buf, "\r\n\r\n");
   if(!sep) {
     // msg incomplete
@@ -877,8 +879,10 @@ static pj_bool_t on_data_read(pj_activesock_t *asock, void *data,
     num_str[len] = '\0';
     int body_len = atoi(num_str);
 
-    if(sep+4+body_len < ud->buf+ud->len) {
-      // msg incomplete
+    assert(body_len > 0 && body_len < 4096);
+
+    if(ud->buf+ud->len < sep+4+body_len) {
+      printf("tcp data: msg incomplete %i %i\n", ud->buf+ud->len, sep+4+body_len);
       *remainder = 0;
       return PJ_TRUE;
     }
@@ -1293,6 +1297,14 @@ int __pjw_init() {
   }
 #endif
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+  status = pjmedia_srtp_init_lib(g_med_endpt);
+  if (status != PJ_SUCCESS) {
+    addon_log(L_DBG, "Error initializing SRTP library\n");
+    return 1;
+  }
+#endif
+
   status = pjmedia_codec_bcg729_init(g_med_endpt);
   if (status != PJ_SUCCESS) {
     printf("pjmedia_codec_bcg729_init failed\n");
@@ -2948,6 +2960,9 @@ pj_status_t send_dtmf(Call *call, const char *digits, int mode) {
     if (me->type != ENDPOINT_TYPE_AUDIO)
       continue;
 
+    if(me->port == 0)
+      continue;
+
     AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
 
     pj_status_t status = audio_endpoint_send_dtmf(call, ae, digits, mode);
@@ -3294,7 +3309,7 @@ int pjw_call_start_record_wav(long call_id, const char *json) {
   pj_status_t status;
   pjmedia_port *stream_port;
 
-  unsigned media_id;
+  unsigned media_id = 0;
 
   MediaEndpoint *me;
   AudioEndpoint *ae;
@@ -3399,7 +3414,7 @@ int pjw_call_start_play_wav(long call_id, const char *json) {
   AudioEndpoint *ae;
   int ae_count;
 
-  unsigned media_id;
+  unsigned media_id = 0;
 
   char *file;
 
@@ -3527,7 +3542,7 @@ int pjw_call_stop_play_wav(long call_id, const char *json) {
   int ae_count;
   int res;
 
-  unsigned media_id;
+  unsigned media_id = 0;
 
   char buffer[MAX_JSON_INPUT];
 
@@ -3624,7 +3639,7 @@ int pjw_call_stop_record_wav(long call_id, const char *json) {
   int ae_count;
   int res;
 
-  unsigned media_id;
+  unsigned media_id = 0;
 
   char buffer[MAX_JSON_INPUT];
 
@@ -3703,7 +3718,7 @@ int pjw_call_start_fax(long call_id, const char *json) {
   AudioEndpoint *ae;
   int ae_count;
 
-  unsigned media_id;
+  unsigned media_id = 0;
 
   char buffer[MAX_JSON_INPUT];
 
@@ -3841,7 +3856,7 @@ int pjw_call_stop_fax(long call_id, const char *json) {
   int ae_count;
   int res;
 
-  unsigned media_id;
+  unsigned media_id = 0;
 
   char buffer[MAX_JSON_INPUT];
 
@@ -3924,7 +3939,7 @@ int pjw_call_get_stream_stat(long call_id, const char *json, char *out_stats) {
   AudioEndpoint *ae;
   VideoEndpoint *ve;
 
-  unsigned media_id;
+  unsigned media_id = 0;
 
   pjmedia_stream *med_stream = NULL;
 
@@ -4098,6 +4113,20 @@ void gen_media_json(char *dest, int len, Call *call,
     pjmedia_sdp_media *local_media = local_sdp->media[idx];
     pjmedia_sdp_media *remote_media = remote_sdp->media[idx];
 
+    if(!me->port) {
+      switch (me->type) {
+        case ENDPOINT_TYPE_AUDIO:
+          p += sprintf(p, "{\"type\": \"audio\", \"port\": 0}");
+          break;
+        case ENDPOINT_TYPE_MRCP:
+          p += sprintf(p, "{\"type\": \"mrcp\", \"port\": 0}");
+          break;
+        default:  
+          p += sprintf(p, "{\"type\": \"unknown\", \"port\": 0}");
+      } 
+      continue;
+    }
+
     switch (me->type) {
     case ENDPOINT_TYPE_AUDIO: {
       AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
@@ -4449,29 +4478,30 @@ static void on_media_update(pjsip_inv_session *inv, pj_status_t status) {
             call->id, b);
 
   // update media endpoint based on sdp media
-
   bool in_use_chart[PJMEDIA_MAX_SDP_MEDIA] = {false};
   MediaEndpoint *active_media[PJMEDIA_MAX_SDP_MEDIA] = {NULL};
   int active_media_count = 0;
 
   for (int i = 0; i < local_sdp->media_count; i++) {
-    pjmedia_sdp_media *media = local_sdp->media[i];
-    if (media->desc.port) {
-      MediaEndpoint *me =
-          find_media_endpt_by_sdp_media(call, media, in_use_chart);
-      if (me) {
-        active_media[active_media_count++] = me;
-      }
-    }
-  }
-
-  for (int i = 0; i < call->media_count; i++) {
     MediaEndpoint *me = call->media[i];
-    if (!is_media_in_active_media(me, active_media, active_media_count)) {
+    if (!local_sdp->media[i]->desc.port) {
       close_media_endpoint(me);
+    } else {
+      if (me->type == ENDPOINT_TYPE_AUDIO) {
+        if (!restart_media_stream(call, me, local_sdp, remote_sdp, i)) {
+          return;
+        }
+      } else if(me->type == ENDPOINT_TYPE_MRCP) {
+        if(call->outgoing) {
+          if(!start_tcp_media(call, me, local_sdp, remote_sdp, i)) {
+            return;
+          }
+        }
+      }
     }
   }
 
+  /*
   printf("active_media_count=%d\n", active_media_count);
   call->media_count = 0;
   for (int i = 0; i < active_media_count; i++) {
@@ -4482,18 +4512,21 @@ static void on_media_update(pjsip_inv_session *inv, pj_status_t status) {
     int idx = find_sdp_media_by_media_endpt(local_sdp, &dummy, me);
     printf("idx=%d\n", idx);
 
-    if (me->type == ENDPOINT_TYPE_AUDIO) {
-      if (!restart_media_stream(call, me, local_sdp, remote_sdp, idx)) {
-        return;
-      }
-    } else if(me->type == ENDPOINT_TYPE_MRCP) {
-      if(call->outgoing) {
-        if(!start_tcp_media(call, me, local_sdp, remote_sdp, idx)) {
+    if(me->port != 0) {
+      if (me->type == ENDPOINT_TYPE_AUDIO) {
+        if (!restart_media_stream(call, me, local_sdp, remote_sdp, idx)) {
           return;
         }
+      } else if(me->type == ENDPOINT_TYPE_MRCP) {
+        if(call->outgoing) {
+          if(!start_tcp_media(call, me, local_sdp, remote_sdp, idx)) {
+            return;
+          }
+        }
       }
     }
   }
+  */
 
   char media[4096];
   gen_media_json(media, sizeof(media), call, local_sdp, remote_sdp);
@@ -5761,15 +5794,31 @@ bool create_media_endpoint(Call *call, Document &document, Value &descr,
   const char *type = (const char *)descr["type"].GetString();
   const pj_str_t str_addr = pj_str(address);
 
-  if (strcmp("audio", type) == 0) {
-    pj_uint16_t allocated_port;
-    pjmedia_transport *med_transport =
-        create_media_transport(&str_addr, &allocated_port);
+  pj_bool_t must_not_be_used = PJ_FALSE;
 
-    if (!med_transport) {
-      set_error("create_media_transport failed");
+  if (descr.HasMember("port")) {
+    if (!descr["port"].IsInt()) {
+      set_error("Parameter port must be an integer");
       return false;
     }
+    int port = descr["port"].GetInt();
+    if(port == 0) {
+      must_not_be_used = PJ_TRUE;
+    }
+  }
+
+  if (strcmp("audio", type) == 0) {
+    pj_uint16_t allocated_port;
+    pjmedia_transport *med_transport = NULL;
+    if(must_not_be_used) {
+      allocated_port = 0;
+    } else {
+      med_transport = create_media_transport(&str_addr, &allocated_port);
+      if (!med_transport) {
+        set_error("create_media_transport failed");
+        return false;
+      }
+    }
 
     AudioEndpoint *audio_endpt =
         (AudioEndpoint *)pj_pool_zalloc(dlg->pool, sizeof(AudioEndpoint));
@@ -5785,16 +5834,20 @@ bool create_media_endpoint(Call *call, Document &document, Value &descr,
     MrcpEndpoint *mrcp_endpt = (MrcpEndpoint *)pj_pool_zalloc(dlg->pool, sizeof(MrcpEndpoint));
     pj_uint16_t allocated_port;
     pj_activesock_t *asock = NULL;
-    if (call->outgoing) {
-      allocated_port = 9; // client must use port 9
+    if(must_not_be_used) {
+      allocated_port = 0;
     } else {
-      pj_str_t ipaddr = pj_str(address);
-      asock = create_tcp_socket(g_sip_endpt, &ipaddr, &allocated_port, med_endpt, call);
-      if(!asock) {
-        set_error("create_media_transport MrcpEndpoint failed");
-        return false;
+      if (call->outgoing) {
+        allocated_port = 9; // client must use port 9
+      } else {
+        pj_str_t ipaddr = pj_str(address);
+        asock = create_tcp_socket(g_sip_endpt, &ipaddr, &allocated_port, med_endpt, call);
+        if(!asock) {
+          set_error("create_media_transport MrcpEndpoint failed");
+          return false;
+        }
+        mrcp_endpt->asock = asock;
       }
-      mrcp_endpt->asock = asock;
     }
 
     med_endpt->type = ENDPOINT_TYPE_MRCP;
@@ -5819,7 +5872,7 @@ bool create_media_endpoint(Call *call, Document &document, Value &descr,
 }
 
 MediaEndpoint *find_media_by_json_descr(Call *call, Value &descr,
-                                        bool in_use_chart[]) {
+                                        bool in_use_chart[], int *idx) {
   const char *type_name = (const char *)descr["type"].GetString();
 
   int type_id = media_type_name_to_type_id(type_name);
@@ -5831,6 +5884,7 @@ MediaEndpoint *find_media_by_json_descr(Call *call, Value &descr,
 
     if (me->type == type_id) {
       in_use_chart[i] = true;
+      *idx = i;
       return me;
     }
   }
@@ -5875,6 +5929,33 @@ pjmedia_sdp_media *create_sdp_media(MediaEndpoint *me, pjsip_dialog *dlg) {
   pj_status_t status;
   pjmedia_sdp_media *media;
 
+  if(me->port == 0) {
+    // media not in use
+    media = (pjmedia_sdp_media *)pj_pool_zalloc(dlg->pool,
+                                                sizeof(pjmedia_sdp_media));
+    if (!media) {
+      set_error("create pjmedia_sdp_media for mrcp endpoint failed");
+      return NULL;
+    }
+
+    pj_strdup(dlg->pool, &media->desc.media, &me->media);
+
+    pj_strdup(dlg->pool, &media->desc.transport, &me->transport);
+
+    media->desc.port = me->port;
+    pj_strdup2(
+        dlg->pool, &media->desc.fmt[media->desc.fmt_count++],
+        "0");
+
+    media->conn =
+        (pjmedia_sdp_conn *)pj_pool_zalloc(dlg->pool, sizeof(pjmedia_sdp_conn));
+    pj_strdup2(dlg->pool, &media->conn->net_type, "IN");
+    pj_strdup2(dlg->pool, &media->conn->addr_type, "IP4");
+    pj_strdup(dlg->pool, &media->conn->addr, &me->addr);
+
+    return media;
+  }
+
   if (ENDPOINT_TYPE_AUDIO == me->type) {
     AudioEndpoint *audio = (AudioEndpoint *)me->endpoint.audio;
     pjmedia_transport_info med_tpinfo;
@@ -6021,9 +6102,51 @@ bool process_media(Call *call, pjsip_dialog *dlg, Document &document) {
   for (SizeType i = 0; i < media.Size(); i++) {
     Value descr = media[i].GetObject();
 
-    MediaEndpoint *me = find_media_by_json_descr(call, descr, in_use_chart);
+    int idx;
+    MediaEndpoint *me = find_media_by_json_descr(call, descr, in_use_chart, &idx);
+
     if (me) {
       addon_log(L_DBG, "i=%d media found\n", i);
+      if (me->port && descr.HasMember("port")) {
+        // me was active but it must be deactivated
+        MediaEndpoint *new_me;
+
+        if(!create_media_endpoint(call, document, descr, dlg, "0.0.0.0", &new_me))
+          return false;
+        addon_log(L_DBG, "i=%d media port=0 created %x\n", i, me);
+
+        pjmedia_sdp_media *media = create_sdp_media(new_me, dlg);
+        if (!media)
+          return false;
+
+        sdp->media[sdp->media_count++] = media;
+      } else if(!me->port && !descr.HasMember("port")) {
+        // me was not active but it is activated now
+        if (!create_media_endpoint(call, document, descr, dlg, t->address, &me))
+          return false;
+        addon_log(L_DBG, "i=%d media created %x\n", i, me);
+        call->media[idx] = me;
+
+        if (!update_media_fields(me, dlg->pool, descr)) {
+          return false;
+        }
+
+        pjmedia_sdp_media *media = create_sdp_media(me, dlg);
+        if (!media)
+          return false;
+
+        sdp->media[sdp->media_count++] = media;
+      } else {
+        if (!update_media_fields(me, dlg->pool, descr)) {
+          return false;
+        }
+
+        pjmedia_sdp_media *media = create_sdp_media(me, dlg);
+        if (!media)
+          return false;
+
+        sdp->media[sdp->media_count++] = media;
+      }
     } else {
       addon_log(L_DBG, "i=%d media not found\n", i);
       if (!create_media_endpoint(call, document, descr, dlg, t->address, &me))
@@ -6032,17 +6155,17 @@ bool process_media(Call *call, pjsip_dialog *dlg, Document &document) {
       call->media[call->media_count++] = me;
       in_use_chart[call->media_count - 1] =
           true; // added elements must be set as in use
-    }
 
-    if (!update_media_fields(me, dlg->pool, descr)) {
-      return false;
-    }
+      if (!update_media_fields(me, dlg->pool, descr)) {
+        return false;
+      }
 
-    pjmedia_sdp_media *media = create_sdp_media(me, dlg);
-    if (!media)
-      return false;
+      pjmedia_sdp_media *media = create_sdp_media(me, dlg);
+      if (!media)
+        return false;
 
-    sdp->media[sdp->media_count++] = media;
+      sdp->media[sdp->media_count++] = media;
+    }
   }
 
   call->local_sdp = sdp;
@@ -6066,8 +6189,12 @@ bool is_media_active(Call *c, MediaEndpoint *me) {
 
 void close_media_endpoint(MediaEndpoint *me) {
   printf("close_media_endpoint %x\n", me);
+  if(!me) return;
+
   if (ENDPOINT_TYPE_AUDIO == me->type) {
-    close_media_transport(me->endpoint.audio->med_transport);
+    AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
+    close_media_transport(ae->med_transport);
+    ae->med_transport = NULL;
   } else if (ENDPOINT_TYPE_MRCP == me->type) {
     if(me->endpoint.mrcp->asock) {
       pj_activesock_t *asock = me->endpoint.mrcp->asock;
@@ -6084,7 +6211,9 @@ void close_media_endpoint(MediaEndpoint *me) {
         printf("pj_activesock_close failed\n");
       }
     }
+    me->endpoint.mrcp->asock = NULL;
   }
+  me->port = 0;
 }
 
 void close_media(Call *c) {
@@ -7601,7 +7730,7 @@ int pjw_call_send_tcp_msg(long call_id, const char *json) {
   MrcpEndpoint *mrcp_endpt;
   int res;
 
-  unsigned media_id;
+  unsigned media_id = 0;
 
   char buffer[MAX_JSON_INPUT];