add ipv6 tests

.travis.yml

@@ -28,5 +28,6 @@ script:
   - python tests/test.py -c tests/server-multi-ports.json
   - python tests/test.py -s tests/server-multi-passwd.json -c tests/server-multi-passwd-client-side.json
   - python tests/test.py -c tests/workers.json
+  - python tests/test.py -s tests/ipv6.json -c tests/ipv6-client-side.json
   - python tests/test.py -b "-m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388" -a "-m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -l 1081"
   - python tests/test.py -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081"

shadowsocks/tcprelay.py

@@ -241,7 +241,7 @@ def _handle_stage_hello(self, data):
                         header = b'\x05\x00\x00\x04'
                     else:
                         header = b'\x05\x00\x00\x01'
-                    addr, port = self._local_sock.getsockname()
+                    addr, port = self._local_sock.getsockname()[:2]
                     addr_to_send = socket.inet_pton(self._local_sock.family,
                                                     addr)
                     port_to_send = struct.pack('>H', port)

tests/ipv6-client-side.json

@@ -0,0 +1,10 @@
+{
+    "server":"::1",
+    "server_port":8388,
+    "local_port":1081,
+    "password":"aes_password",
+    "timeout":60,
+    "method":"aes-256-cfb",
+    "local_address":"127.0.0.1",
+    "fast_open":false
+}

tests/ipv6.json

@@ -0,0 +1,10 @@
+{
+    "server":"::",
+    "server_port":8388,
+    "local_port":1081,
+    "password":"aes_password",
+    "timeout":60,
+    "method":"aes-256-cfb",
+    "local_address":"127.0.0.1",
+    "fast_open":false
+}

tests/test.py

@@ -42,8 +42,8 @@
 
 config = parser.parse_args()
 
-client_args = [python, 'shadowsocks/local.py']
-server_args = [python, 'shadowsocks/server.py']
+client_args = [python, 'shadowsocks/local.py', '-v']
+server_args = [python, 'shadowsocks/server.py', '-v']
 
 if config.client_conf:
     client_args.extend(['-c', config.client_conf])