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

pex/kex hopefully now working

Browse source
This commit is contained in:
Kevin Froman 2018-04-03 16:47:48 -05:00
parent fdceb4be90
commit a611643526
No known key found for this signature in database
GPG key ID: 0D414D0FE405B63B
3 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
onionr/onionrutils.py
View file

@ -58,8 +58,8 @@ class OnionrUtils:
'''Merge ed25519 key list to our database'''
retVal = False
if newKeyList != False:
for key in newKeyList:
if not key in self._core.listPeers(randomOrder=False):
for key in newKeyList.split(','):
if not key in self._core.listPeers(randomOrder=False) and type(key) != None and key != self._core._crypto.pubKey:
if self._core.addPeer(key):
retVal = True
return retVal
@ -69,13 +69,22 @@ class OnionrUtils:
'''Merge peer adders list to our database'''
retVal = False
if newAdderList != False:
for adder in newAdderList:
if not adder in self._core.listAdders(randomOrder=False):
for adder in newAdderList.split(','):
if not adder in self._core.listAdders(randomOrder=False) and adder.strip() != self.getMyAddress():
if self._core.addAddress(adder):
logger.info('added ' + adder + ' to db')
input()
retVal = True
else:
logger.debug(adder + " is either our address or already in our DB")
return retVal
def getMyAddress(self):
myAddressFile = open("data/hs/hostname", 'r')
myAddress = myAddressFile.read()
myAddressFile.close()
return myAddress.strip()
def localCommand(self, command):
'''
Send a command to the local http API server, securely. Intended for local clients, DO NOT USE for remote peers.