|
23 | 23 | g_spew_level = None |
24 | 24 | g_p2p_rendezvous_level = None |
25 | 25 | g_stun_ip = "127.0.100.1" |
| 26 | +g_stun_ipv6 = "fd7f:0:100::1" |
26 | 27 | g_stun_port = 3478 |
27 | 28 | g_setup_mock_ips = False |
28 | 29 | g_cleanup_mock_ips = False |
@@ -152,7 +153,7 @@ def StartClientInThread( role, local, remote, extra_args=[] ): |
152 | 153 | "--log", local + ".verbose.log" |
153 | 154 | ] |
154 | 155 |
|
155 | | - cmdline += [ '--stun-server', "%s:%d" % (g_stun_ip, g_stun_port) ] |
| 156 | + cmdline += [ '--stun-server', "%s:%d,[%s]:%d" % (g_stun_ip, g_stun_port, g_stun_ipv6, g_stun_port) ] |
156 | 157 | cmdline += extra_args |
157 | 158 | if g_spew_level is not None: |
158 | 159 | cmdline.append( '--spewlevel=' + g_spew_level ) |
@@ -194,6 +195,7 @@ def StartClientInThread( role, local, remote, extra_args=[] ): |
194 | 195 | g_stun_ip, |
195 | 196 | _SRV_GW, _CLI_GW, _SRV_GW2, _CLI_GW2, |
196 | 197 | _SRV_INT, _CLI_INT, _SRV_INT2, _CLI_INT2, _DEAD_INT, _CLI_SAME_LAN, |
| 198 | + g_stun_ipv6, |
197 | 199 | _SRV_GW_V6, _CLI_GW_V6, _SRV_INT_V6, _CLI_INT_V6, |
198 | 200 | ] |
199 | 201 |
|
@@ -380,8 +382,11 @@ def _slow_nat( internal, gateway, nat_type, latency_ms ): |
380 | 382 | [ '--mock-adapter', _CLI_GW_V6 ], |
381 | 383 | 'udp', 1 ), |
382 | 384 |
|
383 | | - # NOTE: IPv6 NAT cases require STUN to discover server-reflexive candidates. |
384 | | - # The STUN server does not yet support IPv6, so those tests are deferred. |
| 385 | + # IPv6 full-cone NAT |
| 386 | + ( 'IPv6 full-cone NAT', |
| 387 | + _nat( _SRV_INT_V6, _SRV_GW_V6, 'full-cone' ), |
| 388 | + _nat( _CLI_INT_V6, _CLI_GW_V6, 'full-cone' ), |
| 389 | + 'udp', 1 ), |
385 | 390 | ] |
386 | 391 |
|
387 | 392 | def ClientServerTest( server_extra_args=[], client_extra_args=[], expected_route=None, ice_impl=1 ): |
@@ -428,7 +433,8 @@ def ClientServerTest( server_extra_args=[], client_extra_args=[], expected_route |
428 | 433 | print( "Can't find stun_server.py" ) |
429 | 434 | sys.exit(1) |
430 | 435 |
|
431 | | -stun = StartProcessInThread( "stun", [ sys.executable, stun_server_script, '--host', g_stun_ip, '--port', str(g_stun_port) ], |
| 436 | +stun = StartProcessInThread( "stun", [ sys.executable, stun_server_script, |
| 437 | + '--host', g_stun_ip, '--host6', g_stun_ipv6, '--port', str(g_stun_port) ], |
432 | 438 | ready_message="STUN server listening on", ready_event=g_stun_ready ) |
433 | 439 |
|
434 | 440 | if not g_stun_ready.wait( timeout=g_server_startup_timeout ): |
|
0 commit comments