sip-lab 1.7.1 → 1.8.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.1",
+  "version": "1.8.0",
   "description": "",
   "main": "index.js",
   "engines": {

package/samples/g729.js

@@ -4,6 +4,8 @@ var z = new Zester()
 var m = require('data-matching')
 var sip_msg = require('sip-matching')
 
+var assert = require('assert')
+
 async function test() {
     //sip.set_log_level(6)
     sip.dtmf_aggregation_on(500)
@@ -146,6 +148,18 @@ async function test() {
         },
     ], 500)
 
+    oc_stat = sip.call.get_stream_stat(oc.id)
+    ic_stat = sip.call.get_stream_stat(ic.id)
+
+    console.log(oc_stat)
+    console.log(ic_stat)
+
+    oc_stat = JSON.parse(oc_stat)
+    ic_stat = JSON.parse(ic_stat)
+
+    assert(oc_stat.CodecInfo == 'G729/8000/1')
+    assert(ic_stat.CodecInfo == 'G729/8000/1')
+
     sip.call.terminate(oc.id)
 
     await z.wait([

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); 
 
@@ -346,7 +350,7 @@ void process_in_dialog_subscribe(pjsip_dialog *dlg, pjsip_rx_data *rdata);
 
 static pj_bool_t set_ports(Call *call, 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_port *port);
+static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat, pjmedia_stream_info *stream_info);
 
 bool init_media_ports(Call *c, unsigned sampling_rate, unsigned channel_count, unsigned samples_per_frame, unsigned bits_per_sample); 
 void connect_media_ports(Call *c);
@@ -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)) {
@@ -1417,7 +1497,7 @@ out:
 }
 
 
