dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed support for v2 onions

Browse source
This commit is contained in:
Kevin Froman 2020-03-26 03:48:57 -05:00
parent 922f2be235
commit 62b4f5eb0e
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/communicatorutils/connectnewpeers.py
View file

@ -48,7 +48,7 @@ def connect_new_peer_to_communicator(comm_inst, peer='', useBootstrap=False):
tryingNew.append(x) tryingNew.append(x)
for i in tryingNew: for i in tryingNew:
comm_inst.newPeers.remove(i) comm_inst.newPeers.remove(i)
if len(peerList) == 0 or useBootstrap: if len(peerList) == 0 or useBootstrap:
# Avoid duplicating bootstrap addresses in peerList # Avoid duplicating bootstrap addresses in peerList
if config.get('general.use_bootstrap_list', True): if config.get('general.use_bootstrap_list', True):
@ -57,8 +57,6 @@ def connect_new_peer_to_communicator(comm_inst, peer='', useBootstrap=False):
for address in peerList: for address in peerList:
address = address.strip() address = address.strip()
if not config.get('tor.v3onions') and len(address) == 62:
continue
# Don't connect to our own address # Don't connect to our own address
if address in transports: if address in transports:
continue continue

4
src/netcontroller/torcontrol/gentorrc.py
View file

@ -17,13 +17,11 @@ def generate_torrc(net_controller, api_server_ip):
Generate a torrc file for our tor instance Generate a torrc file for our tor instance
""" """
socks_port = net_controller.socksPort socks_port = net_controller.socksPort
hs_ver = '# v2 onions'
hs_port = net_controller.hsPort hs_port = net_controller.hsPort
home_dir = identifyhome.identify_home() home_dir = identifyhome.identify_home()
tor_config_location = home_dir + '/torrc' tor_config_location = home_dir + '/torrc'
if config.get('tor.v3onions'): hs_ver = 'HiddenServiceVersion 3'
hs_ver = 'HiddenServiceVersion 3'
""" """
Set the Tor control password. Set the Tor control password.

2
src/utils/networkmerger.py
View file

@ -32,8 +32,6 @@ def mergeAdders(newAdderList):
for adder in newAdderList.split(','): for adder in newAdderList.split(','):
adder = adder.strip() adder = adder.strip()
if not adder in keydb.listkeys.list_adders(randomOrder = False) and not adder in gettransports.get() and not blacklist.inBlacklist(adder): if not adder in keydb.listkeys.list_adders(randomOrder = False) and not adder in gettransports.get() and not blacklist.inBlacklist(adder):
if not config.get('tor.v3onions', True) and len(adder) == 62:
continue
if keydb.addkeys.add_address(adder): if keydb.addkeys.add_address(adder):
# Check if we have the maximum amount of allowed stored peers # Check if we have the maximum amount of allowed stored peers
if config.get('peers.max_stored_peers') > len(keydb.listkeys.list_adders()): if config.get('peers.max_stored_peers') > len(keydb.listkeys.list_adders()):