tribufu/rust-gamedig
1
0
Fork 0
mirror of https://github.com/tribufu/rust-gamedig synced 2026-05-18 09:35:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Protocol] Replace IpAddr with SocketAddr in protocols (#44)

Browse source 
* [Crate] Replace IpAddr with SocketAddr in protocols

* [Crate] Remove usage of address.to_string in socket

* [Crate] Update CHANGELOG.md
This commit is contained in:
CosminPerRam 2023-06-02 01:06:24 +03:00 • committed by GitHub
parent 596d15df78
commit e0830bdae5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
70 changed files with 215 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/games/aliens.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::ALIENS.as_engine(),
None,
None,

5
src/games/aoc.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::AOC.as_engine(),
None,
None,

5
src/games/arma2oa.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(2304),
&SocketAddr::new(*address, port.unwrap_or(2304)),
SteamApp::ARMA2OA.as_engine(),
None,
None,

5
src/games/ase.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::ASE.as_engine(),
None,
None,

5
src/games/asrd.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(2304)),
SteamApp::ASRD.as_engine(),
None,
None,

5
src/games/avorion.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27020),
&SocketAddr::new(*address, port.unwrap_or(27020)),
SteamApp::AVORION.as_engine(),
None,
None,

5
src/games/bat1944.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDError::TypeParse,
@ -7,8 +7,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let mut valve_response = valve::query(
address,
port.unwrap_or(7780),
&SocketAddr::new(*address, port.unwrap_or(7780)),
SteamApp::BAT1944.as_engine(),
None,
None,

5
src/games/bb2.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::BB2.as_engine(),
None,
None,

4
src/games/bf1942.rs
View file

@ -1,8 +1,8 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::protocols::gamespy;
use crate::protocols::gamespy::one::Response;
use crate::GDResult;
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
gamespy::one::query(address, port.unwrap_or(23000), None)
gamespy::one::query(&SocketAddr::new(*address, port.unwrap_or(23000)), None)
}

5
src/games/bm.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::BM.as_engine(),
None,
None,

5
src/games/bo.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27016),
&SocketAddr::new(*address, port.unwrap_or(27016)),
SteamApp::BO.as_engine(),
None,
None,

5
src/games/ccure.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::CCURE.as_engine(),
None,
None,

5
src/games/cosu.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27004),
&SocketAddr::new(*address, port.unwrap_or(27004)),
SteamApp::COSU.as_engine(),
None,
None,

5
src/games/cs.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::CS.as_engine(),
None,
None,

5
src/games/cscz.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::CSCZ.as_engine(),
None,
None,

5
src/games/csgo.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::CSGO.as_engine(),
None,
None,

5
src/games/css.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::CSS.as_engine(),
None,
None,

4
src/games/cw.rs
View file

@ -1,8 +1,8 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::protocols::gamespy;
use crate::protocols::gamespy::three::Response;
use crate::GDResult;
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
gamespy::three::query(address, port.unwrap_or(64100), None)
gamespy::three::query(&SocketAddr::new(*address, port.unwrap_or(64100)), None)
}

5
src/games/dod.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::DOD.as_engine(),
None,
None,

5
src/games/dods.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::DODS.as_engine(),
None,
None,

5
src/games/doi.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::DOI.as_engine(),
None,
None,

5
src/games/dst.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27016),
&SocketAddr::new(*address, port.unwrap_or(27016)),
SteamApp::DST.as_engine(),
None,
None,

4
src/games/ffow.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::protocols::types::TimeoutSettings;
use crate::protocols::valve::{Engine, Environment, Server, ValveProtocol};
use crate::GDResult;
@ -48,7 +48,7 @@ pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
}
pub fn query_with_timeout(address: &IpAddr, port: Option<u16>, timeout_settings: TimeoutSettings) -> GDResult<Response> {
let mut client = ValveProtocol::new(address, port.unwrap_or(5478), Some(timeout_settings))?;
let mut client = ValveProtocol::new(&SocketAddr::new(*address, port.unwrap_or(5478)), Some(timeout_settings))?;
let mut buffer = client.get_request_data(
&Engine::GoldSrc(true),
0,

5
src/games/gm.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27016),
&SocketAddr::new(*address, port.unwrap_or(27016)),
SteamApp::GM.as_engine(),
None,
None,

5
src/games/hl2dm.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::HL2DM.as_engine(),
None,
None,

5
src/games/hldms.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::HLDMS.as_engine(),
None,
None,

5
src/games/hll.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(26420),
&SocketAddr::new(*address, port.unwrap_or(26420)),
SteamApp::HLL.as_engine(),
None,
None,

5
src/games/ins.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::INS.as_engine(),
None,
None,

5
src/games/insmic.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::INSMIC.as_engine(),
None,
None,

5
src/games/inss.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27131),
&SocketAddr::new(*address, port.unwrap_or(27131)),
SteamApp::INSS.as_engine(),
None,
None,

5
src/games/l4d.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::L4D.as_engine(),
None,
None,

5
src/games/l4d2.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::L4D2.as_engine(),
None,
None,

