sip-lab 1.24.0 → 1.27.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.24.0",
+  "version": "1.27.1",
   "description": "",
   "main": "index.js",
   "engines": {
@@ -45,6 +45,7 @@
     "DEV.md",
     "samples",
     "prebuilds",
-    "pocketsphinx"
+    "pocketsphinx",
+    "runtests"
   ]
 }

package/runtests

@@ -0,0 +1,80 @@
+#!/bin/bash
+
+set -o nounset
+
+function usage() {
+    cat <<EOF
+Usage: $0 [-g]
+
+Details:
+      -g : run each test inside gdb
+EOF
+}
+
+use_gdb=0
+
+while getopts "gh" o; do
+    case "${o}" in
+        g)
+            use_gdb=1
+	    ;;
+        h)
+            usage
+	    exit 0
+	    ;;
+	*)
+            usage
+	    exit 1
+	    ;;
+    esac
+done
+shift $((OPTIND-1))
+
+successful_tests=()
+
+function output_successful_tests() {
+    echo "Successful tests:"
+    for t in "${successful_tests[@]}"
+    do
+        echo "  - $t"
+    done
+}
+
+echo
+
+for i in $(ls samples/*.js)
+do
+    start_time=$(date +%s.%N)
+
+    if [[ $use_gdb -eq 0 ]]
+    then
+        node $i
+    else
+        gdb -ex "handle SIGSEGV stop" -ex "run" -ex "bt" -ex "quit" --args node $i
+    fi
+
+    if [[ $? -ne 0 ]]
+    then
+        echo "$i failed"
+	echo
+	output_successful_tests
+        exit 1
+    else
+        end_time=$(date +%s.%N)
+        duration=$(echo "$end_time - $start_time" | bc)
+	formatted_duration=$(printf "%.2f seconds" $duration)
+	successful_tests+=("$i: duration=$formatted_duration")
+
+	echo
+	echo "$i failed"
+    fi
+done
+
+echo
+
+echo "Success. All tests passed"
+echo
+output_successful_tests
+echo
+echo "Everything OK"
+echo

package/samples/pcma.js

@@ -0,0 +1,217 @@
+var sip = require ('../index.js')
+var Zeq = require('@mayama/zeq')
+var z = new Zeq()
+var m = require('data-matching')
+var sip_msg = require('sip-matching')
+var sdp = require('sdp-matching')
+
+var assert = require('assert')
+
+async function test() {
+    //sip.set_log_level(6)
+    sip.dtmf_aggregation_on(500)
+
+    z.trap_events(sip.event_source, 'event', (evt) => {
+        var e = evt.args[0]
+        return e
+    })
+
+    console.log(sip.start((data) => { console.log(data)} ))
+
+    t1 = sip.transport.create({address: "127.0.0.1", type: 'udp'})
+    t2 = sip.transport.create({address: "127.0.0.1", type: 'udp'})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    sip.set_codecs("PCMA/8000/1:128")
+
+    flags = 0
+
+    oc = sip.call.create(t1.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${t2.address}:${t2.port}`})
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+                $rr: 'Trying',
+                '$(hdrcnt(via))': 1,
+                'hdr_call_id': m.collect('sip_call_id'),
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+                'hdr_l': '0',
+            }),
+        },
+    ], 1000)
+
+    ic = {
+        id: z.store.call_id,
+        sip_call_id: z.store.sip_call_id,
+    }
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK'})
+
+    await z.wait([
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                '$(hdrcnt(VIA))': 1,
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+                'hdr_content_type': 'application/sdp',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+    ], 1000)
+
+    sip.call.reinvite(oc.id)
+
+    await z.wait([
+        {
+            event: 'reinvite',
+            call_id: ic.id
+        },
+    ], 1000)
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK'})
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+            }),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 500)
+
+    sip.call.reinvite(oc.id, false, 0)
+
+    await z.wait([
+        {
+            event: 'reinvite',
+            call_id: ic.id
+        },
+    ], 1000)
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK'})
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+            }),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 500)
+
+    oc_stat = sip.call.get_stream_stat(oc.id, {media_id: 0})
+    ic_stat = sip.call.get_stream_stat(ic.id, {media_id: 0})
+
+    console.log(oc_stat)
+    console.log(ic_stat)
+
+    oc_stat = JSON.parse(oc_stat)
+    ic_stat = JSON.parse(ic_stat)
+
+    assert(oc_stat.CodecInfo == 'PCMA/8000/1')
+    assert(ic_stat.CodecInfo == 'PCMA/8000/1')
+
+    sip.call.terminate(oc.id)
+
+    await z.wait([
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        },
+        {
+            event: 'call_ended',
+            call_id: ic.id,
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'BYE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+    ], 1000)
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})

package/src/sip.cpp

@@ -1,4 +1,5 @@
 #include <arpa/inet.h>
+#include <netdb.h>
 
 #include "sip.hpp"
 
@@ -305,8 +306,18 @@ struct Subscription {
 struct ConfBridgePort {
     unsigned slot;
     pjmedia_port *port;
+    short connection_mode;
 };
 
+#define FP_DTMFDET      0
+#define FP_WAV_PLAYER   1
+#define FP_WAV_WRITER   2
+#define FP_TONEGEN      3
+#define FP_FAX          4
+#define FP_SPEECH_SYNTH 5
+#define FP_SPEECH_RECOG 6
+#define MAX_FP          7
+
 struct AudioEndpoint {
   pjmedia_transport *med_transport;
   pjmedia_stream *med_stream;
@@ -322,13 +333,7 @@ struct AudioEndpoint {
   pjmedia_port *null_port;
 
   ConfBridgePort stream_cbp;
-  ConfBridgePort wav_player_cbp;
-  ConfBridgePort wav_writer_cbp;
-  ConfBridgePort tonegen_cbp;
-  ConfBridgePort dtmfdet_cbp;
-  ConfBridgePort fax_cbp;
-  ConfBridgePort flite_cbp;
-  ConfBridgePort pocketsphinx_cbp;
+  ConfBridgePort feature_cbps[MAX_FP];
 };
 
 struct VideoEndpoint {
@@ -779,7 +784,7 @@ static int find_endpoint_by_inband_dtmf_media_port(Call *call,
     MediaEndpoint *me = (MediaEndpoint *)call->media[i];
     if (ENDPOINT_TYPE_AUDIO == me->type) {
       AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-      if (ae->dtmfdet_cbp.port && (pjmedia_port *)ae->dtmfdet_cbp.port == port) {
+      if (ae->feature_cbps[FP_DTMFDET].port && (pjmedia_port *)ae->feature_cbps[FP_DTMFDET].port == port) {
         return i;
       }
     }
@@ -1505,8 +1510,8 @@ pjsip_transport *create_udp_transport(pjsip_endpoint *sip_endpt,
   // pj_status_t status;
   pjsip_transport *transport;
 
-  int port = 5060;
   for (int i = 0; i < 1000; ++i) {
+    int port = 5060;
     port += i;
     transport = allocate_udp_transport(sip_endpt, ipaddr, port);
     if (transport) {
@@ -1553,8 +1558,8 @@ pjsip_tpfactory *create_tcp_tpfactory(pjsip_endpoint *sip_endpt,
   // pj_status_t status;
   pjsip_tpfactory *tpfactory;
 
-  int port = 6060;
   for (int i = 0; i < 1000; ++i) {
+    int port = 6060;
     port += i;
     tpfactory = allocate_tcp_tpfactory(sip_endpt, ipaddr, port);
     if (tpfactory) {
@@ -1604,8 +1609,8 @@ pjsip_tpfactory *create_tls_tpfactory(pjsip_endpoint *sip_endpt,
   // pj_status_t status;
   pjsip_tpfactory *tpfactory;
 
-  int port = 6060;
   for (int i = 0; i < 1000; ++i) {
+    int port = 6060;
     port += i;
     tpfactory = allocate_tls_tpfactory(sip_endpt, ipaddr, port);
     if (tpfactory) {
@@ -2796,9 +2801,47 @@ bool dlg_set_transport_by_t(Transport *t, pjsip_dialog *dlg) {
   return true;
 }
 
-void build_transport_tag(char *dest, const char *type, const char *address,
+bool is_ip_address(const char *hostname) {
+    struct sockaddr_in sa;
+    return inet_pton(AF_INET, hostname, &(sa.sin_addr)) != 0;
+}
+
+void build_transport_tag(char *dest, const char *type, const char *hostname,
                          int port) {
-  sprintf(dest, "%s:%s:%d", type, address, port);
+  struct addrinfo hints, * res, *p;
+  
+  if(is_ip_address(hostname)) {
+    sprintf(dest, "%s:%s:%d", type, hostname, port);
+    return;
+  }
+
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC; // AF_INET or AF_INET6 to force version
+  hints.ai_socktype = SOCK_STREAM;
+
+  // Resolve the domain name
+  int status = getaddrinfo(hostname, NULL, &hints, &res);
+  if (status != 0) {
+    printf("build_transport_tag getaddrinfo: %s\n", gai_strerror(status));
+    sprintf(dest, "%s:%s:%d", type, hostname, port);
+  } else {
+    for (p = res; p != NULL; p = p->ai_next) {
+      void *addr;
+      if (p->ai_family == AF_INET) { // IPv4
+        struct sockaddr_in *ipv4 = (struct sockaddr_in *)p->ai_addr;
+        addr = &(ipv4->sin_addr);
+      } else { // IPv6
+        struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)p->ai_addr;
+        addr = &(ipv6->sin6_addr);
+      }
+      char ipstr[INET6_ADDRSTRLEN];
+      inet_ntop(p->ai_family, addr, ipstr, sizeof(ipstr));
+      sprintf(dest, "%s:%s:%d", type, ipstr, port);
+      break;
+    }
+  }
+
+  freeaddrinfo(res);
 }
 
 void build_transport_tag_from_pjsip_transport(char *dest, pjsip_transport *t) {
@@ -2810,6 +2853,7 @@ void build_transport_tag_from_pjsip_transport(char *dest, pjsip_transport *t) {
   assert(t->local_name.host.slen < 16);
   strncpy(address, t->local_name.host.ptr, t->local_name.host.slen);
   address[t->local_name.host.slen] = 0;
+  printf("build_transport_tag_from_pjsip_transport address=%s\n", address);
 
   if (t->key.type == PJSIP_TRANSPORT_UDP) {
     type = "udp";
@@ -3082,7 +3126,7 @@ pj_status_t audio_endpoint_send_dtmf(Call *call, AudioEndpoint *ae,
       tone.on_msec = ON_DURATION;
       tone.off_msec = OFF_DURATION;
       tone.volume = 0;
-      status = pjmedia_tonegen_play_digits((pjmedia_port *)ae->tonegen_cbp.port, 1,
+      status = pjmedia_tonegen_play_digits((pjmedia_port *)ae->feature_cbps[FP_TONEGEN].port, 1,
                                              &tone, 0);
       if (status != PJ_SUCCESS) {
         set_error("pjmedia_tonegen_play_digits failed.");
@@ -3789,7 +3833,7 @@ pj_status_t audio_endpoint_start_speech_synth(Call *call, AudioEndpoint *ae, con
     return -1;
   }
 
-  pjmedia_flite_port_speak(ae->flite_cbp.port, text, flags);
+  pjmedia_flite_port_speak(ae->feature_cbps[FP_SPEECH_SYNTH].port, text, flags);
 
   return PJ_SUCCESS;
 }
@@ -4122,36 +4166,27 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_stop_speech_synth(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, ae, &ae->flite_cbp);
-}
-
-pj_status_t audio_endpoint_stop_speech_recog(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, ae, &ae->pocketsphinx_cbp);
-}
-
 pj_status_t audio_endpoint_stop_play_wav(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, ae, &ae->wav_player_cbp);
+  return audio_endpoint_remove_port(call, ae, &ae->feature_cbps[FP_WAV_PLAYER]);
 }
 
 pj_status_t audio_endpoint_stop_record_wav(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, ae, &ae->wav_writer_cbp);
+  return audio_endpoint_remove_port(call, ae, &ae->feature_cbps[FP_WAV_WRITER]);
 }
 
 pj_status_t audio_endpoint_stop_fax(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, ae, &ae->fax_cbp);
+  return audio_endpoint_remove_port(call, ae, &ae->feature_cbps[FP_FAX]);
 }
 
-
-
-int pjw_call_stop_speech_synth(long call_id, const char *json) {
-  return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_speech_synth);
+pj_status_t audio_endpoint_stop_speech_synth(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, ae, &ae->feature_cbps[FP_SPEECH_SYNTH]);
 }
 
-int pjw_call_stop_speech_recog(long call_id, const char *json) {
-  return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_speech_recog);
+pj_status_t audio_endpoint_stop_speech_recog(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, ae, &ae->feature_cbps[FP_SPEECH_RECOG]);
 }
 
+
 int pjw_call_stop_play_wav(long call_id, const char *json) {
   return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_play_wav);
 }
@@ -4164,6 +4199,14 @@ int pjw_call_stop_fax(long call_id, const char *json) {
   return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_fax);
 }
 
+int pjw_call_stop_speech_synth(long call_id, const char *json) {
+  return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_speech_synth);
+}
+
+int pjw_call_stop_speech_recog(long call_id, const char *json) {
+  return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_speech_recog);
+}
+
 
 int pjw_call_start_fax(long call_id, const char *json) {
   PJW_LOCK();
@@ -4639,15 +4682,6 @@ bool start_tcp_media(Call *call, MediaEndpoint *me,
 void close_audio_endpoint_ports_and_conf(Call *call, AudioEndpoint *ae) {
     pj_status_t status;
 
-    audio_endpoint_remove_port(call, ae, &ae->stream_cbp);
-    audio_endpoint_remove_port(call, ae, &ae->wav_player_cbp);
-    audio_endpoint_remove_port(call, ae, &ae->wav_writer_cbp);
-    audio_endpoint_remove_port(call, ae, &ae->tonegen_cbp);
-    audio_endpoint_remove_port(call, ae, &ae->dtmfdet_cbp);
-    audio_endpoint_remove_port(call, ae, &ae->fax_cbp);
-    audio_endpoint_remove_port(call, ae, &ae->flite_cbp);
-    audio_endpoint_remove_port(call, ae, &ae->pocketsphinx_cbp);
-
     if (ae->master_port) {
         status = pjmedia_master_port_stop(ae->master_port);
         if(status != PJ_SUCCESS) {
@@ -4660,6 +4694,12 @@ void close_audio_endpoint_ports_and_conf(Call *call, AudioEndpoint *ae) {
         ae->master_port = NULL;
     }
 
+    audio_endpoint_remove_port(call, ae, &ae->stream_cbp);
+
+    for(int i=0 ; i<MAX_FP ; i++) {
+        audio_endpoint_remove_port(call, ae, &ae->feature_cbps[i]);
+    }
+
     if (ae->conf) {
         status = pjmedia_conf_destroy(ae->conf);
         if(status != PJ_SUCCESS) {
@@ -4677,17 +4717,17 @@ void close_audio_endpoint_ports_and_conf(Call *call, AudioEndpoint *ae) {
     }
 }
 
-bool connect_feature_port_to_stream_port(Call *call, AudioEndpoint *ae, ConfBridgePort *cbp, int connection_mode) {
+bool connect_feature_port_to_stream_port(Call *call, AudioEndpoint *ae, ConfBridgePort *cbp) {
   pj_status_t status;
 
-  if(connection_mode == CONNECTION_MODE_SOURCE || connection_mode == CONNECTION_MODE_SOURCE_AND_SINK) {
+  if(cbp->connection_mode == CONNECTION_MODE_SOURCE || cbp->connection_mode == CONNECTION_MODE_SOURCE_AND_SINK) {
     status = pjmedia_conf_connect_port(ae->conf, cbp->slot, ae->stream_cbp.slot, 0);
     if (status != PJ_SUCCESS) {
       set_error("pjmedia_conf_connect_port failed");
       return false;
     }
   }
-  if(connection_mode == CONNECTION_MODE_SINK || connection_mode == CONNECTION_MODE_SOURCE_AND_SINK) {
+  if(cbp->connection_mode == CONNECTION_MODE_SINK || cbp->connection_mode == CONNECTION_MODE_SOURCE_AND_SINK) {
     status = pjmedia_conf_connect_port(ae->conf, ae->stream_cbp.slot, cbp->slot, 0);
     printf("status=%i\n" ,status);
     if (status != PJ_SUCCESS) {
@@ -4711,6 +4751,19 @@ bool restart_media_stream(Call *call, MediaEndpoint *me,
   pjmedia_port *old_port = ae->stream_cbp.port;
   pjmedia_port *new_port;
 
+  bool master_port_was_stopped = false;
+
+  if(ae->master_port) {
+    status = pjmedia_master_port_stop(ae->master_port);
+    if(status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                           "setup_failed (pjmedia_master_port_stop failed)", "");
+      dispatch_event(evt);
+      return false;
+    }
+    master_port_was_stopped = true;
+  }
+
   status =
       pjmedia_stream_info_from_sdp(&stream_info, call->inv->dlg->pool,
                                    g_med_endpt, local_sdp, remote_sdp, idx);
@@ -4860,35 +4913,23 @@ bool restart_media_stream(Call *call, MediaEndpoint *me,
     }
 
     // Need to connect ports to new stream port
-    if(ae->dtmfdet_cbp.port) {
-      if(!connect_feature_port_to_stream_port(call, ae, &ae->dtmfdet_cbp, CONNECTION_MODE_SINK)) return false;
-    }
-
-    if(ae->wav_writer_cbp.port) {
-      if(!connect_feature_port_to_stream_port(call, ae, &ae->wav_writer_cbp, CONNECTION_MODE_SINK)) return false;
-    }
-
-    if(ae->wav_player_cbp.port) {
-      if(!connect_feature_port_to_stream_port(call, ae, &ae->wav_player_cbp, CONNECTION_MODE_SOURCE)) return false;
-    }
-
-    if(ae->tonegen_cbp.port) {
-      if(!connect_feature_port_to_stream_port(call, ae, &ae->tonegen_cbp, CONNECTION_MODE_SOURCE)) return false;
-    }
-
-    if(ae->fax_cbp.port) {
-      if(!connect_feature_port_to_stream_port(call, ae, &ae->fax_cbp, CONNECTION_MODE_SOURCE_AND_SINK)) return false;
-    }
-
-    if(ae->flite_cbp.port) {
-      if(!connect_feature_port_to_stream_port(call, ae, &ae->flite_cbp, CONNECTION_MODE_SOURCE)) return false;
+    for(int i=0 ; i<MAX_FP ; i++) {
+        if(ae->feature_cbps[i].port) {
+          if(!connect_feature_port_to_stream_port(call, ae, &ae->feature_cbps[i])) return false;
+        }
     }
+  }
 
-    if(ae->pocketsphinx_cbp.port) {
-      if(!connect_feature_port_to_stream_port(call, ae, &ae->pocketsphinx_cbp, CONNECTION_MODE_SINK)) return false;
+  if(master_port_was_stopped) {
+    status = pjmedia_master_port_start(ae->master_port);
+    if(status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                             "setup_failed (pjmedia_master_port_start failed)", "");
+      dispatch_event(evt);
+      return false;
     }
   }
-  
+     
   return true;
 }
 
@@ -5379,7 +5420,7 @@ static pj_bool_t on_rx_request(pjsip_rx_data *rdata) {
 
     long transport_id;
 
-    // printf("tag=%s\n", tag);
+    //printf("on_rx_request transport_tag=%s\n", tag);
 
     TransportMap::iterator iter = g_TransportMap.find(tag);
     if (iter != g_TransportMap.end()) {
@@ -5490,7 +5531,7 @@ static pj_bool_t on_rx_request(pjsip_rx_data *rdata) {
 
   long transport_id;
 
-  // printf("tag=%s\n", tag);
+  printf("on_rx_request INVITE transport_tag=%s\n", tag);
 
   TransportMap::iterator iter = g_TransportMap.find(tag);
   if (iter != g_TransportMap.end()) {
@@ -6707,7 +6748,9 @@ bool prepare_tonegen(Call *call, AudioEndpoint *ae) {
   printf("prepare_tone_gen call.id=%i\n", call->id);
   pj_status_t status;
 
-  if(ae->tonegen_cbp.port) {
+  ConfBridgePort *fp = &ae->feature_cbps[FP_TONEGEN];
+
+  if(fp->port) {
     printf("already prepared\n");
     return true;
   }
@@ -6716,24 +6759,28 @@ bool prepare_tonegen(Call *call, AudioEndpoint *ae) {
         call->inv->pool, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
         PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info),
         PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
-        PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), 0, &ae->tonegen_cbp.port);
+        PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), 0, &fp->port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_tonegen_create failed");
     return false;
   }
 
-  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->tonegen_cbp.port, NULL, &ae->tonegen_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, fp->port, NULL, &fp->slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  return connect_feature_port_to_stream_port(call, ae, &ae->tonegen_cbp, CONNECTION_MODE_SOURCE);
+  fp->connection_mode = CONNECTION_MODE_SOURCE;
+
+  return connect_feature_port_to_stream_port(call, ae, fp);
 }
 
 bool prepare_wav_player(Call *call, AudioEndpoint *ae, const char *file, unsigned flags, bool end_of_file_event) {
   pj_status_t status;
 
+  ConfBridgePort *fp = &ae->feature_cbps[FP_WAV_PLAYER];
+
   unsigned wav_ptime;
   wav_ptime = PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info) * 1000 /
               PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info);
@@ -6744,7 +6791,7 @@ bool prepare_wav_player(Call *call, AudioEndpoint *ae, const char *file, unsigne
                   wav_ptime,
                   flags,
                   -1,                  /* buf size     */
-                  &ae->wav_player_cbp.port
+                  &fp->port
                   );
 
   if (status != PJ_SUCCESS) {
@@ -6753,71 +6800,83 @@ bool prepare_wav_player(Call *call, AudioEndpoint *ae, const char *file, unsigne
   }
 
   if (end_of_file_event) {
-    status = pjmedia_wav_player_set_eof_cb2(ae->wav_player_cbp.port, (void*)call, on_end_of_file);
+    status = pjmedia_wav_player_set_eof_cb2(fp->port, (void*)call, on_end_of_file);
     if (status != PJ_SUCCESS) {
       set_error("pjmedia_wav_player_set_eof_cb2 failed");
       return false;
     }
   }
 
-  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->wav_player_cbp.port, NULL, &ae->wav_player_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, fp->port, NULL, &fp->slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  return connect_feature_port_to_stream_port(call, ae, &ae->wav_player_cbp, CONNECTION_MODE_SOURCE);
+  fp->connection_mode = CONNECTION_MODE_SOURCE;
+
+  return connect_feature_port_to_stream_port(call, ae, fp);
 }
 
 bool prepare_wav_writer(Call *call, AudioEndpoint *ae, const char *file) {
   pj_status_t status;
 
+  ConfBridgePort *fp = &ae->feature_cbps[FP_WAV_WRITER];
+
   status = pjmedia_wav_writer_port_create(
       call->inv->pool, file, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info), PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), PJMEDIA_FILE_WRITE_PCM, 0,
