sip-lab 1.17.10 → 1.19.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>
 
@@ -228,10 +223,10 @@ bool json_get_and_check_uri(Document &document, const char *param,
   return true;
 }
 
-static pjsip_method info_method = {PJSIP_OTHER_METHOD, {"INFO", 4}};
-static pjsip_method message_method = {PJSIP_OTHER_METHOD, {"MESSAGE", 7}};
+static pjsip_method info_method = {PJSIP_OTHER_METHOD, {(char*)"INFO", 4}};
+static pjsip_method message_method = {PJSIP_OTHER_METHOD, {(char*)"MESSAGE", 7}};
 
-static pj_str_t trying_reason = pj_str("Trying");
+static pj_str_t trying_reason = pj_str((char*)"Trying");
 
 #define PJW_LOCK() pthread_mutex_lock(&g_mutex)
 #define PJW_UNLOCK() pthread_mutex_unlock(&g_mutex)
@@ -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;
@@ -527,8 +531,8 @@ static void on_dtmf(pjmedia_stream *stream, void *user_data, int digit);
 /* Callback for Registration Status */
 static void on_registration_status(pjsip_regc_cbparam *param);
 
-static void on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx,
-                                 pjsip_event *e);
+/* static void on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx,
+                                 pjsip_event *e); */
 
 static void client_on_evsub_state(pjsip_evsub *sub, pjsip_event *event);
 static void on_client_refresh(pjsip_evsub *sub);
@@ -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;
       }
     }
@@ -856,9 +935,6 @@ static pj_bool_t on_data_read(pj_activesock_t *asock, void *data,
     return PJ_FALSE;
   }
 
-  assert(ud->len >= 0);
-
-  assert(size >= 0);
   assert(size + ud->len + 1 < MAX_TCP_DATA);
 
   memcpy(&ud->buf[ud->len], data, size);
@@ -892,7 +968,7 @@ static pj_bool_t on_data_read(pj_activesock_t *asock, void *data,
     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);
+      //printf("tcp data: msg incomplete %i %i\n", ud->buf+ud->len, sep+4+body_len);
       *remainder = 0;
       return PJ_TRUE;
     }
