sip-lab 1.18.0 → 1.20.0

package/binding.gyp

@@ -15,7 +15,7 @@
             "src/pjmedia/include",
             "src/pjmedia/include/pjmedia",
             "3rdParty/rapidjson/include",
-            "3rdParty/boost_1_51_0",
+            "3rdParty/boost_1_66_0",
             "3rdParty/spandsp/src",
             "<!@(node -p \"require('node-addon-api').include\")",
           ],

package/build_deps.sh

@@ -74,10 +74,10 @@ fi
 
 
 cd $START_DIR/3rdParty
-if [[ ! -d boost_1_51_0 ]]
+if [[ ! -d boost_1_66_0 ]]
 then
-    wget http://sourceforge.net/projects/boost/files/boost/1.51.0/boost_1_51_0.tar.bz2
-    tar xf boost_1_51_0.tar.bz2
+    wget https://downloads.sourceforge.net/project/boost/boost/1.66.0/boost_1_66_0.tar.bz2
+    tar xf boost_1_66_0.tar.bz2
 fi
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.18.0",
+  "version": "1.20.0",
   "description": "",
   "main": "index.js",
   "engines": {
@@ -21,7 +21,7 @@
   "gypfile": true,
   "homepage": "https://github.com/MayamaTakeshi/sip-lab",
   "dependencies": {
-    "@mayama/zeq": "^4.15.0",
+    "@mayama/zeq": "^4.16.0",
     "mrcp": "^1.4.0",
     "mrcp-matching": "^1.0.0",
     "node-addon-api": "^5.0.0",

package/samples/100_calls.js

@@ -1,4 +1,4 @@
-// This test creates 256 caller UDP SIP endpoints, 256 callee UDP SIP endpoines and makes one call between them, test dtmf and disconeects.
+// This test creates 100 caller UDP SIP endpoints, 100 callee UDP SIP endpoines and makes one call between them, test dtmf and disconnects.
 
 const sip = require ('../index.js')
 const Zeq = require('@mayama/zeq')

package/samples/multiple_audio_streams.js

@@ -0,0 +1,183 @@
+const sip = require ('../index.js')
+const Zeq = require('@mayama/zeq')
+const m = require('data-matching')
+const sip_msg = require('sip-matching')
+const _ = require('lodash')
+
+// here we create our Zeq instance
+var z = new Zeq()
+
+// here we are restricting codec to PCMU to avoid having the SDP to become too large
+sip.set_codecs('pcmu/8000/1:128')
+
+// here we asking for accumulated DTMF to be reported in case of no more digits after 500 ms
+sip.dtmf_aggregation_on(500)
+
+async function test() {
+    // here we set our Zeq instance to trap events generated by sip-lab event_source
+    z.trap_events(sip.event_source, 'event', (evt) => {
+        var e = evt.args[0]
+        return e
+    })
+
+    // here we start sip-lab
+    console.log(sip.start((data) => { console.log(data)} ))
+
+    // Here we create the SIP endpoints (transports).
+    // Since we don't specify the port, an available port will be allocated.
+    // Since we don't specify the type ('udp' or 'tcp' or 'tls'), 'udp' will be used by default.
+    const t1 = sip.transport.create({address: "127.0.0.1", type: 'tcp'})
+    const t2 = sip.transport.create({address: "127.0.0.1", type: 'tcp'})
+
+    // here we just print the transports
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    const NUM_AUDIO_STREAMS = 8
+    const media = new Array(NUM_AUDIO_STREAMS).fill('audio').join(',')
+
+    const oc = sip.call.create(t1.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${t2.address}:${t2.port}`, media: media})
+
+    // Here we will wait for the call to arrive at t2
+    // We will also get a '100 Trying' that is sent by sip-lab automatically
+    // We will wait for at most 1000ms. If all events don't arrive within 1000ms, an exception will be thrown and the test will fail due to timeout.
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+            transport_id: t2.id,
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+                $rr: 'Trying',
+                '$(hdrcnt(via))': 1,
+                '$hdr(call-id)': m.collect('sip_call_id'),
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+                '$hdr(l)': '0',
+            }),
+        },
+    ], 1000)
+    // Details about zeq wait(list_of_events_to_wait_for, timeout_in_ms):
+    // The order of events in the list is irrelevant.
+    // What matters is that all events arrive within the specified timeout.
+    // When specifying events, you can be as detailed or succinct as you need.
+    // For example, the above event 'response' is waiting for a SIP '100 Trying' to arrive,
+    // but we are specifying things to match just to show that we can be very detailed when performing a match.
+    // But it could have been just like this:
+    //
+    //  {
+    //      event: 'response',
+    //      call_id: oc.id,
+    //      method: 'INVITE',
+    //      msg: sip_msg({
+    //          $rs: '100',
+    //      }),
+    //  }
+    // Regarding the function sip_msg() this is a special matching function provided by https://github.com/MayamaTakeshi/sip-matching that makes it 
+    // easy to match a SIP message using openser/kamailio/opensips pseudo-variables syntax.
+ 
+
+    // Here we store data for the incoming call
+    // just to organize our code (not really needed)
+    const ic = {
+        id: z.store.call_id,
+        sip_call_id: z.store.sip_call_id,
+    }
+
+    // Now we answer the call at t2 side and accept all 2 streams
+    sip.call.respond(ic.id, {code: 200, reason: 'OK', media: media})
+
+    // Then we wait for the '200 OK' at the t1 side
+    // We will also get event 'media_update' for both sides indicating media streams (RTP) were set up successfully
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                '$(hdrcnt(VIA))': 1,
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+                '$hdr(content-type)': 'application/sdp',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 1000)
+
+    sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
+
+    await z.wait(_.chain(_.range(NUM_AUDIO_STREAMS)).map(n => ({
+        event: 'dtmf',
+        call_id: ic.id,
+        digits: '1234',
+        mode: 0,
+        media_id: n,
+    })).value(), 3000)
+
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 1})
+
+    await z.wait(_.chain(_.range(NUM_AUDIO_STREAMS)).map(n => ({
+        event: 'dtmf',
+        call_id: oc.id,
+        digits: '4321',
+        mode: 1,
+        media_id: n,
+    })).value(), 3000)
+
+    // now we terminate the call from t1 side
+    sip.call.terminate(oc.id)
+
+    // and wait for termination events
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'BYE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        },
+        {
+            event: 'call_ended',
+            call_id: ic.id,
+        },
+    ], 1000)
+
+    await z.sleep(100) // wait for any unexpected events
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/src/event_templates.cpp

@@ -49,7 +49,7 @@ int make_evt_dtmf(char *dest, int size, long call_id, int digits_len,
 
 int make_evt_call_ended(char *dest, int size, long call_id, int sip_msg_len,
                         const char *sip_msg) {
-  printf("make_evt_call_ended sip_msg_len=%i sip_msg=%x\n", sip_msg_len,
+  printf("make_evt_call_ended sip_msg_len=%i sip_msg=%s\n", sip_msg_len,
          sip_msg);
   if (!sip_msg || sip_msg == (char *)0xc000000000000) {
     // received invalid pointer to sip_msg so do not add the message to the
@@ -72,8 +72,8 @@ int make_evt_non_dialog_request(char *dest, int size, long transport_id,
                                 long request_id, int sip_msg_len,
                                 const char *sip_msg) {
   return snprintf(dest, size,
-                  "{\"event\": \"non_dialog_request\", \"request_id\": %i, "
-                  "\"transport_id\": %i}\n%.*s",
+                  "{\"event\": \"non_dialog_request\", \"request_id\": %li, "
+                  "\"transport_id\": %li}\n%.*s",
                   request_id, transport_id, sip_msg_len, sip_msg);
 }
 
@@ -85,7 +85,7 @@ int make_evt_internal_error(char *dest, int size, const char *msg) {
 int make_evt_reinvite(char *dest, int size, long call_id, int sip_msg_len,
                       char *sip_msg) {
   return snprintf(dest, size,
-                  "{\"event\": \"reinvite\", \"call_id\": %i}\n%.*s", call_id,
+                  "{\"event\": \"reinvite\", \"call_id\": %li}\n%.*s", call_id,
                   sip_msg_len, sip_msg);
 }
 

package/src/pjmedia/src/pjmedia/fax_port.c

@@ -205,7 +205,7 @@ static pj_status_t fax_get_frame(pjmedia_port *this_port,
 	//printf("ENTER fax_get_frame frame_size=%i\n", frame->size);
 
 	PJ_ASSERT_RETURN(this_port && frame, PJ_EINVAL);
-	char *p = (char*)frame->buf;
+	//char *p = (char*)frame->buf; // TODO: remove
 
 	struct fax_device *fd = (struct fax_device*)this_port;
     pj_lock_acquire(fd->lock);

package/src/sip.cpp

@@ -223,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)
@@ -531,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);
@@ -935,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);
@@ -971,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;
     }
@@ -1101,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;
 
@@ -1195,8 +1189,6 @@ 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");
@@ -2092,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];
@@ -2979,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");
@@ -2987,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;
@@ -2996,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:
@@ -3013,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");
@@ -3110,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];
@@ -3203,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;
 
@@ -3431,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;
@@ -3483,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;
   }
@@ -3550,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;
@@ -3603,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;
   }
@@ -3695,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)) {
@@ -3730,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;
     }
@@ -3768,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)) {
@@ -3808,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;
     }
@@ -3847,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;
@@ -3903,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;
   }
@@ -3973,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)) {
@@ -4013,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;
     }
@@ -4050,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;
@@ -4082,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;
   }
@@ -4142,11 +4110,11 @@ out:
 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) &&
@@ -4162,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) &&
@@ -4181,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;
@@ -4218,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}");
@@ -4231,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 =
@@ -4256,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, "]}");
@@ -4280,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;
@@ -4318,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);
@@ -4628,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
@@ -4653,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;
 
@@ -4696,11 +4659,8 @@ 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(call, me);
@@ -4756,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;
@@ -4830,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 {
@@ -5224,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);
   }
 
@@ -5275,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");
@@ -5320,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 ||
@@ -5851,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);
@@ -5886,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) ||
@@ -5990,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;
@@ -6295,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)
@@ -6308,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)) {
@@ -6335,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
@@ -6384,7 +6340,7 @@ bool is_media_active(Call *c, MediaEndpoint *me) {
 }
 
 void close_media_endpoint(Call *call, MediaEndpoint *me) {
-  printf("close_media_endpoint %x\n", me);
+  printf("close_media_endpoint %p\n", (void*)me);
   if(!me) return;
 
   if (ENDPOINT_TYPE_AUDIO == me->type) {
@@ -6421,7 +6377,7 @@ void close_media_endpoint(Call *call, 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(c, me);
@@ -6989,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);
@@ -7010,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;
   }
 
@@ -7022,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 {
@@ -7053,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();
@@ -7674,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:
@@ -7790,8 +7746,6 @@ out:
 }
 
 void process_in_dialog_subscribe(pjsip_dialog *dlg, pjsip_rx_data *rdata) {
-  char evt[2048];
-
   return;
 }
 
@@ -7859,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) {
@@ -7880,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) {
@@ -7903,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;
 
@@ -7946,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;
     }