From 33e824a64c8855cee04ae1fc089958a7eab1828d Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Mon, 5 May 2014 15:54:17 -0300
Subject: [PATCH] STUN/TURN in default config

---
 config.template.js          | 28 +++++++++++++++++++---------
 js/models/network/WebRTC.js |  7 ++-----
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/config.template.js b/config.template.js
index b297a068b..c3326df2d 100644
--- a/config.template.js
+++ b/config.template.js
@@ -9,18 +9,29 @@ var config = {
     //host: 'localhost',
     //port: 10009,
     //path: '/',
-     //
+    //
     key: 'g23ihfh82h35rf', // api key for the peerjs server
-    host:'162.242.219.26', // peerjs server
-    port:10009,
+    host: '162.242.219.26', // peerjs server
+    port: 10009,
     path: '/',
     maxPeers: 15,
-//    debug: 3,
+    debug: 3,
     sjclParams: {
       salt: 'mjuBtGybi/4=', // choose your own salt (base64)
-      iter:1000,
-      mode:'ccm',
-      ts:parseInt(64),   
+      iter: 1000,
+      mode: 'ccm',
+      ts: parseInt(64),
+    },
+    config: {
+      'iceServers': [
+        // Pass in STUN and TURN server for maximum network compatibility
+        {
+          url: 'stun:stun.l.google.com:19302'
+        }, {
+          url: 'turn:homeo@turn.bistri.com:80',
+          credential: 'homeo'
+        }
+      ]
     }
   },
   limits: {
@@ -47,7 +58,6 @@ var config = {
   storageSalt: 'mjuBtGybi/4=', // choose your own salt (base64)
 };
 
-var log = function () {
+var log = function() {
   if (config.verbose) console.log(arguments);
 }
-
diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js
index 62b308d77..6f9eeaefd 100644
--- a/js/models/network/WebRTC.js
+++ b/js/models/network/WebRTC.js
@@ -28,11 +28,8 @@ function Network(opts) {
     mode:'ccm',
     ts:parseInt(64),   
   };
-
-
-  // For using your own peerJs server
-  self.opts = {};
-  ['port', 'host', 'path', 'debug', 'key'].forEach(function(k) {
+  this.opts = {};
+  ['config', 'port', 'host', 'path', 'debug', 'key'].forEach(function(k) {
     if (opts[k]) self.opts[k] = opts[k];
   });
   this.cleanUp();