-bool set_transport(pjsip_transport *sip_transport, pjsip_dialog *dlg) {
+bool dlg_set_transport(pjsip_transport *sip_transport, pjsip_dialog *dlg) {
 	//Maybe we don't need to allocation sel from the pool
 	pjsip_tpselector *sel = (pjsip_tpselector*)pj_pool_zalloc(dlg->pool, sizeof(pjsip_tpselector));
 	//pjsip_tpselector sel;
@@ -1434,7 +1514,7 @@ bool set_transport(pjsip_transport *sip_transport, pjsip_dialog *dlg) {
 	return true;
 }
 
-bool set_transport_by_t(Transport *t, pjsip_dialog *dlg) {
+bool dlg_set_transport_by_t(Transport *t, pjsip_dialog *dlg) {
 	//Maybe we don't need to allocation sel from the pool
 	pjsip_tpselector *sel = (pjsip_tpselector*)pj_pool_zalloc(dlg->pool, sizeof(pjsip_tpselector));
 	//pjsip_tpselector sel;
@@ -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>");
+    }
 }
 
 
@@ -1662,7 +1748,7 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg, const char *pro
 		return -1;
 	}
 
-	if(!set_transport_by_t(t, dlg)){
+	if(!dlg_set_transport_by_t(t, dlg)){
 		return -1;
 	}
 	addon_log(LOG_LEVEL_DEBUG, "inv=%x tdata=%x\n",inv,tdata);
@@ -2151,7 +2237,7 @@ int pjw_call_get_stream_stat(long call_id, char *out_stats){
 	pj_status_t status;
 
 	pjmedia_rtcp_stat stat;
-	pjmedia_port *port;
+	pjmedia_stream_info stream_info;
 	
 	status = pjmedia_stream_get_stat(call->med_stream, &stat);
 	if(status != PJ_SUCCESS){
@@ -2160,15 +2246,15 @@ int pjw_call_get_stream_stat(long call_id, char *out_stats){
 		return -1;
 	}
 
-	status = pjmedia_stream_get_port(call->med_stream, &port);
+	status = pjmedia_stream_get_info(call->med_stream, &stream_info);
 	if(status != PJ_SUCCESS){
 		PJW_UNLOCK();
-		set_error("Could not get stream stats. Call to pjmedia_stream_get_port failed.");
+		set_error("Could not get stream info. Call to pjmedia_stream_get_info failed.");
 		return -1;
 	}
 
 	ostringstream oss;
-	build_stream_stat(oss, &stat, port);
+	build_stream_stat(oss, &stat, &stream_info);
 
 	PJW_UNLOCK();
 
@@ -2752,7 +2838,7 @@ static pj_bool_t on_rx_request( pjsip_rx_data *rdata ){
 		return PJ_TRUE;
 	}
 
-	if(!set_transport(t, dlg)) {
+	if(!dlg_set_transport(t, dlg)) {
 		close_media_transport(med_transport);
 		reason = pj_str("Internal Server Error (set_transport failed)");
 		pjsip_endpt_respond_stateless(g_sip_endpt, rdata, 500, &reason, NULL, NULL);
@@ -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;
@@ -3384,7 +3472,7 @@ static const char *good_number(char *buf, pj_int32_t val)
     return buf;
 }
 
-static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat, pjmedia_port* port)
+static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat, pjmedia_stream_info *stream_info)
 {
     char temp[200];
     char duration[80], last_update[80];
@@ -3396,7 +3484,7 @@ static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat, pjmed
 	oss << "{ ";
 
     PJ_TIME_VAL_SUB(now, stat->start);
-    sprintf(duration, "'Duration':'%02ld:%02ld:%02ld.%03ld'",
+    sprintf(duration, "\"Duration\": \"%02ld:%02ld:%02ld.%03ld\"",
 	    now.sec / 3600,
 	    (now.sec % 3600) / 60,
 	    (now.sec % 60),
@@ -3404,59 +3492,54 @@ static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat, pjmed
 
 	oss <<  duration;
 
-    sprintf(temp, ", 'CodecInfo':'%.*s@%dHz'",
-	/*
-   	(int)port->info.encoding_name.slen,
-	port->info.encoding_name.ptr,
-	port->info.clock_rate);
-	*/
-	/* lets put fake info for now */
-	4,
-	"FAKE",
-	0);
+    sprintf(temp, ", \"CodecInfo\": \"%.*s/%d/%d\"",
+    stream_info->fmt.encoding_name.slen,
+    stream_info->fmt.encoding_name.ptr,
+	stream_info->fmt.clock_rate,
+    stream_info->fmt.channel_cnt);
 
 	oss << temp << ",";
 
-	oss << " 'RX' : { "; //Opening RX
+	oss << " \"RX\": { "; //Opening RX
 
     if (stat->rx.update_cnt == 0)
-	strcpy(last_update, "'LastUpdate':''");
+	strcpy(last_update, "\"LastUpdate\": \"\"");
     else {
-	sprintf(last_update, "'LastUpdate':'%ld.%ld'",
+	sprintf(last_update, "\"LastUpdate\": \"%ld.%ld\"",
 		stat->rx.update.sec,
 		stat->rx.update.msec);
     }
 
 	oss << last_update;
 
-	oss << ", 'Packets': " << good_number(packets, stat->rx.pkt);
-	oss << ", 'Loss':" << stat->rx.loss;
-	oss << ", 'Dup':" << stat->rx.dup;
-	oss << ", 'Reorder':" << stat->rx.reorder; 
-
-	oss << ", 'LossPeriod': {";
-	oss << "'Min':" << stat->rx.loss_period.min / 1000.0;
-	oss << ", 'Mean':" << stat->rx.loss_period.mean / 1000.0;
-	oss << ", 'Max':" << stat->rx.loss_period.max / 1000.0;
-	oss << ", 'Last':" << stat->rx.loss_period.last / 1000.0;
-	oss << ", 'StandardDeviation':" << pj_math_stat_get_stddev(&stat->rx.loss_period) / 1000.0 << " }";
-
-	oss << ", 'Jitter': { ";
-	oss << "'Min':" << stat->rx.jitter.min / 1000.0;
-	oss << ", 'Mean':" << stat->rx.jitter.mean / 1000.0;
-	oss << ", 'Max':" << stat->rx.jitter.max / 1000.0;
-	oss << ", 'Last':" << stat->rx.jitter.last / 1000.0;
-	oss << ", 'StandardDeviation':" << pj_math_stat_get_stddev(&stat->rx.jitter) / 1000.0 << " }";
+	oss << ", \"Packets\": " << good_number(packets, stat->rx.pkt);
+	oss << ", \"Loss\": " << stat->rx.loss;
+	oss << ", \"Dup\": " << stat->rx.dup;
+	oss << ", \"Reorder\": " << stat->rx.reorder; 
+
+	oss << ", \"LossPeriod\": {";
+	oss << "\"Min\": " << stat->rx.loss_period.min / 1000.0;
+	oss << ", \"Mean\": " << stat->rx.loss_period.mean / 1000.0;
+	oss << ", \"Max\": " << stat->rx.loss_period.max / 1000.0;
+	oss << ", \"Last\": " << stat->rx.loss_period.last / 1000.0;
+	oss << ", \"StandardDeviation\": " << pj_math_stat_get_stddev(&stat->rx.loss_period) / 1000.0 << " }";
+
+	oss << ", \"Jitter\": { ";
+	oss << "\"Min\": " << stat->rx.jitter.min / 1000.0;
+	oss << ", \"Mean\": " << stat->rx.jitter.mean / 1000.0;
+	oss << ", \"Max\": " << stat->rx.jitter.max / 1000.0;
+	oss << ", \"Last\": " << stat->rx.jitter.last / 1000.0;
+	oss << ", \"StandardDeviation\": " << pj_math_stat_get_stddev(&stat->rx.jitter) / 1000.0 << " }";
 
 	oss << " }"; //Closing RX
 
 	
-	oss << ", 'TX' : { "; //Opening TX
+	oss << ", \"TX\": { "; //Opening TX
 
     if (stat->tx.update_cnt == 0)
-	strcpy(last_update, "'LastUpdate':''");
+	strcpy(last_update, "\"LastUpdate\": \"\"");
     else {
-	sprintf(last_update, "'LastUpdate':'%ld.%ld'",
+	sprintf(last_update, "\"LastUpdate\": \"%ld.%ld\"",
 		stat->tx.update.sec,
 		stat->tx.update.msec);
     }
@@ -3464,34 +3547,34 @@ static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat, pjmed
 
 	oss << last_update;
 
-	oss << ", 'Packets': " << good_number(packets, stat->tx.pkt);
-	oss << ", 'Loss':" << stat->tx.loss;
-	oss << ", 'Dup':" << stat->tx.dup;
-	oss << ", 'Reorder':" << stat->tx.reorder; 
-
-	oss << ", 'LossPeriod': { ";
-	oss << "'Min':" << stat->tx.loss_period.min / 1000.0;
-	oss << ", 'Mean':" << stat->tx.loss_period.mean / 1000.0;
-	oss << ", 'Max':" << stat->tx.loss_period.max / 1000.0;
-	oss << ", 'Last':" << stat->tx.loss_period.last / 1000.0;
-	oss << ", 'StandardDeviation':" << pj_math_stat_get_stddev(&stat->tx.loss_period) / 1000.0 << " }";
-
-	oss << ", 'Jitter': { ";
-	oss << "'Min':" << stat->tx.jitter.min / 1000.0;
-	oss << ", 'Mean':" << stat->tx.jitter.mean / 1000.0;
-	oss << ", 'Max':" << stat->tx.jitter.max / 1000.0;
-	oss << ", 'Last':" << stat->tx.jitter.last / 1000.0;
-	oss << ", 'StandardDeviation':" << pj_math_stat_get_stddev(&stat->tx.jitter) / 1000.0 << " }";
+	oss << ", \"Packets\": " << good_number(packets, stat->tx.pkt);
+	oss << ", \"Loss\": " << stat->tx.loss;
+	oss << ", \"Dup\": " << stat->tx.dup;
+	oss << ", \"Reorder\": " << stat->tx.reorder; 
+
+	oss << ", \"LossPeriod\": { ";
+	oss << "\"Min\": " << stat->tx.loss_period.min / 1000.0;
+	oss << ", \"Mean\": " << stat->tx.loss_period.mean / 1000.0;
+	oss << ", \"Max\": " << stat->tx.loss_period.max / 1000.0;
+	oss << ", \"Last\":" << stat->tx.loss_period.last / 1000.0;
+	oss << ", \"StandardDeviation\": " << pj_math_stat_get_stddev(&stat->tx.loss_period) / 1000.0 << " }";
+
+	oss << ", \"Jitter\": { ";
+	oss << "\"Min\": " << stat->tx.jitter.min / 1000.0;
+	oss << ", \"Mean\": " << stat->tx.jitter.mean / 1000.0;
+	oss << ", \"Max\": " << stat->tx.jitter.max / 1000.0;
+	oss << ", \"Last\": " << stat->tx.jitter.last / 1000.0;
+	oss << ", \"StandardDeviation\": " << pj_math_stat_get_stddev(&stat->tx.jitter) / 1000.0 << " }";
 
 	oss << " }"; //Closing TX
 
-	oss << ", 'RTT': { "; // Opening RTT
+	oss << ", \"RTT\": { "; // Opening RTT
 
-	oss << "'Min':" << stat->rtt.min / 1000.0;
-	oss << ", 'Mean':" << stat->rtt.mean / 1000.0;
-	oss << ", 'Max':" << stat->rtt.max / 1000.0;
-	oss << ", 'Last':" << stat->rtt.last / 1000.0;
-	oss << ", 'StandardDeviation':" << pj_math_stat_get_stddev(&stat->rtt) / 1000.0;
+	oss << "\"Min\": " << stat->rtt.min / 1000.0;
+	oss << ", \"Mean\": " << stat->rtt.mean / 1000.0;
+	oss << ", \"Max\": " << stat->rtt.max / 1000.0;
+	oss << ", \"Last\": " << stat->rtt.last / 1000.0;
+	oss << ", \"StandardDeviation\": " << pj_math_stat_get_stddev(&stat->rtt) / 1000.0;
 	oss << " }"; //Closing RTT
 	oss << " }";
 }
@@ -4642,7 +4725,7 @@ int pjw_subscription_create(long transport_id, const char *event, const char *ac
 		goto out;
 	}	
 
-	if(!set_transport_by_t(t, dlg)){
+	if(!dlg_set_transport_by_t(t, dlg)){
 		goto out;
 	}