sip-lab 1.31.0 → 1.32.0

package/index.js

@@ -6,8 +6,8 @@ var eventEmitter = new events.EventEmitter();
 
 process.on('SIGINT', function() {
 	console.log("SIGINT");
-	var res = addon.shutdown()
-	process.exit(0)
+	var res = addon.shutdown(1)
+	process.exit(1)
 });
 
 addon.event_source = eventEmitter
@@ -32,10 +32,9 @@ var timerId = setInterval(() => {
 	}
 }, 50)
 
-addon.stop = () => {
+addon.stop = (clean_up = false) => {
 	clearInterval(timerId)
-	var res = addon.shutdown()
-	process.exit(0)
+	var res = addon.shutdown(clean_up ? 1 : 0)
 }
 
 addon.transport = {

package/package.json

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

package/samples/100_calls.js

@@ -139,6 +139,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/16_audio_streams.js

@@ -139,6 +139,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/183_session_progress.js

@@ -374,6 +374,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/custom_call_id.js

@@ -208,6 +208,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/delayed_media.js

@@ -315,6 +315,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/four_audio_streams_two_refused.js

@@ -314,6 +314,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/g729.js

@@ -198,6 +198,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/media_fields.js

@@ -179,6 +179,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/mrcp_and_audio.js

@@ -411,6 +411,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/mrcp_and_audio.simplified_media.js

@@ -254,6 +254,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/multiple_audio_streams.js

@@ -144,6 +144,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/options.js

@@ -72,6 +72,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/pcma.js

@@ -197,6 +197,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/play_wav_and_speech_recog.bad_transcript.pcmu8000.js

@@ -148,6 +148,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/refer.js

@@ -206,6 +206,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/refuse_telephone_event.js

@@ -148,6 +148,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/register_no_expires.js

@@ -72,6 +72,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/register_subscribe.js

@@ -189,6 +189,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/reinvite_and_dtmf.js

@@ -435,6 +435,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/reinvite_audio_audio.js

@@ -301,6 +301,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/reinvite_with_hold_unhold.js

@@ -393,6 +393,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/rtp_and_srtp.js

@@ -452,6 +452,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/rtp_and_srtp.rtp_refused.js

@@ -416,6 +416,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/rtp_and_srtp.unbalanced_sdp_answer.js.future

@@ -178,6 +178,7 @@ a=crypto:1 AES_256_CM_HMAC_SHA1_80 inline:s6nwVuVNxwupG0Cls+/4X4L46Mx/fqoEMolllU
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/send_and_receive_bfsk.js.future

@@ -160,6 +160,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/send_and_receive_fax.js

@@ -117,6 +117,7 @@ async function test() {
     console.log(`Success. Fax file ${in_file} was transmitted and received as ${out_file}`)
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/session_expires.update.js.future

@@ -257,6 +257,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/session_expires.update.with_sipjs-lab.js

@@ -5,7 +5,7 @@ const sip_msg = require('sip-matching')
 const uuid = require('uuid')
 
 const sipjs = require('sipjs-lab')
-const {endpoint, dialog} = require('sipjs-lab')
+const {endpoint, dialog, sip_msg: sipjs_sip_msg} = require('sipjs-lab')
 
 // here we create our Zeq instance
 
@@ -28,8 +28,6 @@ async function test() {
 
     const address = "127.0.0.1"
 
-    const t1 = sip.transport.create({address})
-
     const e1_port = 7070
     const e1 = endpoint.create({
         address,
@@ -37,6 +35,11 @@ async function test() {
         publicAddress: address
     })
 
+    // hack to not lose first INVITE
+    await z.sleep(0)
+
+    const t1 = sip.transport.create({address})
+
     const sip_call_id = uuid.v4()
 
     var oc = sip.call.create(t1.id, {
@@ -46,28 +49,19 @@ async function test() {
             'Call-ID': sip_call_id,
             'Supported': 'timer',
             'Min-SE': '180',
-            'Session-Expires': '180',
+            'Session-Expires': '180;refresher=uac',
         },
     })
 
     await z.wait([
         {
             source: 'sip_endpoint',
-            req: m.collect('req', {
-                method: 'INVITE',
-                uri: `sip:bob@${address}:${e1_port}`,
-                headers: {
-                    from: {
-                        uri: 'sip:alice@test.com',
-                    },
-                    to: {
-                        uri: `sip:bob@${address}`,
-                    },
-                    supported: 'timer',
-                    'min-se': '180',
-                    'session-expires': '180',
-                },
-            }),
+            req: m.collect('req', sipjs_sip_msg({
+                $rm: 'INVITE',
+                hdr_supported: 'timer',
+                hdr_min_se: '180',
+                hdr_session_expires: '180;refresher=uac',
+            })),
             event: 'dialog_offer',
             dialog_id: m.collect('dialog_id'),
         },
@@ -107,8 +101,6 @@ async function test() {
 
     delete z.store.dialog_id
 
-    await z.sleep(1000)
-
     oc = sip.call.create(t1.id, {
         from_uri: 'sip:alice@test.com',
         to_uri: `sip:bob@${address}:${e1_port}`,
@@ -116,7 +108,7 @@ async function test() {
             'Call-ID': sip_call_id,
             'Supported': 'timer',
             'Min-SE': '300',
-            'Session-Expires': '300',
+            'Session-Expires': '300;refresher=uac',
         },
     })
 
@@ -125,18 +117,12 @@ async function test() {
     await z.wait([
         {
             source: 'sip_endpoint',
-            req: m.collect('req', {
-                method: 'INVITE',
-                uri: `sip:bob@${address}:${e1_port}`,
-                headers: {
-                    from: {
-                        uri: 'sip:alice@test.com',
-                    },
-                    to: {
-                        uri: `sip:bob@${address}`,
-                    },
-                },
-            }),
+            req: m.collect('req', sipjs_sip_msg({
+                $rm: 'INVITE',
+                hdr_supported: 'timer',
+                hdr_min_se: '300',
+                hdr_session_expires: '300;refresher=uac'
+            })),
             event: 'dialog_offer',
             dialog_id: m.collect('dialog_id'),
         },
@@ -154,6 +140,36 @@ a=rtpmap:101 telephone-event/8000
 a=fmtp:101 0-15
 a=ptime:20`.replace(/\n/g, "\r\n")
 
+    dialog.send_reply(
+        z.store.dialog_id,
+        z.store.req,
+        {
+            status: 183,
+            reason: 'Session Progress',
+            headers: {
+                'content-type': 'application/sdp',
+            },
+            content: sdp_answer,
+        }
+    )
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '183',
+                $rr: 'Session Progress',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+    ], 1000)
+
     dialog.send_reply(
         z.store.dialog_id,
         z.store.req,
@@ -199,14 +215,16 @@ a=ptime:20`.replace(/\n/g, "\r\n")
         },
     ], 1000)
 
-
     for(var i=0 ; i<5 ; i++) {
 
+        // sleep here as much as you like
+        await z.sleep(0)
+
         sip.call.update(oc.id, {
             headers: {
                 'Supported': 'timer',
                 'Min-SE': '300',
-                'Session-Expires': '300',
+                'Session-Expires': '300;refresher=uac',
             },
         })
 
@@ -215,14 +233,12 @@ a=ptime:20`.replace(/\n/g, "\r\n")
         await z.wait([
             {
                 source: 'sip_endpoint',
-                req: m.collect('req', {
-                    method: 'UPDATE',
-                    headers: {
-                        'supported': 'timer',
-                        'min-se': '300',
-                        'session-expires': '300',
-                    },
-                }),
+                req: m.collect('req', sipjs_sip_msg({
+                    $rm: 'UPDATE',
+                    hdr_supported: 'timer',
+                    hdr_min_se: '300',
+                    hdr_session_expires: '300;refresher=uac'
+                })),
                 event: 'in_dialog_request',
                 dialog_id: z.store.dialog_id
             },
@@ -266,9 +282,9 @@ a=ptime:20`.replace(/\n/g, "\r\n")
     await z.wait([
         {                                                                                                 
             source: 'sip_endpoint',
-            req: m.collect('req', { 
-              method: 'BYE',
-            }),
+            req: m.collect('req', sipjs_sip_msg({ 
+              $rm: 'BYE',
+            })),
         },
     ], 1000)
 
@@ -302,6 +318,7 @@ a=ptime:20`.replace(/\n/g, "\r\n")
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/simple.js

@@ -170,6 +170,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/sip_cancel.js

@@ -104,6 +104,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/speech_synth_and_recog.speex16000.js

@@ -154,6 +154,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/srtp.js

@@ -330,6 +330,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/start_play_wav_with_end_of_file_event.js

@@ -235,6 +235,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/start_play_wav_with_no_loop.js

@@ -223,6 +223,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/stop_with_cleanup.js

@@ -0,0 +1,127 @@
+const sip = require ('../index.js')
+const Zeq = require('@mayama/zeq')
+const m = require('data-matching')
+const sip_msg = require('sip-matching')
+
+// here we create our Zeq instance
+var z = new Zeq()
+
+
+async function test() {
+    z.trap_events(sip.event_source, 'event', (evt) => {
+        var e = evt.args[0]
+        return e
+    })
+
+    console.log(sip.start((data) => { console.log(data)} ))
+
+    const t1 = sip.transport.create({address: "127.0.0.1"})
+    const t2 = sip.transport.create({address: "127.0.0.1"})
+
+    const oc = sip.call.create(t1.id, {
+        from_uri: '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"),
+            transport_id: t2.id,
+            msg: sip_msg({
+                $rU: 'bob',
+                $fU: 'alice',
+                $tU: 'bob',
+                $fd: 'test.com',
+            })
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+                $rr: 'Trying',
+            }),
+        },
+    ], 1000)
+
+    const 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: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 1000)
+
+    // Now force an error in the script.
+    // This will be catched by exception handler at the end of the script where
+    // sip.stop(true) will be called (true: terminate all remaining calls, registrations and subscriptions)
+
+    throw "SOME ERROR"
+
+    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)
+
+    console.log("Success")
+
+    sip.stop()
+    process.exit(0)
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    sip.stop(true)
+    process.exit(0)
+})
+

package/samples/tcp.js

@@ -401,6 +401,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/text_to_speech.js

@@ -157,6 +157,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/tls.js

@@ -117,6 +117,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/two_audio_streams.js

@@ -477,6 +477,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/two_audio_streams.port_zero.js

@@ -489,6 +489,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/ws_speech_server.bfsk.js

@@ -143,6 +143,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/ws_speech_server.dtmf.js

@@ -143,6 +143,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/ws_speech_server.google.js

@@ -153,6 +153,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/ws_speech_server.send_bfsk.js

@@ -145,6 +145,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/ws_speech_server.start_bfsk_detection.js.future

@@ -153,6 +153,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/src/addon.cpp

@@ -1568,7 +1568,15 @@ Napi::Value do_poll(const Napi::CallbackInfo &info) {
 Napi::Value shutdown_(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
 
-  int res = __pjw_shutdown();
+  if (info.Length() != 1) {
+    Napi::Error::New(
+        env, "Wrong number of arguments. Expected: clean_up")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  int clean_up = info[0].As<Napi::Number>().Int32Value();
+
+  int res = __pjw_shutdown(clean_up);
 
   if (res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();

package/src/idmanager.cpp

@@ -75,3 +75,7 @@ void IdManager::iterate(void (*f)(long id, long val)) {
     ++pos;
   }
 }
+
+int IdManager::size() {
+    return ids.size();
+}

package/src/idmanager.hpp

@@ -17,6 +17,7 @@ public:
   bool get(long id, long &val);
   bool get_id(long val, long &id);
   void iterate(void (*f)(long id, long val));
+  int size();
 
   map<long, long> id_map; // hack to test tcpdumper
 private:

package/src/sip.cpp

@@ -6641,120 +6641,126 @@ int pjw_enable_telephone_event() {
 	return 0;
 }
 
-int __pjw_shutdown() {
-  // addon_log(L_DBG, "pjw_shutdown thread_id=%i\n", syscall(SYS_gettid));
-  PJW_LOCK();
-
-  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()){
-              Call *call = (Call*)iter->second;
-
-              addon_log(L_DBG, "Terminating call %d\n", iter->first);
-
-              pjsip_tx_data *tdata;
-              pj_status_t status;
-              status = pjsip_inv_end_session(call->inv,
-                                                603,
-                                                NULL,
-                                                &tdata); //Copied from pjsua
-              if(status != PJ_SUCCESS){
-                      //ignore
-                      char err[256];
-                      pj_strerror(status, err, sizeof(err));
-                      addon_log(L_DBG, "pjsip_inv_end_session failed statut=%i
-     (%s)\n", status, err);
-                      ++iter;
-                      continue;
-              }
-
-              if(!tdata)
-              {
-                      //if tdata was not set by pjsip_inv_end_session, it means
-     we didn't receive any response yet (100 Trying) and we cannot send CANCEL
-     in this situation. So we just can return here without calling
-     pjsip_inv_send_msg.
-                      ++iter;
-                      addon_log(L_DBG, "no tdata\n");
-                      continue;
-              }
-
-              status = pjsip_inv_send_msg(call->inv, tdata);
-              if(status != PJ_SUCCESS){
-                      addon_log(L_DBG, "pjsip_inv_send_msg failed\n");
-              }
-              ++iter;
-      }
-
-      iter = g_account_ids.id_map.begin();
-      while(iter != g_account_ids.id_map.end()){
-              pjsip_regc *regc = (pjsip_regc*)iter->second;
-
-              addon_log(L_DBG, "Unregistering account %d\n", iter->first);
-
-              pjsip_tx_data *tdata;
-              pj_status_t status;
-
-              status = pjsip_regc_unregister(regc, &tdata);
-              if(status != PJ_SUCCESS)
-              {
-                      addon_log(L_DBG, "pjsip_regc_unregister failed\n");
-              }
-
-              status = pjsip_regc_send(regc, tdata);
-              if(status != PJ_SUCCESS)
-              {
-                      addon_log(L_DBG, "pjsip_regc_send failed\n");
-              }
-              ++iter;
-      }
+int __pjw_shutdown(int clean_up) {
+	addon_log(L_DBG, "pjw_shutdown thread_id=%i\n", syscall(SYS_gettid));
 
-      Subscription *subscription;
-      iter = g_subscription_ids.id_map.begin();
-      while(iter != g_subscription_ids.id_map.end()){
-              addon_log(L_DBG, "Unsubscribing subscription %d\n", iter->first);
+	g_shutting_down = true;
 
-              subscription = (Subscription*)iter->second;
-              if(!subscription_subscribe(subscription, 0, NULL)) {
-                      addon_log(L_DBG, "Unsubscription failed failed\n");
-              }
-              ++iter;
-      }
-
-      PJW_UNLOCK();
-
-      //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
-
-      timeval tv_start;
-      timeval tv_end;
-      gettimeofday(&tv_start, NULL);
-      gettimeofday(&tv_end, NULL);
+    if(!clean_up) {
+      return 0;
+    }
 
-      unsigned int start = tv_start.tv_sec * 1000 + (tv_start.tv_usec / 1000);
-      unsigned int end = tv_end.tv_sec * 1000 + (tv_end.tv_usec / 1000);
+	addon_log(L_DBG, "INITIATING CLEANUP\n");
 
-      int DELAY = 2000; // 1000 ms delay
-      while(end - start < DELAY) {
-              pj_time_val tv = {0, 500};
-              pj_status_t status;
-              status = pjsip_endpt_handle_events(g_sip_endpt, &tv);
+	PJW_LOCK();
 
-              gettimeofday(&tv_end, NULL);
-              end = tv_end.tv_sec * 1000 + (tv_end.tv_usec / 1000);
-              //time(&end);
-      }
+	map<long, long>::iterator iter;
+	iter = g_call_ids.id_map.begin();
+	while(iter != g_call_ids.id_map.end()){
+		Call *call = (Call*)iter->second;
+
+		addon_log(L_DBG, "Terminating call %d\n", iter->first);
+
+		pjsip_tx_data *tdata;
+		pj_status_t status;
+		status = pjsip_inv_end_session(call->inv,
+						  603,
+						  NULL, 
+						  &tdata); //Copied from pjsua
+		if(status != PJ_SUCCESS){
+			//ignore 
+			char err[256];
+			pj_strerror(status, err, sizeof(err));
+			addon_log(L_DBG, "pjsip_inv_end_session failed statut=%i (%s)\n", status, err);
+			++iter;
+			continue;
+		}
+
+		if(!tdata)
+		{
+			//if tdata was not set by pjsip_inv_end_session, it means we didn't receive any response yet (100 Trying) and we cannot send CANCEL in this situation. So we just can return here without calling pjsip_inv_send_msg.
+			++iter;
+			addon_log(L_DBG, "no tdata\n");
+			continue;
+		}
+
+		status = pjsip_inv_send_msg(call->inv, tdata);
+		if(status != PJ_SUCCESS){
+			addon_log(L_DBG, "pjsip_inv_send_msg failed\n");
+		}
+		++iter;
+	}
+
+	iter = g_account_ids.id_map.begin();
+	while(iter != g_account_ids.id_map.end()){
+		pjsip_regc *regc = (pjsip_regc*)iter->second;
+
+		addon_log(L_DBG, "Unregistering account %d\n", iter->first);
+
+		pjsip_tx_data *tdata;
+		pj_status_t status;
+
+		status = pjsip_regc_unregister(regc, &tdata);
+		if(status != PJ_SUCCESS)
+		{
+			addon_log(L_DBG, "pjsip_regc_unregister failed\n");
+		}
+
+		status = pjsip_regc_send(regc, tdata);
+		if(status != PJ_SUCCESS)
+		{
+			addon_log(L_DBG, "pjsip_regc_send failed\n");
+		}
+		++iter;
+	}
+
+	Subscription *subscription;
+	iter = g_subscription_ids.id_map.begin();
+
+    rapidjson::Document doc;
+    doc.Parse("{\"expires\": 0}");
+
+	while(iter != g_subscription_ids.id_map.end()){
+		addon_log(L_DBG, "Unsubscribing subscription %d\n", iter->first);
+
+		subscription = (Subscription*)iter->second;	
+		if(!subscription_subscribe(subscription, 0, doc)) {
+			addon_log(L_DBG, "Unsubscription failed failed\n");
+		}
+		++iter;
+	}
 
-  */
+	PJW_UNLOCK();
 
-  return 0;
+	//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);
+	gettimeofday(&tv_end, NULL);
+
+	unsigned int start = tv_start.tv_sec * 1000 + (tv_start.tv_usec / 1000);
+	unsigned int end = tv_end.tv_sec * 1000 + (tv_end.tv_usec / 1000);
+
+	int DELAY = 1000; // 1000 ms delay
+	while(end - start < DELAY) {
+		pj_time_val tv = {0, 500}; 
+		pj_status_t status;
+		status = pjsip_endpt_handle_events(g_sip_endpt, &tv);
+
+		gettimeofday(&tv_end, NULL);
+		end = tv_end.tv_sec * 1000 + (tv_end.tv_usec / 1000);
+		//time(&end);
+	}
+
+    addon_log(L_DBG, "CLEANUP DONE\n");
+	return 0;
 }
 
 // Copied from streamutil.c (pjsip sample)

package/src/sip.hpp

@@ -92,7 +92,7 @@ int pjw_get_codecs(char *out_codecs);
 
 int pjw_set_codecs(const char *in_codec_info);
 
-int __pjw_shutdown();
+int __pjw_shutdown(int clean_up);
 
 int pjw_notify(long subscriber_id, const char *json);