Merge branch 'master' into release

onsip · Oct 17, 2017 · 0d7d381 · 0d7d381
2 parents b1bd517 + 58f4efc
commit 0d7d381
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "sip.js",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "authors": [
     "James Criscuolo <[email protected]>",
     "Joseph Frazier <[email protected]>",

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "sip.js",
   "title": "SIP.js",
   "description": "A simple, intuitive, and powerful JavaScript signaling library",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "main": "src/index.js",
   "browser": {
     "./src/environment.js": "./src/environment_browser.js"

diff --git a/src/Session.js b/src/Session.js
@@ -1415,6 +1415,8 @@ InviteClientContext = function(ua, target, options, modifiers) {
   this.renderbody = options.renderbody || null;
   this.rendertype = options.rendertype || 'text/plain';
 
+  // Session parameter initialization
+  this.from_tag = SIP.Utils.newTag();
   options.params.from_tag = this.from_tag;
 
   /* Do not add ;ob in initial forming dialog requests if the registration over
@@ -1456,9 +1458,6 @@ InviteClientContext = function(ua, target, options, modifiers) {
     throw new SIP.Exceptions.InvalidStateError(this.status);
   }
 
-  // Session parameter initialization
-  this.from_tag = SIP.Utils.newTag();
-
   // OutgoingSession specific parameters
   this.isCanceled = false;
   this.received_100 = false;

diff --git a/src/UA.js b/src/UA.js
@@ -932,8 +932,10 @@ UA.prototype.loadConfig = function(configuration) {
       // Session Description Handler Options
       sessionDescriptionHandlerFactoryOptions: {
         constraints: {},
-        iceCheckingTimeout: 5000,
-        rtcConfiguration: {},
+        peerConnectionOptions: {
+          iceCheckingTimeout: 5000,
+          rtcConfiguration: {}
+        }
       },
 
       contactName: SIP.Utils.createRandomToken(8), // user name in user part

diff --git a/src/WebRTC/SessionDescriptionHandler.js b/src/WebRTC/SessionDescriptionHandler.js
@@ -381,7 +381,7 @@ SessionDescriptionHandler.prototype = Object.create(SIP.SessionDescriptionHandle
     };
 
     this.startIceCheckingTimer = function () {
-      if (!self.iceCheckingTimer) {
+      if (!self.iceCheckingTimer && options.iceCheckingTimeout) {
         self.iceCheckingTimer = SIP.Timers.setTimeout(function() {
           self.logger.log('RTCIceChecking Timeout Triggered after ' + options.iceCheckingTimeout + ' milliseconds');
           self.onIceCompleted.resolve(this);