Skip to content

/ webtorrent

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
+157 −65
Open

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

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
10d816e
Allow proxying tracker calls and peer connexions in node (TCP/UDP)
yciabaud Jul 24, 2016
40fb20c
Add WebRTC proxy with electron-webrtc
yciabaud Aug 9, 2016
02b9b28
Forward proxyOpts to the tracker when proxyTrackerConnections is true
yciabaud Aug 24, 2016
abda226
Dont forward proxyOpts to the tracker if set to false
yciabaud Aug 24, 2016
072aad6
Clone options before using it in socks
yciabaud Aug 25, 2016
6d313db
Remove socks agent generation since it cannot be reused between requests
yciabaud Aug 26, 2016
124bfc9
Use clone to deepcopy socks opts and add socks agent generation to we…
yciabaud Aug 26, 2016
f127199
Fix a bug in cloning / extending
yciabaud Aug 26, 2016
1583308
Check for proxy requirements in electron
yciabaud Aug 26, 2016
ac34a89
Disable WebRTC when proxy not compatible but continue with other tran…
yciabaud Aug 26, 2016
3fe91ef
Cleanup and error checking
yciabaud Aug 26, 2016
69a66a8
Fix IDE adding semi...
yciabaud Aug 26, 2016
bf564ba
Handle missing wrtc prop
yciabaud Aug 26, 2016
2a410fd
Prevent destroying client on proxy config problem
yciabaud Aug 26, 2016
ba6269b
Run the proxy settings in the electron-wrtc main process
yciabaud Aug 27, 2016
04399a6
Remove useless conditions conditions
yciabaud Sep 6, 2016
File filter...
Filter file types
Clear filters
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Prev Next
Loading status checks…

Fix IDE adding semi...

  • Loading branch information
@yciabaud
yciabaud committed Aug 26, 2016
commit 69a66a80b3dea2d04c8236c984f5ef9c36ae975e
2 index.js
View file
Open in desktop
@@ -116,7 +116,7 @@ function WebTorrent (opts) {
self.tracker.proxyOpts = self.proxyOpts
}

var socksProxy = self.proxyOpts.socksProxy;
var socksProxy = self.proxyOpts.socksProxy
if (socksProxy) {
if (!socksProxy.proxy) socksProxy.proxy = {}
if (!socksProxy.proxy.type) socksProxy.proxy.type = 5
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.