-      (pjmedia_port **)&ae->wav_writer_cbp.port);
+      (pjmedia_port **)&fp->port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_wav_write_port_create failed");
     return false;
   }
   
-  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->wav_writer_cbp.port, NULL, &ae->wav_writer_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, fp->port, NULL, &fp->slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  return connect_feature_port_to_stream_port(call, ae, &ae->wav_writer_cbp, CONNECTION_MODE_SINK);
+  fp->connection_mode = CONNECTION_MODE_SINK;
+
+  return connect_feature_port_to_stream_port(call, ae, fp);
 }
 
 bool prepare_dtmfdet(Call *call, AudioEndpoint *ae) {
   pj_status_t status;
+
+  ConfBridgePort *fp = &ae->feature_cbps[FP_DTMFDET];
+
   status = pjmedia_dtmfdet_create(
       call->inv->pool, 
       PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
       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_inband_dtmf, call, &ae->dtmfdet_cbp.port);
+      on_inband_dtmf, call, &fp->port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_dtmfdet_create failed");
       return false;
   }
   
-  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->dtmfdet_cbp.port, NULL, &ae->dtmfdet_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, fp->port, NULL, &fp->slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  return connect_feature_port_to_stream_port(call, ae, &ae->dtmfdet_cbp, CONNECTION_MODE_SINK);
+  fp->connection_mode = CONNECTION_MODE_SINK;
+
+  return connect_feature_port_to_stream_port(call, ae, fp);
 }
 
