Skip to content

Commit 4fdf9ae

Browse files
committed
feat: bump version out of beta
1 parent 20a72c1 commit 4fdf9ae

File tree

5 files changed

+32
-34
lines changed

5 files changed

+32
-34
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pocket-relay"
3-
version = "0.7.0-beta"
3+
version = "0.7.0"
44
description = "Pocket Relay Server"
55
readme = "README.md"
66
keywords = ["EA", "PocketRelay", "MassEffect"]

src/services/game/store.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ impl Games {
3838

3939
/// Find a game that matches the provided rule set
4040
pub fn get_by_rule_set(&self, rule_set: &RuleSet) -> Option<(GameID, GameRef)> {
41-
let games = &*self.games.read();
42-
games
41+
self.games
42+
.read()
4343
.iter()
4444
.find(|(_game_id, game_ref)| {
4545
let join_state = game_ref.read().joinable_state(Some(rule_set));

src/services/tunnel/mod.rs

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -197,31 +197,33 @@ pub async fn tunnel_keep_alive(service: Arc<TunnelService>) {
197197
.remove_dead_tunnels(now, KEEP_ALIVE_TIMEOUT);
198198
}
199199

200-
let mappings = service.mappings.read();
201-
202200
// Send out keep-alive messages for any tunnels that aren't expired
203-
mappings.tunnel_data().for_each(|(tunnel_id, data)| {
204-
match &data.handle {
205-
TunnelHandle::Udp(target_address) => {
206-
let buffer = pocket_relay_udp_tunnel::serialize_message(
207-
*tunnel_id,
208-
&pocket_relay_udp_tunnel::TunnelMessage::KeepAlive,
209-
);
210-
211-
// Send keep alive message
212-
_ = service.udp_tx.send(UdpTunnelMessage {
213-
buffer,
214-
target_address: *target_address,
215-
});
216-
}
217-
TunnelHandle::Http(tunnel_handle) => {
218-
// Write a keep alive message
219-
_ = tunnel_handle.tx.send(HttpTunnelMessage {
220-
index: 255,
221-
message: Bytes::new(),
222-
});
201+
service
202+
.mappings
203+
.read()
204+
.tunnel_data()
205+
.for_each(|(tunnel_id, data)| {
206+
match &data.handle {
207+
TunnelHandle::Udp(target_address) => {
208+
let buffer = pocket_relay_udp_tunnel::serialize_message(
209+
*tunnel_id,
210+
&pocket_relay_udp_tunnel::TunnelMessage::KeepAlive,
211+
);
212+
213+
// Send keep alive message
214+
_ = service.udp_tx.send(UdpTunnelMessage {
215+
buffer,
216+
target_address: *target_address,
217+
});
218+
}
219+
TunnelHandle::Http(tunnel_handle) => {
220+
// Write a keep alive message
221+
_ = tunnel_handle.tx.send(HttpTunnelMessage {
222+
index: 255,
223+
message: Bytes::new(),
224+
});
225+
}
223226
}
224-
}
225-
});
227+
});
226228
}
227229
}

src/session/routes/game_manager.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ pub async fn handle_join_game(
4040
.ok_or(GameManagerError::InvalidGameId)?;
4141

4242
// Check the game is joinable
43-
let join_state = {
44-
let game = &*game_ref.read();
45-
game.joinable_state(None)
46-
};
43+
let join_state = { game_ref.read().joinable_state(None) };
4744

4845
if !matches!(join_state, GameJoinableState::Joinable) {
4946
return Err(GameManagerError::GameFull.into());
@@ -77,8 +74,7 @@ pub async fn handle_get_game_data(
7774
.get_by_id(game_id)
7875
.ok_or(GameManagerError::InvalidGameId)?;
7976

80-
let game = &*game.read();
81-
let body = game.game_data();
77+
let body = game.read().game_data();
8278

8379
Ok(body)
8480
}

0 commit comments

Comments
 (0)