sip-lab 1.17.10 → 1.18.0

package/src/sip.cpp

@@ -20,13 +20,8 @@
 #include "idmanager.hpp"
 #include "event_templates.hpp"
 
-// Customized media ports that can be chained
-#include "chainlink.h"
-#include "chainlink_dtmfdet.h"
-#include "chainlink_fax.h"
-#include "chainlink_tonegen.h"
-#include "chainlink_wav_port.h"
-#include "chainlink_wire_port.h"
+#include "dtmfdet.h"
+#include "fax_port.h"
 
 #include <ctime>
 
@@ -269,6 +264,14 @@ pjsip_route_hdr route_set;
 pjsip_route_hdr *route;
 const pj_str_t hname = pj_str((char *)"Route");
 
+#define CONF_PORTS 1024
+//#define CLOCK_RATE 16000
+#define CLOCK_RATE 8000
+#define CHANNEL_COUNT 1
+#define PTIME 20
+#define SAMPLES_PER_FRAME (CLOCK_RATE*PTIME/1000)
+#define BITS_PER_SAMPLE 16
+
 #define MAXDIGITS 256
 
 #define DTMF_MODE_RFC2833 0
@@ -305,30 +308,32 @@ struct Subscription {
   bool initialized;
 };
 
+struct ConfBridgePort {
+    unsigned slot;
+    pjmedia_port *port;
+};
+
 struct AudioEndpoint {
   pjmedia_transport *med_transport;
   pjmedia_stream *med_stream;
-  pjmedia_master_port *master_port;
-  pjmedia_port *media_port; // will contain Null Port, WAV File Player etc.
-
-  pjmedia_port *null_port;
-  chainlink *wav_writer;
-  chainlink *wav_player;
-  chainlink *tonegen;
-  chainlink *dtmfdet;
-  chainlink *fax;
 
   char DigitBuffers[2][MAXDIGITS + 1];
   int DigitBufferLength[2];
   int last_digit_timestamp[2];
 
   pj_str_t mode;
+
+  ConfBridgePort stream_cbp;
+  ConfBridgePort wav_player_cbp;
+  ConfBridgePort wav_writer_cbp;
+  ConfBridgePort tonegen_cbp;
+  ConfBridgePort dtmfdet_cbp;
+  ConfBridgePort fax_cbp;
 };
 
 struct VideoEndpoint {
   pjmedia_transport *med_transport;
   pjmedia_stream *med_stream;
-  pjmedia_master_port *master_port;
 };
 
 struct MrcpEndpoint {
@@ -426,6 +431,10 @@ struct Call {
   pjmedia_sdp_session *active_remote_sdp;
 
   bool local_sdp_answer_already_set;
+
+  pjmedia_conf *conf;
+  pjmedia_master_port *master_port;
+  pjmedia_port *null_port;
 };
 
 #define MAX_TCP_DATA 4096
@@ -439,11 +448,6 @@ struct AsockUserData {
   pj_size_t len;
 };
 
-bool init_media_ports(Call *c, AudioEndpoint *ae, unsigned sampling_rate,
-                      unsigned channel_count, unsigned samples_per_frame,
-                      unsigned bits_per_sample);
-void connect_media_ports(AudioEndpoint *ae);
-
 struct Pair_Call_CallId {
   Call *pCall;
   long id;
@@ -606,20 +610,14 @@ void process_in_dialog_refer(pjsip_dialog *dlg, pjsip_rx_data *rdata);
 
 void process_in_dialog_subscribe(pjsip_dialog *dlg, pjsip_rx_data *rdata);
 
-static pj_bool_t set_ports(Call *call, AudioEndpoint *ae,
-                           pjmedia_port *stream_port, pjmedia_port *media_port);
 // static pj_bool_t stop_media_operation(Call *call);
 static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat,
                               pjmedia_stream_info *stream_info);
 
-bool prepare_wire(pj_pool_t *pool, chainlink **link, unsigned sampling_rate,
-                  unsigned channel_count, unsigned samples_per_frame,
-                  unsigned bits_per_sample);
-
 bool prepare_tonegen(Call *call, AudioEndpoint *ae);
+bool prepare_dtmfdet(Call *call, AudioEndpoint *ae);
 bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file);
 bool prepare_wav_writer(Call *c, AudioEndpoint *ae, const char *file);
-
 bool prepare_fax(Call *c, AudioEndpoint *ae, bool is_sender, const char *file,
                  unsigned flags);
 
@@ -629,7 +627,7 @@ void prepare_error_event(ostringstream *oss, char *scope, char *details);
 void append_status(ostringstream *oss, pj_status_t s);
 
 bool is_media_active(Call *c, MediaEndpoint *me);
-void close_media_endpoint(MediaEndpoint *me);
+void close_media_endpoint(Call *call, MediaEndpoint *me);
 
 void close_media(Call *c);
 
@@ -637,6 +635,10 @@ bool process_media(Call *c, pjsip_dialog *dlg, Document &document, bool answer);
 
 typedef pj_status_t (*audio_endpoint_stop_op_t)(Call *call, AudioEndpoint *ae);
 
