Fix autobind on IPv6

Author: evilaliv3

tor2web/t2w.py

@@ -1115,7 +1115,11 @@ def unregisterProtocol(self, p):
 
 def open_listening_socket(ip, port):
     try:
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        if isIPv6Address(ip):
+            s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        else:
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+
         s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         s.setblocking(False)
         s.bind((ip, port))
@@ -1141,7 +1145,7 @@ def daemon_init(self):
 
         i_https = i_http = 0
 
-        for ip in [ipv4, ipv6]:
+        for ip in [ipv6, ipv4]:
             if ip is None:
                 continue
 

tor2web/utils/config.py

@@ -66,8 +66,8 @@ def __init__(self):
         self.__dict__['processes'] = 1
         self.__dict__['requests_per_process'] = 1000000
         self.__dict__['transport'] = 'BOTH'
-        self.__dict__['listen_ipv4'] = '127.0.0.1'
-        self.__dict__['listen_ipv6'] = None
+        self.__dict__['listen_ipv4'] = '0.0.0.0'
+        self.__dict__['listen_ipv6'] = '::'
         self.__dict__['listen_port_http'] = 80
         self.__dict__['listen_port_https'] = 443
         self.__dict__['basehost'] = 'AUTO'