Small Fix. Reply '200' to a CANCEL 'before' replying 487 to the INVITE

- The order was inverted
versatica · Feb 20, 2013 · 1b1ab73 · ibc · Feb 20, 2013 · jmillan
1 parent d64168a
commit 1b1ab73
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/Session.js b/src/Session.js
@@ -305,10 +305,8 @@ JsSIP.Session.prototype.receiveRequest = function(request) {
     * established.
     */
 
-    // Transaction layer already responded 487 to the initial request.
-
-    // Reply 200 to CANCEL
-    request.reply(200);
+    // Reply 487
+    this.request.reply(487);
 
     /*
     * Terminate the whole session in case the user didn't accept nor reject the

diff --git a/src/Transactions.js b/src/Transactions.js
@@ -622,7 +622,6 @@ JsSIP.Transactions.checkTransaction = function(ua, request) {
       tr = ua.transactions.ist[request.via_branch];
       if(tr) {
         if(tr.state === JsSIP.C.TRANSACTION_PROCEEDING) {
-          tr.request.reply(487);
           return false;
         } else {
           return true;

diff --git a/src/UA.js b/src/UA.js
@@ -418,6 +418,7 @@ JsSIP.UA.prototype.receiveRequest = function(request) {
         request.reply(481);
         break;
       case JsSIP.C.CANCEL:
+        request.reply(200);
         session = this.findSession(request);
         if(session) {
           session.receiveRequest(request);