10
src/games/mc.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::minecraft::{self, BedrockResponse, JavaResponse, LegacyGroup},
GDError,
@ -25,22 +25,22 @@ pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<JavaResponse> {
/// Query a Java Server.
pub fn query_java(address: &IpAddr, port: Option<u16>) -> GDResult<JavaResponse> {
minecraft::query_java(address, port_or_java_default(port), None)
minecraft::query_java(&SocketAddr::new(*address, port_or_java_default(port)), None)
}
/// Query a (Java) Legacy Server (1.6 -> 1.4 -> Beta 1.8).
pub fn query_legacy(address: &IpAddr, port: Option<u16>) -> GDResult<JavaResponse> {
minecraft::query_legacy(address, port_or_java_default(port), None)
minecraft::query_legacy(&SocketAddr::new(*address, port_or_java_default(port)), None)
}
/// Query a specific (Java) Legacy Server.
pub fn query_legacy_specific(group: LegacyGroup, address: &IpAddr, port: Option<u16>) -> GDResult<JavaResponse> {
minecraft::query_legacy_specific(group, address, port_or_java_default(port), None)
minecraft::query_legacy_specific(group, &SocketAddr::new(*address, port_or_java_default(port)), None)
}
/// Query a Bedrock Server.
pub fn query_bedrock(address: &IpAddr, port: Option<u16>) -> GDResult<BedrockResponse> {
minecraft::query_bedrock(address, port_or_bedrock_default(port), None)
minecraft::query_bedrock(&SocketAddr::new(*address, port_or_bedrock_default(port)), None)
}
fn port_or_java_default(port: Option<u16>) -> u16 { port.unwrap_or(25565) }

5
src/games/ohd.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27005),
&SocketAddr::new(*address, port.unwrap_or(27005)),
SteamApp::OHD.as_engine(),
None,
None,

5
src/games/onset.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(7776),
&SocketAddr::new(*address, port.unwrap_or(7776)),
SteamApp::ONSET.as_engine(),
None,
None,

5
src/games/pz.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(16261),
&SocketAddr::new(*address, port.unwrap_or(16261)),
SteamApp::PZ.as_engine(),
None,
None,

4
src/games/quake1.rs
View file

@ -1,9 +1,9 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::GDResult;
use crate::protocols::quake;
use crate::protocols::quake::Response;
use crate::protocols::quake::one::Player;
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response<Player>> {
quake::one::query(address, port.unwrap_or(27500), None)
quake::one::query(&SocketAddr::new(*address, port.unwrap_or(27500)), None)
}

4
src/games/quake2.rs
View file

@ -1,9 +1,9 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::GDResult;
use crate::protocols::quake;
use crate::protocols::quake::Response;
use crate::protocols::quake::two::Player;
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response<Player>> {
quake::two::query(address, port.unwrap_or(27910), None)
quake::two::query(&SocketAddr::new(*address, port.unwrap_or(27910)), None)
}

4
src/games/quake3a.rs
View file

@ -1,9 +1,9 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::GDResult;
use crate::protocols::quake;
use crate::protocols::quake::Response;
use crate::protocols::quake::two::Player;
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response<Player>> {
quake::three::query(address, port.unwrap_or(27960), None)
quake::three::query(&SocketAddr::new(*address, port.unwrap_or(27960)), None)
}

5
src/games/ror2.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27016),
&SocketAddr::new(*address, port.unwrap_or(27016)),
SteamApp::ROR2.as_engine(),
None,
None,

5
src/games/rust.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::RUST.as_engine(),
None,
None,

5
src/games/sc.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::SC.as_engine(),
None,
None,

5
src/games/sdtd.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(26900),
&SocketAddr::new(*address, port.unwrap_or(26900)),
SteamApp::SDTD.as_engine(),
None,
None,

4
src/games/sof2.rs
View file

@ -1,9 +1,9 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::GDResult;
use crate::protocols::quake;
use crate::protocols::quake::Response;
use crate::protocols::quake::two::Player;
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response<Player>> {
quake::three::query(address, port.unwrap_or(20100), None)
quake::three::query(&SocketAddr::new(*address, port.unwrap_or(20100)), None)
}

4
src/games/ss.rs
View file

@ -1,8 +1,8 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::protocols::gamespy;
use crate::protocols::gamespy::one::Response;
use crate::GDResult;
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
gamespy::one::query(address, port.unwrap_or(25601), None)
gamespy::one::query(&SocketAddr::new(*address, port.unwrap_or(25601)), None)
}

5
src/games/tf.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27016),
&SocketAddr::new(*address, port.unwrap_or(27016)),
SteamApp::TF.as_engine(),
None,
None,

5
src/games/tf2.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::TF2.as_engine(),
None,
None,

5
src/games/tfc.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::TFC.as_engine(),
None,
None,

5
src/games/ts.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, get_optional_extracted_data, Server, ServerPlayer, SteamApp},
GDResult,
@ -96,8 +96,7 @@ impl Response {
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::TS.as_engine(),
None,
None,

5
src/games/unturned.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27015),
&SocketAddr::new(*address, port.unwrap_or(27015)),
SteamApp::UNTURNED.as_engine(),
None,
None,

4
src/games/ut.rs
View file

@ -1,8 +1,8 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::protocols::gamespy;
use crate::protocols::gamespy::one::Response;
use crate::GDResult;
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
gamespy::one::query(address, port.unwrap_or(7778), None)
gamespy::one::query(&SocketAddr::new(*address, port.unwrap_or(7778)), None)
}

5
src/games/vr.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
@ -6,8 +6,7 @@ use crate::{
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(
address,
port.unwrap_or(27016),
&SocketAddr::new(*address, port.unwrap_or(27016)),
SteamApp::VR.as_engine(),
None,
None,