Skip to content

Revert "Fix netcode server to update address property when letting the system assign a port." #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gafferongames merged 1 commit into from
Jul 5, 2020
Merged

Revert "Fix netcode server to update address property when letting the system assign a port." #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions client_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <assert.h>
#include <signal.h>
#include <inttypes.h>
#include <stdlib.h>

#define CONNECT_TOKEN_EXPIRY 30
#define CONNECT_TOKEN_TIMEOUT 5
Expand Down Expand Up @@ -80,7 +79,7 @@ int main( int argc, char ** argv )
server_config.protocol_id = PROTOCOL_ID;
memcpy( &server_config.private_key, private_key, NETCODE_KEY_BYTES );

char * server_address = "[::1]:00000";
char * server_address = "[::1]:40000";

struct netcode_server_t * server = netcode_server_create( server_address, &server_config, time );

Expand All @@ -92,10 +91,6 @@ int main( int argc, char ** argv )

netcode_server_start( server, 1 );

// Create updated server address that includes system assigned port.
char *updated_server_address = calloc(256, 1);
snprintf(updated_server_address, 256, "[::1]:%i", netcode_server_get_port(server));

uint8_t connect_token[NETCODE_CONNECT_TOKEN_BYTES];

uint64_t client_id = 0;
Expand All @@ -105,7 +100,7 @@ int main( int argc, char ** argv )
uint8_t user_data[NETCODE_USER_DATA_BYTES];
netcode_random_bytes(user_data, NETCODE_USER_DATA_BYTES);

if ( netcode_generate_connect_token( 1, (NETCODE_CONST char**) &updated_server_address, (NETCODE_CONST char**) &updated_server_address, CONNECT_TOKEN_EXPIRY, CONNECT_TOKEN_TIMEOUT, client_id, PROTOCOL_ID, private_key, user_data, connect_token ) != NETCODE_OK )
if ( netcode_generate_connect_token( 1, (NETCODE_CONST char**) &server_address, (NETCODE_CONST char**) &server_address, CONNECT_TOKEN_EXPIRY, CONNECT_TOKEN_TIMEOUT, client_id, PROTOCOL_ID, private_key, user_data, connect_token ) != NETCODE_OK )
{
printf( "error: failed to generate connect token\n" );
return 1;
Expand Down Expand Up @@ -195,9 +190,6 @@ int main( int argc, char ** argv )
netcode_client_destroy( client );

netcode_term();

free(updated_server_address);
updated_server_address = NULL;

return 0;
}
31 changes: 1 addition & 30 deletions netcode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,31 +503,6 @@ char * netcode_address_to_string( struct netcode_address_t * address, char * buf
}
}

int netcode_address_is_any_address(struct netcode_address_t *a) {
if (a->type == NETCODE_ADDRESS_IPV4) {
// 0.0.0.0
if (a->data.ipv4[0] == 0 &&
a->data.ipv4[1] == 0 &&
a->data.ipv4[2] == 0 &&
a->data.ipv4[3] == 0)
return 1;

} else if ( a->type == NETCODE_ADDRESS_IPV6 ) {
// [::] aka [0:0:0:0:0:0:0:0]
if (a->data.ipv6[0] == 0 &&
a->data.ipv6[1] == 0 &&
a->data.ipv6[2] == 0 &&
a->data.ipv6[3] == 0 &&
a->data.ipv6[4] == 0 &&
a->data.ipv6[5] == 0 &&
a->data.ipv6[6] == 0 &&
a->data.ipv6[7] == 0)
return 1;
}

return 0;
}

int netcode_address_equal( struct netcode_address_t * a, struct netcode_address_t * b )
{
netcode_assert( a );
Expand All @@ -539,10 +514,6 @@ int netcode_address_equal( struct netcode_address_t * a, struct netcode_address_
if ( a->port != b->port )
return 0;

// At this point, ports match. If either address is 0.0.0.0 or [::], then mark them as matching. These addresses are never routed, they're only used when listening.
if (netcode_address_is_any_address(a) || netcode_address_is_any_address(b))
return 1;

if ( a->type == NETCODE_ADDRESS_IPV4 )
{
int i;
Expand Down Expand Up @@ -3924,7 +3895,7 @@ struct netcode_server_t * netcode_server_create_overload( NETCODE_CONST char * s
server->config = *config;
server->socket_holder.ipv4 = socket_ipv4;
server->socket_holder.ipv6 = socket_ipv6;
server->address = server_address1.type == NETCODE_ADDRESS_IPV4 ? server->socket_holder.ipv4.address : server->socket_holder.ipv6.address;
server->address = server_address1;
server->flags = 0;
server->time = time;
server->running = 0;
Expand Down