fix encryption crap

ealymbaev · Feb 19, 2013 · bba32d1 · bba32d1
1 parent da4e6af
commit bba32d1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/examples/holla.js b/examples/holla.js
@@ -3546,6 +3546,7 @@ require.register("holla/dist/Call.js", function(exports, require, module){
         return _this.pc.addIceCandidate(new RTC.IceCandidate(candidate));
       });
       this.parent.on("sdp." + this.user, function(stuff) {
+        console.log(stuff);
         _this.pc.setRemoteDescription(new RTC.SessionDescription(stuff));
         return _this.emit("sdp");
       });
@@ -3659,6 +3660,7 @@ require.register("holla/dist/Call.js", function(exports, require, module){
       var done, err,
         _this = this;
       done = function(desc) {
+        desc.sdp = RTC.processSDP(desc.sdp);
         _this.pc.setLocalDescription(desc);
         return _this.socket.write({
           type: "sdp",
@@ -3667,7 +3669,7 @@ require.register("holla/dist/Call.js", function(exports, require, module){
         });
       };
       err = function(e) {
-        return console.log(e);
+        throw e;
       };
       if (this.isCaller) {
         return this.pc.createOffer(done, err);
@@ -3731,7 +3733,7 @@ require.register("holla/dist/RTC.js", function(exports, require, module){
     for (_i = 0, _len = _ref.length; _i < _len; _i++) {
       line = _ref[_i];
       out.push(line);
-      if ((__indexOf.call(search, 'm=') >= 0) !== -1) {
+      if ((__indexOf.call(line, 'm=') >= 0)) {
         out.push(addCrypto);
       }
     }

diff --git a/holla.js b/holla.js
@@ -3546,6 +3546,7 @@ require.register("holla/dist/Call.js", function(exports, require, module){
         return _this.pc.addIceCandidate(new RTC.IceCandidate(candidate));
       });
       this.parent.on("sdp." + this.user, function(stuff) {
+        console.log(stuff);
         _this.pc.setRemoteDescription(new RTC.SessionDescription(stuff));
         return _this.emit("sdp");
       });
@@ -3659,6 +3660,7 @@ require.register("holla/dist/Call.js", function(exports, require, module){
       var done, err,
         _this = this;
       done = function(desc) {
+        desc.sdp = RTC.processSDP(desc.sdp);
         _this.pc.setLocalDescription(desc);
         return _this.socket.write({
           type: "sdp",
@@ -3667,7 +3669,7 @@ require.register("holla/dist/Call.js", function(exports, require, module){
         });
       };
       err = function(e) {
-        return console.log(e);
+        throw e;
       };
       if (this.isCaller) {
         return this.pc.createOffer(done, err);
@@ -3731,7 +3733,7 @@ require.register("holla/dist/RTC.js", function(exports, require, module){
     for (_i = 0, _len = _ref.length; _i < _len; _i++) {
       line = _ref[_i];
       out.push(line);
-      if ((__indexOf.call(search, 'm=') >= 0) !== -1) {
+      if ((__indexOf.call(line, 'm=') >= 0)) {
         out.push(addCrypto);
       }
     }

diff --git a/holla.min.js b/holla.min.js
diff --git a/lib/Call.coffee b/lib/Call.coffee
@@ -23,6 +23,7 @@ class Call extends EventEmitter
       @pc.addIceCandidate new RTC.IceCandidate candidate
 
     @parent.on "sdp.#{@user}", (stuff) =>
+      console.log stuff
       @pc.setRemoteDescription new RTC.SessionDescription stuff
       @emit "sdp"
 
@@ -110,7 +111,7 @@ class Call extends EventEmitter
 
   initSDP: ->
     done = (desc) =>
-      #desc.sdp = RTC.processSDP desc.sdp
+      desc.sdp = RTC.processSDP desc.sdp
       @pc.setLocalDescription desc
       @socket.write
         type: "sdp"

diff --git a/lib/RTC.coffee b/lib/RTC.coffee
@@ -21,7 +21,7 @@ processSDP = (sdp) ->
   out = []
   for line in sdp.split '\r\n'
     out.push line
-    out.push addCrypto if ('m=' in search) isnt -1
+    out.push addCrypto if ('m=' in line)
   return out.join '\r\n'
 
 attachStream = (uri, el) ->