GitHub Action commited on
Commit ·
d354bfb
1
Parent(s): a83ec29
Sync from GitHub with Git LFS
Browse files- agents/peer_sync.py +14 -5
agents/peer_sync.py
CHANGED
|
@@ -87,23 +87,32 @@ def peer_exchange():
|
|
| 87 |
try:
|
| 88 |
addr_list = json.loads(addresses)
|
| 89 |
for addr in addr_list:
|
| 90 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 91 |
if proto not in ["tcp", "any"]:
|
| 92 |
continue # пропускаем UDP
|
| 93 |
|
| 94 |
-
host, port = hostport.split(":")
|
| 95 |
try:
|
|
|
|
| 96 |
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
| 97 |
s.settimeout(2)
|
| 98 |
s.connect((host, int(port)))
|
| 99 |
s.sendall(b"PEER_EXCHANGE_REQUEST")
|
| 100 |
s.close()
|
| 101 |
-
print(f"[PeerSync] Успешно подключились к {peer_id} ({
|
| 102 |
-
break # успешное подключение —
|
| 103 |
except Exception as e:
|
| 104 |
-
print(f"[PeerSync] Не удалось подключиться к {peer_id} ({
|
|
|
|
| 105 |
except Exception as e:
|
| 106 |
print(f"[PeerSync] Ошибка обработки адресов {peer_id} ({addresses}): {e}")
|
|
|
|
| 107 |
time.sleep(PEER_EXCHANGE_INTERVAL)
|
| 108 |
|
| 109 |
# ======================
|
|
|
|
| 87 |
try:
|
| 88 |
addr_list = json.loads(addresses)
|
| 89 |
for addr in addr_list:
|
| 90 |
+
# Нормализация адреса через storage
|
| 91 |
+
norm = storage.normalize_address(addr)
|
| 92 |
+
if norm is None:
|
| 93 |
+
continue
|
| 94 |
+
|
| 95 |
+
proto, hostport = norm.split("://")
|
| 96 |
+
|
| 97 |
+
# TCP и any обрабатываются как TCP
|
| 98 |
if proto not in ["tcp", "any"]:
|
| 99 |
continue # пропускаем UDP
|
| 100 |
|
|
|
|
| 101 |
try:
|
| 102 |
+
host, port = hostport.split(":")
|
| 103 |
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
| 104 |
s.settimeout(2)
|
| 105 |
s.connect((host, int(port)))
|
| 106 |
s.sendall(b"PEER_EXCHANGE_REQUEST")
|
| 107 |
s.close()
|
| 108 |
+
print(f"[PeerSync] Успешно подключились к {peer_id} ({norm})")
|
| 109 |
+
break # успешное подключение — остальные адреса не пробуем
|
| 110 |
except Exception as e:
|
| 111 |
+
print(f"[PeerSync] Не удалось подключиться к {peer_id} ({norm}): {e}")
|
| 112 |
+
|
| 113 |
except Exception as e:
|
| 114 |
print(f"[PeerSync] Ошибка обработки адресов {peer_id} ({addresses}): {e}")
|
| 115 |
+
|
| 116 |
time.sleep(PEER_EXCHANGE_INTERVAL)
|
| 117 |
|
| 118 |
# ======================
|