sip-lab 1.7.3 → 1.10.0

package/devjournal

@@ -431,5 +431,12 @@ The problem is that on_rx_reinvite is getting an offer without media (due RE-INV
 Instead, I think we should go back to use original on_rx_offer because it seems this is called only when we get media offer and so we would avoid this problem.
 
 
+------------------------------------------------------------
+2022/08/12 takeshi:
+
+When rebuilding the addon, this should be enough (it should be fast):
+```
+  npm install --unsafe-perm
+```
 
 

package/package.json

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

package/samples/g729.js

@@ -182,8 +182,6 @@ async function test() {
         },
     ], 1000)
 
-    await z.sleep(1000)
-
     console.log("Success")
 
     sip.stop()

package/samples/late_negotiation.js

@@ -208,8 +208,6 @@ async function test() {
         },
     ], 500)
 
-    await z.sleep(100)
-
     sip.call.reinvite(oc.id, false, flags)
 
     await z.wait([
@@ -275,8 +273,6 @@ async function test() {
         },
     ], 1000)
 
-    await z.sleep(1000)
-
     console.log("Success")
 
     sip.stop()

package/samples/reinvite_and_dtmf.js

@@ -0,0 +1,291 @@
+var sip = require ('../index.js')
+var Zester = require('zester')
+var z = new Zester()
+var m = require('data-matching')
+var sip_msg = require('sip-matching')
+
+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("127.0.0.1", 5090, 1)
+    t2 = sip.transport.create("127.0.0.1", 5092, 1)
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    flags = 0
+
+    oc = sip.call.create(t1.id, flags, 'sip:a@t', 'sip:b@127.0.0.1:5092')
+
+    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: 'a',
+                $fd: 't',
+                $tU: 'b',
+                '$hdr(l)': '0',
+            }),
+        },
+    ], 1000)
+
+    ic = {
+        id: z.store.call_id,
+        sip_call_id: z.store.sip_call_id,
+    }
+
+    sip.call.respond(ic.id, 200, 'OK')
+
+    await z.wait([
+        {
+            event: 'media_status',
+            call_id: oc.id,
+            status: 'setup_ok',
+            local_mode: 'sendrecv',
+            remote_mode: 'sendrecv',
+        },
+        {
+            event: 'media_status',
+            call_id: ic.id,
+            status: 'setup_ok',
+            local_mode: 'sendrecv',
+            remote_mode: 'sendrecv',
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                '$(hdrcnt(VIA))': 1,
+                $fU: 'a',
+                $fd: 't',
+                $tU: 'b',
+                '$hdr(content-type)': 'application/sdp',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+    ], 1000)
+
+    sip.call.send_dtmf(oc.id, '1234', 0)
+    sip.call.send_dtmf(ic.id, '4321', 1)
+
+    await z.wait([
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+        },
+        {
+            event: 'dtmf',
+            call_id: oc.id,
+            digits: '4321',
+            mode: 1,
+        },
+    ], 2000)
+
+
+    sip.call.reinvite(oc.id, true, 0)
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                $rb: '!{_}a=recvonly',
+            }),
+        },
+        {
+            event: 'media_status',
+            call_id: oc.id,
+            status: 'setup_ok',
+            local_mode: 'sendonly',
+            remote_mode: 'recvonly',
+        },
+        {
+            event: 'media_status',
+            call_id: ic.id,
+            status: 'setup_ok',
+            local_mode: 'recvonly',
+            remote_mode: 'sendonly',
+        },
+    ], 500)
+
+    sip.call.send_dtmf(oc.id, '1234', 0)
+    sip.call.send_dtmf(ic.id, '4321', 1) // this will not generate event 'dtmf' as the call is on hold
+
+    await z.wait([
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+        },
+    ], 2000)
+
+    sip.call.reinvite(ic.id, false, 0)
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: ic.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                $rb: '!{_}a=sendonly',
+            }),
+        },
+        {
+            event: 'media_status',
+            call_id: oc.id,
+            status: 'setup_ok',
+            local_mode: 'sendonly',
+            remote_mode: 'recvonly',
+        },
+        {
+            event: 'media_status',
+            call_id: ic.id,
+            status: 'setup_ok',
+            local_mode: 'recvonly',
+            remote_mode: 'sendonly',
+        },
+    ], 500)
+
+    sip.call.send_dtmf(oc.id, '1234', 0)
+    sip.call.send_dtmf(ic.id, '4321', 1) // this will not generate event 'dtmf' as the call is on hold
+
+    await z.wait([
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+        },
+    ], 2000)
+
+    sip.call.send_request(oc.id, 'INFO')
+
+    await z.wait([
+        {
+            event: 'request',
+            call_id: ic.id,
+            msg: sip_msg({
+                $rm: 'INFO',
+            }),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INFO',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+    ], 500)
+
+    sip.call.reinvite(oc.id, false, 0)
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+        {
+            event: 'media_status',
+            call_id: oc.id,
+            status: 'setup_ok',
+            local_mode: 'sendrecv',
+            remote_mode: 'sendrecv',
+        },
+        {
+            event: 'media_status',
+            call_id: ic.id,
+            status: 'setup_ok',
+            local_mode: 'sendrecv',
+            remote_mode: 'sendrecv',
+        },
+    ], 500)
+
+    sip.call.send_dtmf(oc.id, '1234', 0)
+    sip.call.send_dtmf(ic.id, '4321', 1)
+
+    await z.wait([
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+        },
+        {
+            event: 'dtmf',
+            call_id: oc.id,
+            digits: '4321',
+            mode: 1,
+        },
+    ], 2000)
+
+    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/samples/simple.js

