Add JsSIP.Utils.createRandomToken utility to create random tokens

versatica · Feb 14, 2013 · dcf4021 · dcf4021
1 parent bc21816
commit dcf4021
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/src/DigestAuthentication.js b/src/DigestAuthentication.js
@@ -47,7 +47,7 @@ JsSIP.DigestAuthentication.prototype.authenticate = function(password) {
 
   password = password || this.password;
 
-  this.cnonce = Math.random().toString(36).substr(2, 12);
+  this.cnonce = JsSIP.Utils.createRandomToken(12);
   this.nc += 1;
 
   // nc-value = 8LHEX. Max value = 'FFFFFFFF'

diff --git a/src/Registrator.js b/src/Registrator.js
@@ -19,7 +19,7 @@ JsSIP.Registrator = function(ua, transport) {
   this.min_expires = ua.configuration.register_min_expires;
 
   // Call-ID and CSeq values RFC3261 10.2
-  this.call_id = Math.random().toString(36).substr(2, 22);
+  this.call_id = JsSIP.Utils.createRandomToken(22);
   this.cseq = 80;
 
   this.registrar = 'sip:'+ ua.configuration.domain;

diff --git a/src/SIPMessage.js b/src/SIPMessage.js
@@ -78,7 +78,7 @@ JsSIP.OutgoingRequest = function(method, ruri, ua, params, extraHeaders, body) {
   if(params.call_id) {
     call_id = params.call_id;
   } else {
-    call_id = ua.configuration.jssip_id + Math.random().toString(36).substr(2, 15);
+    call_id = ua.configuration.jssip_id + JsSIP.Utils.createRandomToken(15);
   }
   this.setHeader('call-id', call_id);
 

diff --git a/src/UA.js b/src/UA.js
@@ -600,7 +600,7 @@ JsSIP.UA.prototype.loadConfig = function(configuration) {
       /* Host address
       * Value to be set in Via sent_by and host part of Contact FQDN
       */
-      via_host: Math.random().toString(36).substr(2, 12) + '.invalid',
+      via_host: JsSIP.Utils.createRandomToken(12) + '.invalid',
 
       // Password
       password: null,
@@ -682,7 +682,7 @@ JsSIP.UA.prototype.loadConfig = function(configuration) {
   settings.instance_id = JsSIP.Utils.newUUID();
 
   // jssip_id instance parameter. Static random tag of length 5
-  settings.jssip_id = Math.random().toString(36).substr(2, 5);
+  settings.jssip_id = JsSIP.Utils.createRandomToken(5);
 
   settings.from_uri = settings.uri.toAor();
 

diff --git a/src/Utils.js b/src/Utils.js
@@ -17,8 +17,22 @@ JsSIP.Utils= {
     return !isNaN(num) && (parseFloat(num) === parseInt(num,10));
   },
 
+  createRandomToken: function(size, base) {
+    var i, r,
+    token = '';
+
+    base = base || 32;
+
+    for( i=0; i < size; i++ ) {
+      r = Math.random() * base|0;
+      token += r.toString(base);
+    }
+
+    return token;
+  },
+
   newTag: function() {
-    return Math.random().toString(36).substr(2,JsSIP.C.TAG_LENGTH);
+    return JsSIP.Utils.createRandomToken(JsSIP.C.TAG_LENGTH);
   },
 
   // http://stackoverflow.com/users/109538/broofa