sip-lab 1.29.0 → 1.30.0

package/src/sip.cpp

@@ -267,7 +267,7 @@ int ms_timestamp();
 bool g_shutting_down;
 
 int g_dtmf_inter_digit_timer = 0;
-int g_bfsk_inter_bit_timer = 0;
+int g_bfsk_inter_bit_timer = 200;
 
 pj_str_t g_sip_ipaddress;
 
@@ -641,12 +641,12 @@ static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat,
 
 bool prepare_tonegen(Call *call, AudioEndpoint *ae);
 bool prepare_dtmfdet(Call *call, AudioEndpoint *ae);
-bool prepare_bfsk_det(Call *call, AudioEndpoint *ae, const int freq_zero, const int freq_one, const int min_level, const int baud_rate);
+bool prepare_bfsk_det(Call *call, AudioEndpoint *ae, const int freq_zero, const int freq_one);
 bool prepare_wav_player(Call *call, AudioEndpoint *ae, const char *file, unsigned flags, bool end_of_file_event);
 bool prepare_wav_writer(Call *call, AudioEndpoint *ae, const char *file);
 bool prepare_fax(Call *call, AudioEndpoint *ae, bool is_sender, const char *file, unsigned flags);
-bool prepare_speech_synth(Call *call, AudioEndpoint *ae, const char *server_url, const char *engine, const char *voice, const char *language, const char *text, int times);
-bool prepare_speech_recog(Call *call, AudioEndpoint *ae, const char *server_url, const char *engine, const char *language);
+bool prepare_speech_synth(Call *call, AudioEndpoint *ae, const char *server_url, const char *uuid, const char *engine, const char *voice, const char *language, const char *text, int times);
+bool prepare_speech_recog(Call *call, AudioEndpoint *ae, const char *server_url, const char *uuid, const char *engine, const char *language);
 
 void prepare_error_event(ostringstream *oss, char *scope, char *details);
 // void prepare_pjsipcall_error_event(ostringstream *oss, char *scope, char
@@ -897,7 +897,7 @@ static void on_bfsk_bit(pjmedia_port *port, void *user_data, int bit) {
       return;
     }
 
-    ae->BfskBuffer[len] = bit;
+    ae->BfskBuffer[len] = bit == 0 ? '0' : '1';
     ae->BfskBufferLength++;
 
     ae->last_bit_timestamp = ms_timestamp();
@@ -905,7 +905,7 @@ static void on_bfsk_bit(pjmedia_port *port, void *user_data, int bit) {
   } else {
     char evt[1024];
     char the_bit[1];
-    the_bit[0] = bit;
+    the_bit[0] = bit == 0 ? '0' : '1';
     make_evt_bfsk(evt, sizeof(evt), call_id, 1, the_bit, media_id);
     dispatch_event(evt);
   }
@@ -1457,11 +1457,13 @@ int __pjw_init() {
     return 1;
   }
 
+  /*
   status = pjsip_replaces_init_module(g_sip_endpt);
   if (status != PJ_SUCCESS) {
     addon_log(L_DBG, "pjsip_replaces_init_module failed\n");
     return 1;
   }
+  */
 
   pjsip_inv_callback inv_cb;
   pj_bzero(&inv_cb, sizeof(inv_cb));
@@ -2423,6 +2425,8 @@ int pjw_call_respond(long call_id, const char *json) {
 
       if (code >= 200 && code < 300) {
         call->pending_request = -1;
+
+        pjsip_msg_find_remove_hdr(tdata->msg, PJSIP_H_SUPPORTED, NULL);
       }
     }
   } else {
@@ -2446,6 +2450,9 @@ int pjw_call_respond(long call_id, const char *json) {
 
       if (code >= 200 && code < 300) {
         call->pending_request = -1;
+
+        pjsip_msg *msg = tdata->msg;
+        pjsip_msg_find_remove_hdr(msg, PJSIP_H_SUPPORTED, NULL);
       }
     }
 
@@ -3249,6 +3256,8 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg,
   }
   addon_log(L_DBG, "inv=%p tdata=%p\n", (void*)inv, (void*)tdata);
 
