jacob.eva/Reticulum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on I2P Interface

Browse Source
This commit is contained in:
Mark Qvist 2022-02-23 22:15:06 +01:00
parent 8d58bb62ab
commit 9c6fd132d4
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
RNS/Interfaces/I2PInterface.py
View File

@ -9,11 +9,6 @@ import os
import RNS import RNS
import asyncio import asyncio
# TODO: Remove
import logging
logging.basicConfig()
logging.getLogger().setLevel(logging.DEBUG)
class HDLC(): class HDLC():
FLAG = 0x7E FLAG = 0x7E
ESC = 0x7D ESC = 0x7D
@ -64,6 +59,7 @@ class I2PController:
finally: finally:
self.loop.close() self.loop.close()
# TODO: Remove
RNS.log("EVENT LOOP DOWN") RNS.log("EVENT LOOP DOWN")
def stop(self): def stop(self):
@ -100,15 +96,11 @@ class I2PController:
key_file = open(i2p_keyfile, "w") key_file = open(i2p_keyfile, "w")
key_file.write(i2p_dest.private_key.base64) key_file.write(i2p_dest.private_key.base64)
key_file.close() key_file.close()
# TODO: Remove
RNS.log("Created")
else: else:
key_file = open(i2p_keyfile, "r") key_file = open(i2p_keyfile, "r")
prvd = key_file.read() prvd = key_file.read()
key_file.close() key_file.close()
i2p_dest = self.i2plib.Destination(data=prvd, has_private_key=True) i2p_dest = self.i2plib.Destination(data=prvd, has_private_key=True)
# TODO: Remove
RNS.log("Loaded")
i2p_b32 = i2p_dest.base32 i2p_b32 = i2p_dest.base32
@ -132,15 +124,10 @@ class ThreadingI2PServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
pass pass
class I2PInterfacePeer(Interface): class I2PInterfacePeer(Interface):
RECONNECT_WAIT = 10 RECONNECT_WAIT = 15
RECONNECT_MAX_TRIES = None RECONNECT_MAX_TRIES = None
# TCP socket options # TCP socket options
TCP_USER_TIMEOUT = 20
TCP_PROBE_AFTER = 5
TCP_PROBE_INTERVAL = 3
TCP_PROBES = 5
I2P_USER_TIMEOUT = 40 I2P_USER_TIMEOUT = 40
I2P_PROBE_AFTER = 10 I2P_PROBE_AFTER = 10
I2P_PROBE_INTERVAL = 5 I2P_PROBE_INTERVAL = 5
@ -195,9 +182,6 @@ class I2PInterfacePeer(Interface):
self.owner.i2p.client_tunnel(self, target_i2p_dest) self.owner.i2p.client_tunnel(self, target_i2p_dest)
# TODO: Remove
RNS.log("TCP params: "+str((self.bind_ip, self.bind_port)))
if not self.connect(initial=True): if not self.connect(initial=True):
# TODO: Remove # TODO: Remove
RNS.log("Initial TCP attempt failed, trying reconnects...") RNS.log("Initial TCP attempt failed, trying reconnects...")
@ -318,8 +302,8 @@ class I2PInterfacePeer(Interface):
RNS.Transport.synthesize_tunnel(self) RNS.Transport.synthesize_tunnel(self)
else: else:
RNS.log("Attempt to reconnect on a non-initiator TCP interface. This should not happen.", RNS.LOG_ERROR) RNS.log("Attempt to reconnect on a non-initiator I2P interface. This should not happen.", RNS.LOG_ERROR)
raise IOError("Attempt to reconnect on a non-initiator TCP interface") raise IOError("Attempt to reconnect on a non-initiator I2P interface")
def processIncoming(self, data): def processIncoming(self, data):
self.rxb += len(data) self.rxb += len(data)
@ -363,8 +347,6 @@ class I2PInterfacePeer(Interface):
while True: while True:
data_in = self.socket.recv(4096) data_in = self.socket.recv(4096)
if len(data_in) > 0: if len(data_in) > 0:
# TODO: Remove
RNS.log("Read "+str(len(data_in)))
pointer = 0 pointer = 0
while pointer < len(data_in): while pointer < len(data_in):
byte = data_in[pointer] byte = data_in[pointer]
@ -501,17 +483,14 @@ class I2PInterface(Interface):
thread.setDaemon(True) thread.setDaemon(True)
thread.start() thread.start()
# TODO: Remove
RNS.log("Started TCP server for I2P on "+str(self.address)+" "+str(self.server))
self.i2p.server_tunnel(self) self.i2p.server_tunnel(self)
if peers != None: if peers != None:
for peer_addr in peers: for peer_addr in peers:
interface_name = peer_addr interface_name = peer_addr
peer_interface = I2PInterfacePeer(self, interface_name, peer_addr) peer_interface = I2PInterfacePeer(self, interface_name, peer_addr)
peer_interface.OUT = self.OUT peer_interface.OUT = True
peer_interface.IN = self.IN peer_interface.IN = True
peer_interface.parent_interface = self peer_interface.parent_interface = self
RNS.Transport.interfaces.append(peer_interface) RNS.Transport.interfaces.append(peer_interface)
@ -522,8 +501,8 @@ class I2PInterface(Interface):
RNS.log("Accepting incoming I2P connection", RNS.LOG_VERBOSE) RNS.log("Accepting incoming I2P connection", RNS.LOG_VERBOSE)
interface_name = "Connected peer on "+self.name interface_name = "Connected peer on "+self.name
spawned_interface = I2PInterfacePeer(self.owner, interface_name, connected_socket=handler.request) spawned_interface = I2PInterfacePeer(self.owner, interface_name, connected_socket=handler.request)
spawned_interface.OUT = self.OUT spawned_interface.OUT = True
spawned_interface.IN = self.IN spawned_interface.IN = True
spawned_interface.parent_interface = self spawned_interface.parent_interface = self
spawned_interface.online = True spawned_interface.online = True
RNS.log("Spawned new I2PInterface Peer: "+str(spawned_interface), RNS.LOG_VERBOSE) RNS.log("Spawned new I2PInterface Peer: "+str(spawned_interface), RNS.LOG_VERBOSE)