-bool prepare_fax(Call *call, AudioEndpoint *ae, bool is_sender, const char *file,
-                 unsigned flags) {
+bool prepare_fax(Call *call, AudioEndpoint *ae, bool is_sender, const char *file, unsigned flags) {
   pj_status_t status;
 
+  ConfBridgePort *fp = &ae->feature_cbps[FP_FAX];
+
   status = pjmedia_fax_port_create(
       call->inv->pool,
       PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
@@ -6825,26 +6884,29 @@ bool prepare_fax(Call *call, AudioEndpoint *ae, bool is_sender, const char *file
       PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info),
       on_fax_result, call, is_sender, file,
-      flags, &ae->fax_cbp.port);
+      flags, &fp->port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_fax_port_create failed");
     return false;
   }
 
-  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->fax_cbp.port, NULL, &ae->fax_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, fp->port, NULL, &fp->slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  return connect_feature_port_to_stream_port(call, ae, &ae->fax_cbp, CONNECTION_MODE_SOURCE_AND_SINK);
+  fp->connection_mode = CONNECTION_MODE_SOURCE_AND_SINK;
+
+  return connect_feature_port_to_stream_port(call, ae, fp);
 }
 
 bool prepare_flite(Call *call, AudioEndpoint *ae, const char *voice, bool end_of_speech_event) {
-  printf("prepare_flite call.id=%i\n", call->id);
   pj_status_t status;
 
-  if(ae->flite_cbp.port) {
+  ConfBridgePort *fp = &ae->feature_cbps[FP_SPEECH_SYNTH];
+
+  if(fp->port) {
     printf("already prepared\n");
     return true;
   }
@@ -6853,34 +6915,39 @@ bool prepare_flite(Call *call, AudioEndpoint *ae, const char *voice, bool end_of
         call->inv->pool, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
         PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info),
         PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
-        PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), voice, &ae->flite_cbp.port);
+        PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info),
+        voice,
+        &fp->port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_flite_port_create failed");
     return false;
   }
 
   if (end_of_speech_event) {
-    status = pjmedia_flite_port_set_eof_cb(ae->flite_cbp.port, (void*)call, on_end_of_speech);
+    status = pjmedia_flite_port_set_eof_cb(fp->port, (void*)call, on_end_of_speech);
     if (status != PJ_SUCCESS) {
       set_error("pjmedia_flite_port_set_eof_cb failed");
       return false;
     }
   }
 
