gnunet prefix

main
Bob Mottram 2020-06-09 13:07:43 +01:00
parent bee0d99ce6
commit 74d77aef3e
1 changed files with 14 additions and 6 deletions

View File

@ -375,6 +375,10 @@ if args.testsnetwork:
httpPrefix = 'https' httpPrefix = 'https'
if args.http: if args.http:
httpPrefix = 'http' httpPrefix = 'http'
if args.i2p:
httpPrefix = 'i2p'
elif args.gnunet:
httpPrefix = 'gnunet'
baseDir = args.baseDir baseDir = args.baseDir
if baseDir.endswith('/'): if baseDir.endswith('/'):
@ -1076,14 +1080,18 @@ if args.actor:
domain = args.actor.split('@')[1] domain = args.actor.split('@')[1]
domain = domain.replace('\n', '').replace('\r', '') domain = domain.replace('\n', '').replace('\r', '')
cachedWebfingers = {} cachedWebfingers = {}
if args.http or \ if args.http or domain.endswith('.onion'):
domain.endswith('.onion') or domain.endswith('.i2p'):
httpPrefix = 'http' httpPrefix = 'http'
port = 80 port = 80
if domain.endswith('.onion'): proxyType = 'tor'
proxyType = 'tor' elif domain.endswith('.i2p'):
elif domain.endswith('.i2p'): httpPrefix = 'i2p'
proxyType = 'i2p' port = 80
proxyType = 'i2p'
elif args.gnunet:
httpPrefix = 'gnunet'
port = 80
proxyType = 'gnunet'
else: else:
httpPrefix = 'https' httpPrefix = 'https'
port = 443 port = 443