sip-lab 1.27.0 → 1.27.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.27.0",
+  "version": "1.27.1",
   "description": "",
   "main": "index.js",
   "engines": {

package/samples/pcma.js

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

package/src/sip.cpp

@@ -1510,8 +1510,8 @@ pjsip_transport *create_udp_transport(pjsip_endpoint *sip_endpt,
   // pj_status_t status;
   pjsip_transport *transport;
 
-  int port = 5060;
   for (int i = 0; i < 1000; ++i) {
+    int port = 5060;
     port += i;
     transport = allocate_udp_transport(sip_endpt, ipaddr, port);
     if (transport) {
@@ -1558,8 +1558,8 @@ pjsip_tpfactory *create_tcp_tpfactory(pjsip_endpoint *sip_endpt,
   // pj_status_t status;
   pjsip_tpfactory *tpfactory;
 
-  int port = 6060;
   for (int i = 0; i < 1000; ++i) {
+    int port = 6060;
     port += i;
     tpfactory = allocate_tcp_tpfactory(sip_endpt, ipaddr, port);
     if (tpfactory) {
@@ -1609,8 +1609,8 @@ pjsip_tpfactory *create_tls_tpfactory(pjsip_endpoint *sip_endpt,
   // pj_status_t status;
   pjsip_tpfactory *tpfactory;
 
-  int port = 6060;
   for (int i = 0; i < 1000; ++i) {
+    int port = 6060;
     port += i;
     tpfactory = allocate_tls_tpfactory(sip_endpt, ipaddr, port);
     if (tpfactory) {
@@ -4682,12 +4682,6 @@ bool start_tcp_media(Call *call, MediaEndpoint *me,
 void close_audio_endpoint_ports_and_conf(Call *call, AudioEndpoint *ae) {
     pj_status_t status;
 
-    audio_endpoint_remove_port(call, ae, &ae->stream_cbp);
-
-    for(int i=0 ; i<MAX_FP ; i++) {
-        audio_endpoint_remove_port(call, ae, &ae->feature_cbps[i]);
-    }
-
     if (ae->master_port) {
         status = pjmedia_master_port_stop(ae->master_port);
         if(status != PJ_SUCCESS) {
@@ -4700,6 +4694,12 @@ void close_audio_endpoint_ports_and_conf(Call *call, AudioEndpoint *ae) {
         ae->master_port = NULL;
     }
 
+    audio_endpoint_remove_port(call, ae, &ae->stream_cbp);
+
+    for(int i=0 ; i<MAX_FP ; i++) {
+        audio_endpoint_remove_port(call, ae, &ae->feature_cbps[i]);
+    }
+
     if (ae->conf) {
         status = pjmedia_conf_destroy(ae->conf);
         if(status != PJ_SUCCESS) {
@@ -4751,6 +4751,19 @@ bool restart_media_stream(Call *call, MediaEndpoint *me,
   pjmedia_port *old_port = ae->stream_cbp.port;
   pjmedia_port *new_port;
 
+  bool master_port_was_stopped = false;
+
+  if(ae->master_port) {
+    status = pjmedia_master_port_stop(ae->master_port);
+    if(status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                           "setup_failed (pjmedia_master_port_stop failed)", "");
+      dispatch_event(evt);
+      return false;
+    }
+    master_port_was_stopped = true;
+  }
+
   status =
       pjmedia_stream_info_from_sdp(&stream_info, call->inv->dlg->pool,
                                    g_med_endpt, local_sdp, remote_sdp, idx);
@@ -4906,7 +4919,17 @@ bool restart_media_stream(Call *call, MediaEndpoint *me,
         }
     }
   }
-  
+
+  if(master_port_was_stopped) {
+    status = pjmedia_master_port_start(ae->master_port);
+    if(status != PJ_SUCCESS) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                             "setup_failed (pjmedia_master_port_start failed)", "");
+      dispatch_event(evt);
+      return false;
+    }
+  }
+     
   return true;
 }