@@ -86,175 +86,6 @@ async function test() {
         },
     ], 1000)
 
-    sip.call.send_dtmf(oc.id, '1234', 0)
-    sip.call.send_dtmf(ic.id, '4321', 1)
-
-    await z.wait([
-        {
-            event: 'dtmf',
-            call_id: ic.id,
-            digits: '1234',
-            mode: 0,
-        },
-        {
-            event: 'dtmf',
-            call_id: oc.id,
-            digits: '4321',
-            mode: 1,
-        },
-    ], 2000)
-
-
-    sip.call.reinvite(oc.id, true, 0)
-
-    await z.wait([
-        {
-            event: 'response',
-            call_id: oc.id,
-            method: 'INVITE',
-            msg: sip_msg({
-                $rs: '200',
-                $rr: 'OK',
-                $rb: '!{_}a=recvonly',
-            }),
-        },
-        {
-            event: 'media_status',
-            call_id: oc.id,
-            status: 'setup_ok',
-            local_mode: 'sendonly',
-            remote_mode: 'recvonly',
-        },
-        {
-            event: 'media_status',
-            call_id: ic.id,
-            status: 'setup_ok',
-            local_mode: 'recvonly',
-            remote_mode: 'sendonly',
-        },
-    ], 500)
-
-    sip.call.send_dtmf(oc.id, '1234', 0)
-    sip.call.send_dtmf(ic.id, '4321', 1) // this will not generate event 'dtmf' as the call is on hold
-
-    await z.wait([
-        {
-            event: 'dtmf',
-            call_id: ic.id,
-            digits: '1234',
-            mode: 0,
-        },
-    ], 2000)
-
-    sip.call.reinvite(ic.id, false, 0)
-
-    await z.wait([
-        {
-            event: 'response',
-            call_id: ic.id,
-            method: 'INVITE',
-            msg: sip_msg({
-                $rs: '200',
-                $rr: 'OK',
-                $rb: '!{_}a=sendonly',
-            }),
-        },
-        {
-            event: 'media_status',
-            call_id: oc.id,
-            status: 'setup_ok',
-            local_mode: 'sendonly',
-            remote_mode: 'recvonly',
-        },
-        {
-            event: 'media_status',
-            call_id: ic.id,
-            status: 'setup_ok',
-            local_mode: 'recvonly',
-            remote_mode: 'sendonly',
-        },
-    ], 500)
-
-    sip.call.send_dtmf(oc.id, '1234', 0)
-    sip.call.send_dtmf(ic.id, '4321', 1) // this will not generate event 'dtmf' as the call is on hold
-
-    await z.wait([
-        {
-            event: 'dtmf',
-            call_id: ic.id,
-            digits: '1234',
-            mode: 0,
-        },
-    ], 2000)
-
-    sip.call.send_request(oc.id, 'INFO')
-
-    await z.wait([
-        {
-            event: 'request',
-            call_id: ic.id,
-            msg: sip_msg({
-                $rm: 'INFO',
-            }),
-        },
-        {
-            event: 'response',
-            call_id: oc.id,
-            method: 'INFO',
-            msg: sip_msg({
-                $rs: '200',
-                $rr: 'OK',
-            }),
-        },
-    ], 500)
-
-    sip.call.reinvite(oc.id, false, 0)
-
-    await z.wait([
-        {
-            event: 'response',
-            call_id: oc.id,
-            method: 'INVITE',
-            msg: sip_msg({
-                $rs: '200',
-                $rr: 'OK',
-                $rb: '!{_}a=sendrecv',
-            }),
-        },
-        {
-            event: 'media_status',
-            call_id: oc.id,
-            status: 'setup_ok',
-            local_mode: 'sendrecv',
-            remote_mode: 'sendrecv',
-        },
-        {
-            event: 'media_status',
-            call_id: ic.id,
-            status: 'setup_ok',
-            local_mode: 'sendrecv',
-            remote_mode: 'sendrecv',
-        },
-    ], 500)
-
-    sip.call.send_dtmf(oc.id, '1234', 0)
-    sip.call.send_dtmf(ic.id, '4321', 1)
-
-    await z.wait([
-        {
-            event: 'dtmf',
-            call_id: ic.id,
-            digits: '1234',
-            mode: 0,
-        },
-        {
-            event: 'dtmf',
-            call_id: oc.id,
-            digits: '4321',
-            mode: 1,
-        },
-    ], 2000)
-
     sip.call.terminate(oc.id)
 
     await z.wait([
@@ -277,8 +108,6 @@ async function test() {
         },
     ], 1000)
 
