b7b3b2cb5f
Try to prevent truckload of warnings on iOS
2017-02-26 10:33:03 +01:00
07cfd90dc6
Actually USE the new slave options in config.
2017-02-23 21:49:22 -05:00
3ff9a43b7d
Spectator and slave mode are rewind-free
...
This commit makes spectator mode and slave mode in netplay always stay
ahead of the input, thereby avoiding rewinds, which is sort of the
point. This also changes catch-up detection to be a bit less eager, so
that they hopefully don't flap between stalling for server input and
catching up with that input.
2017-02-23 19:05:43 -05:00
e495671563
In spectator mode, we should never be ahead of our peer.
2017-02-22 23:19:22 -05:00
3e0bc5acdc
Don't flush so eagerly...
2017-02-22 23:19:02 -05:00
d1ab288d73
Fix update_unread_ptr to handle the case of only slaves connected
2017-02-22 21:10:02 -05:00
e70ee045bf
Initial implementation of Netplay master/slave mode.
2017-02-22 20:34:17 -05:00
972b41f803
Fix race condition in NAT traversal task.
2017-02-20 20:16:53 -05:00
5f723d1bda
Moving NAT traversal into a task to avoid blocking the UI.
2017-02-20 19:08:31 -05:00
816d7786ac
Re-adding the option to start in spectator mode
...
This used to be a configuration option because spectator mode and "net"
mode were incompatible. When the ability to switch between player and
spectator was added, the configuration option was removed, since it was
no longer a mode toggle. This re-adds it, mainly so that I can use it to
implement regression tests.
2017-02-16 19:17:06 -05:00
4c1abfaa71
Support for reset in netplay
...
This patch transfers core_reset across netplay. Resets effectively
worked before thanks to check_frames, but this makes resets work even
without check_frames, and in particular should allow resets to force
sync in savestateless cores, bringing them one step closer to actually
being usable by non-experts.
2017-02-15 14:40:37 -05:00
6d821132f5
msvc buildfix
2017-02-14 02:37:25 +00:00
aa77d688ec
Make announcing netplay on the public lobby optional.
2017-02-06 13:45:58 -05:00
e3a1b1859d
Fix ./configure --disable-rgui
2017-02-04 09:20:41 +01:00
0c8ee93e3e
Moved cheevos files to their own folder in preparation for the changes to support leaderboards
2017-02-03 10:03:57 +00:00
1148b8230c
Fixes to stateless+input latency.
2017-02-01 22:54:03 -05:00
2ea3936d16
Renaming input_ptr/input_frame_count back to self_.
2017-02-01 22:54:03 -05:00
55157e934d
input_latency_frames is now configurable and has a range
2017-02-01 22:54:03 -05:00
5f5a8dc6d7
CRC searching should really start from run_ptr, not input_ptr
2017-02-01 22:54:03 -05:00
561eb42c84
Don't enable input latency if we're not connected
2017-02-01 22:54:03 -05:00
c4cb94db19
New approach to input latency
2017-02-01 22:54:03 -05:00
2596de53ec
Merge pull request #4523 from fr500/master
...
add support for no content cores
2017-01-29 04:51:50 +01:00
3d24e844a4
We're in client mode if either server OR direct_host is set
2017-01-28 22:39:17 -05:00
cfb882f4fc
add support for no content cores
2017-01-28 22:12:34 -05:00
12e8deedb4
Only disable netplay in deinit_netplay if it was actually on
2017-01-25 22:08:05 -05:00
263470a66c
Set netplay_enabled to false during deinit_netplay
...
This simply prevents the odd behavior of netplay automatically
restarting, or trying to restart, when you load a new game.
2017-01-25 21:23:55 -05:00
29a1d504d7
allow different server ports again
2017-01-25 17:48:43 -05:00
af14da93d5
fix whitespace
2017-01-25 17:43:56 -05:00
c097c2062e
fix when port is 0
2017-01-25 17:43:17 -05:00
178d959cad
Fix C89_BUILD
2017-01-22 21:24:57 +01:00
36b2c48cb5
Fix CXX_BUILD
2017-01-22 21:19:39 +01:00
3ff158b907
Merge pull request #4436 from fr500/lobby
...
Basic lobby system (don't merge, just for tracking)
2017-01-22 21:08:43 +01:00
a0e6a24f38
use deferred netplay init
2017-01-22 13:07:30 -05:00
33cc168eb9
allow connecting to lobby port instead of the port in settings
2017-01-22 12:29:29 -05:00
addcbb896a
Fixing an incompatibility between stateless mode and the password prompt
...
Previously, the host would time out waiting for the guest to enter a
password, as the timeout was not conditionalized on whether the guest
was actually playing. This fixes that.
2017-01-22 10:43:09 -05:00
96c8ca5a09
Header update #1
2017-01-22 13:40:32 +01:00
768ce0854c
Make driver_set_nonblock_state a public function
2017-01-22 12:47:17 +01:00
8c304dfda7
Make the client send an INFO even if it's wrong
...
This simply gives the server a reason why the client disconnected,
rather than a generic, unexplained disconnection.
2017-01-21 13:18:31 -05:00
0de43b954e
can now connect when starting a game too
2017-01-20 16:04:10 -05:00
dcca2f8131
only announce if host
2017-01-20 14:33:57 -05:00
8a1fb24fe9
update url
2017-01-19 23:21:22 -05:00
930cde21a2
crc is announced now (for cores that don't have needs_fullpath set)
2017-01-19 21:43:46 -05:00
3dd6c91493
start populating the list
2017-01-19 08:56:56 -05:00
95a2da81e4
start adding ui elements to insert room list into
2017-01-18 22:46:48 -05:00
72cdb390cb
reannounce roughly every minute
2017-01-18 21:31:02 -05:00
ca2c2a8ce7
separate this
2017-01-18 21:12:01 -05:00
9a87bada55
Style nit
2017-01-17 19:05:33 +01:00
f2beb49fd8
Announce netplay games to lobby.libretro.com
2017-01-16 22:24:35 -05:00
a0f236a83f
Use autosave_lock and autosave_unlock during SRAM negotiation
...
The SRAM transfer in netplay handshake now uses autosave_lock and
autosave_unlock. Will possibly fix a hang/crash bug on Android with
netplay and autosave conflicting.
2017-01-15 18:10:24 -05:00
e9e7878b5c
netplay_buf should use O_NOSIGNAL to avoid SIGPIPE
2017-01-15 10:59:25 -05:00
80bc91477a
Remove header include
2017-01-09 02:19:16 +01:00
20c0de352c
Fix to the netplay_is_alive function when server isn't playing
...
Fixes a bug by which very strange things would happen if the server went
to spectator mode with exactly one connected client.
2017-01-02 20:03:00 -05:00
ee55e2d783
LOAD_SAVESTATE can't use player frame timing from a server that's not playing
2017-01-02 18:56:08 -05:00
cd281d5757
Reverse catch-up, i.e., server-demanded stalling
...
Previously, if two clients were connected to the same server and one of
them was ahead of the server, the only way to rectify that situation was
for the client to get so far ahead that it stalled, as the server could
only catch up with an ahead client if all clients were ahead. That's
unrealistic. This gives the server the alternate option of demanding
that a client stall. This keeps things nicely in line even with >2
players.
2016-12-24 15:25:03 -05:00
70a1a5f38e
Buildfixes
2016-12-24 01:48:36 +01:00
64dc7daeca
(MSVC) MSVC build fixes
2016-12-24 01:45:37 +01:00
77e5cdbfde
Revert "Rename runloop_msg_queue_push to video_driver_msg_queue_push"
...
This reverts commit ad7386913c
2016-12-22 23:36:11 +01:00
ad7386913c
Rename runloop_msg_queue_push to video_driver_msg_queue_push
...
and move code to video_driver.c
2016-12-22 13:15:02 +01:00
3df38fa40e
Silence two compiler warnings
2016-12-21 10:13:31 -05:00
f0bb0a77f8
Make netplay no longer cache passwords
...
Netplay now always loads passwords from the configuration, so that
passwords can be changed mid-session.
2016-12-21 09:51:50 -05:00
c780e7db43
Accept the variable size quirk
...
Since the quirks protocol was that a core could report variable
savestate size, but the host then tells it "no", we should actually
accept the variable size quirk in netplay, since RetroArch refuses to
allow cores to actually produce variable-size states.
2016-12-20 22:17:15 -05:00
7bb26eb5c5
Fix some minor checked-return bugs
...
Should resolve Coverity reports 158862, 158861, 158860.
158863 is spurious but I have no idea how to convince Coverity of that.
2016-12-20 19:16:31 -05:00
8f35de9da0
Adding blocks in the empty-RECV case to (hopefully) suppress warnings
2016-12-19 17:31:24 -05:00
1d36c5effa
Silence warnings - remove unused variables
2016-12-19 23:19:59 +01:00
fc1c83d8c0
Shut up false positive warning
2016-12-19 16:38:55 +01:00
11a3063fc6
Forgot the other half of that last bugfix
2016-12-18 20:08:21 -05:00
8f8e6dfc5f
Unset the netplay callbacks when we deinit netplay
...
This is a bugfix to master that hadn't migrated to my branch.
2016-12-18 19:54:01 -05:00
dcd4b3046b
Making negative check_frames be "check only" mode
2016-12-18 19:28:44 -05:00
677ffa9ebd
Support different forms of compression from different clients.
2016-12-18 19:28:44 -05:00
84c33634a6
Communicate paused-ness during initial connection SYNC.
2016-12-18 19:28:44 -05:00
60b81e3a51
Nominal support for server sending blank INFO
2016-12-18 19:28:44 -05:00
e79f30604f
Better stall timing
...
We now stall not until we've reached parity (which makes no sense since
we expect latency), but only until we're not likely to stall again.
2016-12-18 19:28:44 -05:00
8195a5bcee
Try to catch up if we're falling behind our peer, not anyone
...
In the previous catch-up system, we would only try to catch up if we
were falling behind the farthest-behind peer. However, as they would
also only try to catch up to us, everyone basically agreed to the
worst-case latency. It makes more sense to try to be in parity with your
direct peer than with indirect connections.
2016-12-18 19:28:44 -05:00
b535412914
Adding nick-changing
...
This is just to disambiguate multiple connections with the same nick
(usually Anonymous), which will now become e.g. Anonymous (2).
2016-12-18 19:28:44 -05:00
7c2f12fbd9
Removign some leftover debug code
2016-12-18 19:28:44 -05:00
04266cf4f7
Run synchronization even when stalled
...
Previously, we could be stalled by one player but still reading data
from another, which would wedge the client because we would never act
upon the newly-read data. Now we act upon data even if we're stalled.
Fixes bugs in initial connection with high latency.
2016-12-18 19:28:44 -05:00
d6d96704fd
Don't panic about delta frames not being ready if we're not even fully
...
connected yet.
2016-12-18 19:28:43 -05:00
8b21014d07
Improvements to handshake protocol
...
Making the netplay handshake protocol send the core and content as an
explicit command, so that the other side can (notionally) choose to load
it. That isn't implemented, of course.
2016-12-18 19:28:43 -05:00
1fa60b396f
Improvements to the communication of netplay pausing.
2016-12-18 19:28:43 -05:00
db2c8de44c
Slightly changing how catch-up works to avoid spamming the console
2016-12-18 19:28:43 -05:00
1141825605
Documenting (somewhat) the new sync system.
2016-12-18 19:28:43 -05:00
a20e79bbb5
Server needs double the buffer frames since two connected clients could
...
be ahead and behind by the max frames
2016-12-18 19:28:43 -05:00
f7f6590156
Goodbye delay_frames! stateless_mode is the new delay_frames=0
2016-12-18 19:28:43 -05:00
45d732a014
New sync system
...
The idea:
* Use a fixed number of delay_frames (eventually to be fixed at 120,
currently still uses the config variable, 0 will still be an option)
* Determine how long it takes to simulate a frame.
* Stall only if resimulating the intervening frames would be
sufficiently annoying (currently fixed at three frames worth of
time)
Because clients always try to catch up, the actual frame delay works out
automatically to be minimally zero and maximally the latency. If one
client is underpowered but the other is fine, the powerful one will
automatically take up the slack. Seems like the most reasonable system.
2016-12-18 19:28:43 -05:00
6890456ac0
Updated error messages and fixed some stall-related disconnected-client
...
bugs.
2016-12-18 19:28:43 -05:00
6658826759
CRC validity checking. Ignore CRCs if they don't work.
2016-12-18 19:28:43 -05:00
a6cd8c3aa1
Error reporting when a password is refused, plus a bugfix so that
...
socket_receive_all_nonblocking actually reports disconnects.
2016-12-18 19:28:43 -05:00
df2600fbf4
Added error reporting when a player is not allowed to play.
2016-12-18 19:28:43 -05:00
bade067d9a
Support for catching up if the netplay peer is ahead of us.
2016-12-18 19:28:43 -05:00
4e01481b39
Only allow clients to load state if there's no further synchronization
2016-12-18 19:28:43 -05:00
70d04ec6a5
Apparently the frontend gets really pissy if it can't check the flip state
2016-12-18 19:28:43 -05:00
da7efcb939
Cleaning up netplay headers.
2016-12-18 19:28:43 -05:00
9c6ac2b934
Only the server can flip users.
2016-12-18 19:28:43 -05:00
03415c261d
Added netplay spectator password separate from play password
2016-12-18 19:28:43 -05:00
694b7a9723
Don't allow more players to join than are actually being polled
2016-12-18 19:28:43 -05:00
7ad4e3f115
Per-connection stalling
2016-12-18 19:28:43 -05:00
1b22191869
Deduplicating some code.
2016-12-18 19:28:43 -05:00
f619789e48
Refactoring: netplay_common.c -> netplay_handshake.c/netplay_delta.c
...
Refactoring netplay_common into its two actual components, the handshake
and delta-frame related functions.
2016-12-18 19:28:43 -05:00
4e905bf524
Refactoring: netplay_sync.c
...
Renamed netplay_net.c to netplay_sync.c, as all that remains in that
file is synchronization-related functions.
2016-12-18 19:28:43 -05:00
257c5d3188
Refactoring netplay_init.c/netplay_net.c
...
Split the remainder of netplay.c into netplay_init.c and netplay_net.c
(which will soon be netplay_sync.c)
2016-12-18 19:28:43 -05:00
7e2465ef1f
Refactoring: Moving I/O functionality into netplay_io.c
2016-12-18 19:28:43 -05:00
8c59c7dd77
Starting to refactor: Separating frontend stuff into netplay_frontend.c
2016-12-18 19:28:43 -05:00
ab989d7f41
More careful disconnection.
2016-12-18 19:28:43 -05:00
c8bba9a981
Simplistic builtin randomizer.
2016-12-18 19:28:43 -05:00
28e331b5fd
Remove some magic numbers
2016-12-18 19:28:43 -05:00
6e6f2bfdbe
Use a proper password hash across the line.
2016-12-18 19:28:42 -05:00
763a657f82
Terrible first cut at password (sent in plain text D-8)
2016-12-18 19:28:42 -05:00
5a0328dc09
Transfer pad configuration over netplay.
2016-12-18 19:28:42 -05:00
888e45c88b
Updates to allow the server to toggle game/watch
2016-12-18 19:28:42 -05:00
3631ff74ff
Very, very partial support for the server spectating
2016-12-18 19:28:42 -05:00
3d7f1f6575
Updating Netplay README to be more true
2016-12-18 19:28:42 -05:00
f6f9905ae3
Made remote pausing connection-specific
2016-12-18 19:28:42 -05:00
6556af1100
force_send_savestate is global again
...
We cannot send a savestate to only one player, as sending a savestate is
a synchronization event invalidating all prior input.
2016-12-18 19:28:42 -05:00
3d34c0222f
Added simple (cheesy) announcements on join/leave
2016-12-18 19:28:42 -05:00
727743aa7b
Fixing a couple FIXMEs/TODOs
2016-12-18 19:28:42 -05:00
2130fd81a5
Fixed simulation for >2 players
2016-12-18 19:28:42 -05:00
262d77546b
Adding game/watch key
...
Adding a key to toggle between playing and spectating. This key takes
the place of the previous flip key, although player flipping does
continue to work (and must be rebound if you still want it)
2016-12-18 19:28:42 -05:00
90c15fc7a6
Still need to flush input data.
2016-12-18 19:28:42 -05:00
e7ce01ad3b
More renaming
...
Now that remote_input_state isn't always remote, it should just be
called real_input_state (and is).
2016-12-18 19:28:42 -05:00
f6630ad85a
More fixups for >2 player mode. Mostly was just sending packets that
...
shouldn't have been sent.
2016-12-18 19:28:42 -05:00
479955a085
More 3-player support. The initial connection is wonky with
...
delay_frames>0
2016-12-18 19:28:42 -05:00
d373684bd5
Off-by-one
2016-12-18 19:28:42 -05:00
b51cf8be2b
Real, actual (almost) >2-player support.
2016-12-18 19:28:42 -05:00
2cc8c5c467
Removing silly foo_ names used to help migration.
2016-12-18 19:28:42 -05:00
53c46530aa
Very first tidbits of true multiplayer support (minus actual multiple
...
players so far)
2016-12-18 19:28:42 -05:00
b5cd187077
Since there's now only one mode, removing netplay_callbacks entirely.
2016-12-18 19:28:42 -05:00
9b2270f5d4
Say goodbye to spectator mode (for now)
2016-12-18 19:28:42 -05:00
4768970d52
Moving force_send_savestate from netplay to connection.
2016-12-18 19:28:42 -05:00
ea722b49c8
Move other_addr from netplay to connection.
2016-12-18 19:28:42 -05:00
d1d29143b2
Move nickname field to connections. Spectate mode officially broken.
2016-12-18 19:28:42 -05:00
189cc6e5d6
Moving socket buffers to per-connection (currently breaks
...
delay_frames=0)
2016-12-18 19:28:42 -05:00
b334f04bd5
Removing RARCH_ from Netplay stall reasons.
2016-12-18 19:28:42 -05:00
1e1abf6951
First step of multiple connections. Still only one connection actually
...
works.
2016-12-18 19:28:42 -05:00
3908e25895
Separating local mode from remote mode.
2016-12-18 19:28:42 -05:00
775584cdac
Adding more README info.
2016-12-18 19:28:42 -05:00
170b590bdb
Client now starts one frame after finishing connection, for easier sync.
2016-12-18 19:28:42 -05:00
80be19a7da
Renames for readability, merging frame and sram into sync packet.
2016-12-18 19:28:42 -05:00
f89e54fcb7
Now that we don't have to start at frame 0, use the server frame count
2016-12-18 19:28:42 -05:00
b3092f6fde
Moving things that shouldn't have been public into netplay_private.h
2016-12-18 19:28:41 -05:00
9054b51f0e
Finally, bringing back the first frame (in nonblocking mode)
2016-12-18 19:28:41 -05:00
ce7686104d
Removing dead code
2016-12-18 19:28:41 -05:00
71e5cb756a
Support for delay_frames=0 in nonblocking mode.
2016-12-18 19:28:41 -05:00
1c8f056239
Nonblocking initial connection. Haven't tested with delay_frames=0 yet
2016-12-18 19:28:41 -05:00
3f8f9761f6
Fixes particularly affecting delay_frames=0 mode
2016-12-18 19:28:41 -05:00
91e7db3eca
This semicolon broke everything!
2016-12-18 19:28:40 -05:00
ba76528b8f
A more sophisticated status variable for later making the initial
...
connection nonblocking.
2016-12-18 19:28:39 -05:00
0f5eec9987
Use zbuffer_size instead of state_size for the packet buffer
2016-12-18 19:28:39 -05:00
1214541410
Added packet buffer resizing to cope with initialization quirks.
2016-12-18 19:28:38 -05:00
36a93e5697
Fix a few bits broken by merging.
2016-12-18 19:28:38 -05:00
900e5a79ec
Use nonblocking sockets for Netplay to avoid some stalls.
2016-12-18 19:28:38 -05:00
Twinaphex