@@ -1022,17 +1098,14 @@ static pj_bool_t on_connect_complete(pj_activesock_t *asock,
 }
 
 static pj_activesock_t* create_tcp_socket(pjsip_endpoint *sip_endpt, pj_str_t *ipaddr, pj_uint16_t  *out_port, MediaEndpoint *media_endpt, Call *call) {
-  pj_ioqueue_key_t **skey;
   pj_ioqueue_t *ioqueue = pjsip_endpt_get_ioqueue(sip_endpt);
 
   pj_pool_t *pool = call->inv->dlg->pool; 
 
-  skey = (pj_ioqueue_key_t **)pj_pool_alloc(pool, sizeof(pj_ioqueue_key_t *));
   pj_sock_t *sock = (pj_sock_t *)pj_pool_alloc(pool, sizeof(pj_sock_t));
 
   pj_status_t rc;
-  pj_sockaddr_in addr, client_add, rmt_addr;
-  int client_addr_len;
+  pj_sockaddr_in addr;
 
   pj_activesock_t *asock = NULL;
 
@@ -1309,6 +1382,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;
@@ -2010,8 +2084,6 @@ int pjw_call_respond(long call_id, const char *json) {
 
   pjsip_tx_data *tdata;
 
-  const pjmedia_sdp_session *local_sdp;
-
   Call *call;
 
   char buffer[MAX_JSON_INPUT];
@@ -2897,7 +2969,7 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg,
   pjsip_tx_data *tdata;
   status = pjsip_inv_invite(inv, &tdata);
   if (status != PJ_SUCCESS) {
-    g_call_ids.remove(call_id, (long &)call);
+    g_call_ids.remove(call_id, (long&)call);
     close_media(call);
     status = pjsip_dlg_terminate(dlg); // ToDo:
     set_error("pjsip_inv_invite failed");
@@ -2905,7 +2977,7 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg,
   }
 
   if (!add_headers(dlg->pool, tdata, document)) {
-    g_call_ids.remove(call_id, (long &)call);
+    g_call_ids.remove(call_id, (long&)call);
     close_media(call);                 // Todo:
     status = pjsip_dlg_terminate(dlg); // ToDo:
     return -1;
@@ -2914,13 +2986,12 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg,
   if (!dlg_set_transport_by_t(t, dlg)) {
     return -1;
   }
-  addon_log(L_DBG, "inv=%x tdata=%x\n", inv, tdata);
+  addon_log(L_DBG, "inv=%p tdata=%p\n", (void*)inv, (void*)tdata);
 
   status = pjsip_inv_send_msg(inv, tdata);
   addon_log(L_DBG, "status=%d\n", status);
-  pj_perror(0, "", status, "");
   if (status != PJ_SUCCESS) {
-    g_call_ids.remove(call_id, (long &)call);
+    g_call_ids.remove(call_id, (long&)call);
     close_media(call); // Todo:
     // The below code cannot be called here it will cause seg fault
     // status = pjsip_dlg_terminate(dlg); //ToDo:
@@ -2931,7 +3002,7 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg,
   // Without this, on_rx_response will not be called
   status = pjsip_dlg_add_usage(dlg, &mod_tester, call);
   if (status != PJ_SUCCESS) {
-    g_call_ids.remove(call_id, (long &)call);
+    g_call_ids.remove(call_id, (long&)call);
     close_media(call);                 // Todo:
     status = pjsip_dlg_terminate(dlg); // ToDo:
     set_error("pjsip_dlg_add_usage failed");
@@ -2939,6 +3010,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 +3055,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;
       }
     }
@@ -3022,8 +3099,6 @@ int pjw_call_send_dtmf(long call_id, const char *json) {
   int mode = 0;
   ;
 
-  pj_status_t status;
-
   Call *call;
 
   char buffer[MAX_JSON_INPUT];
@@ -3115,8 +3190,6 @@ int pjw_call_reinvite(long call_id, const char *json) {
 
   pj_status_t status;
 
-  const pjmedia_sdp_session *old_sdp = NULL;
-
   pjsip_tx_data *tdata;
   // pjmedia_sdp_session *sdp = 0;
 
@@ -3343,9 +3416,8 @@ int pjw_call_start_record_wav(long call_id, const char *json) {
   long val;
   Call *call;
   pj_status_t status;
-  pjmedia_port *stream_port;
 
-  unsigned media_id = 0;
+  unsigned  media_id = 0;
 
   MediaEndpoint *me;
   AudioEndpoint *ae;
@@ -3395,7 +3467,7 @@ int pjw_call_start_record_wav(long call_id, const char *json) {
     }
   }
 
-  if (media_id >= call->media_count) {
+  if ((int)media_id >= call->media_count) {
     set_error("invalid media_id");
     goto out;
   }
@@ -3408,6 +3480,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 +3507,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)
@@ -3443,8 +3534,6 @@ int pjw_call_start_play_wav(long call_id, const char *json) {
 
   long val;
   Call *call;
-  pj_status_t status;
-  pjmedia_port *stream_port;
 
   MediaEndpoint *me;
   AudioEndpoint *ae;
@@ -3496,7 +3585,7 @@ int pjw_call_start_play_wav(long call_id, const char *json) {
     }
   }
 
-  if (media_id >= call->media_count) {
+  if ((int)media_id >= call->media_count) {
     set_error("invalid media_id");
     goto out;
   }
@@ -3541,28 +3630,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();
@@ -3575,15 +3677,12 @@ int pjw_call_stop_play_wav(long call_id, const char *json) {
 
   MediaEndpoint *me;
   AudioEndpoint *ae;
-  int ae_count;
   int res;
 
   unsigned media_id = 0;
 
   char buffer[MAX_JSON_INPUT];
 
-  const char *valid_params[] = {"media_id", ""};
-
   Document document;
 
   if (!g_call_ids.get(call_id, val)) {
@@ -3610,7 +3709,7 @@ int pjw_call_stop_play_wav(long call_id, const char *json) {
   } else {
     // Stop play wav on specified media_id
 
-    if (media_id >= call->media_count) {
+    if ((int)media_id >= call->media_count) {
       set_error("invalid media_id");
       goto out;
     }
@@ -3639,26 +3738,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) {
@@ -3667,20 +3747,16 @@ int pjw_call_stop_record_wav(long call_id, const char *json) {
 
   long val;
   Call *call = (Call *)val;
-  pjmedia_port *stream_port;
   pj_status_t status;
 
   MediaEndpoint *me;
   AudioEndpoint *ae;
-  int ae_count;
   int res;
 
   unsigned media_id = 0;
 
   char buffer[MAX_JSON_INPUT];
 
-  const char *valid_params[] = {"media_id", ""};
-
   Document document;
 
   if (!g_call_ids.get(call_id, val)) {
@@ -3707,7 +3783,7 @@ int pjw_call_stop_record_wav(long call_id, const char *json) {
   } else {
     // Stop record wav on specified media_id
 
-    if (media_id >= call->media_count) {
+    if ((int)media_id >= call->media_count) {
       set_error("invalid media_id");
       goto out;
     }
@@ -3735,7 +3811,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();
@@ -3743,7 +3822,6 @@ int pjw_call_start_fax(long call_id, const char *json) {
   long val;
   Call *call;
   pj_status_t status;
-  pjmedia_port *stream_port;
 
   bool is_sender;
   char *file;
@@ -3799,7 +3877,7 @@ int pjw_call_start_fax(long call_id, const char *json) {
     }
   }
 
-  if (media_id >= call->media_count) {
+  if ((int)media_id >= call->media_count) {
     set_error("invalid media_id");
     goto out;
   }
@@ -3841,6 +3919,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 +3940,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();
@@ -3884,20 +3947,16 @@ int pjw_call_stop_fax(long call_id, const char *json) {
   long val;
   Call *call;
 
-  pjmedia_port *stream_port;
   pj_status_t status;
 
   MediaEndpoint *me;
   AudioEndpoint *ae;
-  int ae_count;
   int res;
 
   unsigned media_id = 0;
 
   char buffer[MAX_JSON_INPUT];
 
-  const char *valid_params[] = {"media_id", ""};
-
   Document document;
 
   if (!g_call_ids.get(call_id, val)) {
@@ -3924,7 +3983,7 @@ int pjw_call_stop_fax(long call_id, const char *json) {
   } else {
     // Stop fax on specified media_id
 
-    if (media_id >= call->media_count) {
+    if ((int)media_id >= call->media_count) {
       set_error("invalid media_id");
       goto out;
     }
@@ -3961,8 +4020,6 @@ int pjw_call_get_stream_stat(long call_id, const char *json, char *out_stats) {
 
   char buffer[MAX_JSON_INPUT];
 
-  const char *valid_params[] = {"media_id", ""};
-
   Document document;
 
   pj_status_t status;
@@ -3993,7 +4050,7 @@ int pjw_call_get_stream_stat(long call_id, const char *json, char *out_stats) {
     goto out;
   }
 
-  if (media_id >= call->media_count) {
+  if ((int)media_id >= call->media_count) {
     set_error("invalid media_id");
     goto out;
   }
@@ -4050,38 +4107,14 @@ 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");
-  for (int i = 0; i < local_sdp->media_count; i++) {
+  for (unsigned i = 0; i < local_sdp->media_count; i++) {
     pjmedia_sdp_media *media = local_sdp->media[i];
     printf("port: %d %d\n", me->port, media->desc.port);
-    printf("media: %.*s %.*s\n", me->media.slen, me->media.ptr,
-           media->desc.media.slen, media->desc.media.ptr);
+    printf("media: %.*s %.*s\n", (int)me->media.slen, me->media.ptr,
+           (int)media->desc.media.slen, media->desc.media.ptr);
     if (me->port && (me->port == media->desc.port) &&
         (pj_strcmp(&me->media, &media->desc.media) == 0) &&
         (pj_strcmp(&me->transport, &media->desc.transport) == 0) &&
@@ -4097,10 +4130,10 @@ bool media_endpoint_present_in_session_media(
 int find_sdp_media_by_media_endpt(const pjmedia_sdp_session *sdp,
                                   pjmedia_sdp_media **media_out,
                                   MediaEndpoint *me) {
-  printf("find_sdp_media_by_media_endpt %x\n", me);
-  for (int i = 0; i < sdp->media_count; i++) {
+  printf("find_sdp_media_by_media_endpt %p\n", (void*)me);
+  for (unsigned int i = 0; i < sdp->media_count; i++) {
     pjmedia_sdp_media *media = sdp->media[i];
-    printf("i=%d me->port=%i media->desc.port=%i me->media=%.*s media->desc.media=%.*s me->transport=%.*s media->desc.transport=%.*s\n", i, me->port, media->desc.port, me->media.slen, me->media.ptr, media->desc.media.slen, media->desc.media.ptr, me->transport.slen, me->transport.ptr, media->desc.transport.slen, media->desc.transport.ptr);
+    printf("i=%d me->port=%i media->desc.port=%i me->media=%.*s media->desc.media=%.*s me->transport=%.*s media->desc.transport=%.*s\n", i, me->port, media->desc.port, (int)me->media.slen, me->media.ptr, (int)media->desc.media.slen, media->desc.media.ptr, (int)me->transport.slen, me->transport.ptr, (int)media->desc.transport.slen, media->desc.transport.ptr);
 
     if ((me->port == media->desc.port) &&
         (pj_strcmp(&me->media, &media->desc.media) == 0) &&
@@ -4116,10 +4149,10 @@ int find_sdp_media_by_media_endpt(const pjmedia_sdp_session *sdp,
 
 bool is_media_in_active_media(MediaEndpoint *me, MediaEndpoint **active_media,
                               unsigned count) {
-  printf("is_media_in_active_media me=%x\n", me);
-  for (int i = 0; i < count; i++) {
+  printf("is_media_in_active_media me=%p\n", (void*)me);
+  for (unsigned i = 0; i < count; i++) {
     MediaEndpoint *current = active_media[i];
-    printf("i=%d current=%x\n", i, current);
+    printf("i=%d current=%p\n", i, (void*)current);
     if (current == me) {
       printf("yes\n");
       return true;
@@ -4153,10 +4186,10 @@ void gen_media_json(char *dest, int len, Call *call,
     if(!me->port) {
       switch (me->type) {
         case ENDPOINT_TYPE_AUDIO:
-          p += sprintf(p, "{\"type\": \"audio\", \"protocol\": \"%.*s\", \"port\": 0}", me->transport.slen, me->transport.ptr);
+          p += sprintf(p, "{\"type\": \"audio\", \"protocol\": \"%.*s\", \"port\": 0}", (int)me->transport.slen, me->transport.ptr);
           break;
         case ENDPOINT_TYPE_MRCP:
-          p += sprintf(p, "{\"type\": \"mrcp\", \"protocol\": \"%.*s\", \"port\": 0}", me->transport.slen, me->transport.ptr);
+          p += sprintf(p, "{\"type\": \"mrcp\", \"protocol\": \"%.*s\", \"port\": 0}", (int)me->transport.slen, me->transport.ptr);
           break;
         default:  
           p += sprintf(p, "{\"type\": \"unknown\", \"port\": 0}");
@@ -4166,8 +4199,6 @@ void gen_media_json(char *dest, int len, Call *call,
 
     switch (me->type) {
     case ENDPOINT_TYPE_AUDIO: {
-      AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-
       const char *local_mode =
           get_media_mode(local_media->attr, local_media->attr_count);
       const char *remote_mode =
@@ -4191,21 +4222,21 @@ void gen_media_json(char *dest, int len, Call *call,
                    "{\"type\": \"audio\", \"protocol\": \"%.*s\", \"local\": {\"addr\": \"%.*s\", "
                    "\"port\": %d, \"mode\": \"%s\"}, \"remote\": {\"addr\": "
                    "\"%.*s\", \"port\": %d, \"mode\": \"%s\"}, \"fmt\": [",
-                   me->transport.slen, me->transport.ptr,
-                   local_addr->slen, local_addr->ptr, local_media->desc.port,
-                   local_mode, remote_addr->slen, remote_addr->ptr,
+                   (int)me->transport.slen, me->transport.ptr,
+                   (int)local_addr->slen, local_addr->ptr, local_media->desc.port,
+                   local_mode, (int)remote_addr->slen, remote_addr->ptr,
                    remote_media->desc.port, remote_mode);
 
-      for (int i = 0; i < local_media->desc.fmt_count; i++) {
+      for (unsigned i = 0; i < local_media->desc.fmt_count; i++) {
         if (i > 0)
           p += sprintf(p, ",");
         pj_str_t *fmt = &local_media->desc.fmt[i];
         pjmedia_sdp_attr *attr = pjmedia_sdp_attr_find2(
             local_media->attr_count, local_media->attr, "rtpmap", fmt);
         if (attr) {
-          p += sprintf(p, "\"%.*s\"", attr->value.slen, attr->value.ptr);
+          p += sprintf(p, "\"%.*s\"", (int)attr->value.slen, attr->value.ptr);
         } else {
-          p += sprintf(p, "\"%.*s\"", fmt->slen, fmt->ptr);
+          p += sprintf(p, "\"%.*s\"", (int)fmt->slen, fmt->ptr);
         }
       }
       p += sprintf(p, "]}");
@@ -4215,7 +4246,7 @@ void gen_media_json(char *dest, int len, Call *call,
       p += sprintf(p,
                    "{\"type\": \"mrcp\", \"protocol\": \"%.*s\", \"local\": {\"port\": %d}, "
                    "\"remote\": {\"port\": %d}}",
-                   me->transport.slen, me->transport.ptr,
+                   (int)me->transport.slen, me->transport.ptr,
                    local_sdp->media[idx]->desc.port,
                    remote_sdp->media[idx]->desc.port);
       break;
@@ -4253,14 +4284,12 @@ bool start_tcp_media(Call *call, MediaEndpoint *me,
   } else {
     remote_addr = &remote_sdp->conn->addr;
   }
-  printf("start_tcp_media remote port: %d, remote addr: %.*s\n", remote_media->desc.port, remote_addr->slen, remote_addr->ptr);
+  printf("start_tcp_media remote port: %d, remote addr: %.*s\n", remote_media->desc.port, (int)remote_addr->slen, remote_addr->ptr);
 
   pj_sock_t *sock = (pj_sock_t *)pj_pool_alloc(pool, sizeof(pj_sock_t));
 
   pj_activesock_t *asock = NULL;
 
-  unsigned allocated_port = 0;
-
   AsockUserData *ud = NULL;
 
   status = pj_sock_socket(pj_AF_INET(), pj_SOCK_STREAM(), 0, sock);
@@ -4325,16 +4354,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 +4484,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 +4492,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;
@@ -4459,7 +4592,7 @@ MediaEndpoint *find_media_endpt_by_sdp_media(Call *call,
         }
       }
     } else {
-      printf("local_media->desc.media=%.*s\n", local_media->desc.media.slen,
+      printf("local_media->desc.media=%.*s\n", (int)local_media->desc.media.slen,
              local_media->desc.media.ptr);
       assert(0);
       // missing media type support implementation
@@ -4484,9 +4617,8 @@ static void on_media_update(pjsip_inv_session *inv, pj_status_t status) {
                      "be notified.\n");
     return;
   }
-  printf("call_id=%d\n", call_id);
+  printf("call_id=%li\n", call_id);
 
-  pjmedia_stream_info stream_info;
   const pjmedia_sdp_session *local_sdp;
   const pjmedia_sdp_session *remote_sdp;
 
@@ -4499,13 +4631,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(
@@ -4534,14 +4659,11 @@ 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++) {
+  for (unsigned 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 +4679,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 +4686,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");
 
@@ -4677,7 +4716,7 @@ static void on_state_changed(pjsip_inv_session *inv, pjsip_event *e) {
   printf("inv->state=%d\n", inv->state);
 
   if (PJSIP_INV_STATE_DISCONNECTED == inv->state) {
-    addon_log(L_DBG, "call will terminate call=%x\n", call);
+    addon_log(L_DBG, "call will terminate call=%p\n", (void*)call);
     pj_status_t status;
 
     long call_id;
@@ -4687,33 +4726,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 +4743,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;
@@ -4769,7 +4790,7 @@ static pjmedia_transport *create_media_transport(const pj_str_t *addr,
       pjmedia_transport_info tpinfo;
       pjmedia_transport_info_init(&tpinfo);
       status = pjmedia_transport_get_info(med_transport, &tpinfo);
-      //printf("create_media_transport port=%i created %x\n", port,  med_transport);
+      //printf("create_media_transport port=%i created %p\n", port,  (void*)med_transport);
       *allocated_port = port;
       return med_transport;
     } else {
@@ -5115,6 +5136,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;
@@ -5156,7 +5184,7 @@ static pj_bool_t on_rx_request(pjsip_rx_data *rdata) {
     Transport *transport = (Transport *)val;
     call->transport = transport;
   } else {
-    printf("could not resolve transport id=%d\n", transport_id);
+    printf("could not resolve transport id=%li\n", transport_id);
     exit(1);
   }
 
@@ -5207,7 +5235,7 @@ static pj_bool_t on_rx_response(pjsip_rx_data *rdata) {
   long call_id;
 
   if (call) {
-    // addon_log(L_DBG, "call:%x\n",call);
+    // addon_log(L_DBG, "call:%p\n", (void*)call);
     if (!g_call_ids.get_id((long)call, call_id)) {
       // addon_log(L_DBG, "The call is not present in g_call_ids.\n");
       //  It means the call terminated and was removed from g_call_ids\n");
@@ -5252,16 +5280,12 @@ static void on_rx_offer2(pjsip_inv_session *inv,
   if (g_shutting_down)
     return;
 
-  char evt[2048];
-
   Call *call = (Call *)inv->dlg->mod_data[mod_tester.id];
 
   printf("on_rx_offer2 call_id=%d\n", call->id);
 
   pj_status_t status;
 
-  const pjsip_rx_data *rdata = param->rdata;
-
   pjmedia_sdp_neg_state state = pjmedia_sdp_neg_get_state(inv->neg);
   printf("neg state: %d\n", state);
   if (PJMEDIA_SDP_NEG_STATE_NULL == state ||
@@ -5783,7 +5807,7 @@ static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat,
 }
 
 void close_media_transport(pjmedia_transport *med_transport) {
-  printf("close_media_transport %x\n", med_transport);
+  printf("close_media_transport %p\n", (void*)med_transport);
   pjmedia_transport_info tpinfo;
   pjmedia_transport_info_init(&tpinfo);
   pj_status_t status = pjmedia_transport_get_info(med_transport, &tpinfo);
@@ -5818,7 +5842,7 @@ bool has_attribute_mode(MediaEndpoint *me) {
 }
 
 void remove_mode_attributes(pjmedia_sdp_media *m) {
-  for (int i = 0; i < m->attr_count; i++) {
+  for (unsigned i = 0; i < m->attr_count; i++) {
     pjmedia_sdp_attr *attr = m->attr[i];
     if ((pj_strcmp2(&attr->name, "sendrecv") == 0) ||
         (pj_strcmp2(&attr->name, "sendonly") == 0) ||
@@ -5922,7 +5946,7 @@ bool create_media_endpoint(Call *call, Document &document, Value &descr,
       }
       audio_endpt->med_transport = srtp;
 
-      status = pjmedia_transport_media_create(audio_endpt->med_transport, dlg->pool, NULL, NULL, 0);
+      status = pjmedia_transport_media_create(audio_endpt->med_transport, dlg->pool, 0, NULL, 0);
       if(status != PJ_SUCCESS) {
         set_error("pjmedia_transport_media_create failed"); 
         return false;
@@ -6227,9 +6251,9 @@ bool process_media(Call *call, pjsip_dialog *dlg, Document &document, bool answe
         // 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))
+        if(!create_media_endpoint(call, document, descr, dlg, (char*)"0.0.0.0", &new_me))
           return false;
-        addon_log(L_DBG, "i=%d media port=0 created %x\n", i, me);
+        addon_log(L_DBG, "i=%d media port=0 created %p\n", i, (void*)me);
 
         pjmedia_sdp_media *media = create_sdp_media(new_me, dlg);
         if (!media)
@@ -6240,7 +6264,7 @@ bool process_media(Call *call, pjsip_dialog *dlg, Document &document, bool answe
         // 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);
+        addon_log(L_DBG, "i=%d media created %p\n", i, (void*)me);
         call->media[idx] = me;
 
         if (!update_media_fields(me, dlg->pool, descr)) {
@@ -6267,7 +6291,7 @@ bool process_media(Call *call, pjsip_dialog *dlg, Document &document, bool answe
       addon_log(L_DBG, "i=%d media not found\n", i);
       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);
+      addon_log(L_DBG, "i=%d media created %p\n", i, (void*)me);
       call->media[call->media_count++] = me;
       in_use_chart[call->media_count - 1] =
           true; // added elements must be set as in use
@@ -6315,12 +6339,20 @@ bool is_media_active(Call *c, MediaEndpoint *me) {
   return false;
 }
 
-void close_media_endpoint(MediaEndpoint *me) {
-  printf("close_media_endpoint %x\n", me);
+void close_media_endpoint(Call *call, MediaEndpoint *me) {
+  printf("close_media_endpoint %p\n", (void*)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) {
@@ -6345,157 +6377,141 @@ void close_media_endpoint(MediaEndpoint *me) {
 }
 
 void close_media(Call *c) {
-  printf("close_media call_id=%x\n", c->id);
+  printf("close_media call_id=%li\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->tonegen_cbp.port) {
+    printf("already prepared\n");
+    return true;
   }
 
-  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) {
-    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
+                  );
+
+  if (status != PJ_SUCCESS) {
+    set_error("pjmedia_wav_player_port_create failed");
+    return false;
+  }
 
-  pjmedia_port *stream_port;
-  status = pjmedia_stream_get_port(ae->med_stream, &stream_port);
+  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;
   }
 
-  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_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 +6519,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;
 }
@@ -6941,7 +6945,7 @@ void process_in_dialog_refer(pjsip_dialog *dlg, pjsip_rx_data *rdata) {
   }
 }
 
-static void on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx,
+/* static void on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx,
                                  pjsip_event *e) {
   addon_log(L_DBG, "on_tsx_state change method=%.*s.\n", tsx->method.name.slen,
             tsx->method.name.ptr);
@@ -6962,11 +6966,11 @@ static void on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx,
   printf("call_id=%d\n", call->id);
 
   if (call->inv == NULL) {
-    /* Shouldn't happen. It happens only when we don't terminate the
-     * server subscription caused by REFER after the call has been
-     * transfered (and this call has been disconnected), and we
-     * receive another REFER for this call.
-     */
+    // Shouldn't happen. It happens only when we don't terminate the
+    // server subscription caused by REFER after the call has been
+    // transfered (and this call has been disconnected), and we
+    // receive another REFER for this call.
+    //
     return;
   }
 
@@ -6974,9 +6978,9 @@ static void on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx,
   // Transport *t;
   if (tsx->role == PJSIP_ROLE_UAS && tsx->state == PJSIP_TSX_STATE_TRYING) {
     if (pjsip_method_cmp(&tsx->method, pjsip_get_refer_method()) == 0) {
-      /*
-       * Incoming REFER request.
-       */
+      // 
+      // Incoming REFER request.
+      //
 
       process_in_dialog_refer(call->inv->dlg, e->body.tsx_state.src.rdata);
     } else {
@@ -7005,7 +7009,7 @@ static void on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx,
   } else {
     addon_log(L_DBG, "doing nothiing");
   }
-}
+} */
 
 int pjw_call_get_info(long call_id, const char *required_info, char *out_info) {
   PJW_LOCK();
@@ -7626,7 +7630,7 @@ int pjw_subscription_create(long transport_id, const char *json,
 
   pjsip_evsub_set_mod_data(evsub, mod_tester.id, subscription);
 
-  printf("subscription=%x\n", subscription);
+  printf("subscription=%p\n", (void*)subscription);
 
   *out_subscription_id = subscription_id;
 out:
@@ -7742,8 +7746,6 @@ out:
 }
 
 void process_in_dialog_subscribe(pjsip_dialog *dlg, pjsip_rx_data *rdata) {
-  char evt[2048];
-
   return;
 }
 
@@ -7811,7 +7813,7 @@ pj_status_t tcp_endpoint_send_msg(Call *call, MediaEndpoint *me, char *msg, pj_s
     send_key = (pj_ioqueue_op_key_t*)pj_pool_alloc(call->inv->pool, sizeof(pj_ioqueue_op_key_t));
     char *data = (char*)pj_pool_alloc(call->inv->pool, size);
     memcpy(data, msg, size);
-    printf("tcp_endpoint_send_msg send_key %x\n", send_key);
+    printf("tcp_endpoint_send_msg send_key %p\n", (void*)send_key);
     //status = pj_activesock_send(asock, send_key, data, &size, 0);
     status = pj_activesock_send(asock, send_key, data, &size, PJ_IOQUEUE_ALWAYS_ASYNC);
     if (status != PJ_SUCCESS) {
@@ -7832,7 +7834,6 @@ pj_status_t call_send_tcp_msg(Call *call, char *msg, pj_ssize_t size) {
   pj_status_t status;
   for (int i = 0; i < call->media_count; i++) {
     MediaEndpoint *me = (MediaEndpoint *)call->media[i];
-    pj_activesock_t *asock = NULL;
     if (ENDPOINT_TYPE_MRCP == me->type) {
       status = tcp_endpoint_send_msg(call, me, msg, size);
       if(status != PJ_SUCCESS) {
@@ -7855,15 +7856,12 @@ int pjw_call_send_tcp_msg(long call_id, const char *json) {
   long val;
 
   MediaEndpoint *me;
-  MrcpEndpoint *mrcp_endpt;
   int res;
 
   unsigned media_id = 0;
 
   char buffer[MAX_JSON_INPUT];
 
-  const char *valid_params[] = {"msg", "media_id", ""};
-
   char *msg;
   pj_ssize_t size;
 
@@ -7898,7 +7896,7 @@ int pjw_call_send_tcp_msg(long call_id, const char *json) {
   } else {
     // Send msg to specified media_id
 
-    if (media_id >= call->media_count) {
+    if ((int)media_id >= call->media_count) {
       set_error("invalid media_id");
       goto out;
     }