sip-lab 1.12.0 → 1.12.3

package/README.md

@@ -35,6 +35,10 @@ Then install sip-lab by doing:
   npm install sip-lab
 ```
 
+Be patient because we will need to download pjproject and build it.
+
+We will also download rapidjson.
+
 To test from within this repo just build and install by doing:
 ```
   npm install -g node-gyp
@@ -44,6 +48,8 @@ And run some sample script from subfolder samples:
 ```
   node samples/simple.js
 ```
+The above script has detailed comments. 
+Please read it to undestand how to write your own test scripts.
 
 The module is known to work properly in Ubuntu 18.04.4, Ubuntu 20.04.4, Debian 8 and Debian 10 (and it is expected to work in Debian 9).
 It was originally developed with node v.10 and tested with v.12 and v16.13.1 and it is expected to work with latest versions of node.
@@ -65,4 +71,9 @@ But if you do so, you will need to set NODE_PATH for node to find it by doing:
   export NODE_PATH=$(npm root --quiet -g)
 ```
 
+### About the code
+
+Although the code in written in *.cpp/*.hpp named files, this is not actually a C++ project.
+
+It is mostly written in C using some C++ facilities.
 

package/package.json

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

package/samples/register_subscribe.js

@@ -28,7 +28,11 @@ async function test() {
         domain, 
         server,
         username: 'user1',
-        password: 'pass1'
+        password: 'pass1',
+        headers: {
+            'X-MyHeader1': 'aaa',
+            'X-MyHeader2': 'bbb',
+        },
     })
 
     sip.account.register(a1, {auto_register: true})
@@ -42,6 +46,8 @@ async function test() {
                 $fd: domain,
                 $tU: 'user1',
                 $td: domain,
+                '$hdr(X-MyHeader1)': 'aaa',
+                '$hdr(X-MyHeader2)': 'bbb',
             }),
         },
     ], 1000)

package/samples/send_and_receive_fax.js

@@ -21,7 +21,7 @@ async function test() {
     console.log("t1", t1)
     console.log("t2", t2)
 
-    oc = sip.call.create(t1.id, {from_uri: 'sip:a@t', to_uri: 'sip:b@127.0.0.1:5092'})
+    oc = sip.call.create(t1.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${t2.address}:${t2.port}`})
 
     await z.wait([
         {
@@ -37,9 +37,9 @@ async function test() {
                 $rr: 'Trying',
                 '$(hdrcnt(via))': 1,
                 '$hdr(call-id)': m.collect('sip_call_id'),
-                $fU: 'a',
-                $fd: 't',
-                $tU: 'b',
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
                 '$hdr(l)': '0',
             }),
         },
@@ -75,9 +75,9 @@ async function test() {
                 $rs: '200',
                 $rr: 'OK',
                 '$(hdrcnt(VIA))': 1,
-                $fU: 'a',
-                $fd: 't',
-                $tU: 'b',
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
                 '$hdr(content-type)': 'application/sdp',
                 $rb: '!{_}a=sendrecv',
             }),

package/samples/simple.js

@@ -1,32 +1,45 @@
-var sip = require ('../index.js')
-var Zester = require('zester')
+// This test creates 2 UDP SIP endpoints, makes a call between them and disconeects.
+
+const sip = require ('../index.js')
+const Zester = require('zester')
+const m = require('data-matching')
+const sip_msg = require('sip-matching')
+
+// here we create our Zester instance
 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)
 
+async function test() {
+    // here we set our zester 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)} ))
 
-    t1 = sip.transport.create({address: "127.0.0.1", port: 5090, type: 'udp'})
-    t2 = sip.transport.create({address: "127.0.0.1", port: 5092, type: 'udp'})
+    // 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"})
+    const t2 = sip.transport.create({address: "127.0.0.1"})
 
+    // here we just print the transports
     console.log("t1", t1)
     console.log("t2", t2)
 
-    oc = sip.call.create(t1.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${t2.address}:${t2.port}`})
+    // make the call from t1 to t2
+    const oc = sip.call.create(t1.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${t2.address}:${t2.port}`})
 
+    // 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',
@@ -44,29 +57,39 @@ async function test() {
             }),
         },
     ], 1000)
