From a53f2205bf1a8b67e6572fe05df64ed6c5ad3972 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Wed, 21 Aug 2024 14:22:14 -0700 Subject: [PATCH 1/3] Fix logging setup. I misspelled "getLogger" --- server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server.py b/server.py index c1a6a2f..3778914 100755 --- a/server.py +++ b/server.py @@ -3,12 +3,13 @@ import argparse import logging import socket -LOGGER = logging.Logger(__name__) +LOGGER = logging.getLogger(__name__) def main(): parser = argparse.ArgumentParser() parser.add_argument("host", help="The IPv6 address of the host to connect to.") parser.add_argument("--port", "-p", default=50007, help="The port to connect to.") + parser.add_argument("--verbose", action="store_true", help="Verbose logging") args = parser.parse_args() addresses = [addr for addr in socket.getaddrinfo(host=args.host, port=args.port, family=socket.AF_INET6, type=socket.SOCK_STREAM, proto=0, flags=0)] From 71a3076f991ba3df3da331f00a42f496d6a0d624 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Wed, 21 Aug 2024 14:22:31 -0700 Subject: [PATCH 2/3] Add not-working IP scan This came from a bad LLM. Needs cleanup. --- server.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index 3778914..0a3beba 100755 --- a/server.py +++ b/server.py @@ -7,12 +7,28 @@ LOGGER = logging.getLogger(__name__) def main(): parser = argparse.ArgumentParser() - parser.add_argument("host", help="The IPv6 address of the host to connect to.") + parser.add_argument("--address", help="The IPv6 address to bind") parser.add_argument("--port", "-p", default=50007, help="The port to connect to.") parser.add_argument("--verbose", action="store_true", help="Verbose logging") args = parser.parse_args() - addresses = [addr for addr in socket.getaddrinfo(host=args.host, port=args.port, family=socket.AF_INET6, type=socket.SOCK_STREAM, proto=0, flags=0)] + logging.basicConfig( + format="%(asctime)s %(message)s", + level=logging.DEBUG if args.verbose else logging.INFO, + ) + + hostname = socket.gethostname() + addresses = [] + for interface in socket.if_nameindex(): + interface_name = interface[1] + LOGGER.debug("Found interface %s", interface_name) + try: + addrs = socket.getaddrinfo(host=hostname, port=80, family=socket.AF_INET6) + for addr in addrs: + addresses.append((interface_name, addr[4][0])) + except socket.gaierror: + LOGGER.info("Interfare '%s' has no IPv6 addresses", interface_name) + addresses = [addr for addr in socket.getaddrinfo(host=args.address, port=args.port, family=socket.AF_INET6, type=socket.SOCK_STREAM, proto=0, flags=0)] if not addresses: raise ValueError("Couldn't find ipv6 address for source %s" % source_ip) if len(addresses) > 1: From d577928b3ad48ebd4383b5014ed6e6c3d7f3a5af Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Wed, 21 Aug 2024 14:22:47 -0700 Subject: [PATCH 3/3] Respond with additional data so the client knows we interpreted things. --- server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.py b/server.py index 0a3beba..25f9830 100755 --- a/server.py +++ b/server.py @@ -57,7 +57,7 @@ def bind_socket(family, type_, proto, canonname, sockaddr): while True: data = conn.recv(1024) if not data: break - conn.send(data) + conn.send(("Hey " + data.decode("UTF-8").encode("UTF-8")) if __name__ == "__main__": main()