projects
/
hlquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d9facf5
)
Include address in query result
author
MegaBrutal
<megabrutal+github@megabrutal.com>
Sat, 18 Feb 2023 03:35:00 +0000
(
04:35
+0100)
committer
MegaBrutal
<megabrutal+github@megabrutal.com>
Sat, 18 Feb 2023 03:35:00 +0000
(
04:35
+0100)
src/main.rs
patch
|
blob
|
history
diff --git
a/src/main.rs
b/src/main.rs
index 782152192ce80918cf84409ec5628814e6c60a0d..3df7603af6f0495b559dd8948dee39d07026bcf2 100644
(file)
--- a/
src/main.rs
+++ b/
src/main.rs
@@
-9,6
+9,7
@@
use crate::HLQueryError::A2SError;
#[derive(Debug, Serialize)]
struct HLQueryResult {
#[derive(Debug, Serialize)]
struct HLQueryResult {
+ address: SocketAddrV4,
info: Result<a2s::info::Info, HLQueryError>,
rules: Result<Vec<a2s::rules::Rule>, HLQueryError>,
players: Result<Vec<a2s::players::Player>, HLQueryError>
info: Result<a2s::info::Info, HLQueryError>,
rules: Result<Vec<a2s::rules::Rule>, HLQueryError>,
players: Result<Vec<a2s::players::Player>, HLQueryError>
@@
-17,6
+18,7
@@
struct HLQueryResult {
impl HLQueryResult {
fn new(a2s_client: &A2SClient, server: SocketAddrV4) -> Self {
Self {
impl HLQueryResult {
fn new(a2s_client: &A2SClient, server: SocketAddrV4) -> Self {
Self {
+ address: server,
info: a2s_client.info(server).map_err(From::from),
rules: a2s_client.rules(server).map_err(From::from),
players: a2s_client.players(server).map_err(From::from)
info: a2s_client.info(server).map_err(From::from),
rules: a2s_client.rules(server).map_err(From::from),
players: a2s_client.players(server).map_err(From::from)