Merge branch 'dev' into maximilien

This commit is contained in:
Maximilien LEDOUX 2022-03-10 13:51:45 +01:00
commit 9e2e2d7aa4
3 changed files with 12 additions and 1 deletions

View File

@ -32,9 +32,10 @@ class AppController:
if message_id == Protocol.PARSE_SIGNOK: if message_id == Protocol.PARSE_SIGNOK:
self.window_controller.switch_connected_mode() self.window_controller.switch_connected_mode()
self.show_message("Connection done", False) self.show_message("Connection done", False)
self.on_filelist()
elif message_id == Protocol.PARSE_SIGNERROR: elif message_id == Protocol.PARSE_SIGNERROR:
self.show_message("Error during SIGN_IN / SIGN_UP", True) self.show_message("Error during SIGN_IN / SIGN_UP", True)
self.on_filelist() self.connection.close()
except Exception as ex: except Exception as ex:
print(ex) print(ex)
traceback.print_exc() traceback.print_exc()

View File

@ -11,10 +11,14 @@ class MainWindow:
self.root.title("SecCon - © Louis SWINNEN 2022") self.root.title("SecCon - © Louis SWINNEN 2022")
self.root.config(bd=5) self.root.config(bd=5)
self.host = tk.StringVar() self.host = tk.StringVar()
self.host.set("127.0.0.1")
self.passw = tk.StringVar() self.passw = tk.StringVar()
self.passw.set("aaaaa")
self.login = tk.StringVar() self.login = tk.StringVar()
self.login.set("aa")
self.tls = tk.BooleanVar() self.tls = tk.BooleanVar()
self.port = tk.IntVar() self.port = tk.IntVar()
self.port.set(8500)
self.draw_window() self.draw_window()
def start_main_loop(self): def start_main_loop(self):

View File

@ -107,5 +107,11 @@ class UnicastConnection:
def close(self): def close(self):
self.sock.close() self.sock.close()
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.is_connected = False
self.is_tls = False
self.ssock = None
self.ca_path = None
self.ssl_info = None