mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed Netplay positive acknowledgement messages: They didn't document

Browse Source 
their corresponding sent message, and so couldn't be used for
acknowledgement anyway. Negative acknowledgement is sufficient.
This commit is contained in:
Gregor Richards 2016-09-13 18:03:36 -04:00
parent 6829b80c6b
commit b140b16b5d
1 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
network/netplay/netplay.c
View File

@ -58,20 +58,6 @@ static void warn_hangup(void)
runloop_msg_queue_push("Netplay has disconnected. Will continue without connection.", 0, 480, false); runloop_msg_queue_push("Netplay has disconnected. Will continue without connection.", 0, 480, false);
} }
/**
* check_netplay_synched:
* @netplay: pointer to the netplay object.
* Checks to see if the host and client have synchronized states. Returns true
* on success and false on failure.
*/
bool check_netplay_synched(netplay_t* netplay)
{
retro_assert(netplay);
/*return netplay->self_frame_count < (netplay->flip_frame + 2 * UDP_FRAME_PACKETS);*/
/* FIXME */
return true;
}
static bool netplay_info_cb(netplay_t* netplay, unsigned frames) { static bool netplay_info_cb(netplay_t* netplay, unsigned frames) {
return netplay->net_cbs->info_cb(netplay, frames); return netplay->net_cbs->info_cb(netplay, frames);
} }
@ -203,25 +189,11 @@ static bool netplay_send_raw_cmd(netplay_t *netplay, uint32_t cmd,
return true; return true;
} }
static bool netplay_cmd_ack(netplay_t *netplay)
{
return netplay_send_raw_cmd(netplay, NETPLAY_CMD_ACK, NULL, 0);
}
static bool netplay_cmd_nak(netplay_t *netplay) static bool netplay_cmd_nak(netplay_t *netplay)
{ {
return netplay_send_raw_cmd(netplay, NETPLAY_CMD_NAK, NULL, 0); return netplay_send_raw_cmd(netplay, NETPLAY_CMD_NAK, NULL, 0);
} }
static bool netplay_get_response(netplay_t *netplay)
{
uint32_t response;
if (!socket_receive_all_blocking(netplay->fd, &response, sizeof(response)))
return false;
return ntohl(response) == NETPLAY_CMD_ACK;
}
static bool netplay_get_cmd(netplay_t *netplay) static bool netplay_get_cmd(netplay_t *netplay)
{ {
uint32_t cmd; uint32_t cmd;
@ -312,7 +284,7 @@ static bool netplay_get_cmd(netplay_t *netplay)
RARCH_LOG("Netplay users are flipped.\n"); RARCH_LOG("Netplay users are flipped.\n");
runloop_msg_queue_push("Netplay users are flipped.", 1, 180, false); runloop_msg_queue_push("Netplay users are flipped.", 1, 180, false);
return netplay_cmd_ack(netplay); return true;
case NETPLAY_CMD_SPECTATE: case NETPLAY_CMD_SPECTATE:
RARCH_ERR("NETPLAY_CMD_SPECTATE unimplemented.\n"); RARCH_ERR("NETPLAY_CMD_SPECTATE unimplemented.\n");
@ -320,7 +292,7 @@ static bool netplay_get_cmd(netplay_t *netplay)
case NETPLAY_CMD_DISCONNECT: case NETPLAY_CMD_DISCONNECT:
warn_hangup(); warn_hangup();
return netplay_cmd_ack(netplay); return true;
case NETPLAY_CMD_LOAD_SAVESTATE: case NETPLAY_CMD_LOAD_SAVESTATE:
RARCH_ERR("NETPLAY_CMD_LOAD_SAVESTATE unimplemented.\n"); RARCH_ERR("NETPLAY_CMD_LOAD_SAVESTATE unimplemented.\n");
@ -328,11 +300,11 @@ static bool netplay_get_cmd(netplay_t *netplay)
case NETPLAY_CMD_PAUSE: case NETPLAY_CMD_PAUSE:
command_event(CMD_EVENT_PAUSE, NULL); command_event(CMD_EVENT_PAUSE, NULL);
return netplay_cmd_ack(netplay); return true;
case NETPLAY_CMD_RESUME: case NETPLAY_CMD_RESUME:
command_event(CMD_EVENT_UNPAUSE, NULL); command_event(CMD_EVENT_UNPAUSE, NULL);
return netplay_cmd_ack(netplay); return true;
default: break; default: break;
} }
@ -849,7 +821,6 @@ bool netplay_command(netplay_t* netplay, enum netplay_cmd cmd,
const char* msg = NULL; const char* msg = NULL;
bool allowed_spectate = !!(flags & CMD_OPT_ALLOWED_IN_SPECTATE_MODE); bool allowed_spectate = !!(flags & CMD_OPT_ALLOWED_IN_SPECTATE_MODE);
bool host_only = !!(flags & CMD_OPT_HOST_ONLY); bool host_only = !!(flags & CMD_OPT_HOST_ONLY);
bool require_sync = !!(flags & CMD_OPT_REQUIRE_SYNC);
retro_assert(netplay); retro_assert(netplay);
@ -865,21 +836,11 @@ bool netplay_command(netplay_t* netplay, enum netplay_cmd cmd,
goto error; goto error;
} }
if(require_sync && check_netplay_synched(netplay)) if (!netplay_send_raw_cmd(netplay, cmd, data, sz))
{
msg = "Cannot %s while host and client are not in sync.";
goto error; goto error;
}
if(netplay_send_raw_cmd(netplay, cmd, data, sz)) { runloop_msg_queue_push(success_msg, 1, 180, false);
if(netplay_get_response(netplay))
runloop_msg_queue_push(success_msg, 1, 180, false);
else
{
msg = "Failed to send command \"%s\"";
goto error;
}
}
return true; return true;
error: error: