test

Author: npapagna

client/bin/gs-info.py

@@ -23,17 +23,19 @@
 import subprocess
 import sys
 
-def netldi_ip():
+def local_outbound_ip():
     # Doesn't actually send any packets (UDP connect() just picks a route):
     # this reads back whichever local address the OS would use to reach the
     # outside world, i.e. this machine's own address as seen from beyond its
     # network stack -- the same thing `hostname -I` plus IPv4/IPv6 filtering
     # was after.
-    probe_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    probe_socket.connect(("8.8.8.8", 80))
-    ip = probe_socket.getsockname()[0]
-    probe_socket.close()
-    return ip
+    try:
+        with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as probe_socket:
+            probe_socket.connect(("8.8.8.8", 80))
+            return probe_socket.getsockname()[0]
+    except OSError as e:
+        print(f"Could not determine this machine's outbound IP: {e}", file=sys.stderr)
+        sys.exit(1)
 
 def netldi_port(name):
     result = subprocess.run(
@@ -71,7 +73,9 @@ def netldi_port(name):
     return entries[0]["Port"]
 
 def main():
+    if len(sys.argv) != 2:
+        sys.exit(f"Usage: {sys.argv[0]} <netldi-name>")
     name = sys.argv[1]
-    print(netldi_ip(), netldi_port(name))
+    print(local_outbound_ip(), netldi_port(name))
 
 main()