grey/Enlight
1
0
Fork 0
mirror of https://github.com/TheGreyDiamond/Enlight.git synced 2026-03-31 14:50:24 +02:00
Code Issues Releases Activity

Update session.py

Browse Source
This commit is contained in:
TheGreyDiamond
2020-09-11 16:43:03 +02:00
parent 502aa1ac22
commit bcd1a0b0f8
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Code/session.py
View File

@@ -88,24 +88,41 @@ class enlightSession():
self.__client__.bind(("", 37020)) self.__client__.bind(("", 37020))
logging.info("Starting lighthouse thread") logging.info("Starting lighthouse thread")
self.__activ__ = True self.__activ__ = True
self.__direct_socket__ = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.__direct_socket__.bind(("", 5589))
self.__client_thread__ = threading.Thread(target=self.lighthouseMain, args=(), name="Lighthouse server") self.__client_thread__ = threading.Thread(target=self.lighthouseMain, args=(), name="Lighthouse server")
self.__client_thread__.start() self.__client_thread__.start()
self.__direct_thread__ = threading.Thread(target=self.lightSearcherDirectMain, args=(), name="Inbound session direct server")
self.__direct_thread__.start()
self.__trying_to_connect__ = False
def lightSearcherMain(self): def lightSearcherMain(self):
''' The main thread for clients to connect '''
logging.info("Inbound connection handler started") logging.info("Inbound connection handler started")
self.__direct_socket__.listen() self.__direct_socket__.listen()
while self.allowJoin: while self.allowJoin:
''' The main thread for clients to connect '''
try: try:
conn, addr = self.__direct_socket__.accept() conn, addr = self.__direct_socket__.accept()
data, addr = self.__direct_socket__.recvfrom(1024) data = conn.recv(1024)
conn.sendall(b"CONNECTION INT OK")
logging.info("Got inbound connection with data: " + str(data) + " from " + str(addr))
except OSError: except OSError:
logging.warning("Client socket, failure. Session maybe not avaiable anymore?") logging.warning("Client socket, failure. Session maybe not avaiable anymore?")
else:
print(data)
logging.info("Inbound connection handler stopped") logging.info("Inbound connection handler stopped")
def lightSearcherDirectMain(self):
while self.allowJoin:
try:
conn, addr = self.__direct_socket__.accept()
data = conn.recv(1024)
if(self.__trying_to_connect__ != False):
conn.sendall(b"ACK")
logging.info("Got inbound connection with data: " + str(data) + " from " + str(addr))
except OSError:
logging.warning("Client socket, failure. Session maybe not avaiable anymore?")
def lighthouseMain(self): def lighthouseMain(self):
''' The main thread for searching/finding sessions ''' ''' The main thread for searching/finding sessions '''
while self.__activ__: while self.__activ__:
@@ -167,6 +184,7 @@ class enlightSession():
self.__direct_socket__.connect((data[len(data)-1][0], 5589)) self.__direct_socket__.connect((data[len(data)-1][0], 5589))
self.__direct_socket__.sendall(b'CONNECT') self.__direct_socket__.sendall(b'CONNECT')
self.__trying_to_connect__ = sessionID
logging.info("Sent JOIN intent to session host") logging.info("Sent JOIN intent to session host")
except ConnectionRefusedError: except ConnectionRefusedError:
logging.warning("Connection refused by session host") logging.warning("Connection refused by session host")