Merge I2P Branch (#19)

* work on i2p support

* work on i2p support

* redid socks check

* redid socks check

* redid socks check

* work on i2p and fixed broken block processing

* fixed no newline delim on block list in api

* fixed no newline delim on block list in api

* fixed no newline delim on block list in api

* use extend instead of append for blocklist after newline changes
This commit is contained in:
Kevin Froman 2018-05-19 16:32:21 -05:00 committed by Arinerron
parent bbac26fed1
commit 500658808f
8 changed files with 46 additions and 13 deletions

View file

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
'''
import sqlite3, os, sys, time, math, base64, tarfile, getpass, simplecrypt, hashlib, nacl, logger, json, netcontroller, math
import sqlite3, os, sys, time, math, base64, tarfile, getpass, simplecrypt, hashlib, nacl, logger, json, netcontroller, math, config
#from Crypto.Cipher import AES
#from Crypto import Random
@ -111,6 +111,8 @@ class Core:
'''
Add an address to the address database (only tor currently)
'''
if address == config.get('i2p')['ownAddr']:
return False
if self._utils.validateID(address):
conn = sqlite3.connect(self.addressDB)
c = conn.cursor()