0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wesnothd: avoid needlessly casting pointer to long int

Browse source
This commit is contained in:
loonycyborg 2018-06-05 13:31:50 +03:00
parent 051182fa1c
commit a251808933
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/server/server.cpp
View file

@ -866,17 +866,17 @@ bool server::authenticate(
// A password (or hashed password) was provided, however
// there is no seed
if(seeds_[reinterpret_cast<long int>(socket.get())].empty()) {
if(seeds_[socket.get()].empty()) {
send_password_request(socket, "Please try again.", username, version, MP_NO_SEED_ERROR);
return false;
}
// This name is registered and an incorrect password provided
else if(!(user_handler_->login(username, password, seeds_[reinterpret_cast<unsigned long>(socket.get())]))) {
else if(!(user_handler_->login(username, password, seeds_[socket.get()]))) {
const std::time_t now = std::time(nullptr);
// Reset the random seed
seeds_.erase(reinterpret_cast<unsigned long>(socket.get()));
seeds_.erase(socket.get());
login_log login_ip = login_log(client_address(socket), 0, now);
auto i = std::find(failed_logins_.begin(), failed_logins_.end(), login_ip);
@ -922,7 +922,7 @@ bool server::authenticate(
registered = true;
// Reset the random seed
seeds_.erase(reinterpret_cast<long int>(socket.get()));
seeds_.erase(socket.get());
user_handler_->user_logged_in(username);
}
}
@ -956,7 +956,7 @@ void server::send_password_request(socket_ptr socket,
return;
}
seeds_[reinterpret_cast<long int>(socket.get())] = nonce;
seeds_[socket.get()] = nonce;
simple_wml::document doc;
simple_wml::node& e = doc.root().add_child("error");

2
src/server/server.hpp
View file

@ -106,7 +106,7 @@ private:
std::deque<login_log> failed_logins_;
std::unique_ptr<user_handler> user_handler_;
std::map<long int,std::string> seeds_;
std::map<socket_ptr::element_type*, std::string> seeds_;
player_connections player_connections_;
std::deque<std::shared_ptr<game>> games() {