1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## 23_remove_UPnP_options.dpatch by Cameron Dale <camrdale@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove the UPnP options which only work on Windows.
@DPATCH@
--- bittornado.orig/BitTornado/download_bt1.py
+++ bittornado/BitTornado/download_bt1.py
@@ -95,9 +95,6 @@
'allow the client to connect to peers via IPv6'),
('ipv6_binds_v4', autodetect_socket_style(),
"set if an IPv6 server socket won't also field IPv4 connections"),
- ('upnp_nat_access', 1,
- 'attempt to autoconfigure a UPnP router to forward a server port ' +
- '(0 = disabled, 1 = mode 1 [fast], 2 = mode 2 [slow])'),
('upload_rate_fudge', 5.0,
'time equivalent of writing to kernel-level TCP buffer, for rate adjustment'),
('tcp_ack_fudge', 0.03,
@@ -194,7 +191,7 @@
config['timeout'], ipv6_enable = config['ipv6_enabled'],
failfunc = failed, errorfunc = exchandler)
- upnp_type = UPnP_test(config['upnp_nat_access'])
+ upnp_type = 0
try:
listen_port = rawserver.find_and_bind(config['minport'], config['maxport'],
config['bind'], ipv6_socket_style = config['ipv6_binds_v4'],
--- bittornado.orig/BitTornado/launchmanycore.py
+++ bittornado/BitTornado/launchmanycore.py
@@ -169,7 +169,7 @@
self.rawserver = RawServer(self.doneflag, config['timeout_check_interval'],
config['timeout'], ipv6_enable = config['ipv6_enabled'],
failfunc = self.failed, errorfunc = self.exchandler)
- upnp_type = UPnP_test(config['upnp_nat_access'])
+ upnp_type = 0
while True:
try:
self.listen_port = self.rawserver.find_and_bind(
--- bittornado.orig/btdownloadcurses.py
+++ bittornado/btdownloadcurses.py
@@ -334,7 +334,7 @@
config['timeout'], ipv6_enable = config['ipv6_enabled'],
failfunc = d.failed, errorfunc = d.error)
- upnp_type = UPnP_test(config['upnp_nat_access'])
+ upnp_type = 0
while True:
try:
listen_port = rawserver.find_and_bind(config['minport'], config['maxport'],
--- bittornado.orig/btdownloadgui.py
+++ bittornado/btdownloadgui.py
@@ -2253,7 +2253,7 @@
config['timeout'], ipv6_enable = config['ipv6_enabled'],
failfunc = d.error, errorfunc = d.errorwindow)
- upnp_type = UPnP_test(config['upnp_nat_access'])
+ upnp_type = 0
while True:
try:
listen_port = rawserver.find_and_bind(config['minport'], config['maxport'],
--- bittornado.orig/btdownloadheadless.py
+++ bittornado/btdownloadheadless.py
@@ -175,7 +175,7 @@
rawserver = RawServer(doneflag, config['timeout_check_interval'],
config['timeout'], ipv6_enable = config['ipv6_enabled'],
failfunc = h.failed, errorfunc = disp_exception)
- upnp_type = UPnP_test(config['upnp_nat_access'])
+ upnp_type = 0
while True:
try:
listen_port = rawserver.find_and_bind(config['minport'], config['maxport'],
|
