Skip to content

update P2P synchronisation #16

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

Open
Wit-MKW wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update P2P synchronisation #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67c29c6
update P2P synchronisation
Wit-MKW Jun 24, 2025
0704f56
keep P2P socket open on remote disconnect
Wit-MKW Jun 25, 2025
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
36 changes: 10 additions & 26 deletions commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ static struct mobile_packet *command_tel_ip(struct mobile_adapter *adapter, stru
}

s->state = MOBILE_CONNECTION_CALL;
s->call_packets_sent = 0;

packet->length = 0;
return packet;
Expand Down Expand Up @@ -361,7 +360,6 @@ static struct mobile_packet *command_tel_relay(struct mobile_adapter *adapter, s
}

s->state = MOBILE_CONNECTION_CALL;
s->call_packets_sent = 0;

packet->length = 0;
return packet;
Expand Down Expand Up @@ -464,7 +462,6 @@ static struct mobile_packet *command_wait_call_ip(struct mobile_adapter *adapter
if (!mobile_cb_sock_accept(adapter, 0)) return NULL;

s->state = MOBILE_CONNECTION_CALL_RECV;
s->call_packets_sent = 0;

packet->length = 0;
return packet;
Expand Down Expand Up @@ -500,7 +497,6 @@ static struct mobile_packet *command_wait_call_relay(struct mobile_adapter *adap
}

s->state = MOBILE_CONNECTION_CALL_RECV;
s->call_packets_sent = 0;

packet->length = 0;
return packet;
Expand Down Expand Up @@ -625,31 +621,19 @@ static struct mobile_packet *command_data(struct mobile_adapter *adapter, struct
}
return NULL;
}

// Pokémon Crystal expects communications to be "synchronized".
// For this, we only try to receive packets when we've sent one.
// TODO: Check other games with peer to peer functionality.
if (!internet) {
if (s->call_packets_sent < 0xFF) s->call_packets_sent++;
}
}

int recv_size = 0;
if (internet || s->call_packets_sent) {
recv_size = mobile_cb_sock_recv(adapter, conn, data,
MOBILE_MAX_TRANSFER_SIZE, NULL);
}

if (!internet && recv_size > 0) {
if (s->call_packets_sent > 0) s->call_packets_sent--;
}
int recv_size = mobile_cb_sock_recv(adapter, conn, data,
MOBILE_MAX_TRANSFER_SIZE, NULL);

// If connected to the internet, and a disconnect is received, we should
// inform the game about a remote disconnect.
if (internet && recv_size == -2) {
mobile_cb_sock_close(adapter, conn);
s->connections[conn] = false;
packet->command = MOBILE_COMMAND_DATA_END;
if (recv_size == -2) {
// If connected to the internet, and a disconnect is received, we
// should inform the game about a remote disconnect.
if (internet) {
mobile_cb_sock_close(adapter, conn);
s->connections[conn] = false;
packet->command = MOBILE_COMMAND_DATA_END;
}
packet->length = 1;
return packet;
}
Expand Down
1 change: 0 additions & 1 deletion commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ struct mobile_adapter_commands {
enum mobile_connection_state state;
bool connections[MOBILE_MAX_CONNECTIONS];
bool dns2_use;
unsigned char call_packets_sent;
struct mobile_addr4 dns1;
struct mobile_addr4 dns2;
};
Expand Down