Firepup650/python-talk
2
1
Fork 1
Code Issues Pull requests Activity Actions

Refuse blank server names, allow IPv6 & IPv4 connections at the same time

Browse source
This commit is contained in:
Firepup Sixfifty 2024-07-31 21:08:25 +00:00
parent a245acc770
commit 8bc876d7af
Signed by: Firepup650
SSH key fingerprint: SHA256:U0Zp8EhEe3CMqFSrC79CqatzaEiL4sjta80/RSX2XrY
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server.py
View file

@ -1,5 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
import os, sys, asyncio, re, signal import os, sys, asyncio, re, signal, socket
from platform import uname from platform import uname
from traceback import format_exc from traceback import format_exc
from logs import log from logs import log
@ -37,7 +37,7 @@ G.outboundLinks = []
G.S2SLogs = [] G.S2SLogs = []
G.cwlgd = False G.cwlgd = False
saveLogs = True saveLogs = True
address = "0.0.0.0" address = "::"
# Try to load a message log, if one exists # Try to load a message log, if one exists
try: try:
G.msgs = __import__("cache").msgs G.msgs = __import__("cache").msgs
@ -239,7 +239,7 @@ Please note that this is not network level statistics.\r\n""".encode(
writer.close() writer.close()
await writer.wait_closed() await writer.wait_closed()
return # Server is already "linked", drop the connection return # Server is already "linked", drop the connection
if G.remoteID == sName: # Hey! you can't *also* be ***me***! if G.remoteID == sName or not sName: # Hey! you can't *also* be ***me***!
writer.close() writer.close()
await writer.wait_closed() await writer.wait_closed()
return # drop "us" return # drop "us"
@ -444,7 +444,7 @@ async def connectServer(hostname: str, port: int):
writer.close() writer.close()
await writer.wait_closed() await writer.wait_closed()
return return
if G.remoteID == rID: if G.remoteID == rID or not rID:
writer.close() writer.close()
await writer.wait_closed() await writer.wait_closed()
return return
@ -602,7 +602,13 @@ async def connectServer(hostname: str, port: int):
async def runServer(address: str, port: int): async def runServer(address: str, port: int):
global G global G
server = await asyncio.start_server(handleClient, address, port) if ":" in address:
INET = socket.AF_INET6
else:
INET = socket.AF_INET
sock = socket.socket(INET, socket.SOCK_STREAM)
sock.bind((address, port))
server = await asyncio.start_server(handleClient, sock=sock)
log(f"Listening on port {port}...") log(f"Listening on port {port}...")
G.msgs.append(log("Server startup")) G.msgs.append(log("Server startup"))
links = [] links = []