From 6ec65239a4d771f694ceff248d28cc0bff88d2c5 Mon Sep 17 00:00:00 2001 From: SanderJ Date: Fri, 31 Jan 2014 17:36:52 +0100 Subject: [PATCH] Report IPv4 and IPv6 address via logging.info, patched against develop --- SABnzbd.py | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/SABnzbd.py b/SABnzbd.py index 43761bc..c49de92 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -882,6 +882,26 @@ def get_f_option(opts): else: return None +def print_ip_addresses(): + try: + s_ipv4 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s_ipv4.connect(("google.com",80)) + logging.info('IP address = %s', s_ipv4.getsockname()[0]) + s_ipv4.close() + except: + logging.info('could not determine IP address') + pass + + try: + s_ipv6 = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) + s_ipv6.connect(("ipv6.google.com",80)) + logging.info('IPv6 address = %s', s_ipv6.getsockname()[0]) + s_ipv6.close() + except: + logging.info('could not determine IPv6 address') + pass + + return None #------------------------------------------------------------------------------ def main(): @@ -1264,6 +1284,24 @@ def main(): logging.info('Python-version = %s', sys.version) logging.info('Arguments = %s', sabnzbd.CMDLINE) + try: + s_ipv4 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s_ipv4.connect(("google.com",80)) + logging.info('IP address = %s', s_ipv4.getsockname()[0]) + s_ipv4.close() + except: + logging.info('could not determine IP address') + pass + + try: + s_ipv6 = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) + s_ipv6.connect(("ipv6.google.com",80)) + logging.info('IPv6 address = %s', s_ipv6.getsockname()[0]) + s_ipv6.close() + except: + logging.info('could not determine IPv6 address') + pass + # OSX 10.5 I/O priority setting if sabnzbd.DARWIN: logging.info('[osx] IO priority setting')