+pj_status_t audio_endpoint_stop_play_wav(Call *call, AudioEndpoint *ae);
+pj_status_t audio_endpoint_stop_record_wav(Call *call, AudioEndpoint *ae);
+pj_status_t audio_endpoint_stop_fax(Call *call, AudioEndpoint *ae);
+
 static pjsip_module mod_tester = {
     NULL,
     NULL,                           /* prev, next.		*/
@@ -710,13 +712,90 @@ find_endpoint_by_inband_dtmf_media_stream(Call *call,
   return -1;
 }
 
+pj_status_t setup_call_conf(Call *call) {
+  pj_status_t status;
+  status = pjmedia_conf_create(call->inv->pool,
+                                 CONF_PORTS,
+                                 CLOCK_RATE,
+                                 CHANNEL_COUNT,
+                                 SAMPLES_PER_FRAME,
+                                 BITS_PER_SAMPLE,
+                                 PJMEDIA_CONF_NO_DEVICE,
+                                 &call->conf);
+
+  if (status != PJ_SUCCESS) {
+    addon_log(L_DBG, "pjmedia_conf_create failed\n");
+    return false;
+  }
+
+  status = pjmedia_null_port_create(call->inv->pool, CLOCK_RATE, CHANNEL_COUNT, SAMPLES_PER_FRAME, BITS_PER_SAMPLE, &call->null_port);
+  if (status != PJ_SUCCESS) {
+    addon_log(L_DBG, "pjmedia_null_port_created failed\n");
+    return false;
+  }
+    
+  pjmedia_port *conf_port = NULL;
+
+  conf_port = pjmedia_conf_get_master_port(call->conf);
+  if (conf_port == NULL) {
+    addon_log(L_DBG, "pjmedia_conf_get_master_port failed\n");
+    return false;
+  }
+    
+  status = pjmedia_master_port_create(call->inv->pool, call->null_port, conf_port, 0, &call->master_port);
+  if (status != PJ_SUCCESS) {
+    addon_log(L_DBG, "pjmedia_master_port_create failed\n");
+    return false;
+  }
+    
+  status = pjmedia_master_port_start(call->master_port);
+  if (status != PJ_SUCCESS) {
+    addon_log(L_DBG, "pjmedia_master_port_start failed\n");
+    return false;
+  }
+
+  return PJ_SUCCESS;
+}
+
+void release_call_conf(Call *call) {
+    pj_status_t status;
+
+    if (call->master_port) {
+        status = pjmedia_master_port_stop(call->master_port);
+        if(status != PJ_SUCCESS) {
+            addon_log(L_DBG, "pjmedia_master_port_stop failed\n");
+        }
+        pjmedia_master_port_destroy(call->master_port, 0);
+        if(status != PJ_SUCCESS) {
+            addon_log(L_DBG, "pjmedia_master_port_destroy failed\n");
+        }
+        call->master_port = NULL;
+    }
+
+    if (call->conf) {
+        status = pjmedia_conf_destroy(call->conf);
+        if(status != PJ_SUCCESS) {
+            addon_log(L_DBG, "pjmedia_conf_destroy failed\n");
+        }
+        call->conf = NULL;
+    }
+
+    if (call->null_port) {
+        status = pjmedia_port_destroy(call->null_port);
+        if(status != PJ_SUCCESS) {
+            addon_log(L_DBG, "pjmedia_port_destroy(null_port) failed\n");
+        }
+        call->null_port = NULL;
+    }
+}
+
 static int find_endpoint_by_inband_dtmf_media_port(Call *call,
                                                    pjmedia_port *port) {
   for (int i = 0; i < call->media_count; i++) {
     MediaEndpoint *me = (MediaEndpoint *)call->media[i];
     if (ENDPOINT_TYPE_AUDIO == me->type) {
       AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-      if ((pjmedia_port *)ae->dtmfdet == port) {
+      if (ae->dtmfdet_cbp.port && (pjmedia_port *)ae->dtmfdet_cbp.port == port) {
         return i;
       }
     }
@@ -1116,6 +1195,8 @@ int __pjw_init() {
 
   pj_status_t status;
 
+  pjmedia_port *conf_port = NULL;
+
   status = pj_init();
   if (status != PJ_SUCCESS) {
     addon_log(L_DBG, "pj_init failed\n");
@@ -1309,6 +1390,7 @@ int __pjw_init() {
 
 #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;
@@ -2939,6 +3021,12 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg,
   }
   // addon_log(L_DBG, "pjsip_dlg_add_usage OK\n");
 
+  status = setup_call_conf(call);
+  if (status != PJ_SUCCESS) {
+    set_error("setup_call_conf failed");
+    return -1;
+  }
+
   return call_id;
 }
 
@@ -2978,10 +3066,10 @@ 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 = chainlink_tonegen_play_digits((pjmedia_port *)ae->tonegen, 1,
+      status = pjmedia_tonegen_play_digits((pjmedia_port *)ae->tonegen_cbp.port, 1,
                                              &tone, 0);
       if (status != PJ_SUCCESS) {
-        set_error("chainlink_tonegen_play_digits failed.");
+        set_error("pjmedia_tonegen_play_digits failed.");
         return status;
       }
     }
@@ -3408,6 +3496,17 @@ int pjw_call_start_record_wav(long call_id, const char *json) {
 
   ae = (AudioEndpoint *)me->endpoint.audio;
 
+  if(!ae->stream_cbp.port) {
+    set_error("stream port is not ready yet");
+    goto out;
+  }
+
+  // stop/destroy existing writer
+  status = audio_endpoint_stop_record_wav(call, ae);
+  if(status != PJ_SUCCESS) {
+    goto out;
+  }
+
   if (!prepare_wav_writer(call, ae, file)) {
     set_error("prepare_wav_writer failed");
     goto out;
@@ -3424,16 +3523,24 @@ out:
 
 pj_status_t audio_endpoint_start_play_wav(Call *call, AudioEndpoint *ae,
                                           const char *file) {
-  pjmedia_port *stream_port;
-  pj_status_t status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
-  if (status != PJ_SUCCESS) {
-    set_error("pjmedia_stream_get_port failed with status=%i", status);
-    return status;
+  pj_status_t status;
+
+  if(!ae->stream_cbp.port) {
+    set_error("stream port is not ready yet");
+    return -1;
+  }
+
+  // First stop and destroy existing wav port.
+  status = audio_endpoint_stop_play_wav(call, ae);
+  if(status != PJ_SUCCESS) {
+    return -1;
   }
 
   if (!prepare_wav_player(call, ae, file)) {
     return -1;
   }
+
+  return PJ_SUCCESS;
 }
 
 // int pjw_call_start_play_wav(long call_id, const char *file)
@@ -3541,28 +3648,41 @@ pj_status_t call_stop_audio_endpoints_op(Call *call,
   return PJ_SUCCESS;
 }
 
-pj_status_t audio_endpoint_stop_play_wav(Call *call, AudioEndpoint *ae) {
-  pjmedia_port *stream_port;
-  pj_status_t status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
-  if (status != PJ_SUCCESS) {
-    set_error("pjmedia_stream_get_port failed with status=%i", status);
-    return status;
-  }
+pj_status_t audio_endpoint_remove_port(Call *call, ConfBridgePort *cbp) {
+  printf("audio_endpoint_remove_port\n");
+  pj_status_t status;
 
-  if (!prepare_wire(call->inv->pool, &ae->wav_player,
-                    PJMEDIA_PIA_SRATE(&stream_port->info),
-                    PJMEDIA_PIA_CCNT(&stream_port->info),
-                    PJMEDIA_PIA_SPF(&stream_port->info),
-                    PJMEDIA_PIA_BITS(&stream_port->info))) {
-    set_error("prepare_wire failed.");
-    return -1;
-  }
+  if(cbp->port) {
+    /* 
+    no need to call pjmedia_conf_disconnect_port because pjmedia_conf_remove_port calls:
+      pjmedia_conf_disconnect_port_from_sources(conf, port);
+      pjmedia_conf_disconnect_port_from_sinks(conf, port);
+    */
+
+    status = pjmedia_conf_remove_port(call->conf, cbp->slot);
+    if (status != PJ_SUCCESS) {
+      set_error("pjmedia_conf_remove_port failed");
+      return false;
+    }
+    cbp->slot = 0;
 
-  connect_media_ports(ae);
+    status = pjmedia_port_destroy(cbp->port);
+    if (status != PJ_SUCCESS) {
+      set_error("pjmedia_port_destroy failed");
+      return false;
+    }
+    cbp->port = NULL;
+  }
 
+  printf("success\n");
   return PJ_SUCCESS;
 }
 
+
+pj_status_t audio_endpoint_stop_play_wav(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, &ae->wav_player_cbp);
+}
+
 int pjw_call_stop_play_wav(long call_id, const char *json) {
   PJW_LOCK();
   clear_error();
@@ -3639,26 +3759,7 @@ out:
 }
 
 pj_status_t audio_endpoint_stop_record_wav(Call *call, AudioEndpoint *ae) {
-  pjmedia_port *stream_port;
-
-  pj_status_t status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
-  if (status != PJ_SUCCESS) {
-    set_error("pjmedia_stream_get_port failed.");
-    return status;
-  }
-
-  if (!prepare_wire(call->inv->pool, &ae->wav_writer,
-                    PJMEDIA_PIA_SRATE(&stream_port->info),
-                    PJMEDIA_PIA_CCNT(&stream_port->info),
-                    PJMEDIA_PIA_SPF(&stream_port->info),
-                    PJMEDIA_PIA_BITS(&stream_port->info))) {
-    set_error("prepare_wire failed.");
-    return -1;
-  }
-
-  connect_media_ports(ae);
-
-  return PJ_SUCCESS;
+  return audio_endpoint_remove_port(call, &ae->wav_writer_cbp);
 }
 
 int pjw_call_stop_record_wav(long call_id, const char *json) {
@@ -3735,7 +3836,10 @@ out:
   return 0;
 }
 
-// int pjw_call_start_fax(long call_id, bool is_sender, const char *file)
+pj_status_t audio_endpoint_stop_fax(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, &ae->fax_cbp);
+}
+
 int pjw_call_start_fax(long call_id, const char *json) {
   PJW_LOCK();
   clear_error();
@@ -3841,6 +3945,13 @@ int pjw_call_start_fax(long call_id, const char *json) {
       flags |= FAX_FLAG_TRANSMIT_ON_IDLE;
   }
 
+  // First stop and destroy existing fax port.
+  status = audio_endpoint_stop_fax(call, ae);
+  if(status != PJ_SUCCESS) {
+    set_error("audio_endpoint_stop_fax failed");
+    return -1;
+  }
+
   if (!prepare_fax(call, ae, is_sender, file, flags)) {
     set_error("prepare_fax failed");
     goto out;
@@ -3855,28 +3966,6 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_stop_fax(Call *call, AudioEndpoint *ae) {
-  pjmedia_port *stream_port;
-  pj_status_t status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
-  if (status != PJ_SUCCESS) {
-    set_error("pjmedia_stream_get_port failed.");
-    return status;
-  }
-
-  if (!prepare_wire(call->inv->pool, &ae->fax,
-                    PJMEDIA_PIA_SRATE(&stream_port->info),
-                    PJMEDIA_PIA_CCNT(&stream_port->info),
-                    PJMEDIA_PIA_SPF(&stream_port->info),
-                    PJMEDIA_PIA_BITS(&stream_port->info))) {
-    set_error("prepare_wire failed.");
-    return -1;
-  }
-
-  connect_media_ports(ae);
-
-  return PJ_SUCCESS;
-}
-
 int pjw_call_stop_fax(long call_id, const char *json) {
   PJW_LOCK();
   clear_error();
@@ -4050,30 +4139,6 @@ out:
   return 0;
 }
 
-bool stop_master_ports(Call *call) {
-  for (int i = 0; i < call->media_count; i++) {
-    MediaEndpoint *me = (MediaEndpoint *)call->media[i];
-    pjmedia_master_port *master_port = NULL;
-    if (ENDPOINT_TYPE_AUDIO == me->type) {
-      AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-      master_port = ae->master_port;
-    } else if (ENDPOINT_TYPE_VIDEO == me->type) {
-      VideoEndpoint *ve = (VideoEndpoint *)me->endpoint.video;
-      master_port = ve->master_port;
-    } else {
-      continue;
-    }
-
-    if (master_port) {
-      if (pjmedia_master_port_stop(master_port) != PJ_SUCCESS) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
 bool media_endpoint_present_in_session_media(
     MediaEndpoint *me, const pjmedia_sdp_session *local_sdp) {
   printf("media_endpoint_present_in_session_media:\n");
@@ -4325,16 +4390,71 @@ bool restart_media_stream(Call *call, MediaEndpoint *me,
 
   pj_status_t status;
 
-  if (ae->master_port) {
-    status = pjmedia_master_port_stop(ae->master_port);
+  if(ae->stream_cbp.port) {
+    if(ae->tonegen_cbp.port) {
+      status = pjmedia_conf_disconnect_port(call->conf, ae->tonegen_cbp.slot, ae->stream_cbp.slot);
+      if (status != PJ_SUCCESS) {
+        make_evt_media_update(evt, sizeof(evt), call->id,
+                            "setup_failed (pjmedia_conf_disconnect_port for tonegen failed)", "");
+        dispatch_event(evt);
+        return false;
+      }
+    }
+
+    if(ae->wav_player_cbp.port) {
+      status = pjmedia_conf_disconnect_port(call->conf, ae->wav_player_cbp.slot, ae->stream_cbp.slot);
+      if (status != PJ_SUCCESS) {
+        make_evt_media_update(evt, sizeof(evt), call->id,
+                           "setup_failed (pjmedia_conf_disconnect_port for wav_player failed)", "");
+        dispatch_event(evt);
+        return false;
+      }
+    }
+
+    if(ae->dtmfdet_cbp.port) {
+      status = pjmedia_conf_disconnect_port(call->conf, ae->stream_cbp.slot, ae->dtmfdet_cbp.slot);
+      if (status != PJ_SUCCESS) {
+        make_evt_media_update(evt, sizeof(evt), call->id,
+                           "setup_failed (pjmedia_conf_disconnect_port for dtmfdet failed)", "");
+        dispatch_event(evt);
+        return false;
+      }
+    }
+
+    if(ae->fax_cbp.port) {
+      status = pjmedia_conf_disconnect_port(call->conf, ae->stream_cbp.slot, ae->fax_cbp.slot);
+      if (status != PJ_SUCCESS) {
+        make_evt_media_update(evt, sizeof(evt), call->id,
+                           "setup_failed (pjmedia_conf_disconnect_port fax dst failed)", "");
+        dispatch_event(evt);
+        return false;
+      }
+
+      status = pjmedia_conf_disconnect_port(call->conf, ae->fax_cbp.slot, ae->stream_cbp.slot);
+      if (status != PJ_SUCCESS) {
+        make_evt_media_update(evt, sizeof(evt), call->id,
+                           "setup_failed (pjmedia_conf_disconnect_port for fax src failed)", "");
+        dispatch_event(evt);
+        return false;
+      }
+    }
+
+    status = pjmedia_conf_remove_port(call->conf, ae->stream_cbp.slot);
     if (status != PJ_SUCCESS) {
       make_evt_media_update(evt, sizeof(evt), call->id,
-                            "setup_failed (pjmedia_master_port_stop failed)",
-                            "");
-      dispatch_event(evt);
+                           "setup_failed (pjmedia_conf_remove_port failed)", "");
       return false;
     }
-  }
+    ae->stream_cbp.slot = 0;
+
+    status = pjmedia_port_destroy(ae->stream_cbp.port);
+    if (status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                           "setup_failed (pjmedia_port_destroy failed)", "");
+      return false;
+    }
+    ae->stream_cbp.port = NULL;
+  } 
 
   status =
       pjmedia_stream_info_from_sdp(&stream_info, call->inv->dlg->pool,
@@ -4400,8 +4520,7 @@ bool restart_media_stream(Call *call, MediaEndpoint *me,
     return false;
   }
 
-  pjmedia_port *stream_port;
-  status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
+  status = pjmedia_stream_get_port(ae->med_stream, &ae->stream_cbp.port);
   if (status != PJ_SUCCESS) {
     make_evt_media_update(evt, sizeof(evt), call->id,
                           "setup_failed (pjmedia_stream_get_port failed)", "");
@@ -4409,21 +4528,71 @@ bool restart_media_stream(Call *call, MediaEndpoint *me,
     return false;
   }
 
-  if (!init_media_ports(call, ae, PJMEDIA_PIA_SRATE(&stream_port->info),
-                        PJMEDIA_PIA_CCNT(&stream_port->info),
-                        PJMEDIA_PIA_SPF(&stream_port->info),
-                        PJMEDIA_PIA_BITS(&stream_port->info))) {
+  status = pjmedia_conf_add_port(call->conf, call->inv->pool, ae->stream_cbp.port, NULL, &ae->stream_cbp.slot);
+  if (status != PJ_SUCCESS) {
     make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (init_media_ports failed)", "");
+                          "setup_failed (pjmedia_conf_add_port failed)", "");
     dispatch_event(evt);
     return false;
   }
 
-  if (!set_ports(call, ae, stream_port, (pjmedia_port *)ae->dtmfdet)) {
-    make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (set_ports failed)", "");
-    dispatch_event(evt);
-    return false;
+  if(!ae->dtmfdet_cbp.port) {
+    if(!prepare_dtmfdet(call, ae)) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                          "setup_failed (prepare_dtmfdet failed)", "");
+      dispatch_event(evt);
+      return false;
+    }
+  }
+
+  if(ae->tonegen_cbp.port) {
+    status = pjmedia_conf_connect_port(call->conf, ae->tonegen_cbp.slot, ae->stream_cbp.slot, 0);
+    if (status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                          "setup_failed (pjmedia_conf_connect_port for tonegen failed)", "");
+      dispatch_event(evt);
+      return false;
+    }
+  }
+
+  if(ae->wav_player_cbp.port) {
+    status = pjmedia_conf_connect_port(call->conf, ae->wav_player_cbp.slot, ae->stream_cbp.slot, 0);
+    if (status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                          "setup_failed (pjmedia_conf_connect_port for wav_player failed)", "");
+      dispatch_event(evt);
+      return false;
+    }
+  }
+
+  if(ae->dtmfdet_cbp.port) {
+    status = pjmedia_conf_connect_port(call->conf, ae->stream_cbp.slot, ae->dtmfdet_cbp.slot, 0);
+    if (status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                          "setup_failed (pjmedia_conf_connect_port for dtmfdet failed)", "");
+      dispatch_event(evt);
+      return false;
+
+    }
+  }
+
+  if(ae->fax_cbp.port) {
+    status = pjmedia_conf_connect_port(call->conf, ae->stream_cbp.slot, ae->fax_cbp.slot, 0);
+    if (status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                          "setup_failed (pjmedia_conf_connect_port for fax dst failed)", "");
+      dispatch_event(evt);
+      return false;
+
+    }
+
+    status = pjmedia_conf_connect_port(call->conf, ae->fax_cbp.slot, ae->stream_cbp.slot, 0);
+    if (status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                          "setup_failed (pjmedia_conf_connect_port for fax src failed)", "");
+      dispatch_event(evt);
+      return false;
+    }
   }
 
   return true;
@@ -4499,13 +4668,6 @@ static void on_media_update(pjsip_inv_session *inv, pj_status_t status) {
     return;
   }
 
-  if (!stop_master_ports(call)) {
-    make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (stop_master_port error)", "");
-    dispatch_event(evt);
-    return;
-  }
-
   status = pjmedia_sdp_neg_get_active_local(inv->neg, &local_sdp);
   if (status != PJ_SUCCESS) {
     make_evt_media_update(
@@ -4541,7 +4703,7 @@ static void on_media_update(pjsip_inv_session *inv, pj_status_t status) {
   for (int i = 0; i < local_sdp->media_count; i++) {
     MediaEndpoint *me = call->media[i];
     if (!local_sdp->media[i]->desc.port) {
-      close_media_endpoint(me);
+      close_media_endpoint(call, me);
     } else {
       if (me->type == ENDPOINT_TYPE_AUDIO) {
         if (!restart_media_stream(call, me, local_sdp, remote_sdp, i)) {
@@ -4557,33 +4719,6 @@ static void on_media_update(pjsip_inv_session *inv, pj_status_t status) {
     }
   }
 
-  /*
-  printf("active_media_count=%d\n", active_media_count);
-  call->media_count = 0;
-  for (int i = 0; i < active_media_count; i++) {
-    MediaEndpoint *me = active_media[i];
-    call->media[call->media_count++] = me;
-
-    pjmedia_sdp_media *dummy;
-    int idx = find_sdp_media_by_media_endpt(local_sdp, &dummy, me);
-    printf("idx=%d\n", 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);
 
@@ -4591,62 +4726,6 @@ static void on_media_update(pjsip_inv_session *inv, pj_status_t status) {
   dispatch_event(evt);
 }
 
-static pj_bool_t set_ports(Call *call, AudioEndpoint *ae,
-                           pjmedia_port *stream_port,
-                           pjmedia_port *media_port) {
-  pj_status_t status;
-
-  if (!ae->master_port) {
-    status = pjmedia_master_port_create(call->inv->pool, stream_port,
-                                        media_port, 0, &ae->master_port);
-    if (status != PJ_SUCCESS) {
-      return PJ_FALSE;
-    }
-
-    status = pjmedia_master_port_start(ae->master_port);
-    if (status != PJ_SUCCESS) {
-      return PJ_FALSE;
-    }
-
-    ae->media_port = media_port;
-    return PJ_TRUE;
-  }
-
-  status = pjmedia_master_port_stop(ae->master_port);
-  if (status != PJ_SUCCESS) {
-    return PJ_FALSE;
-  }
-
-  status = pjmedia_master_port_set_uport(ae->master_port, stream_port);
-  if (status != PJ_SUCCESS) {
-    return PJ_FALSE;
-  }
-
-  if (ae->media_port) {
-    if (ae->media_port != media_port) {
-      status = pjmedia_port_destroy(ae->media_port);
-      if (status != PJ_SUCCESS) {
-        return PJ_FALSE;
-      }
-    }
-    ae->media_port = NULL;
-  }
-
-  status = pjmedia_master_port_set_dport(ae->master_port, media_port);
-  if (status != PJ_SUCCESS) {
-    return PJ_FALSE;
-  }
-
-  ae->media_port = media_port;
-
-  status = pjmedia_master_port_start(ae->master_port);
-  if (status != PJ_SUCCESS) {
-    return PJ_FALSE;
-  }
-
-  return PJ_TRUE;
-}
-
 static void on_state_changed(pjsip_inv_session *inv, pjsip_event *e) {
   addon_log(L_DBG, "on_state_changed\n");
 
@@ -4687,33 +4766,14 @@ static void on_state_changed(pjsip_inv_session *inv, pjsip_event *e) {
       return;
     }
 
+    close_media(call);
+
     for (int i = 0; i < call->media_count; i++) {
       addon_log(L_DBG, "processing media[%d]\n", i);
       MediaEndpoint *me = call->media[i];
       if (ENDPOINT_TYPE_AUDIO == me->type) {
         AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
         addon_log(L_DBG, "processing media[%d] as AudioEndpoint\n", i);
-        if (ae->master_port) {
-          addon_log(L_DBG, "calling pjmedia_port_stop\n");
-          status = pjmedia_master_port_stop(ae->master_port);
-          if (status != PJ_SUCCESS) {
-            addon_log(L_DBG, "pjmedia_master_port_stop failed\n");
-          }
-
-          addon_log(L_DBG, "calling pjmedia_master_port_destroy\n");
-          status = pjmedia_master_port_destroy(ae->master_port, PJ_FALSE);
-          if (status != PJ_SUCCESS) {
-            addon_log(L_DBG, "pjmedia_master_port_destroy failed\n");
-          }
-        }
-
-        if (ae->media_port) {
-          addon_log(L_DBG, "calling pjmedia_port_destroy\n");
-          status = pjmedia_port_destroy(ae->media_port);
-          if (status != PJ_SUCCESS) {
-            addon_log(L_DBG, "pjmedia_port_destroy failed\n");
-          }
-        }
 
         if (ae->med_stream) {
           addon_log(L_DBG, "calling pjmedia_stream_destroy");
@@ -4723,19 +4783,20 @@ static void on_state_changed(pjsip_inv_session *inv, pjsip_event *e) {
           }
         }
       }
+    }
 
-      long val;
-      if (!g_call_ids.remove(call_id, val)) {
-        addon_log(L_DBG, "g_call_ids.remove failed\n");
-      }
+    release_call_conf(call);
 
-      Pair_Call_CallId pcc;
-      pcc.pCall = call;
-      pcc.id = call_id;
-      g_LastCalls.push_back(pcc);
+    long val;
+    if (!g_call_ids.remove(call_id, val)) {
+      addon_log(L_DBG, "g_call_ids.remove failed\n");
     }
 
-    close_media(call);
+    Pair_Call_CallId pcc;
+    pcc.pCall = call;
+    pcc.id = call_id;
+    g_LastCalls.push_back(pcc);
+
 
     char evt[2048];
     int sip_msg_len = 0;
@@ -5115,6 +5176,13 @@ static pj_bool_t on_rx_request(pjsip_rx_data *rdata) {
     return PJ_TRUE;
   }
 
+  status = setup_call_conf(call);
+  if (status != PJ_SUCCESS) {
+    printf("setup_call_conf failed\n");
+    pjsip_endpt_respond_stateless(g_sip_endpt, rdata, 500, &reason, NULL, NULL);
+    return PJ_TRUE;
+  }
+
   // TODO: check if this is really necessary as we are calling
   // pjsip_dlg_add_usage subsequently
   inv->dlg->mod_data[mod_tester.id] = call;
@@ -6315,12 +6383,20 @@ bool is_media_active(Call *c, MediaEndpoint *me) {
   return false;
 }
 
-void close_media_endpoint(MediaEndpoint *me) {
+void close_media_endpoint(Call *call, MediaEndpoint *me) {
   printf("close_media_endpoint %x\n", me);
   if(!me) return;
 
   if (ENDPOINT_TYPE_AUDIO == me->type) {
     AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
+
+    audio_endpoint_remove_port(call, &ae->stream_cbp);
+    audio_endpoint_remove_port(call, &ae->wav_player_cbp);
+    audio_endpoint_remove_port(call, &ae->wav_writer_cbp);
+    audio_endpoint_remove_port(call, &ae->tonegen_cbp);
+    audio_endpoint_remove_port(call, &ae->dtmfdet_cbp);
+    audio_endpoint_remove_port(call, &ae->fax_cbp);
+
     close_media_transport(ae->med_transport);
     ae->med_transport = NULL;
   } else if (ENDPOINT_TYPE_MRCP == me->type) {
@@ -6348,154 +6424,138 @@ void close_media(Call *c) {
   printf("close_media call_id=%x\n", c->id);
   for (int i = 0; i < c->media_count; ++i) {
     MediaEndpoint *me = c->media[i];
-    close_media_endpoint(me);
+    close_media_endpoint(c, me);
   }
   c->media_count = 0;
 }
 
-bool init_media_ports(Call *call, AudioEndpoint *ae, unsigned sampling_rate,
-                      unsigned channel_count, unsigned samples_per_frame,
-                      unsigned bits_per_sample) {
+bool prepare_tonegen(Call *c, AudioEndpoint *ae) {
+  printf("prepare_tone_gen call.id=%i\n", c->id);
   pj_status_t status;
 
-  if (!ae->null_port) {
-    status = pjmedia_null_port_create(call->inv->pool, sampling_rate,
-                                      channel_count, samples_per_frame,
-                                      bits_per_sample, &ae->null_port);
-    if (status != PJ_SUCCESS)
-      return false;
-  }
-
-  if (!ae->wav_writer) {
-    if (!prepare_wire(call->inv->pool, &ae->wav_writer, sampling_rate,
-                      channel_count, samples_per_frame, bits_per_sample)) {
-      return false;
-    }
-  }
-
-  if (!ae->wav_player) {
-    if (!prepare_wire(call->inv->pool, &ae->wav_player, sampling_rate,
-                      channel_count, samples_per_frame, bits_per_sample)) {
-      return false;
-    }
+  if(ae->tonegen_cbp.port) {
+    printf("already prepared\n");
+    return true;
   }
 
-  if (!ae->tonegen) {
-    if (!prepare_wire(call->inv->pool, &ae->tonegen, sampling_rate,
-                      channel_count, samples_per_frame, bits_per_sample)) {
-      return false;
-    }
+  printf("call.id=%i p1\n", c->id);
+  status = pjmedia_tonegen_create(
+        c->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);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_tonegen_create failed");
+    return false;
   }
 
-  if (!ae->dtmfdet) {
-    status = chainlink_dtmfdet_create(
-        call->inv->pool, sampling_rate, channel_count, samples_per_frame,
-        bits_per_sample, on_inband_dtmf, call, (pjmedia_port **)&ae->dtmfdet);
-    if (status != PJ_SUCCESS)
-      return false;
+  printf("call.id=%i p2\n", c->id);
+  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->tonegen_cbp.port, NULL, &ae->tonegen_cbp.slot);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_conf_add_port failed");
+    return false;
   }
 
-  if (!ae->fax) {
-    if (!prepare_wire(call->inv->pool, &ae->fax, sampling_rate, channel_count,
-                      samples_per_frame, bits_per_sample)) {
-      return false;
-    }
+  printf("call.id=%i p3\n", c->id);
+  status = pjmedia_conf_connect_port(c->conf, ae->tonegen_cbp.slot, ae->stream_cbp.slot, 0);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_conf_connect_port failed");
+    return false;
   }
 
-  connect_media_ports(ae);
+  printf("call.id=%i p4 (success)\n", c->id);
   return true;
 }
 
-void connect_media_ports(AudioEndpoint *ae) {
-  ((chainlink *)ae->dtmfdet)->next = (pjmedia_port *)ae->tonegen;
-  ((chainlink *)ae->tonegen)->next = (pjmedia_port *)ae->wav_player;
-  ((chainlink *)ae->wav_player)->next = (pjmedia_port *)ae->wav_writer;
-  ((chainlink *)ae->wav_writer)->next = (pjmedia_port *)ae->fax;
-  ((chainlink *)ae->fax)->next = ae->null_port;
-}
-
-bool prepare_tonegen(Call *c, AudioEndpoint *ae) {
-  printf("prepare_tonegen\n");
+bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file) {
   pj_status_t status;
 
-  chainlink *link = (chainlink *)ae->tonegen;
+  unsigned wav_ptime;
+  wav_ptime = PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info) * 1000 /
+              PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info);
+
+  status = pjmedia_wav_player_port_create(
+                  c->inv->pool, 
+                  file,
+                  wav_ptime,
+                  0,                  /* flags        */
+                  -1,                  /* buf size     */
+                  &ae->wav_player_cbp.port
+                  );
 
-  pjmedia_port *stream_port;
-  status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
   if (status != PJ_SUCCESS) {
+    set_error("pjmedia_wav_player_port_create failed");
     return false;
   }
 
-  if (link->port.info.signature == CHAINLINK_WIRE_PORT_SIGNATURE) {
-    status = chainlink_tonegen_create(
-        c->inv->pool, PJMEDIA_PIA_SRATE(&stream_port->info),
-        PJMEDIA_PIA_CCNT(&stream_port->info),
-        PJMEDIA_PIA_SPF(&stream_port->info),
-        PJMEDIA_PIA_BITS(&stream_port->info), 0, (pjmedia_port **)&ae->tonegen);
-    if (status != PJ_SUCCESS)
-      return false;
+  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->wav_player_cbp.port, NULL, &ae->wav_player_cbp.slot);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_conf_add_port failed");
+    return false;
+  }
+
+  status = pjmedia_conf_connect_port(c->conf, ae->wav_player_cbp.slot, ae->stream_cbp.slot, 0);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_conf_connect_port failed");
+    return false;
   }
 
-  connect_media_ports(ae);
   return true;
 }
 
-bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file) {
+bool prepare_wav_writer(Call *c, AudioEndpoint *ae, const char *file) {
   pj_status_t status;
 
-  chainlink *link = (chainlink *)ae->wav_player;
-
-  pjmedia_port *stream_port;
-  status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
+  status = pjmedia_wav_writer_port_create(
+      c->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);
   if (status != PJ_SUCCESS) {
-    set_error("pj_media_stream_get_port failed");
+    set_error("pjmedia_wav_write_port_create failed");
     return false;
   }
-
-  unsigned wav_ptime;
-  wav_ptime = PJMEDIA_PIA_SPF(&stream_port->info) * 1000 /
-              PJMEDIA_PIA_SRATE(&stream_port->info);
-
-  status = pjmedia_port_destroy((pjmedia_port *)link);
+  
+  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->wav_writer_cbp.port, NULL, &ae->wav_writer_cbp.slot);
   if (status != PJ_SUCCESS) {
-    set_error("pjmedia_port_destroy failed");
+    set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  status = chainlink_wav_player_port_create(
-      c->inv->pool, file, wav_ptime, 0, -1, (pjmedia_port **)&ae->wav_player);
+  status = pjmedia_conf_connect_port(c->conf, ae->stream_cbp.slot, ae->wav_writer_cbp.slot, 0);
   if (status != PJ_SUCCESS) {
-    set_error("chainllink_wav_player_port_create failed");
+    set_error("pjmedia_conf_connect_port failed");
     return false;
   }
 
-  connect_media_ports(ae);
   return true;
 }
 
-bool prepare_wav_writer(Call *c, AudioEndpoint *ae, const char *file) {
+bool prepare_dtmfdet(Call *c, AudioEndpoint *ae) {
   pj_status_t status;
-
-  chainlink *link = (chainlink *)ae->wav_writer;
-
-  pjmedia_port *stream_port;
-  status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
-  if (status != PJ_SUCCESS)
-    return false;
-
-  status = pjmedia_port_destroy((pjmedia_port *)link);
-  if (status != PJ_SUCCESS)
+  status = pjmedia_dtmfdet_create(
+      c->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, c, &ae->dtmfdet_cbp.port);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_dtmfdet_create failed");
+      return false;
+  }
+  
+  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->dtmfdet_cbp.port, NULL, &ae->dtmfdet_cbp.slot);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_conf_add_port failed");
     return false;
+  }
 
-  status = chainlink_wav_writer_port_create(
-      c->inv->pool, file, PJMEDIA_PIA_SRATE(&stream_port->info),
-      PJMEDIA_PIA_CCNT(&stream_port->info), PJMEDIA_PIA_SPF(&stream_port->info),
-      PJMEDIA_PIA_BITS(&stream_port->info), PJMEDIA_FILE_WRITE_PCM, 0,
-      (pjmedia_port **)&ae->wav_writer);
-  if (status != PJ_SUCCESS)
+  status = pjmedia_conf_connect_port(c->conf, ae->stream_cbp.slot, ae->dtmfdet_cbp.slot, 0);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_conf_connect_port failed");
     return false;
+  }
 
-  connect_media_ports(ae);
   return true;
 }
 
@@ -6503,48 +6563,36 @@ bool prepare_fax(Call *c, AudioEndpoint *ae, bool is_sender, const char *file,
                  unsigned flags) {
   pj_status_t status;
 
-  chainlink *link = (chainlink *)ae->fax;
-
-  pjmedia_port *stream_port;
-  status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
-  if (status != PJ_SUCCESS)
+  status = pjmedia_fax_port_create(
+      c->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_fax_result, c, is_sender, file,
+      flags, &ae->fax_cbp.port);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_fax_port_create failed");
     return false;
+  }
 
-  status = pjmedia_port_destroy((pjmedia_port *)link);
-  if (status != PJ_SUCCESS)
+  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->fax_cbp.port, NULL, &ae->fax_cbp.slot);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_conf_add_port failed");
     return false;
+  }
 
-  status = chainlink_fax_port_create(
-      c->inv->pool, PJMEDIA_PIA_SRATE(&stream_port->info),
-      PJMEDIA_PIA_CCNT(&stream_port->info), PJMEDIA_PIA_SPF(&stream_port->info),
-      PJMEDIA_PIA_BITS(&stream_port->info), on_fax_result, c, is_sender, file,
-      flags, (pjmedia_port **)&ae->fax);
-  if (status != PJ_SUCCESS)
+  status = pjmedia_conf_connect_port(c->conf, ae->fax_cbp.slot, ae->stream_cbp.slot, 0);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_conf_connect_port failed");
     return false;
-
-  connect_media_ports(ae);
-  return true;
-}
-
-bool prepare_wire(pj_pool_t *pool, chainlink **link, unsigned sampling_rate,
-                  unsigned channel_count, unsigned samples_per_frame,
-                  unsigned bits_per_sample) {
-  pj_status_t status;
-
-  if (*link) {
-    // addon_log(L_DBG, "prepare_wire: link is set. It will be destroyed\n");
-    pjmedia_port *port = (pjmedia_port *)*link;
-    status = pjmedia_port_destroy(port);
-    *link = NULL;
-    if (status != PJ_SUCCESS)
-      return false;
   }
 
-  status = chainlink_wire_port_create(pool, sampling_rate, channel_count,
-                                      samples_per_frame, bits_per_sample,
-                                      (pjmedia_port **)link);
-  if (status != PJ_SUCCESS)
+  status = pjmedia_conf_connect_port(c->conf, ae->stream_cbp.slot, ae->fax_cbp.slot, 0);
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_conf_connect_port failed");
     return false;
+  }
 
   return true;
 }