Consolidate impl of get_ip_address

(cherry picked from commit e812ef0)

Author: NickCao

packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py

@@ -6,7 +6,7 @@
 from aiohttp import web
 from jumpstarter_driver_opendal.driver import Opendal
 
-from jumpstarter.common.ipaddress import get_default_ip
+from jumpstarter.common.ipaddress import get_ip_address
 from jumpstarter.driver import Driver, export
 
 
@@ -42,7 +42,7 @@ def __post_init__(self):
             ]
         )
         if self.host is None:
-            self.host = get_default_ip(logger=self.logger)
+            self.host = get_ip_address(logger=self.logger)
 
     @classmethod
     def client(cls) -> str:

packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver.py

@@ -1,6 +1,5 @@
 import asyncio
 import os
-import socket
 import threading
 from dataclasses import dataclass, field
 from typing import Optional
@@ -9,7 +8,7 @@
 
 from jumpstarter_driver_tftp.server import TftpServer
 
-from jumpstarter.common.ipaddress import get_default_ip
+from jumpstarter.common.ipaddress import get_ip_address
 from jumpstarter.driver import Driver, export
 
 
@@ -56,7 +55,7 @@ def __post_init__(self):
         self.storage = self.children["storage"]
 
         if self.host == "":
-            self.host = get_default_ip(logger=self.logger)
+            self.host = get_ip_address(logger=self.logger)
 
     @classmethod
     def client(cls) -> str:

packages/jumpstarter/jumpstarter/common/ipaddress.py

@@ -1,27 +1,22 @@
 import logging
 import socket
+from ipaddress import ip_address
 
 
-def get_ip_address() -> str:
+def get_ip_address(logger: logging.Logger | None = None) -> str:
     """Get the IP address of the host machine"""
     # Try to get the IP address using the hostname
     hostname = socket.gethostname()
     address = socket.gethostbyname(hostname)
-    # If it returns a bogus address, do it the hard way
-    if not address or address.startswith("127."):
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        s.connect(("1.1.1.1", 0))
-        address = s.getsockname()[0]
-    return address
-
+    # If it returns nothing or a loopbadck address, do it the hard way
+    if not address or ip_address(address).is_loopback:
+        try:
+            with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
+                s.connect(("192.175.48.1", 53))  # AS112
+                return s.getsockname()[0]
+        except Exception:
+            if logger:
+                logger.warning("Could not determine default IP address, falling back to 0.0.0.0")
+            return "0.0.0.0"
 
-def get_default_ip(logger: logging.Logger | None = None):
-    """Get the IP address of the default route interface"""
-    try:
-        with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
-            s.connect(("8.8.8.8", 80))
-            return s.getsockname()[0]
-    except Exception:
-        if logger:
-            logger.warning("Could not determine default IP address, falling back to 0.0.0.0")
-        return "0.0.0.0"
+    return address