Skip to content

Commit

Permalink
wesnothd: avoid needlessly casting pointer to long int
Browse files Browse the repository at this point in the history
  • Loading branch information
loonycyborg committed Jun 5, 2018
1 parent 1b7557a commit 608d39f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions src/server/server.cpp
Expand Up @@ -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())]))) {
const time_t now = time(nullptr);
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);
Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/server/server.hpp
Expand Up @@ -106,7 +106,7 @@ class server : public server_base
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() {
Expand Down

0 comments on commit 608d39f

Please sign in to comment.