Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add proxy options to allow proxying tracker and peer connections #874

Open
wants to merge 16 commits into
base: master
from
Open
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Remove socks agent generation since it cannot be reused between requests

  • Loading branch information
yciabaud committed Aug 26, 2016
commit 6d313db54b0dbde92a9c70c60fa3f471c1d3c349
@@ -16,7 +16,6 @@ var parseTorrent = require('parse-torrent')
var path = require('path')
var Peer = require('simple-peer')
var randombytes = require('randombytes')
var Socks = require('socks')
var speedometer = require('speedometer')
var zeroFill = require('zero-fill')

@@ -121,18 +120,6 @@ function WebTorrent (opts) {
if (!self.proxyOpts.socksProxy.proxy) self.proxyOpts.socksProxy.proxy = {}
if (!self.proxyOpts.socksProxy.proxy.type) self.proxyOpts.socksProxy.proxy.type = 5

// Create HTTP agents from socks proxy if needed
if (!self.proxyOpts.httpAgent) {
var httpOpts = extend(self.proxyOpts.socksProxy)
httpOpts.proxy = extend(opts.proxy)
self.proxyOpts.httpAgent = new Socks.Agent(httpOpts, false)
}
if (!self.proxyOpts.httpsAgent) {
var httpsOpts = extend(self.proxyOpts.socksProxy)
httpsOpts.proxy = extend(opts.proxy)
self.proxyOpts.httpsAgent = new Socks.Agent(httpsOpts, true)
}

// Convert proxy opts to electron API in webtorrent-hybrid
if (self.tracker.wrtc && self.tracker.wrtc.electronDaemon &&
self.proxyOpts && self.proxyOpts.socksProxy && self.proxyOpts.proxyPeerConnections) {
@@ -1664,7 +1664,6 @@ Torrent.prototype._drain = function () {
command: 'connect',
target: opts
})
proxyOpts.proxy = extend(proxyOpts.proxy)

Socks.createConnection(proxyOpts, onGotSocket)
} else {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.