-
-    ic = {
+    // Details about zester 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
     sip.call.respond(ic.id, {code: 200, reason: 'OK'})
 
+    // Then we wait for the '200 OK' at the t1 side
+    // We will also get event 'media_status' for both sides indicating media streams (RTP) were set up successfully
     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,
@@ -82,19 +105,27 @@ async function test() {
                 $rb: '!{_}a=sendrecv',
             }),
         },
-    ], 1000)
-
-    sip.call.terminate(oc.id)
-
-    await z.wait([
         {
-            event: 'call_ended',
+            event: 'media_status',
             call_id: oc.id,
+            status: 'setup_ok',
+            local_mode: 'sendrecv',
+            remote_mode: 'sendrecv',
         },
         {
-            event: 'call_ended',
+            event: 'media_status',
             call_id: ic.id,
+            status: 'setup_ok',
+            local_mode: 'sendrecv',
+            remote_mode: 'sendrecv',
         },
+    ], 1000)
+
+    // 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,
@@ -104,6 +135,14 @@ async function test() {
                 $rr: 'OK',
             }),
         },
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        },
+        {
+            event: 'call_ended',
+            call_id: ic.id,
+        },
     ], 1000)
 
     console.log("Success")

package/samples/tcp_and_extra_headers.js

@@ -0,0 +1,333 @@
+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({address: "127.0.0.1", port: 5090, type: 'tcp'})
+    t2 = sip.transport.create({address: "127.0.0.1", port: 5092, type: 'tcp'})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    oc = sip.call.create(t1.id, {
+        from_uri: '"abc"<sip:alice@test.com>',
+        to_uri: `sip:bob@${t2.address}:${t2.port}`,
+        headers: {
+            'X-MyHeader1': 'abc',
+            'X-MyHeader2': 'def',
+        },
+    })
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+            msg: sip_msg({
+                $rm: 'INVITE',
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+                '$hdr(X-MyHeader1)': 'abc',
+                '$hdr(X-MyHeader2)': 'def',
+            }),
+        },
+        {
+            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',
+        headers: {
+            'X-MyHeader3': 'ghi',
+            'X-MyHeader4': 'jkl',
+        },
+    })
+
+    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: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+                '$hdr(content-type)': 'application/sdp',
+                $rb: '!{_}a=sendrecv',
+                '$hdr(X-MyHeader3)': 'ghi',
+                '$hdr(X-MyHeader4)': 'jkl',
+            }),
+        },
+    ], 1000)
+
+    sip.call.start_recording(oc.id, {file: './oc.wav'})
+    sip.call.start_recording(ic.id, {file: './ic.wav'})
+
+    sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 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, { hold: true })
+
+    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, {digits: '1234', mode: 0})
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 0}) // 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)
+
+    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, {digits: '1234', mode: 0})
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 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, {method: '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)
+
+    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, {digits: '1234', mode: 0})
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 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.start_playing(oc.id, {file: '/home/takeshi/work/src/svn/brastel/SIP-Tools/trunk/sip-tester/yosemitesam.wav'})
+    sip.call.start_playing(ic.id, {file: '/home/takeshi/work/src/svn/brastel/SIP-Tools/trunk/sip-tester/yosemitesam.wav'})
+
+    await z.sleep(2000)
+
+    stat1 = sip.call.get_stream_stat(oc.id)
+    stat2 = sip.call.get_stream_stat(ic.id)
+
+    console.log("stat1", stat1)
+    console.log("stat2", stat2)
+
+    sip.call.stop_recording(oc.id)
+    sip.call.stop_recording(ic.id)
+
+
+    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)
+
+    await z.sleep(1000)
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/src/pjmedia/include/chainlink/chainlink_fax.h

@@ -14,7 +14,6 @@ PJ_DECL(pj_status_t) chainlink_fax_port_create( pj_pool_t *pool,
                     void *user_data,
                     int result),
                 void *user_data,
-                int is_caller,
                 int is_sender,
                 const char *file,
                 pjmedia_port **p_port);

package/src/pjmedia/src/chainlink/chainlink_fax.c

@@ -61,7 +61,6 @@ struct fax_device
 	fax_state_t fax;
 	void (*fax_cb)(pjmedia_port*, void*, int);
 	void *fax_cb_user_data;
-	int is_caller;
 	int is_sender;
 
     pj_lock_t	       *lock;
@@ -121,7 +120,6 @@ PJ_DEF(pj_status_t) chainlink_fax_port_create( pj_pool_t *pool,
 					void *user_data, 
 					int result), 
 				void *user_data,
