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

Use literal NULs instead of pipes to differenciate between the message and client name

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

25
server.py
View file

@ -36,6 +36,7 @@ G.killList = {}
G.outboundLinks = [] G.outboundLinks = []
G.S2SLogs = [] G.S2SLogs = []
G.cwlgd = False G.cwlgd = False
G.NUL = "\x00"
saveLogs = True saveLogs = True
address = "::" address = "::"
# Try to load a message log, if one exists # Try to load a message log, if one exists
@ -319,16 +320,16 @@ Please note that this is not network level statistics.\r\n""".encode(
) )
) )
case "M": case "M":
cName = buffer[2:].split("|", 1)[0] cName = buffer[2:].split(G.NUL, 1)[0]
message = buffer[2:].split("|", 1)[1] message = buffer[2:].split(G.NUL, 1)[1]
G.msgs.append(log(f" {cName}: {message}")) G.msgs.append(log(f" {cName}: {message}"))
G.S2SLogs.append(("M", (cName, message), sName)) G.S2SLogs.append(("M", (cName, message), sName))
writer.write( writer.write(
b"I Get these damn heretic ghost clients out of my store so i can buy my cult candles in peace.\r\n" b"I Get these damn heretic ghost clients out of my store so i can buy my cult candles in peace.\r\n"
) )
case "A": case "A":
cName = buffer[2:].split("|", 1)[0] cName = buffer[2:].split(G.NUL, 1)[0]
message = buffer[2:].split("|", 1)[1] message = buffer[2:].split(G.NUL, 1)[1]
G.msgs.append(log(f"* {cName} {message}")) G.msgs.append(log(f"* {cName} {message}"))
G.S2SLogs.append(("A", (cName, message), sName)) G.S2SLogs.append(("A", (cName, message), sName))
writer.write(b"I Mmm... Strawberries\r\n") writer.write(b"I Mmm... Strawberries\r\n")
@ -371,10 +372,10 @@ Please note that this is not network level statistics.\r\n""".encode(
match type: match type:
case "A": case "A":
nick, msg = data nick, msg = data
writer.write(f"A {nick}|{msg}\r\n".encode("utf8")) writer.write(f"A {nick}{G.NUL}{msg}\r\n".encode("utf8"))
case "M": case "M":
nick, msg = data nick, msg = data
writer.write(f"M {nick}|{msg}\r\n".encode("utf8")) writer.write(f"M {nick}{G.NUL}{msg}\r\n".encode("utf8"))
case "+": case "+":
writer.write(f"+ {data}\r\n".encode("utf8")) writer.write(f"+ {data}\r\n".encode("utf8"))
case "-": case "-":
@ -505,16 +506,16 @@ async def connectServer(hostname: str, port: int):
) )
) )
case "M": case "M":
cName = buffer[2:].split("|", 1)[0] cName = buffer[2:].split(G.NUL, 1)[0]
message = buffer[2:].split("|", 1)[1] message = buffer[2:].split(G.NUL, 1)[1]
G.msgs.append(log(f" {cName}: {message}")) G.msgs.append(log(f" {cName}: {message}"))
G.S2SLogs.append(("M", (cName, message), rID)) G.S2SLogs.append(("M", (cName, message), rID))
writer.write( writer.write(
b"I Get these damn heretic ghost clients out of my store so i can buy my cult candles in peace.\r\n" b"I Get these damn heretic ghost clients out of my store so i can buy my cult candles in peace.\r\n"
) )
case "A": case "A":
cName = buffer[2:].split("|", 1)[0] cName = buffer[2:].split(G.NUL, 1)[0]
message = buffer[2:].split("|", 1)[1] message = buffer[2:].split(G.NUL, 1)[1]
G.S2SLogs.append(("A", (cName, message), rID)) G.S2SLogs.append(("A", (cName, message), rID))
G.msgs.append(log(f"* {cName} {message}")) G.msgs.append(log(f"* {cName} {message}"))
writer.write(b"I Mmm... Strawberries\r\n") writer.write(b"I Mmm... Strawberries\r\n")
@ -556,10 +557,10 @@ async def connectServer(hostname: str, port: int):
match type: match type:
case "A": case "A":
nick, msg = data nick, msg = data
writer.write(f"A {nick}|{msg}\r\n".encode("utf8")) writer.write(f"A {nick}{G.NUL}{msg}\r\n".encode("utf8"))
case "M": case "M":
nick, msg = data nick, msg = data
writer.write(f"M {nick}|{msg}\r\n".encode("utf8")) writer.write(f"M {nick}{G.NUL}{msg}\r\n".encode("utf8"))
case "+": case "+":
writer.write(f"+ {data}\r\n".encode("utf8")) writer.write(f"+ {data}\r\n".encode("utf8"))
case "-": case "-":