anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix "hello" for authenticated peers

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-30 14:28:33 -03:00
commit 6cf8988eae
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/models/network/WebRTC.js
View file

@ -174,7 +174,8 @@ Network.prototype._onData = function(encStr, isInbound, peerId) {
console.log('### RECEIVED INBOUND?:%s TYPE: %s FROM %s', console.log('### RECEIVED INBOUND?:%s TYPE: %s FROM %s',
isInbound, payload.type, peerId, payload); isInbound, payload.type, peerId, payload);
if(payload.type === 'hello' && !this.authenticatedPeers[peerId]) { if(payload.type === 'hello' ) {
if (!this.authenticatedPeers[peerId]) {
var payloadStr = JSON.stringify(payload); var payloadStr = JSON.stringify(payload);
if (this.allowedCopayerIds && !this.allowedCopayerIds[payload.copayerId]) { if (this.allowedCopayerIds && !this.allowedCopayerIds[payload.copayerId]) {
console.log('#### Peer is not on the allowedCopayerIds. Closing connection', console.log('#### Peer is not on the allowedCopayerIds. Closing connection',
@ -182,6 +183,7 @@ Network.prototype._onData = function(encStr, isInbound, peerId) {
this._deletePeer(peerId); this._deletePeer(peerId);
return; return;
} }
}
console.log('#### Peer sent hello. Setting it up.'); //TODO console.log('#### Peer sent hello. Setting it up.'); //TODO
this._setPeerAuthenticated(peerId); this._setPeerAuthenticated(peerId);
this._addCopayer(payload.copayerId, isInbound); this._addCopayer(payload.copayerId, isInbound);

1
js/services/controllerUtils.js
View file

@ -88,6 +88,7 @@ angular.module('copay.controllerUtils')
root.setSocketHandlers = function() { root.setSocketHandlers = function() {
Socket.removeAllListeners(); Socket.removeAllListeners();
if (!$rootScope.wallet) return;
var addrs = $rootScope.wallet.getAddressesStr(); var addrs = $rootScope.wallet.getAddressesStr();
for (var i = 0; i < addrs.length; i++) { for (var i = 0; i < addrs.length; i++) {