eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 14:29:20 +02:00
Code Issues 151 Wiki Activity

multiplayer stage 1: --host/--connect startup, client without a local scenario

Browse Source 
Networking used to be reachable only through the eu07.ini network.server /
network.client entries, and init_modes() refused to start at all unless a
scenery file was already known. That made it impossible to join a session
without knowing (and typing) the host's scenario up front, even though
SERVER_HELLO already carries the scenario name.

- add --host [address:port] and --connect address:port to the command line
  (default port 7420, --host defaults to 0.0.0.0), plus --scenario/--vehicle
  aliases and -h/--help; the existing ini settings keep working
- drop the init_modes() restriction: a client goes straight to the scenario
  loader and waits there for the handshake, a host without -s still gets the
  launcher and simply refuses joins until a scenario is up
- the loader screen reports the network state instead of sitting on a blank
  progress bar
- a client that did not ask for a vehicle with -v starts as an observer
  rather than failing to find the default EU07-424; the lobby of stage 2 will
  take over the choice
- handshake carries build identification and the server answers an
  impossible join with SERVER_REJECT and a readable reason instead of
  dropping the socket silently; protocol version bumped to 3
- deserialize_message() no longer dereferences a null message on an unknown
  message type
This commit is contained in:
Hirek
2026-09-06 17:28:44 +00:00
parent eed44dc858
commit 8460fc531f
6 changed files with 200 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
network/message.cpp
View File

@@ -6,12 +6,24 @@ void network::client_hello::serialize(std::ostream &stream) const
{
sn_utils::ls_int32(stream, version);
sn_utils::ls_uint32(stream, start_packet);
sn_utils::s_str(stream, app_version);
}
void network::client_hello::deserialize(std::istream &stream)
{
version = sn_utils::ld_int32(stream);
start_packet = sn_utils::ld_uint32(stream);
app_version = sn_utils::d_str(stream);
}
void network::server_reject::serialize(std::ostream &stream) const
{
sn_utils::s_str(stream, reason);
}
void network::server_reject::deserialize(std::istream &stream)
{
reason = sn_utils::d_str(stream);
}
void network::server_hello::serialize(std::ostream &stream) const
@@ -20,6 +32,7 @@ void network::server_hello::serialize(std::ostream &stream) const
sn_utils::ls_int64(stream, timestamp);
sn_utils::ls_int64(stream, config);
sn_utils::s_str(stream, scenario);
sn_utils::s_str(stream, app_version);
}
void network::server_hello::deserialize(std::istream &stream)
@@ -28,6 +41,7 @@ void network::server_hello::deserialize(std::istream &stream)
timestamp = sn_utils::ld_int64(stream);
config = sn_utils::ld_int64(stream);
scenario = sn_utils::d_str(stream);
app_version = sn_utils::d_str(stream);
}
void ::network::request_command::serialize(std::ostream &stream) const
@@ -115,6 +129,13 @@ std::shared_ptr<network::message> network::deserialize_message(std::istream &str
msg = std::make_shared<frame_info>();
else if (type == message::REQUEST_COMMAND)
msg = std::make_shared<request_command>();
else if (type == message::SERVER_REJECT)
msg = std::make_shared<server_reject>();
if (!msg) {
// unknown message type; hand back a marker the peer handlers treat as a protocol error
return std::make_shared<message>(message::TYPE_MAX);
}
msg->deserialize(stream);