Skip to content
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

Fix: try to match port on epic protocol #225

Merged
merged 7 commits into from
Oct 13, 2024
Merged

Fix: try to match port on epic protocol #225

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b9be69
fix(protocol): try to match port on epic
cainthebest Oct 11, 2024
43baa19
fix(protocol): add a fallback session to epic for matching
cainthebest Oct 11, 2024
ac65c04
revert(protocol): remove bad fallback and handle as err
cainthebest Oct 11, 2024
2ade7f9
fix(protocol): clean up addr match in epic
cainthebest Oct 11, 2024
2ef9a59
fix(protocol): add ADDRESS_s back for epic
cainthebest Oct 11, 2024
249f910
fix(protocol): add GAMESERVER_PORT_1 match for epic
cainthebest Oct 11, 2024
c574a8c
fix(protocol): remove ADDRESS_s from matching as it is always true
cainthebest Oct 11, 2024
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
20 changes: 11 additions & 9 deletions crates/lib/src/protocols/epic/protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,24 @@ impl EpicProtocol {
let attributes = session
.get("attributes")
.ok_or(PacketBad.context("Expected attributes field missing in sessions."))?;
if attributes

let address_match = attributes
.get("ADDRESSBOUND_s")
.and_then(Value::as_str)
.map_or(false, |v| {
v.contains(&address) || v.contains(&port.to_string())
})
.map_or(false, |v| v == address || v == format!("0.0.0.0:{}", port))
|| attributes
.get("ADDRESS_s")
.and_then(Value::as_str)
.map_or(false, |v| v.contains(&address))
{
.get("GAMESERVER_PORT_1")
.and_then(Value::as_u64)
.map_or(false, |v| v == port as u64);

if address_match {
return Ok(session);
}
}

return Err(PacketBad.context("Servers were provided but the specified one couldn't be find amonst them."));
return Err(
PacketBad.context("Servers were provided but the specified one couldn't be found amongst them.")
);
}

Err(PacketBad.context("Expected session field to be an array."))
Expand Down
Loading