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

Merge pull request #4676 from GregorR/netplay-nat-traversal-task-2

Browse Source 
Fix race condition in NAT traversal task.
This commit is contained in:
Twinaphex 2017-02-21 02:18:43 +01:00 committed by GitHub
commit 91ed01dbcc
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
network/netplay/netplay_frontend.c
View File

@ -685,6 +685,7 @@ bool netplay_pre_frame(netplay_t *netplay)
/* NAT traversal if applicable */ /* NAT traversal if applicable */
if (netplay->nat_traversal && if (netplay->nat_traversal &&
!netplay->nat_traversal_task_oustanding &&
netplay->nat_traversal_state.request_outstanding && netplay->nat_traversal_state.request_outstanding &&
!netplay->nat_traversal_state.have_inet4) !netplay->nat_traversal_state.have_inet4)
{ {
@ -1198,7 +1199,10 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
ret = netplay_disconnect(netplay_data); ret = netplay_disconnect(netplay_data);
goto done; goto done;
case RARCH_NETPLAY_CTL_FINISHED_NAT_TRAVERSAL: case RARCH_NETPLAY_CTL_FINISHED_NAT_TRAVERSAL:
netplay_data->nat_traversal_task_oustanding = false;
#ifndef HAVE_SOCKET_LEGACY
netplay_announce_nat_traversal(netplay_data); netplay_announce_nat_traversal(netplay_data);
#endif
goto done; goto done;
default: default:
case RARCH_NETPLAY_CTL_NONE: case RARCH_NETPLAY_CTL_NONE:

1
network/netplay/netplay_io.c
View File

@ -1432,5 +1432,6 @@ void netplay_announce_nat_traversal(netplay_t *netplay)
void netplay_init_nat_traversal(netplay_t *netplay) void netplay_init_nat_traversal(netplay_t *netplay)
{ {
memset(&netplay->nat_traversal_state, 0, sizeof(netplay->nat_traversal_state)); memset(&netplay->nat_traversal_state, 0, sizeof(netplay->nat_traversal_state));
netplay->nat_traversal_task_oustanding = true;
task_push_netplay_nat_traversal(&netplay->nat_traversal_state, netplay->tcp_port); task_push_netplay_nat_traversal(&netplay->nat_traversal_state, netplay->tcp_port);
} }

2
network/netplay/netplay_private.h
View File

@ -344,7 +344,7 @@ struct netplay
uint16_t tcp_port; uint16_t tcp_port;
/* NAT traversal info (if NAT traversal is used and serving) */ /* NAT traversal info (if NAT traversal is used and serving) */
bool nat_traversal; bool nat_traversal, nat_traversal_task_oustanding;
struct natt_status nat_traversal_state; struct natt_status nat_traversal_state;
struct delta_frame *buffer; struct delta_frame *buffer;