-    await z.sleep(1000)
-
     console.log("Success")
 
     sip.stop()

package/samples/sip_cancel.js

@@ -108,8 +108,6 @@ async function test() {
         },
     ], 1000)
 
-    await z.sleep(1000)
-
     console.log("Success")
 
     sip.stop()

package/src/sip.cpp

@@ -196,6 +196,7 @@ Pair_Call_CallId_Buf g_LastCalls(1000);
 typedef map<pjsip_transport*, int> SipTransportMap;
 SipTransportMap g_SipTransportMap;
 int g_TlsTransportId = -100;
+int g_TcpTransportId = -100;
 
 typedef set< pair<string,string> > PackageSet;
 PackageSet g_PackageSet;
@@ -322,10 +323,13 @@ pjsip_transport *allocate_udp_transport(pjsip_endpoint* sip_endpt, pj_str_t *ipa
 pjsip_tpfactory *create_tls_tpfactory(pjsip_endpoint* sip_endpt, pj_str_t *ipaddr, int *allocated_port);
 pjsip_tpfactory *allocate_tls_tpfactory(pjsip_endpoint* sip_endpt, pj_str_t *ipaddr, int port); 
 
+pjsip_tpfactory *create_tcp_factory(pjsip_endpoint* sip_endpt, pj_str_t *ipaddr, int *allocated_port);
+pjsip_tpfactory *allocate_tcp_tpfactory(pjsip_endpoint* sip_endpt, pj_str_t *ipaddr, int port); 
+
 bool set_proxy(pjsip_dialog *dlg, const char *proxy_uri);
 
 void build_local_contact(char *dest, pjsip_transport *transport, const char *contact_username);
-void build_local_contact_from_tpfactory(char *dest, pjsip_tpfactory *tpfactory, const char *contact_username);
+void build_local_contact_from_tpfactory(char *dest, pjsip_tpfactory *tpfactory, const char *contact_username, pjsip_transport_type_e type);
 
 pj_bool_t add_additional_headers(pj_pool_t *pool, pjsip_tx_data *tdata, const char *additional_headers); 
 
@@ -812,6 +816,52 @@ pjsip_transport *create_udp_transport(pjsip_endpoint* sip_endpt, pj_str_t *ipadd
 	return NULL;
 }
 
+pjsip_tpfactory *allocate_tcp_tpfactory(pjsip_endpoint* sip_endpt, pj_str_t *ipaddr, int port) {
+	printf("allocate_tcp_tpfactory ipaddr=%.*s port=%i\n", ipaddr->slen, ipaddr->ptr, port);
+	pj_status_t status;
+	pjsip_tpfactory *tpfactory;
+	pj_sockaddr local_addr;
+	pjsip_host_port a_name;
+
+	int af;
+        af = pj_AF_INET();
+        pj_sockaddr_init(af, &local_addr, NULL, 0);
+
+        pj_sockaddr_set_port(&local_addr, (pj_uint16_t)port);
+
+        status = pj_sockaddr_set_str_addr(af, &local_addr, ipaddr);
+        if (status != PJ_SUCCESS) {
+		return NULL;
+	}
+
+    status = pjsip_tcp_transport_start2(sip_endpt, &local_addr.ipv4, NULL, 1, &tpfactory);
+    if (status != PJ_SUCCESS) {
+        printf("status=%i\n", status);
+        return NULL;
+    }
+
+	return tpfactory;
+}
+
+pjsip_tpfactory *create_tcp_tpfactory(pjsip_endpoint* sip_endpt, pj_str_t *ipaddr, int *allocated_port)
+{
+	pj_status_t status;
+	pjsip_tpfactory *tpfactory;
+
+	int port = 6060;
+	for(int i=0 ; i<1000 ; ++i)
+	{
+		port += i;		
+		tpfactory = allocate_tcp_tpfactory(sip_endpt, ipaddr, port);
+		if (tpfactory) {
+			*allocated_port = port;
+			return tpfactory;
+		}
+	}
+
+	return NULL;
+}
+
 pjsip_tpfactory *allocate_tls_tpfactory(pjsip_endpoint* sip_endpt, pj_str_t *ipaddr, int port) {
 	addon_log(LOG_LEVEL_DEBUG, "allocate_tls_tpfactory ipaddr=%.*s port=%i\n", ipaddr->slen, ipaddr->ptr, port);
 	pj_status_t status;
@@ -904,7 +954,37 @@ int pjw_transport_create(const char *sip_ipaddr, int port, pjsip_transport_type_
 		if(type == PJSIP_TRANSPORT_UDP) {
 			g_SipTransportMap.insert(make_pair(sip_transport, t_id));
 		}
+    } else if(type == PJSIP_TRANSPORT_TCP) {
+		pjsip_tpfactory *tpfactory;
+		int af;
+
+
+		if(port != 0) {
+			tpfactory = allocate_tcp_tpfactory(g_sip_endpt, &ipaddr, port);
+		} else {
+			tpfactory = create_tcp_tpfactory(g_sip_endpt, &ipaddr, &port);
+		}
+
+		if(!tpfactory)
+		{
+			PJW_UNLOCK();
+			set_error("Unable to start TCP transport");
+            return -1;
+		}
 
+		t = new Transport;
+		t->type = PJSIP_TRANSPORT_TCP;
+		t->tpfactory = tpfactory;
+
+		if(!g_transport_ids.add((long)t, t_id)){
+			status = (tpfactory->destroy)(tpfactory);
+
+			PJW_UNLOCK();
+			set_error("Failed to allocate id");
+            return -1;
+		}
+
+		g_TcpTransportId = t_id; 
 	} else {
 		pjsip_tpfactory *tpfactory;
 		int af;
@@ -1392,7 +1472,7 @@ int pjw_call_create(long t_id, unsigned flags, const char *from_uri, const char
 	if(t->type == PJSIP_TRANSPORT_UDP) {
 		build_local_contact(local_contact, t->sip_transport, contact_username);
 	} else {
-		build_local_contact_from_tpfactory(local_contact, t->tpfactory, contact_username);
+		build_local_contact_from_tpfactory(local_contact, t->tpfactory, contact_username, t->type);
 	}
 
 	if(!dlg_create(&dlg, t, from_uri, to_uri, request_uri, realm, username, password, local_contact)) {
@@ -1469,12 +1549,14 @@ void build_local_contact(char *dest, pjsip_transport *t, const char *contact_use
 	}
 	if(t->key.type == PJSIP_TRANSPORT_UDP) {
 		p += sprintf(p,">");
+	} else if(t->key.type == PJSIP_TRANSPORT_TCP) {
+		p += sprintf(p,";transport=tcp>");
 	} else {
 		p += sprintf(p,";transport=tls>");
 	}
 }
 
-void build_local_contact_from_tpfactory(char *dest, pjsip_tpfactory *tpfactory, const char *contact_username) {
+void build_local_contact_from_tpfactory(char *dest, pjsip_tpfactory *tpfactory, const char *contact_username, pjsip_transport_type_e type) {
 	char *p = dest;
 	int len;
 	p += sprintf(p, "<sip:%s@", contact_username);
@@ -1484,7 +1566,11 @@ void build_local_contact_from_tpfactory(char *dest, pjsip_tpfactory *tpfactory,
 	if(tpfactory->addr_name.port) {
 		p += sprintf(p, ":%d",tpfactory->addr_name.port);
 	}
-	p += sprintf(p,";transport=tls>");
+    if(type == PJSIP_TRANSPORT_TCP) {
+	    p += sprintf(p,";transport=tcp>");
+    } else {
+	    p += sprintf(p,";transport=tls>");
+    }
 }
 
 
@@ -2839,7 +2925,9 @@ static pj_bool_t on_rx_request( pjsip_rx_data *rdata ){
 	if( iter != g_SipTransportMap.end() ){
 		transport_id = iter->second;
 	} else {
-		if(t->key.type == PJSIP_TRANSPORT_TLS) {
+		if(t->key.type == PJSIP_TRANSPORT_TCP) {
+			transport_id = g_TcpTransportId;
+		} else if(t->key.type == PJSIP_TRANSPORT_TLS) {
 			transport_id = g_TlsTransportId;
 		} else {
 			transport_id = -1;
@@ -3262,6 +3350,9 @@ int __pjw_shutdown()
 
 	g_shutting_down = true;
 
+    //disable auto cleanup
+
+    /*
 	map<long, long>::iterator iter;
 	iter = g_call_ids.id_map.begin();
 	while(iter != g_call_ids.id_map.end()){
@@ -3339,11 +3430,6 @@ int __pjw_shutdown()
 	//uint32_t wait = 100000 * (g_call_ids.id_map.size() + g_account_ids.id_map.size()));
 	//wait += 1000000; //Wait one whole second to permit packet capture to get any final packets
 
-	/*
-	time_t end,start;
-	time(&start);
-	end = start;
-	*/
 	timeval tv_start;
 	timeval tv_end;
 	gettimeofday(&tv_start, NULL);
@@ -3363,6 +3449,8 @@ int __pjw_shutdown()
 		//time(&end);
 	}
 
+    */
+
 	return 0;
 }