0.7.4

versatica · Aug 10, 2015 · 2b70a84 · 2b70a84
1 parent d6a86e0
commit 2b70a84
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+Version 0.7.4 (released in 2015-08-10)
+---------------------------------------
+
+* Allow rejecting an in-dialog INVITE or UPDATE message
+
+
 Version 0.7.3 (released in 2015-07-29)
 ---------------------------------------
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jssip",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "the Javascript SIP library",
   "main": "dist/jssip.js",
   "homepage": "http://jssip.net",

diff --git a/dist/jssip-0.7.3.min.js b/dist/jssip-0.7.3.min.js
diff --git a/dist/jssip-0.7.3.js → dist/jssip-0.7.4.js b/dist/jssip-0.7.3.js → dist/jssip-0.7.4.js
@@ -1,5 +1,5 @@
 /*
- * JsSIP v0.7.3
+ * JsSIP v0.7.4
  * the Javascript SIP library
  * Copyright: 2012-2015 José Luis Millán <jmillan@aliax.net> (https://github.com/jmillan)
  * Homepage: http://jssip.net
@@ -15530,19 +15530,44 @@ function receiveReinvite(request) {
   debug('receiveReinvite()');
 
   var
-    sdp, idx, direction,
+    sdp, idx, direction, m,
     self = this,
     contentType = request.getHeader('Content-Type'),
-    m,
     hold = false,
+    rejected = false,
     data = {
       request: request,
-      callback: undefined
+      callback: undefined,
+      reject: reject.bind(this)
     };
 
+  function reject(options) {
+    options = options || {};
+    rejected = true;
+
+    var
+      status_code = options.status_code || 403,
+      reason_phrase = options.reason_phrase || '',
+      extraHeaders = options.extraHeaders && options.extraHeaders.slice() || [];
+
+    if (this.status !== C.STATUS_CONFIRMED) {
+      return false;
+    }
+
+    if (status_code < 300 || status_code >= 700) {
+      throw new TypeError('Invalid status_code: '+ status_code);
+    }
+
+    request.reply(status_code, reason_phrase, extraHeaders);
+  }
+
   // Emit 'reinvite'.
   this.emit('reinvite', data);
 
+  if (rejected) {
+    return;
+  }
+
   if (request.body) {
     this.late_sdp = false;
     if (contentType !== 'application/sdp') {
@@ -15642,19 +15667,44 @@ function receiveUpdate(request) {
   debug('receiveUpdate()');
 
   var
-    sdp, idx, direction,
+    sdp, idx, direction, m,
     self = this,
     contentType = request.getHeader('Content-Type'),
-    m,
+    rejected = false,
     hold = false,
     data = {
       request: request,
-      callback: undefined
+      callback: undefined,
+      reject: reject.bind(this)
     };
 
+  function reject(options) {
+    options = options || {};
+    rejected = true;
+
+    var
+      status_code = options.status_code || 403,
+      reason_phrase = options.reason_phrase || '',
+      extraHeaders = options.extraHeaders && options.extraHeaders.slice() || [];
+
+    if (this.status !== C.STATUS_CONFIRMED) {
+      return false;
+    }
+
+    if (status_code < 300 || status_code >= 700) {
+      throw new TypeError('Invalid status_code: '+ status_code);
+    }
+
+    request.reply(status_code, reason_phrase, extraHeaders);
+  }
+
   // Emit 'update'.
   this.emit('update', data);
 
+  if (rejected) {
+    return;
+  }
+
   if (! request.body) {
     var extraHeaders = [];
     handleSessionTimersInIncomingRequest.call(this, request, extraHeaders);
@@ -25072,7 +25122,7 @@ module.exports={
   "name": "jssip",
   "title": "JsSIP",
   "description": "the Javascript SIP library",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "homepage": "http://jssip.net",
   "author": "José Luis Millán <jmillan@aliax.net> (https://github.com/jmillan)",
   "contributors": [

diff --git a/dist/jssip-0.7.4.min.js b/dist/jssip-0.7.4.min.js
diff --git a/dist/jssip.js b/dist/jssip.js
@@ -1,5 +1,5 @@
 /*
- * JsSIP v0.7.3
+ * JsSIP v0.7.4
  * the Javascript SIP library
  * Copyright: 2012-2015 José Luis Millán <jmillan@aliax.net> (https://github.com/jmillan)
  * Homepage: http://jssip.net
@@ -15530,19 +15530,40 @@ function receiveReinvite(request) {
   debug('receiveReinvite()');
 
   var
-    sdp, idx, direction,
+    sdp, idx, direction, m,
     self = this,
     contentType = request.getHeader('Content-Type'),
-    m,
     hold = false,
+    rejected = false,
     data = {
       request: request,
-      callback: undefined
+      callback: undefined,
+      reject: reject
     };
 
+  function reject(options) {
+    options = options || {};
+    rejected = true;
+
+    var
+      status_code = options.status_code || 403,
+      reason_phrase = options.reason_phrase || '',
+      extraHeaders = options.extraHeaders && options.extraHeaders.slice() || [];
+
+    if (status_code < 300 || status_code >= 700) {
+      throw new TypeError('Invalid status_code: '+ status_code);
+    }
+
+    request.reply(status_code, reason_phrase, extraHeaders);
+  }
+
   // Emit 'reinvite'.
   this.emit('reinvite', data);
 
+  if (rejected) {
+    return;
+  }
+
   if (request.body) {
     this.late_sdp = false;
     if (contentType !== 'application/sdp') {
@@ -15642,19 +15663,40 @@ function receiveUpdate(request) {
   debug('receiveUpdate()');
 
   var
-    sdp, idx, direction,
+    sdp, idx, direction, m,
     self = this,
     contentType = request.getHeader('Content-Type'),
-    m,
+    rejected = false,
     hold = false,
     data = {
       request: request,
-      callback: undefined
+      callback: undefined,
+      reject: reject
     };
 
+  function reject(options) {
+    options = options || {};
+    rejected = true;
+
+    var
+      status_code = options.status_code || 403,
+      reason_phrase = options.reason_phrase || '',
+      extraHeaders = options.extraHeaders && options.extraHeaders.slice() || [];
+
+    if (status_code < 300 || status_code >= 700) {
+      throw new TypeError('Invalid status_code: '+ status_code);
+    }
+
+    request.reply(status_code, reason_phrase, extraHeaders);
+  }
+
   // Emit 'update'.
   this.emit('update', data);
 
+  if (rejected) {
+    return;
+  }
+
   if (! request.body) {
     var extraHeaders = [];
     handleSessionTimersInIncomingRequest.call(this, request, extraHeaders);
@@ -25072,7 +25114,7 @@ module.exports={
   "name": "jssip",
   "title": "JsSIP",
   "description": "the Javascript SIP library",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "homepage": "http://jssip.net",
   "author": "José Luis Millán <jmillan@aliax.net> (https://github.com/jmillan)",
   "contributors": [

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "jssip",
   "title": "JsSIP",
   "description": "the Javascript SIP library",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "homepage": "http://jssip.net",
   "author": "José Luis Millán <jmillan@aliax.net> (https://github.com/jmillan)",
   "contributors": [