From 3e853ddb79b38e0e93a4560c22071086911d5cb6 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Mon, 19 Feb 2024 22:54:43 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py    | 25 ++++++++++++------------
 network.py | 56 +++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/main.py b/main.py
index ca1f775..50bd9b4 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,9 @@
 from os import system, name
 from threading import Thread
+from time import sleep
 
 # Здесь общий запуск всех файлов и команд
-
+'''
 # Проверка обновлений
 from sys import argv
 if len(argv) == 1:
@@ -12,29 +13,29 @@ if len(argv) == 1:
 	system("python main.py updated")
 	exit()
 print("\nУспешно перезагружено!")
-
 '''
+
 # Порт для приёма всяких запросов
+from random import randint
+dest = randint(4000, 4200)
 def reverse_proxy():
+	global dest
 	port = 8000
 	if name == "posix":
-		system(f"./bore local {port} --to jetwork.404.mn")
+		system(f"./bore local {port} --to jetwork.404.mn --port {dest}")
 	elif name == "nt":
-		system("")
+		system(f"bore.exe local {port} --to jetwork.404.mn --port {dest}")
 
+'''
 # Стартуем проброс порта
 rp = Thread(target = reverse_proxy)
 rp.start()
+sleep(0.5)
 '''
+print(f"\nВаш порт: {dest}")
 
-'''
 from network import *
 
-#server(8000)
-
-if client(8001):
-	print(1)
-else:
-	print(2)
-'''
+#server(8001)
+client(8001)
 
diff --git a/network.py b/network.py
index 790f9f2..e4dcc7d 100644
--- a/network.py
+++ b/network.py
@@ -5,11 +5,35 @@ import os
 
 # TODO:
 # 1. [+] Пинг
-# 2. [+] Проверка существования .zip сайта
+# 2. [+] Проверка существования сайта
 # 3. Передача сайта
 # 4. Приём рассылки сайтов
 
-def server(port):
+def server(port = 8000):
+	host = "127.0.0.1"
+
+	s = socket.socket()
+	s.bind((host, port))
+
+	while True:
+		s.listen(2)
+		conn, address = s.accept()
+
+		print("Connection from: " + str(address))
+
+		while True:
+			try:
+				op = conn.recv(1024).decode()
+			except:
+				pass
+			if not op:
+				break
+
+			if op == "ping":
+				conn.send("Pinged success".encode())
+		conn.close()
+
+'''
 	sock = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
 	sock.bind (('127.0.0.1', port))
 
@@ -18,6 +42,7 @@ def server(port):
 		#print (addres[0], addres[1])
 		op = data.decode('utf-8')
 
+		print(op)
 		if op == "ping":
 			sock.sendto("Pinged success".encode('utf-8'), addres)
 		elif op[:3] == "is_":
@@ -28,20 +53,33 @@ def server(port):
 				sock.sendto("not exist".encode('utf-8'), addres)
 		else:
 			sock.sendto(data, addres)
-
+'''
 
 # op = operation
-def client(dest_port, op = "ping"):
-	server = '127.0.0.1', dest_port
+def client(port, op = "ping"):
+	host = 'jetwork.404.mn'
+	s = socket.socket()
+	s.connect((host, port))
+
+	s.send("ping".encode())
+	data = s.recv(1024).decode()
+	print('Received from server: ' + data)
+
+	s.close()
+
+'''
+	server = 'jetwork.404.mn', port
 
 	sor = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
 	sor.sendto((op).encode('utf-8'), server)
 	sor.settimeout(5)
 
-	try:
+#	try:
+	if True:
 		data = sor.recv(1024)
 		res = data.decode('utf-8')
 		return res
-	except:
-		print(f"[:{dest_port}] Недоступен.")
-		return None
+#	except:
+#		print(f"[:{dest_port}] Недоступен.")
+#		return None
+'''