-				int is_caller,
 				int is_sender,
 				const char *file,
 				pjmedia_port **p_port)
@@ -145,7 +143,7 @@ PJ_DEF(pj_status_t) chainlink_fax_port_create( pj_pool_t *pool,
     fd->link.port.put_frame = &fax_put_frame;
     fd->link.port.on_destroy = &fax_on_destroy;
 
-	fax_init(&fd->fax, is_caller);
+	fax_init(&fd->fax, is_sender);
 	//fax_set_transmit_on_idle(&fd->fax,1);
 
 	t30_state_t *t30 = fax_get_t30_state(&fd->fax);
@@ -162,7 +160,6 @@ PJ_DEF(pj_status_t) chainlink_fax_port_create( pj_pool_t *pool,
     //printf("setting document_handler with user_data=%p\n", (void*)fd);
 	t30_set_document_handler(t30, &document_handler, (void*)fd);
 
-	fd->is_caller = is_caller;
 	fd->is_sender = is_sender;
 
 	pj_status_t status = pj_lock_create_simple_mutex(pool, "fax", &fd->lock);

package/src/sip.cpp

@@ -426,9 +426,10 @@ static void server_on_evsub_rx_refresh(pjsip_evsub *sub, pjsip_rx_data *rdata, i
 
 bool dlg_create(pjsip_dialog **dlg, Transport *transport, const char *from_uri, const char *to_uri, const char *request_uri, const char *realm, const char *username, const char *password, const char *local_contact); 
 
-static int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg, const char *proxy_uri, const char *additional_headers);
+static int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg, const char *proxy_uri, Document &document);
 
-bool subscription_subscribe(Subscription *s, int expires, const char *additional_headers);
+bool subscription_subscribe_no_headers(Subscription *s, int expires);
+bool subscription_subscribe(Subscription *s, int expires, Document &document);
 
 static pjmedia_transport *create_media_transport(const pj_str_t *addr);
 void close_media_transport(pjmedia_transport *med_transport);
@@ -446,11 +447,12 @@ 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, pjsip_transport_type_e type);
 
-pj_bool_t add_additional_headers(pj_pool_t *pool, pjsip_tx_data *tdata, const char *additional_headers); 
+//pj_bool_t add_additional_headers(pj_pool_t *pool, pjsip_tx_data *tdata, const char *additional_headers); 
+pj_bool_t add_headers(pj_pool_t *pool, pjsip_tx_data *tdata, Document &document); 
 
-pj_bool_t add_additional_headers_for_account(pjsip_regc* regc, const char *additional_headers); 
+pj_bool_t add_headers_for_account(pjsip_regc* regc, Document &document); 
 
-pj_bool_t get_content_type_and_subtype_from_additional_headers(const char *additional_headers, char *type, char *subtype);
+pj_bool_t get_content_type_and_subtype_from_headers(Document &document, char *type, char *subtype);
 
 bool build_subscribe_info(ostringstream *oss, pjsip_rx_data *rdata, Subscriber *s);
 //bool build_notify_info(pjsip_rx_data *rdata, Subscription *s);
@@ -1256,7 +1258,6 @@ int pjw_account_create(int t_id, const char *json, int *out_acc_id)
     char *password;
     char *c_to_uri = NULL;
     int expires = 60;
-    char *additional_headers = NULL;
 
     pj_str_t server_uri;
     pj_str_t from_uri;
@@ -1322,11 +1323,8 @@ int pjw_account_create(int t_id, const char *json, int *out_acc_id)
 		goto out;
 	}
 
-	if(additional_headers) {
-		if(!add_additional_headers_for_account(regc, additional_headers)) {
-			set_error("add_additional_headers_for_account failed");
-			goto out;
-		}
+    if(!add_headers_for_account(regc, document)) {
+        goto out;
 	}
 
 	if(!g_account_ids.add((long)regc, acc_id)){
@@ -1542,8 +1540,6 @@ int pjw_call_respond(long call_id, const char *json)
 
 	Call *call;
 
-    char *additional_headers = NULL;
-
     char buffer[MAX_JSON_INPUT];
 
     Document document;
@@ -1602,7 +1598,7 @@ int pjw_call_respond(long call_id, const char *json)
             goto out;
 		}
 
-		if(!add_additional_headers(call->inv->dlg->pool, tdata, additional_headers)) {
+		if(!add_headers(call->inv->dlg->pool, tdata, document)) {
 			goto out;
 		}
 	}
@@ -1634,8 +1630,6 @@ int pjw_call_terminate(long call_id, const char *json)
     char *reason = (char*)"";
 	pj_str_t r;// = pj_str((char*)reason);
 
-    const char *additional_headers;
-
     Call *call;
 
     char buffer[MAX_JSON_INPUT];
@@ -1677,8 +1671,7 @@ int pjw_call_terminate(long call_id, const char *json)
         goto out;
 	}
 
