@@ -3142,6 +3142,22 @@ void netcode_client_reset_connection_data( struct netcode_client_t * client, int
31423142
31433143void netcode_client_disconnect_internal ( struct netcode_client_t * client , int destination_state , int send_disconnect_packets );
31443144
3145+ static int netcode_client_address_family_usable ( struct netcode_client_t * client , int address_type )
3146+ {
3147+ // a network simulator or send/receive override reaches every family without a socket
3148+
3149+ if ( client -> config .network_simulator || client -> config .override_send_and_receive )
3150+ return 1 ;
3151+
3152+ if ( address_type == NETCODE_ADDRESS_IPV4 )
3153+ return netcode_socket_handle_valid ( client -> socket_holder .ipv4 .handle );
3154+
3155+ if ( address_type == NETCODE_ADDRESS_IPV6 )
3156+ return netcode_socket_handle_valid ( client -> socket_holder .ipv6 .handle );
3157+
3158+ return 0 ;
3159+ }
3160+
31453161void netcode_client_connect ( struct netcode_client_t * client , uint8_t * connect_token )
31463162{
31473163 netcode_assert ( client );
@@ -3155,8 +3171,22 @@ void netcode_client_connect( struct netcode_client_t * client, uint8_t * connect
31553171 return ;
31563172 }
31573173
3158- client -> server_address_index = 0 ;
3159- client -> server_address = client -> connect_token .server_addresses [0 ];
3174+ int server_address_index = 0 ;
3175+
3176+ while ( server_address_index < client -> connect_token .num_server_addresses &&
3177+ !netcode_client_address_family_usable ( client , client -> connect_token .server_addresses [server_address_index ].type ) )
3178+ {
3179+ server_address_index ++ ;
3180+ }
3181+
3182+ if ( server_address_index >= client -> connect_token .num_server_addresses )
3183+ {
3184+ netcode_client_set_state ( client , NETCODE_CLIENT_STATE_INVALID_CONNECT_TOKEN );
3185+ return ;
3186+ }
3187+
3188+ client -> server_address_index = server_address_index ;
3189+ client -> server_address = client -> connect_token .server_addresses [server_address_index ];
31603190
31613191 char server_address_string [NETCODE_MAX_ADDRESS_STRING_LENGTH ];
31623192
@@ -3472,14 +3502,22 @@ int netcode_client_connect_to_next_server( struct netcode_client_t * client )
34723502{
34733503 netcode_assert ( client );
34743504
3475- if ( client -> server_address_index + 1 >= client -> connect_token .num_server_addresses )
3505+ int server_address_index = client -> server_address_index + 1 ;
3506+
3507+ while ( server_address_index < client -> connect_token .num_server_addresses &&
3508+ !netcode_client_address_family_usable ( client , client -> connect_token .server_addresses [server_address_index ].type ) )
3509+ {
3510+ server_address_index ++ ;
3511+ }
3512+
3513+ if ( server_address_index >= client -> connect_token .num_server_addresses )
34763514 {
34773515 netcode_printf ( NETCODE_LOG_LEVEL_DEBUG , "client has no more servers to connect to\n" );
34783516 return 0 ;
34793517 }
34803518
3481- client -> server_address_index ++ ;
3482- client -> server_address = client -> connect_token .server_addresses [client -> server_address_index ];
3519+ client -> server_address_index = server_address_index ;
3520+ client -> server_address = client -> connect_token .server_addresses [server_address_index ];
34833521
34843522 netcode_client_reset_before_next_connect ( client );
34853523
@@ -8792,20 +8830,35 @@ void test_server_update_drains_empty_datagrams()
87928830
87938831 netcode_client_send_packet ( client , packet_data , NETCODE_MAX_PACKET_SIZE );
87948832
8795- netcode_server_update ( server , time );
8833+ // the empty datagrams need not all be queued before this update starts, so pump
8834+ // the server until the payload shows up, with a bounded wait so a stuck run fails
8835+ // instead of hanging
87968836
87978837 int received = 0 ;
8838+ int attempts ;
87988839
8799- while ( 1 )
8840+ for ( attempts = 0 ; attempts < 200 && ! received ; attempts ++ )
88008841 {
8801- int packet_bytes ;
8802- uint64_t packet_sequence ;
8803- void * packet = netcode_server_receive_packet ( server , 0 , & packet_bytes , & packet_sequence );
8804- if ( !packet )
8842+ netcode_server_update ( server , time );
8843+
8844+ while ( 1 )
8845+ {
8846+ int packet_bytes ;
8847+ uint64_t packet_sequence ;
8848+ void * packet = netcode_server_receive_packet ( server , 0 , & packet_bytes , & packet_sequence );
8849+ if ( !packet )
8850+ break ;
8851+ if ( packet_bytes == NETCODE_MAX_PACKET_SIZE && memcmp ( packet , packet_data , NETCODE_MAX_PACKET_SIZE ) == 0 )
8852+ received = 1 ;
8853+ netcode_server_free_packet ( server , packet );
8854+ }
8855+
8856+ if ( received )
88058857 break ;
8806- if ( packet_bytes == NETCODE_MAX_PACKET_SIZE && memcmp ( packet , packet_data , NETCODE_MAX_PACKET_SIZE ) == 0 )
8807- received = 1 ;
8808- netcode_server_free_packet ( server , packet );
8858+
8859+ netcode_sleep ( 0.01 );
8860+
8861+ time += delta_time ;
88098862 }
88108863
88118864 check ( received );
@@ -9332,6 +9385,182 @@ void test_client_error_connect_token_expired()
93329385 netcode_network_simulator_destroy ( network_simulator );
93339386}
93349387
9388+ void test_client_connect_matching_address_family ()
9389+ {
9390+ // model a client with one address family and no socket of the other.
9391+ // create runs with send and receive overrides, so it opens no socket;
9392+ // the family that exists is then a handle, and the overrides are cleared
9393+ // before connect. connect does not read or write a socket.
9394+
9395+ struct netcode_client_config_t client_config ;
9396+ netcode_default_client_config ( & client_config );
9397+ client_config .override_send_and_receive = 1 ;
9398+ client_config .send_packet_override = test_override_send_packet ;
9399+ client_config .receive_packet_override = test_override_receive_packet ;
9400+
9401+ uint8_t user_data [NETCODE_USER_DATA_BYTES ];
9402+ memset ( user_data , 0 , sizeof ( user_data ) );
9403+
9404+ struct netcode_client_t * client = netcode_client_create ( "127.0.0.1:50000" , & client_config , 0.0 );
9405+
9406+ check ( client );
9407+ check ( !netcode_socket_handle_valid ( client -> socket_holder .ipv4 .handle ) );
9408+ check ( !netcode_socket_handle_valid ( client -> socket_holder .ipv6 .handle ) );
9409+
9410+ client -> config .override_send_and_receive = 0 ;
9411+ client -> config .send_packet_override = NULL ;
9412+ client -> config .receive_packet_override = NULL ;
9413+ client -> socket_holder .ipv4 .handle = 1 ;
9414+ client -> socket_holder .ipv6 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9415+
9416+ NETCODE_CONST char * other_family = "[::1]:40000" ;
9417+ uint8_t connect_token [NETCODE_CONNECT_TOKEN_BYTES ];
9418+
9419+ check ( netcode_generate_connect_token ( 1 , & other_family , & other_family , TEST_CONNECT_TOKEN_EXPIRY , TEST_TIMEOUT_SECONDS , TEST_CLIENT_ID , TEST_PROTOCOL_ID , private_key , user_data , connect_token ) );
9420+
9421+ netcode_client_connect ( client , connect_token );
9422+
9423+ check ( netcode_client_state ( client ) == NETCODE_CLIENT_STATE_INVALID_CONNECT_TOKEN );
9424+
9425+ client -> state = NETCODE_CLIENT_STATE_DISCONNECTED ;
9426+ client -> socket_holder .ipv4 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9427+ netcode_client_destroy ( client );
9428+
9429+ client = netcode_client_create ( "127.0.0.1:50000" , & client_config , 0.0 );
9430+
9431+ check ( client );
9432+
9433+ client -> config .override_send_and_receive = 0 ;
9434+ client -> config .send_packet_override = NULL ;
9435+ client -> config .receive_packet_override = NULL ;
9436+ client -> socket_holder .ipv4 .handle = 1 ;
9437+ client -> socket_holder .ipv6 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9438+
9439+ NETCODE_CONST char * server_addresses [] = { "[::1]:40000" , "127.0.0.1:40000" };
9440+
9441+ check ( netcode_generate_connect_token ( 2 , server_addresses , server_addresses , TEST_CONNECT_TOKEN_EXPIRY , TEST_TIMEOUT_SECONDS , TEST_CLIENT_ID , TEST_PROTOCOL_ID , private_key , user_data , connect_token ) );
9442+
9443+ netcode_client_connect ( client , connect_token );
9444+
9445+ check ( netcode_client_state ( client ) == NETCODE_CLIENT_STATE_SENDING_CONNECTION_REQUEST );
9446+ check ( client -> server_address_index == 1 );
9447+ check ( client -> server_address .type == NETCODE_ADDRESS_IPV4 );
9448+ check ( client -> server_address .port == 40000 );
9449+
9450+ client -> state = NETCODE_CLIENT_STATE_DISCONNECTED ;
9451+ client -> socket_holder .ipv4 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9452+ netcode_client_destroy ( client );
9453+
9454+ client = netcode_client_create ( "127.0.0.1:50000" , & client_config , 0.0 );
9455+
9456+ check ( client );
9457+
9458+ client -> config .override_send_and_receive = 0 ;
9459+ client -> config .send_packet_override = NULL ;
9460+ client -> config .receive_packet_override = NULL ;
9461+ client -> socket_holder .ipv4 .handle = 1 ;
9462+ client -> socket_holder .ipv6 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9463+
9464+ NETCODE_CONST char * stopped_addresses [] = { "127.0.0.1:40000" , "[::1]:40001" };
9465+
9466+ check ( netcode_generate_connect_token ( 2 , stopped_addresses , stopped_addresses , TEST_CONNECT_TOKEN_EXPIRY , TEST_TIMEOUT_SECONDS , TEST_CLIENT_ID , TEST_PROTOCOL_ID , private_key , user_data , connect_token ) );
9467+
9468+ netcode_client_connect ( client , connect_token );
9469+
9470+ check ( client -> server_address_index == 0 );
9471+ check ( client -> server_address .type == NETCODE_ADDRESS_IPV4 );
9472+ check ( client -> server_address .port == 40000 );
9473+
9474+ check ( netcode_client_connect_to_next_server ( client ) == 0 );
9475+ check ( client -> server_address_index == 0 );
9476+ check ( client -> server_address .type == NETCODE_ADDRESS_IPV4 );
9477+ check ( client -> server_address .port == 40000 );
9478+ check ( netcode_client_state ( client ) == NETCODE_CLIENT_STATE_SENDING_CONNECTION_REQUEST );
9479+
9480+ client -> state = NETCODE_CLIENT_STATE_DISCONNECTED ;
9481+ client -> socket_holder .ipv4 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9482+ netcode_client_destroy ( client );
9483+
9484+ client = netcode_client_create ( "127.0.0.1:50000" , & client_config , 0.0 );
9485+
9486+ check ( client );
9487+
9488+ client -> config .override_send_and_receive = 0 ;
9489+ client -> config .send_packet_override = NULL ;
9490+ client -> config .receive_packet_override = NULL ;
9491+ client -> socket_holder .ipv4 .handle = 1 ;
9492+ client -> socket_holder .ipv6 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9493+
9494+ NETCODE_CONST char * later_addresses [] = { "127.0.0.1:40000" , "[::1]:40001" , "127.0.0.1:40002" };
9495+
9496+ check ( netcode_generate_connect_token ( 3 , later_addresses , later_addresses , TEST_CONNECT_TOKEN_EXPIRY , TEST_TIMEOUT_SECONDS , TEST_CLIENT_ID , TEST_PROTOCOL_ID , private_key , user_data , connect_token ) );
9497+
9498+ netcode_client_connect ( client , connect_token );
9499+
9500+ check ( client -> server_address_index == 0 );
9501+ check ( client -> server_address .type == NETCODE_ADDRESS_IPV4 );
9502+
9503+ check ( netcode_client_connect_to_next_server ( client ) == 1 );
9504+ check ( client -> server_address_index == 2 );
9505+ check ( client -> server_address .type == NETCODE_ADDRESS_IPV4 );
9506+ check ( client -> server_address .port == 40002 );
9507+
9508+ client -> state = NETCODE_CLIENT_STATE_DISCONNECTED ;
9509+ client -> socket_holder .ipv4 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9510+ netcode_client_destroy ( client );
9511+
9512+ // ipv6-only client: a token with only an ipv4 address has no family to use
9513+
9514+ client = netcode_client_create ( "[::1]:50000" , & client_config , 0.0 );
9515+
9516+ check ( client );
9517+
9518+ client -> config .override_send_and_receive = 0 ;
9519+ client -> config .send_packet_override = NULL ;
9520+ client -> config .receive_packet_override = NULL ;
9521+ client -> socket_holder .ipv4 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9522+ client -> socket_holder .ipv6 .handle = 1 ;
9523+
9524+ NETCODE_CONST char * ipv4_only = "127.0.0.1:40000" ;
9525+
9526+ check ( netcode_generate_connect_token ( 1 , & ipv4_only , & ipv4_only , TEST_CONNECT_TOKEN_EXPIRY , TEST_TIMEOUT_SECONDS , TEST_CLIENT_ID , TEST_PROTOCOL_ID , private_key , user_data , connect_token ) );
9527+
9528+ netcode_client_connect ( client , connect_token );
9529+
9530+ check ( netcode_client_state ( client ) == NETCODE_CLIENT_STATE_INVALID_CONNECT_TOKEN );
9531+
9532+ client -> state = NETCODE_CLIENT_STATE_DISCONNECTED ;
9533+ client -> socket_holder .ipv6 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9534+ netcode_client_destroy ( client );
9535+
9536+ // ipv6-only client: skip an ipv4 address and select the ipv6 one after it
9537+
9538+ client = netcode_client_create ( "[::1]:50000" , & client_config , 0.0 );
9539+
9540+ check ( client );
9541+
9542+ client -> config .override_send_and_receive = 0 ;
9543+ client -> config .send_packet_override = NULL ;
9544+ client -> config .receive_packet_override = NULL ;
9545+ client -> socket_holder .ipv4 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9546+ client -> socket_holder .ipv6 .handle = 1 ;
9547+
9548+ NETCODE_CONST char * ipv6_after_ipv4_addresses [] = { "127.0.0.1:40000" , "[::1]:40001" };
9549+
9550+ check ( netcode_generate_connect_token ( 2 , ipv6_after_ipv4_addresses , ipv6_after_ipv4_addresses , TEST_CONNECT_TOKEN_EXPIRY , TEST_TIMEOUT_SECONDS , TEST_CLIENT_ID , TEST_PROTOCOL_ID , private_key , user_data , connect_token ) );
9551+
9552+ netcode_client_connect ( client , connect_token );
9553+
9554+ check ( netcode_client_state ( client ) == NETCODE_CLIENT_STATE_SENDING_CONNECTION_REQUEST );
9555+ check ( client -> server_address_index == 1 );
9556+ check ( client -> server_address .type == NETCODE_ADDRESS_IPV6 );
9557+ check ( client -> server_address .port == 40001 );
9558+
9559+ client -> state = NETCODE_CLIENT_STATE_DISCONNECTED ;
9560+ client -> socket_holder .ipv6 .handle = NETCODE_SOCKET_HANDLE_INVALID ;
9561+ netcode_client_destroy ( client );
9562+ }
9563+
93359564void test_client_error_connect_token_expired_multiple_servers ()
93369565{
93379566 struct netcode_network_simulator_t * network_simulator = netcode_network_simulator_create ( NULL , NULL , NULL );
@@ -11691,6 +11920,7 @@ void netcode_test()
1169111920 RUN_TEST ( test_client_server_multiple_clients );
1169211921 RUN_TEST ( test_client_server_multiple_servers );
1169311922 RUN_TEST ( test_client_error_connect_token_expired );
11923+ RUN_TEST ( test_client_connect_matching_address_family );
1169411924 RUN_TEST ( test_client_error_connect_token_expired_multiple_servers );
1169511925 RUN_TEST ( test_client_error_invalid_connect_token );
1169611926 RUN_TEST ( test_client_error_connection_timed_out );
0 commit comments