-  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->flite_cbp.port, NULL, &ae->flite_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, fp->port, NULL, &fp->slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  return connect_feature_port_to_stream_port(call, ae, &ae->flite_cbp, CONNECTION_MODE_SOURCE);
+  fp->connection_mode = CONNECTION_MODE_SOURCE;
+
+  return connect_feature_port_to_stream_port(call, ae, fp);
 }
 
 bool prepare_pocketsphinx(Call *call, AudioEndpoint *ae) {
-  printf("prepare_pocketsphinx call.id=%i\n", call->id);
   pj_status_t status;
 
-  if(ae->pocketsphinx_cbp.port) {
+  ConfBridgePort *fp = &ae->feature_cbps[FP_SPEECH_RECOG];
+
+  if(fp->port) {
     printf("already prepared\n");
     return true;
   }
@@ -6892,19 +6959,21 @@ bool prepare_pocketsphinx(Call *call, AudioEndpoint *ae) {
         PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), 
         on_speech_transcript,
         call,
-        &ae->pocketsphinx_cbp.port);
+        &fp->port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_pocketsphinx_port_create failed");
     return false;
   }
 
-  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->pocketsphinx_cbp.port, NULL, &ae->pocketsphinx_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, fp->port, NULL, &fp->slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  return connect_feature_port_to_stream_port(call, ae, &ae->pocketsphinx_cbp, CONNECTION_MODE_SINK);
+  fp->connection_mode = CONNECTION_MODE_SINK;
+
+  return connect_feature_port_to_stream_port(call, ae, fp);
 }
 
 void on_rx_notify(pjsip_evsub *sub, pjsip_rx_data *rdata, int *p_st_code,