-	if(!add_additional_headers(call->inv->dlg->pool, tdata, additional_headers)) {
-		set_error("add_additional_headers failed");
+	if(!add_headers(call->inv->dlg->pool, tdata, document)) {
         goto out;
 	}
 
@@ -1720,8 +1713,6 @@ int pjw_call_create(long t_id, const char *json, long *out_call_id, char *out_si
     char *request_uri = NULL;
     char *proxy_uri = NULL;
 
-    char *headers = NULL;
-
     char *realm = NULL;
     char *username = NULL;
     char *password = NULL;
@@ -1761,16 +1752,6 @@ int pjw_call_create(long t_id, const char *json, long *out_call_id, char *out_si
         goto out;
     }
 
-    /*
-    const Value& headers = document["headers"];
-    if(document.HasMember("headers") {
-        if(!headers.IsArray()) {
-            set_error("headers must be an array");
-            goto out;
-        }
-    }
-    */
-
     if(document.HasMember("auth")) {
         if(!document["auth"].IsObject()) {
             set_error("Parameter auth must be an object");
@@ -1828,7 +1809,7 @@ int pjw_call_create(long t_id, const char *json, long *out_call_id, char *out_si
 		goto out;
 	}
 	
-	call_id = call_create(t, flags, dlg, proxy_uri, headers); 
+	call_id = call_create(t, flags, dlg, proxy_uri, document); 
 	if(call_id < 0) {
 		goto out;
 	}
@@ -2007,7 +1988,7 @@ bool dlg_create(pjsip_dialog **dlg, Transport *transport, const char *from_uri,
 }
 
 
-int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg, const char *proxy_uri, const char *additional_headers)
+int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg, const char *proxy_uri, Document &document)
 {
 	pjsip_inv_session *inv;
 	//in_addr addr;
@@ -2092,7 +2073,7 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg, const char *pro
 
 	
 
-	if(!add_additional_headers(dlg->pool, tdata, additional_headers)) {
+	if(!add_headers(dlg->pool, tdata, document)) {
 		g_call_ids.remove(call_id, (long &)call);
 		close_media_transport(med_transport); //Todo:
 		status = pjsip_dlg_terminate(dlg); //ToDo:	
@@ -2382,7 +2363,6 @@ int pjw_call_send_request(long call_id, const char *json)
 	clear_error();
 
     char *method = NULL;
-    char *additional_headers = NULL;
     char *body = NULL;
     char *ct_type = NULL;
     char *ct_subtype = NULL;
@@ -2454,7 +2434,7 @@ int pjw_call_send_request(long call_id, const char *json)
 		goto out;
 	}
 
-	if(!add_additional_headers(call->inv->dlg->pool, tdata, additional_headers)) {
+	if(!add_headers(call->inv->dlg->pool, tdata, document)) {
 		goto out;
 	}
 
@@ -3704,17 +3684,13 @@ static void on_rx_offer(pjsip_inv_session *inv, const pjmedia_sdp_session *offer
 		// Keep call on-hold by setting 'sendonly' attribute.
 		// (See RFC 3264 Section 8.4 and RFC 4317 Section 3.1)
 		if(call->remote_hold) {
-			printf("p1\n");
 			attr = pjmedia_sdp_attr_create(inv->pool, "inactive", NULL);
 		} else {
-			printf("p2\n");
 			attr = pjmedia_sdp_attr_create(inv->pool, "sendonly", NULL);
 		}
 	} else if(call->remote_hold) {
-		printf("p3\n");
 		attr = pjmedia_sdp_attr_create(inv->pool, "recvonly", NULL);
 	} else {
-		printf("p4\n");
 		attr = pjmedia_sdp_attr_create(inv->pool, "sendrecv", NULL);
 	}
 	pjmedia_sdp_media_add_attr(answer->media[0], attr);
@@ -4370,7 +4346,6 @@ bool prepare_fax(Call *c, bool is_sender, const char *file) {
                        PJMEDIA_PIA_BITS(&stream_port->info),
                        on_fax_result,
                        c,
-                       c->outgoing,
                        is_sender,
                        file,
                        (pjmedia_port**)&c->fax);
@@ -4433,7 +4408,7 @@ static void on_client_refresh( pjsip_evsub *sub ) {
 		goto out;
 	}
 
-	if(!subscription_subscribe(subscription, -1, "")) {
+	if(!subscription_subscribe_no_headers(subscription, -1)) {
 		goto out;
 	}
 
@@ -4852,7 +4827,6 @@ int pjw_call_refer(long call_id, const char *json, long *out_subscription_id)
 	clear_error();
 
     char *dest_uri;
-    char *additional_headers;
 
 	long val;
 	Call *call;
@@ -4895,7 +4869,7 @@ int pjw_call_refer(long call_id, const char *json, long *out_subscription_id)
 	s_dest_uri = pj_str((char*)dest_uri);
 	status = pjsip_xfer_initiate(sub, &s_dest_uri, &tdata);
 
-	if(!add_additional_headers(call->inv->dlg->pool, tdata, additional_headers)) {
+	if(!add_headers(call->inv->dlg->pool, tdata, document)) {
 		goto out;
 	}
 
@@ -4960,7 +4934,7 @@ int pjw_call_get_info(long call_id, const char *required_info, char *out_info)
 	return 0;
 }
 
-bool notify(pjsip_evsub *evsub, const char *content_type, const char *body, int subscription_state, const char *reason, const char *additional_headers) {
+bool notify(pjsip_evsub *evsub, const char *content_type, const char *body, int subscription_state, const char *reason, Document &document) {
 	//pj_str_t s_content_type;
 	//pj_str_t s_body;
 	pj_str_t s_reason;
@@ -5014,7 +4988,9 @@ bool notify(pjsip_evsub *evsub, const char *content_type, const char *body, int
 	}
 	s_content_type_subtype = pj_str(tok);
 
-	add_additional_headers(tdata->pool, tdata, additional_headers);	
+	if(!add_headers(tdata->pool, tdata, document)) {
+        return false;
+    }
 	
 	msg_body->content_type.type = s_content_type_type;
 	msg_body->content_type.subtype = s_content_type_subtype;
@@ -5045,7 +5021,6 @@ int pjw_notify(long subscriber_id, const char *json)
     char *body = NULL;
     int subscription_state;
     char *reason = NULL;
-    char *additional_headers = NULL;
 
 	long val;
 
@@ -5086,7 +5061,7 @@ int pjw_notify(long subscriber_id, const char *json)
         goto out;
     }
 
-	if(!notify(subscriber->evsub, content_type, body, subscription_state, reason, additional_headers)){
+	if(!notify(subscriber->evsub, content_type, body, subscription_state, reason, document)){
 		goto out;
 	}
 
@@ -5174,6 +5149,7 @@ out:
 	return 0;
 }
 
+/*
 pj_bool_t add_additional_headers(pj_pool_t *pool, pjsip_tx_data *tdata, const char *additional_headers) {
 
 	if(additional_headers && additional_headers[0]){
@@ -5210,94 +5186,133 @@ pj_bool_t add_additional_headers(pj_pool_t *pool, pjsip_tx_data *tdata, const ch
 	}
 	return PJ_TRUE;
 }
+*/
 
-pj_bool_t add_additional_headers_for_account(pjsip_regc *regc, const char *additional_headers) {
 
-	if(additional_headers && additional_headers[0]){
-		pjsip_hdr hdr_list;
-		pj_list_init(&hdr_list);
+pj_bool_t add_headers(pj_pool_t *pool, pjsip_tx_data *tdata, Document &document) {
+    if(!document.HasMember("headers")) {
+        return PJ_TRUE;
+    }
 
-		char pool_buf[4096];
-		pj_pool_t *pool;
-		pool = pj_pool_create_on_buf(NULL, pool_buf, sizeof(pool_buf));
+    if(!document["headers"].IsObject()) {
+        set_error("Parameter headers must be an object");
+        return PJ_FALSE;
+    }
 
-		char buf[2048];
-		strcpy(buf,additional_headers);
-		char *saved;
-		char *token = strtok_r(buf, "\n", &saved);
-		while(token){
-			char *name = strtok(token, ":");
-			char *value = strtok(NULL, "\n"); 
-			//addon_log(LOG_LEVEL_DEBUG, "Adding %s:%s\n", name, value);
+    Value headers = document["headers"].GetObject();
 
-			if(!name || !value) {
-				set_error("Invalid additional_header");
-				return PJ_FALSE;
-			}
+    for (Value::ConstMemberIterator itr = headers.MemberBegin(); itr != headers.MemberEnd(); ++itr) {
+        printf("%s => '%s'\n", itr->name.GetString(), itr->value.GetString());
 
-			pj_str_t hname = pj_str(name);
-			pjsip_hdr *hdr = (pjsip_hdr*)pjsip_parse_hdr(pool,
-						&hname,
-						value,
-						strlen(value),
-						NULL);
+        const char *name = itr->name.GetString();
+        if(!itr->value.IsString()) {
+            set_error("Parameter headers key '%s' found with non-string value", name);
+            return PJ_FALSE;
+        }
 
-			if(!hdr) {
-				set_error("Failed to parse additional header to INVITE");
-				return PJ_FALSE; 
-			}					
-			
-			pj_list_push_back(&hdr_list, hdr);
-			token = strtok_r(NULL, "\n", &saved);
-		}
-		pjsip_regc_add_headers(regc, &hdr_list);
-	}
+        const char *value = itr->value.GetString();
+
+        pj_str_t hname = pj_str((char*)name);
+        pjsip_hdr *hdr = (pjsip_hdr*)pjsip_parse_hdr(pool,
+                    &hname,
+                    (char*)value,
+                    strlen(value),
+                    NULL);
+
+        if(!hdr) {
+            set_error("Failed to parse header '%s' => '%s'", name, value);
+            return PJ_FALSE; 
+        }					
+        pjsip_hdr *clone_hdr = (pjsip_hdr*) pjsip_hdr_clone(pool, hdr);
+        pjsip_msg_add_hdr(tdata->msg, clone_hdr); 
+    }
 	return PJ_TRUE;
 }
 
-pj_bool_t get_content_type_and_subtype_from_additional_headers(const char *additional_headers, char *type, char *subtype) {
+pj_bool_t add_headers_for_account(pjsip_regc *regc, Document &document) {
+    pjsip_hdr hdr_list;
+    pj_list_init(&hdr_list);
 
-	if(!additional_headers || !additional_headers[0]){
-		set_error("Header Content-Type not supplied");
-		return PJ_FALSE;
-	}	
+    char pool_buf[4096];
+    pj_pool_t *pool;
+    pool = pj_pool_create_on_buf(NULL, pool_buf, sizeof(pool_buf));
 
-	char buf[1000];
-	strcpy(buf,additional_headers);
-	char *saved;
-	char *token = strtok_r(buf, "\n", &saved);
-	while(token){
-		char *name = strtok(token, ":");
-		char *value = strtok(NULL, " "); 
-		addon_log(LOG_LEVEL_DEBUG, "Checking %s: %s\n", name, value);
-
-		if(!name || !value) {
-			set_error("Invalid additional_header");
-			return PJ_FALSE;
-		}
+    if(!document.HasMember("headers")) {
+        return PJ_TRUE;
+    }
 
-		if(strcmp(name, "Content-Type")==0) {
-			char *token_type = strtok(value, "/");
-			if(!token_type) {
-				set_error("No type specified in header Content-Type");
-				return PJ_FALSE;
-			}
-		
-			char *token_subtype = strtok(NULL, "\n");
-			if(!token_subtype) {
-				set_error("No subtype specified in header Content-Type");
-				return PJ_FALSE;
-			}
+    if(!document["headers"].IsObject()) {
+        set_error("Parameter headers must be an object");
+        return PJ_FALSE;
+    }
 
-			strcpy(type, token_type);
-			strcpy(subtype, token_subtype);
-			addon_log(LOG_LEVEL_DEBUG, "Checking parsing of Content-Type. type=%s: subtype=%s\n", type, subtype);
-			return PJ_TRUE;
-		}
-		token = strtok_r(NULL, "\n", &saved);
+    Value headers = document["headers"].GetObject();
+
+    for (Value::ConstMemberIterator itr = headers.MemberBegin(); itr != headers.MemberEnd(); ++itr) {
+        printf("%s => '%s'\n", itr->name.GetString(), itr->value.GetString());
+
+        const char *name = itr->name.GetString();
+        if(!itr->value.IsString()) {
+            set_error("Parameter headers key '%s' found with non-string value", name);
+            return PJ_FALSE;
+        }
+
+        const char *value = itr->value.GetString();
+
+        pj_str_t hname = pj_str((char*)name);
+        pjsip_hdr *hdr = (pjsip_hdr*)pjsip_parse_hdr(pool,
+                    &hname,
+                    (char*)value,
+                    strlen(value),
+                    NULL);
+
+        if(!hdr) {
+            set_error("Failed to parse header %s", name);
+            return PJ_FALSE; 
+        }					
+        
+        pj_list_push_back(&hdr_list, hdr);
 	}
-	set_error("Header Content-Type not supplied");
-	return PJ_FALSE;
+
+	pjsip_regc_add_headers(regc, &hdr_list);
+	return PJ_TRUE;
+}
+
+pj_bool_t get_content_type_and_subtype_from_headers(Document &document, char *type, char *subtype) {
+    if(!document.HasMember("headers")) {
+		set_error("Parameter headers absent");
+        return PJ_FALSE;
+    }
+
+    if(!document["headers"].IsObject()) {
+        set_error("Parameter headers must be an object");
+        return PJ_FALSE;
+    }
+
+    Value headers = document["headers"].GetObject();
+
+    if(!headers.HasMember("Content-Type")) {
+        set_error("Parameter headers doesn't contain key Content-Type");
+        return PJ_FALSE;
+    }
+
+    const char *content_type = headers["Content-Type"].GetString();
+
+    const char *slash;
+    int index;
+
+    slash = strchr(content_type, '/');
+    if(!slash) {
+	    set_error("Invalid header Content-Type");
+        return PJ_FALSE;
+    }
+
+    index = (int)(slash - content_type);
+
+    strncpy(type, content_type, index-1);
+    strcpy(subtype, content_type+index);
+    addon_log(LOG_LEVEL_DEBUG, "Checking parsing of Content-Type. type=%s: subtype=%s\n", type, subtype);
+    return PJ_TRUE;
 }
 
 
@@ -5505,7 +5520,37 @@ out:
 	return 0;
 }
 
-bool subscription_subscribe(Subscription *s, int expires, const char *additional_headers) {
+bool subscription_subscribe_no_headers(Subscription *s, int expires) {
+	pj_status_t status;
+	pjsip_tx_data *tdata;
+
+	status = pjsip_evsub_initiate(s->evsub, 
+					NULL,
+					expires,	
+					&tdata);
+	if(status != PJ_SUCCESS) {
+		set_error("pjsip_evsub_initiate failed");
+		return false;	
+	}
+
+	status = pjsip_evsub_send_request(s->evsub, tdata);
+	if(status != PJ_SUCCESS) {
+		set_error("pjsip_inv_send_msg failed");
+		return false;	
+	}
+
+	//Without this, on_rx_response will not be called
+	status = pjsip_dlg_add_usage(s->dlg, &mod_tester, s);
+	if(status != PJ_SUCCESS) {
+		set_error("pjsip_dlg_add_usage failed");
+		return false;	
+	}
+
+	return true;
+}
+
+
+bool subscription_subscribe(Subscription *s, int expires, Document &document) {
 	pj_status_t status;
 	pjsip_tx_data *tdata;
 
@@ -5518,7 +5563,7 @@ bool subscription_subscribe(Subscription *s, int expires, const char *additional
 		return false;	
 	}
 
-	if(!add_additional_headers(s->dlg->pool, tdata, additional_headers)) {
+	if(!add_headers(s->dlg->pool, tdata, document)) {
 		return false;
 	}
 
@@ -5544,7 +5589,6 @@ int pjw_subscription_subscribe(long subscription_id, const char *json) {
 	clear_error();
 
     int expires;
-    char *additional_headers = NULL;
 
 	Subscription *subscription;
 
@@ -5568,7 +5612,7 @@ int pjw_subscription_subscribe(long subscription_id, const char *json) {
         goto out;
     }
 
-	if(!subscription_subscribe(subscription, expires, additional_headers)) {
+	if(!subscription_subscribe(subscription, expires, document)) {
 		goto out;
 	}