+  pjsip_msg_find_remove_hdr(tdata->msg, PJSIP_H_SUPPORTED, NULL);
+
   status = pjsip_inv_send_msg(inv, tdata);
   addon_log(L_DBG, "status=%d\n", status);
   if (status != PJ_SUCCESS) {
@@ -3470,7 +3479,7 @@ out:
 }
 
 pj_status_t audio_endpoint_send_bfsk(Call *call, AudioEndpoint *ae,
-                                     const char *bits, const int freq_zero, const int freq_one, const int level, const int baud_rate) {
+                                     const char *bits, const int freq_zero, const int freq_one, const int level, const int signal_duration) {
   pj_status_t status;
 
   if (!prepare_tonegen(call, ae)) {
@@ -3480,14 +3489,12 @@ pj_status_t audio_endpoint_send_bfsk(Call *call, AudioEndpoint *ae,
 
   int len = strlen(bits);
 
-  int duration = 1000 / baud_rate;  // Duration of each tone in milliseconds
-
   pjmedia_tone_desc *tones = (pjmedia_tone_desc*)pj_pool_zalloc(call->inv->pool, sizeof(pjmedia_tone_desc) * len);
 
   for (int i = 0; i < len; ++i) {
     tones[i].freq1 = bits[i] == '0' ? freq_zero : freq_one;
-    tones[i].on_msec = duration;
-    tones[i].off_msec = duration;
+    tones[i].on_msec = signal_duration;
+    tones[i].off_msec = signal_duration;
     tones[i].volume = level;
   } 
 
@@ -3500,7 +3507,7 @@ pj_status_t audio_endpoint_send_bfsk(Call *call, AudioEndpoint *ae,
   return PJ_SUCCESS;
 }
 
-pj_status_t send_bfsk(Call *call, const char *bits, const int freq_zero, const int freq_one, const int level, const int baud_rate) {
+pj_status_t send_bfsk(Call *call, const char *bits, const int freq_zero, const int freq_one, const int level, const int signal_duration) {
   for (int i = 0; i < call->media_count; i++) {
     MediaEndpoint *me = (MediaEndpoint *)call->media[i];
     if (me->type != ENDPOINT_TYPE_AUDIO)
@@ -3511,7 +3518,7 @@ pj_status_t send_bfsk(Call *call, const char *bits, const int freq_zero, const i
 
     AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
 
-    pj_status_t status = audio_endpoint_send_bfsk(call, ae, bits, freq_zero, freq_one, level, baud_rate);
+    pj_status_t status = audio_endpoint_send_bfsk(call, ae, bits, freq_zero, freq_one, level, signal_duration);
     if (status != PJ_SUCCESS)
       return status;
   }
@@ -3536,8 +3543,8 @@ int pjw_call_send_bfsk(long call_id, const char *json) {
   char *bits;
   int freq_zero;
   int freq_one;
-  int level;
-  int baud_rate;
+  int level = 24000;
+  int signal_duration = 10;
 
   MediaEndpoint *me;
   AudioEndpoint *ae;
@@ -3549,7 +3556,7 @@ int pjw_call_send_bfsk(long call_id, const char *json) {
 
   Document document;
 
-  const char *valid_params[] = {"bits", "freq_zero", "freq_one", "level", "baud_rate", "media_id", ""};
+  const char *valid_params[] = {"bits", "freq_zero", "freq_one", "level", "signal_duration", "media_id", ""};
 
   if (!g_call_ids.get(call_id, val)) {
     set_error("Invalid call_id");
@@ -3577,11 +3584,11 @@ int pjw_call_send_bfsk(long call_id, const char *json) {
     goto out;
   }
 
-  if (json_get_int_param(document, "level", false, &level) <= 0) {
+  if (json_get_int_param(document, "level", true, &level) <= 0) {
     goto out;
   }
 
-  if (json_get_int_param(document, "baud_rate", false, &baud_rate) <= 0) {
+  if (json_get_int_param(document, "signal_duration", true, &signal_duration) <= 0) {
     goto out;
   }
 
@@ -3606,7 +3613,7 @@ int pjw_call_send_bfsk(long call_id, const char *json) {
 
   if (NOT_FOUND_OPTIONAL == res) {
     // send_bfsk_bits to all audio endpoints
-    status = send_bfsk(call, bits, freq_zero, freq_one, level, baud_rate);
+    status = send_bfsk(call, bits, freq_zero, freq_one, level, signal_duration);
     if (status != PJ_SUCCESS) {
       goto out;
     }
@@ -3626,7 +3633,7 @@ int pjw_call_send_bfsk(long call_id, const char *json) {
 
     ae = (AudioEndpoint *)me->endpoint.audio;
 
-    status = audio_endpoint_send_bfsk(call, ae, bits, freq_one, freq_zero, level, baud_rate);
+    status = audio_endpoint_send_bfsk(call, ae, bits, freq_one, freq_zero, level, signal_duration);
     if (status != PJ_SUCCESS) {
       goto out;
     }
@@ -3759,6 +3766,8 @@ int pjw_call_reinvite(long call_id, const char *json) {
     goto out;
   }
 
+  pjsip_msg_find_remove_hdr(tdata->msg, PJSIP_H_SUPPORTED, NULL);
+
   status = pjsip_inv_send_msg(call->inv, tdata);
   if (status != PJ_SUCCESS) {
     set_error("pjsip_inv_send_msg failed");
@@ -4171,7 +4180,7 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_start_speech_synth(Call *call, AudioEndpoint *ae, const char *server_url, const char *engine, const char *voice, const char *language, const char *text, int times) {
+pj_status_t audio_endpoint_start_speech_synth(Call *call, AudioEndpoint *ae, const char *server_url, const char *uuid, const char *engine, const char *voice, const char *language, const char *text, int times) {
   pj_status_t status;
 
   if(!ae->stream_cbp.port) {
@@ -4185,7 +4194,7 @@ pj_status_t audio_endpoint_start_speech_synth(Call *call, AudioEndpoint *ae, con
     return -1;
   }
 
-  if (!prepare_speech_synth(call, ae, server_url, engine, voice, language, text, times)) {
+  if (!prepare_speech_synth(call, ae, server_url, uuid, engine, voice, language, text, times)) {
     return -1;
   }
 
@@ -4304,13 +4313,16 @@ int pjw_call_start_speech_synth(long call_id, const char *json) {
     }
   }
 
+  char uuid[1024];
+  sprintf(uuid, "%.*s", call->inv->dlg->call_id->id.slen, call->inv->dlg->call_id->id.ptr);
+
   if (NOT_FOUND_OPTIONAL == res) {
     // start on all audio media endpoints
     for (int i = 0; i < call->media_count; i++) {
       MediaEndpoint *me = (MediaEndpoint *)call->media[i];
       if (me->type == ENDPOINT_TYPE_AUDIO) {
         AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-        status = audio_endpoint_start_speech_synth(call, ae, server_url, engine, voice, language, text, times);
+        status = audio_endpoint_start_speech_synth(call, ae, server_url, uuid, engine, voice, language, text, times);
         if (status != PJ_SUCCESS) goto out;
       }
     }
@@ -4328,7 +4340,7 @@ int pjw_call_start_speech_synth(long call_id, const char *json) {
 
     ae = (AudioEndpoint *)me->endpoint.audio;
 
-    audio_endpoint_start_speech_synth(call, ae, server_url, engine, voice, language, text, times);
+    audio_endpoint_start_speech_synth(call, ae, server_url, uuid, engine, voice, language, text, times);
   }
 
 out:
@@ -4340,7 +4352,7 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_start_speech_recog(Call *call, AudioEndpoint *ae, const char *server_url, const char *engine, const char *language) {
+pj_status_t audio_endpoint_start_speech_recog(Call *call, AudioEndpoint *ae, const char *server_url, const char *uuid, const char *engine, const char *language) {
   pj_status_t status;
 
   if(!ae->stream_cbp.port) {
@@ -4354,7 +4366,7 @@ pj_status_t audio_endpoint_start_speech_recog(Call *call, AudioEndpoint *ae, con
     return -1;
   }
 
-  if (!prepare_speech_recog(call, ae, server_url, engine, language)) {
+  if (!prepare_speech_recog(call, ae, server_url, uuid, engine, language)) {
     return -1;
   }
 
@@ -4445,13 +4457,16 @@ int pjw_call_start_speech_recog(long call_id, const char *json) {
     }
   }
 
+  char uuid[1024];
+  sprintf(uuid, "%.*s", call->inv->dlg->call_id->id.slen, call->inv->dlg->call_id->id.ptr);
+
   if (NOT_FOUND_OPTIONAL == res) {
     // start on all audio media endpoints
     for (int i = 0; i < call->media_count; i++) {
       MediaEndpoint *me = (MediaEndpoint *)call->media[i];
       if (me->type == ENDPOINT_TYPE_AUDIO) {
         AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-        status = audio_endpoint_start_speech_recog(call, ae, server_url, engine, language);
+        status = audio_endpoint_start_speech_recog(call, ae, server_url, uuid, engine, language);
         if (status != PJ_SUCCESS) goto out;
       }
     }
@@ -4469,7 +4484,7 @@ int pjw_call_start_speech_recog(long call_id, const char *json) {
 
     ae = (AudioEndpoint *)me->endpoint.audio;
 
-    audio_endpoint_start_speech_recog(call, ae, server_url, engine, language);
+    audio_endpoint_start_speech_recog(call, ae, server_url, uuid, engine, language);
   }
 
 out:
@@ -4580,7 +4595,7 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_start_bfsk_detection(Call *call, AudioEndpoint *ae, const int freq_zero, const int freq_one, const int min_level, const int baud_rate) {
+pj_status_t audio_endpoint_start_bfsk_detection(Call *call, AudioEndpoint *ae, const int freq_zero, const int freq_one) {
   pj_status_t status;
 
   if(!ae->stream_cbp.port) {
@@ -4588,7 +4603,7 @@ pj_status_t audio_endpoint_start_bfsk_detection(Call *call, AudioEndpoint *ae, c
     return -1;
   }
 
-  if(!prepare_bfsk_det(call, ae, freq_zero, freq_one, min_level, baud_rate)) {
+  if(!prepare_bfsk_det(call, ae, freq_zero, freq_one)) {
     return -1;
   }
 
@@ -4614,14 +4629,12 @@ int pjw_call_start_bfsk_detection(long call_id, const char *json) {
 
   int freq_zero;
   int freq_one;
-  int min_level;
-  int baud_rate;
 
   char buffer[MAX_JSON_INPUT];
 
   Document document;
 
-  const char *valid_params[] = {"freq_zero", "freq_one", "min_level", "baud_rate", "media_id", ""};
+  const char *valid_params[] = {"freq_zero", "freq_one", "media_id", ""};
 
   if (!g_call_ids.get(call_id, val)) {
     set_error("Invalid call_id");
@@ -4654,16 +4667,6 @@ int pjw_call_start_bfsk_detection(long call_id, const char *json) {
     goto out;
   }
 
-  res = json_get_int_param(document, "min_level", false, &min_level);
-  if (res <= 0) {
-    goto out;
-  }
-
-  res = json_get_int_param(document, "baud_rate", false, &baud_rate);
-  if (res <= 0) {
-    goto out;
-  }
-
   res = json_get_int_param(document, "media_id", true, &media_id);
   if (res <= 0) {
     goto out;
@@ -4674,7 +4677,7 @@ int pjw_call_start_bfsk_detection(long call_id, const char *json) {
       MediaEndpoint *me = (MediaEndpoint *)call->media[i];
       if (me->type == ENDPOINT_TYPE_AUDIO) {
         AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-        status = audio_endpoint_start_bfsk_detection(call, ae, freq_zero, freq_one, min_level, baud_rate);
+        status = audio_endpoint_start_bfsk_detection(call, ae, freq_zero, freq_one);
         if (status != PJ_SUCCESS) goto out;
       }
     }
@@ -4692,7 +4695,7 @@ int pjw_call_start_bfsk_detection(long call_id, const char *json) {
 
     ae = (AudioEndpoint *)me->endpoint.audio;
 
-    audio_endpoint_start_bfsk_detection(call, ae, freq_zero, freq_one, min_level, baud_rate);
+    audio_endpoint_start_bfsk_detection(call, ae, freq_zero, freq_one);
   }
 
 out:
@@ -7488,7 +7491,7 @@ bool prepare_dtmfdet(Call *call, AudioEndpoint *ae) {
   return connect_feature_port_to_stream_port(call, ae, fp);
 }
 
-bool prepare_bfsk_det(Call *call, AudioEndpoint *ae, const int freq_zero, const int freq_one, const int min_level, const int baud_rate) {
+bool prepare_bfsk_det(Call *call, AudioEndpoint *ae, const int freq_zero, const int freq_one) {
   printf("DEBUG prepare_bfsk_det\n");
   pj_status_t status;
 
@@ -7505,7 +7508,7 @@ bool prepare_bfsk_det(Call *call, AudioEndpoint *ae, const int freq_zero, const
       PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), 
-      on_bfsk_bit, call, freq_zero, freq_one, min_level, baud_rate, &fp->port);
+      on_bfsk_bit, call, freq_zero, freq_one, &fp->port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_bfsk_det_create failed");
       return false;
@@ -7552,7 +7555,7 @@ bool prepare_fax(Call *call, AudioEndpoint *ae, bool is_sender, const char *file
   return connect_feature_port_to_stream_port(call, ae, fp);
 }
 
-bool prepare_speech_synth(Call *call, AudioEndpoint *ae, const char *server_url, const char *engine, const char *voice, const char *language, const char *text, int times) {
+bool prepare_speech_synth(Call *call, AudioEndpoint *ae, const char *server_url, const char *uuid, const char *engine, const char *voice, const char *language, const char *text, int times) {
   pj_status_t status;
 
   ConfBridgePort *fp = &ae->feature_cbps[FP_SPEECH_SYNTH];
@@ -7607,6 +7610,7 @@ bool prepare_speech_synth(Call *call, AudioEndpoint *ae, const char *server_url,
             PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info),
             g_ws_endpt,
             server_url,
+            uuid,
             engine,
             voice,
             language,
@@ -7640,7 +7644,7 @@ bool prepare_speech_synth(Call *call, AudioEndpoint *ae, const char *server_url,
   return PJ_SUCCESS;
 }
 
-bool prepare_speech_recog(Call *call, AudioEndpoint *ae, const char *server_url, const char *engine, const char *language) {
+bool prepare_speech_recog(Call *call, AudioEndpoint *ae, const char *server_url, const char *uuid, const char *engine, const char *language) {
   pj_status_t status;
 
   ConfBridgePort *fp = &ae->feature_cbps[FP_SPEECH_RECOG];
@@ -7672,6 +7676,7 @@ bool prepare_speech_recog(Call *call, AudioEndpoint *ae, const char *server_url,
             PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info),
             g_ws_endpt,
             server_url,
+            uuid,
             NULL,
             NULL,
             NULL,
@@ -9106,6 +9111,18 @@ void check_digit_buffer(Call *call, int mode) {
       *pLen = 0;
       ae->last_digit_timestamp[mode] = 0;
     }
+  }
+}
+
+void check_bit_buffer(Call *call) {
+  char evt[1024];
+
+  for (int i = 0; i < call->media_count; i++) {
+    MediaEndpoint *me = (MediaEndpoint *)call->media[i];
+    if (ENDPOINT_TYPE_AUDIO != me->type)
+      continue;
+
+    AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
 
     if (ae->last_bit_timestamp > 0 &&
         g_now - ae->last_bit_timestamp > g_bfsk_inter_bit_timer) {
@@ -9118,11 +9135,12 @@ void check_digit_buffer(Call *call, int mode) {
   }
 }
 
-void check_digit_buffers(long id, long val) {
+void check_buffers(long id, long val) {
   Call *call = (Call *)val;
 
   check_digit_buffer(call, DTMF_MODE_RFC2833);
   check_digit_buffer(call, DTMF_MODE_INBAND);
+  check_bit_buffer(call);
 }
 
 static int digit_buffer_thread(void *arg) {
@@ -9137,7 +9155,7 @@ static int digit_buffer_thread(void *arg) {
     PJW_LOCK();
     if (g_dtmf_inter_digit_timer > 0) {
       g_now = ms_timestamp();
-      g_call_ids.iterate(check_digit_buffers);
+      g_call_ids.iterate(check_buffers);
     }
     PJW_UNLOCK();