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

Make the MP server now always send gzipped data.

Browse source
This commit is contained in:
Mark de Wever 2008-01-08 17:17:46 +00:00
parent 57d7d0839f
commit c52dc5088f
6 changed files with 91 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -52,6 +52,7 @@ Version 1.3.13+svn:
* the previous "max-saves" slider is now used as a slider to determin the
maximum number of auto-saves to keep, default value is 10, so the 11th
oldest and all older auto-saves will be deleted
* the MP server now always sends gzipped data
Version 1.3.13:
* campaigns:

88
src/server/game.cpp
View file

@ -30,8 +30,6 @@
#define DBG_GAME LOG_STREAM(debug, mp_server)
int game::id_num = 1;
//! @todo remove after 1.3.12 is no longer allowed on the server.
bool game::send_gzipped = true;
game::game(player_map& players, const network::connection host, const std::string name)
: player_info_(&players), id_(id_num++), name_(name), owner_(host),
@ -159,7 +157,7 @@ bool game::take_side(const player_map::const_iterator user)
sides_taken_[side_num - 1] = true;
cfg["side"] = (**side)["side"];
// Tell the host which side the new player should take.
network::send_data(cfg, owner_, send_gzipped);
network::send_data(cfg, owner_, true);
DBG_GAME << debug_player_info();
return true;
}
@ -177,7 +175,7 @@ bool game::take_side(const player_map::const_iterator user)
sides_taken_[side_num - 1] = true;
cfg["side"] = (**side)["side"];
// Tell the host which side the new player should take.
network::send_data(cfg, owner_, send_gzipped);
network::send_data(cfg, owner_, true);
DBG_GAME << debug_player_info();
return true;
}
@ -262,7 +260,7 @@ void game::transfer_side_control(const network::connection sock, const config& c
DBG_GAME << "transfer_side_control...\n";
if (!is_player(sock)) {
network::send_data(construct_server_message(
"You cannot change controllers: not a player."), sock, send_gzipped);
"You cannot change controllers: not a player."), sock, true);
return;
}
@ -282,7 +280,7 @@ void game::transfer_side_control(const network::connection sock, const config& c
}
// Is he in this game?
if (newplayer == player_info_->end() || !is_member(newplayer->first)) {
network::send_data(construct_server_message("Player/Observer not in this game."), sock, send_gzipped);
network::send_data(construct_server_message("Player/Observer not in this game."), sock, true);
return;
}
// Check the side number.
@ -294,16 +292,16 @@ void game::transfer_side_control(const network::connection sock, const config& c
std::ostringstream msg;
msg << "The side number has to be between 1 and "
<< gamemap::MAX_PLAYERS << ".";
network::send_data(construct_server_message(msg.str()), sock, send_gzipped);
network::send_data(construct_server_message(msg.str()), sock, true);
return;
}
}
catch(bad_lexical_cast&) {
network::send_data(construct_server_message("Not a side number."), sock, send_gzipped);
network::send_data(construct_server_message("Not a side number."), sock, true);
return;
}
if (side_num > level_.get_children("side").size()) {
network::send_data(construct_server_message("Invalid side number."), sock, send_gzipped);
network::send_data(construct_server_message("Invalid side number."), sock, true);
return;
}
@ -311,18 +309,18 @@ void game::transfer_side_control(const network::connection sock, const config& c
&& cfg["own_side"] != "yes")
{
network::send_data(construct_server_message(
"This side is already controlled by a player."), sock, send_gzipped);
"This side is already controlled by a player."), sock, true);
return;
}
// Check if the sender actually owns the side he gives away or is the host.
if (!(sides_[side_num - 1] == sock || (sock == owner_))) {
DBG_GAME << "Side belongs to: " << sides_[side_num - 1] << "\n";
network::send_data(construct_server_message("Not your side."), sock, send_gzipped);
network::send_data(construct_server_message("Not your side."), sock, true);
return;
}
if (newplayer->first == sock) {
network::send_data(construct_server_message(
"That's already your side, silly."), sock, send_gzipped);
"That's already your side, silly."), sock, true);
return;
}
sides_[side_num - 1] = 0;
@ -373,7 +371,7 @@ void game::transfer_side_control(const network::connection sock, const config& c
send_data(response, newplayer->first);
// Tell the new player that he controls this side now.
change["controller"] = "human";
network::send_data(response, newplayer->first, send_gzipped);
network::send_data(response, newplayer->first, true);
// Update the level so observers who join get the new name.
config::child_itors it = level_.child_range("side");
@ -388,7 +386,7 @@ void game::transfer_side_control(const network::connection sock, const config& c
if (side_controllers_[i] == "ai") {
change["side"] = lexical_cast<std::string, unsigned int>(i + 1);
change["controller"] = "ai";
network::send_data(response, owner_, send_gzipped);
network::send_data(response, owner_, true);
sides_[side_num - 1] = owner_;
}
}
@ -416,7 +414,7 @@ void game::notify_new_host(){
config& cfg_host_transfer = cfg.add_child("host_transfer");
cfg_host_transfer["name"] = it_host->second.name();
cfg_host_transfer["value"] = "1";
network::send_data(cfg, owner_, send_gzipped);
network::send_data(cfg, owner_, true);
}
}
@ -458,14 +456,14 @@ bool game::player_is_banned(const network::connection sock) const {
void game::mute_observer(const config& mute, const player_map::const_iterator muter) {
if (muter->first != owner_) {
network::send_data(construct_server_message(
"You cannot mute: not the game host."), muter->first, send_gzipped);
"You cannot mute: not the game host."), muter->first, true);
return;
}
const std::string name = mute["username"];
if (name.empty()) {
if (all_observers_muted_) {
network::send_data(construct_server_message(
"All observers are muted."), muter->first, send_gzipped);
"All observers are muted."), muter->first, true);
return;
}
std::string muted_nicks = "";
@ -478,7 +476,7 @@ void game::mute_observer(const config& mute, const player_map::const_iterator mu
muted_nicks += player_info_->find(*muted_obs)->second.name();
}
network::send_data(construct_server_message("Muted observers: "
+ muted_nicks), muter->first, send_gzipped);
+ muted_nicks), muter->first, true);
return;
}
const player_map::const_iterator user = find_user(name);
@ -486,18 +484,18 @@ void game::mute_observer(const config& mute, const player_map::const_iterator mu
//! and also allow muting of usernames not in the game.
if (user == player_info_->end() || !is_observer(user->first)) {
network::send_data(construct_server_message(
"Observer not found."), muter->first, send_gzipped);
"Observer not found."), muter->first, true);
return;
}
//! Prevent muting ourselves.
if (user->first != muter->first) {
network::send_data(construct_server_message(
"Don't mute yourself, silly."), muter->first, send_gzipped);
"Don't mute yourself, silly."), muter->first, true);
return;
}
if (is_muted_observer(user->first)) {
network::send_data(construct_server_message(user->second.name()
+ " is already muted."), muter->first, send_gzipped);
+ " is already muted."), muter->first, true);
return;
}
muted_observers_.push_back(user->first);
@ -505,7 +503,7 @@ void game::mute_observer(const config& mute, const player_map::const_iterator mu
<< muter->second.name() << "muted: " << user->second.name()
<< "\tfrom game:\t\"" << name_ << "\" (" << id_ << ")\n";
network::send_data(construct_server_message(
"You have been muted."), user->first, send_gzipped);
"You have been muted."), user->first, true);
send_data(construct_server_message(user->second.name()
+ " has been muted."), user->first);
}
@ -517,31 +515,31 @@ network::connection game::kick_member(const config& kick,
{
if (kicker->first != owner_) {
network::send_data(construct_server_message(
"You cannot kick: not the game host."), kicker->first, send_gzipped);
"You cannot kick: not the game host."), kicker->first, true);
return 0;
}
const std::string name = kick["username"];
const player_map::const_iterator user = find_user(name);
if (user == player_info_->end() || !is_member(user->first)) {
network::send_data(construct_server_message(
"Not a member of this game."), kicker->first, send_gzipped);
"Not a member of this game."), kicker->first, true);
return 0;
}
if (user->first == kicker->first) {
network::send_data(construct_server_message(
"Don't kick yourself, silly."), kicker->first, send_gzipped);
"Don't kick yourself, silly."), kicker->first, true);
return 0;
}
LOG_GAME << network::ip_address(kicker->first) << "\t"
<< kicker->second.name() << "\tkicked: " << user->second.name()
<< "\tfrom game:\t\"" << name_ << "\" (" << id_ << ")\n";
network::send_data(construct_server_message("You have been kicked."),
user->first, send_gzipped);
user->first, true);
const config& msg = construct_server_message(name + " has been kicked.");
send_data(msg, user->first);
record_data(msg);
// Tell the user to leave the game.
network::send_data(config("leave_game"), user->first, send_gzipped);
network::send_data(config("leave_game"), user->first, true);
remove_player(user->first);
return user->first;
}
@ -555,24 +553,24 @@ network::connection game::ban_user(const config& ban,
{
if (banner->first != owner_) {
network::send_data(construct_server_message(
"You cannot ban: not the game host."), banner->first, send_gzipped);
"You cannot ban: not the game host."), banner->first, true);
return 0;
}
const std::string name = ban["username"];
const player_map::const_iterator user = find_user(name);
if (user == player_info_->end()) {
network::send_data(construct_server_message(
"User not found."), banner->first, send_gzipped);
"User not found."), banner->first, true);
return 0;
}
if (user->first == banner->first) {
network::send_data(construct_server_message(
"Don't ban yourself, silly."), banner->first, send_gzipped);
"Don't ban yourself, silly."), banner->first, true);
return 0;
}
if (player_is_banned(user->first)) {
network::send_data(construct_server_message(name
+ " is already banned."), banner->first, send_gzipped);
+ " is already banned."), banner->first, true);
return 0;
}
LOG_GAME << network::ip_address(banner->first) << "\t"
@ -584,9 +582,9 @@ network::connection game::ban_user(const config& ban,
record_data(msg);
if (is_member(user->first)) {
network::send_data(construct_server_message("You have been banned."),
user->first, send_gzipped);
user->first, true);
// Tell the user to leave the game.
network::send_data(config("leave_game"), user->first, send_gzipped);
network::send_data(config("leave_game"), user->first, true);
remove_player(user->first);
return user->first;
}
@ -620,7 +618,7 @@ bool game::process_turn(config data, const player_map::const_iterator user) {
{
network::send_data(construct_server_message(
"You have been muted, others can't see your message!"),
user->first, send_gzipped);
user->first, true);
return res;
}
chat_message::truncate_message((*speak)["message"]);
@ -758,13 +756,13 @@ void game::add_player(const network::connection player, const bool observer) {
DBG_GAME << debug_player_info();
send_user_list();
// Send the user the game data.
network::send_data(level_, player, send_gzipped);
network::send_data(level_, player, true);
//if the game has already started, we add the player as an observer
if(started_) {
//tell this player that the game has started
network::send_data(config("start_game"), player, send_gzipped);
network::send_data(config("start_game"), player, true);
// Send the player the history of the game to-date.
network::send_data(history_, player, send_gzipped);
network::send_data(history_, player, true);
// Send observer join of all the observers in the game to the new player
// only once the game started. The client forgets about it anyway
// otherwise.
@ -853,7 +851,7 @@ bool game::remove_player(const network::connection player, const bool disconnect
config drop;
drop["side_drop"] = lexical_cast<std::string, size_t>(side + 1);
drop["controller"] = "ai";
network::send_data(drop, owner_, send_gzipped);
network::send_data(drop, owner_, true);
sides_taken_[side] = false;
}
}
@ -870,7 +868,7 @@ bool game::remove_player(const network::connection player, const bool disconnect
config drop;
drop["side_drop"] = lexical_cast<std::string, size_t>(side - sides_.begin() + 1);
drop["controller"] = side_controllers_[side - sides_.begin()];
network::send_data(drop, owner_, send_gzipped);
network::send_data(drop, owner_, true);
}
side_controllers_[side - sides_.begin()] = "null";
sides_taken_[side - sides_.begin()] = false;
@ -905,9 +903,9 @@ void game::load_next_scenario(const player_map::const_iterator user) const {
+ " advances to the next scenario."), user->first);
config cfg_scenario;
cfg_scenario.add_child("next_scenario", level_);
network::send_data(cfg_scenario, user->first, send_gzipped);
network::send_data(cfg_scenario, user->first, true);
// Send the player the history of the game to-date.
network::send_data(history_, user->first, send_gzipped);
network::send_data(history_, user->first, true);
// Send observer join of all the observers in the game to the user.
send_observerjoin(user->first);
}
@ -917,7 +915,7 @@ void game::send_data(const config& data, const network::connection exclude) cons
const user_vector users = all_game_users();
for(user_vector::const_iterator i = users.begin(); i != users.end(); ++i) {
if (*i != exclude) {
network::send_data(data, *i, send_gzipped);
network::send_data(data, *i, true);
}
}
}
@ -940,7 +938,7 @@ void game::send_data_team(const config& data, const std::string& team,
{
for(user_vector::const_iterator i = players_.begin(); i != players_.end(); ++i) {
if(*i != exclude && player_on_team(team,*i)) {
network::send_data(data, *i, send_gzipped);
network::send_data(data, *i, true);
}
}
}
@ -948,7 +946,7 @@ void game::send_data_team(const config& data, const std::string& team,
void game::send_data_observers(const config& data, const network::connection exclude) const {
for(user_vector::const_iterator i = observers_.begin(); i != observers_.end(); ++i) {
if (*i != exclude) {
network::send_data(data, *i, send_gzipped);
network::send_data(data, *i, true);
}
}
}
@ -961,7 +959,7 @@ void game::send_observerjoin(const network::connection sock) const {
if (obs != player_info_->end()) {
config cfg;
cfg.add_child("observer").values["name"] = obs->second.name();
network::send_data(cfg, sock, send_gzipped);
network::send_data(cfg, sock, true);
}
}
}

5
src/server/game.hpp
View file

@ -130,11 +130,6 @@ public:
if (termination_.empty()) { termination_ = reason; }
}
//! This is a tempory variable to have a flag to switch between
//! gzipped data and not.
//! @todo remove after 1.3.12 is no longer allowed on the server.
static bool send_gzipped;
private:
//! Figures out which side to take and tells that side to the game owner.
bool take_side(const player_map::const_iterator user);

5
src/server/proxy.cpp
View file

@ -75,15 +75,14 @@ void disconnect(network::connection sock)
network::disconnect(peer);
}
//! @todo remove gzip param after 1.3.12 is no longer allowed on the server.
void received_data(network::connection sock, const config& data, const bool send_gzipped)
void received_data(network::connection sock, const config& data)
{
const network::connection peer = find_peer(sock);
if(!peer) {
return;
}
network::send_data(data, peer, send_gzipped);
network::send_data(data, peer, true);
}
}

3
src/server/proxy.hpp
View file

@ -27,8 +27,7 @@ void create_proxy(network::connection sock, const std::string& host, int port);
bool is_proxy(network::connection sock);
void disconnect(network::connection sock);
//! @todo remove gzip param after 1.3.12 is no longer allowed on the server.
void received_data(network::connection sock, const config& data, const bool send_gzipped);
void received_data(network::connection sock, const config& data);
}

98
src/server/server.cpp
View file

@ -136,11 +136,6 @@ private:
time_t last_stats_;
void dump_stats(const time_t& now);
//! This is a tempory variable to have a flag to switch between
//! gzipped data and not.
//! @todo remove after 1.3.12 is no longer allowed on the server.
bool send_gzipped_;
void process_data(const network::connection sock, const config& data);
void process_login(const network::connection sock, const config& data);
//! Handle queries from clients.
@ -168,8 +163,7 @@ server::server(int port, input_stream& input, const std::string& config_file, si
games_and_users_list_("gamelist"),
old_games_and_users_list_(games_and_users_list_),
last_ping_(time(NULL)),
last_stats_(last_ping_),
send_gzipped_(true)
last_stats_(last_ping_)
{
load_config();
signal(SIGHUP, reload_config);
@ -199,10 +193,6 @@ config server::read_config() const {
void server::load_config() {
admin_passwd_ = cfg_["passwd"];
motd_ = cfg_["motd"];
// Note this option will not be documented since it's only needed
// for a short transition phase.
send_gzipped_ = utils::string_bool(cfg_["gzipped"], false);
game::send_gzipped = send_gzipped_;
disallowed_names_.clear();
if (cfg_["disallow_names"] == "") {
@ -316,7 +306,7 @@ void server::run() {
for (player_map::const_iterator i = players_.begin();
i != players_.end(); ++i)
{
network::send_data(ping, i->first, send_gzipped_);
network::send_data(ping, i->first, true);
}
last_ping_ = now;
}
@ -328,16 +318,16 @@ void server::run() {
const std::string& ip = network::ip_address(sock);
if (is_ip_banned(ip)) {
LOG_SERVER << ip << "\trejected banned user.\n";
network::send_data(construct_error("You are banned."), sock, send_gzipped_);
network::send_data(construct_error("You are banned."), sock, true);
network::disconnect(sock);
} else if (ip_exceeds_connection_limit(ip)) {
LOG_SERVER << ip << "\trejected ip due to excessive connections\n";
network::send_data(construct_error("Too many connections from your IP."), sock, send_gzipped_);
network::send_data(construct_error("Too many connections from your IP."), sock, true);
network::disconnect(sock);
} else {
DBG_SERVER << ip << "\tnew connection accepted. (socket: "
<< sock << ")\n";
network::send_data(version_query_response_, sock, send_gzipped_);
network::send_data(version_query_response_, sock, true);
not_logged_in_.add_player(sock, true);
}
}
@ -431,7 +421,7 @@ void server::run() {
void server::process_data(const network::connection sock, const config& data) {
if (proxy::is_proxy(sock)) {
proxy::received_data(sock, data, send_gzipped_);
proxy::received_data(sock, data);
}
// Ignore client side pings for now.
if (data.values.find("ping") != data.values.end()) return;
@ -464,7 +454,7 @@ void server::process_login(const network::connection sock, const config& data) {
LOG_SERVER << network::ip_address(sock)
<< "\tplayer joined using accepted version " << version_str
<< ":\ttelling them to log in.\n";
network::send_data(login_response_, sock, send_gzipped_);
network::send_data(login_response_, sock, true);
return;
}
std::map<std::string,config>::const_iterator config_it;
@ -482,7 +472,7 @@ void server::process_login(const network::connection sock, const config& data) {
<< ":" << config_it->second["port"] << "\n";
config response;
response.add_child("redirect",config_it->second);
network::send_data(response, sock, send_gzipped_);
network::send_data(response, sock, true);
return;
}
// Check if it's a version we should start a proxy for.
@ -514,13 +504,13 @@ void server::process_login(const network::connection sock, const config& data) {
ERR_SERVER << "ERROR: This server doesn't accept any versions at all.\n";
response["version"] = "null";
}
network::send_data(response, sock, send_gzipped_);
network::send_data(response, sock, true);
return;
}
const config* const login = data.child("login");
// Client must send a login first.
if (login == NULL) {
network::send_data(construct_error("You must login first"), sock, send_gzipped_);
network::send_data(construct_error("You must login first"), sock, true);
return;
}
// Check if the username is valid (all alpha-numeric plus underscore and hyphen)
@ -528,11 +518,11 @@ void server::process_login(const network::connection sock, const config& data) {
if (!utils::isvalid_username(username)) {
network::send_data(construct_error("This username contains invalid "
"characters. Only alpha-numeric characters, underscores and hyphens"
"are allowed."), sock, send_gzipped_);
"are allowed."), sock, true);
return;
}
if (username.size() > 18) {
network::send_data(construct_error("This username is too long"), sock, send_gzipped_);
network::send_data(construct_error("This username is too long"), sock, true);
return;
}
// Check if the uername is allowed.
@ -543,7 +533,7 @@ void server::process_login(const network::connection sock, const config& data) {
utils::lowercase(*d_it)))
{
network::send_data(construct_error("The nick '" + username
+ "' is reserved and can not be used by players"), sock, send_gzipped_);
+ "' is reserved and can not be used by players"), sock, true);
return;
}
}
@ -551,11 +541,11 @@ void server::process_login(const network::connection sock, const config& data) {
player_map::const_iterator p;
for (p = players_.begin(); p != players_.end(); ++p) {
if (p->second.name() == username) {
network::send_data(construct_error("This username is already taken"), sock, send_gzipped_);
network::send_data(construct_error("This username is already taken"), sock, true);
return;
}
}
network::send_data(join_lobby_response_, sock, send_gzipped_);
network::send_data(join_lobby_response_, sock, true);
config* const player_cfg = &games_and_users_list_.add_child("user");
const player new_player(username, *player_cfg, default_max_messages_,
@ -566,10 +556,10 @@ void server::process_login(const network::connection sock, const config& data) {
lobby_.add_player(sock, true);
// Send the new player the entire list of games and players
network::send_data(games_and_users_list_, sock, send_gzipped_);
network::send_data(games_and_users_list_, sock, true);
if (motd_ != "") {
network::send_data(lobby_.construct_server_message(motd_), sock, send_gzipped_);
network::send_data(lobby_.construct_server_message(motd_), sock, true);
}
// Send other players in the lobby the update that the player has joined
@ -621,7 +611,7 @@ void server::process_query(const network::connection sock, const config& query)
} else {
response << "Error: unrecognized query: '" << command << "'\n" << help_msg;
}
network::send_data(lobby_.construct_server_message(response.str()), sock, send_gzipped_);
network::send_data(lobby_.construct_server_message(response.str()), sock, true);
}
std::string server::process_command(const std::string& query) {
@ -802,7 +792,7 @@ void server::process_whisper(const network::connection sock,
}
config cwhisper;
cwhisper.add_child("whisper",whisper);
network::send_data(cwhisper,i->first, send_gzipped_);
network::send_data(cwhisper,i->first, true);
sent = true;
break;
}
@ -813,7 +803,7 @@ void server::process_whisper(const network::connection sock,
msg["message"] = "Invalid number of arguments";
msg["sender"] = "server";
data.add_child("message", msg);
network::send_data(data, sock, send_gzipped_);
network::send_data(data, sock, true);
sent = true;
}
@ -827,7 +817,7 @@ void server::process_whisper(const network::connection sock,
}
msg["sender"] = "server";
data.add_child("message", msg);
network::send_data(data, sock, send_gzipped_);
network::send_data(data, sock, true);
}
}
@ -871,10 +861,10 @@ void server::process_data_lobby(const network::connection sock, const config& da
} catch(bad_lexical_cast&) {
WRN_SERVER << network::ip_address(sock) << "\t" << pl->second.name()
<< "\tattempted to join invalid game:\t" << id << "\n";
network::send_data(config("leave_game"), sock, send_gzipped_);
network::send_data(config("leave_game"), sock, true);
network::send_data(lobby_.construct_server_message(
"Attempt to join invalid game."), sock, send_gzipped_);
network::send_data(games_and_users_list_, sock, send_gzipped_);
"Attempt to join invalid game."), sock, true);
network::send_data(games_and_users_list_, sock, true);
return;
}
const std::vector<game>::iterator g =
@ -882,48 +872,48 @@ void server::process_data_lobby(const network::connection sock, const config& da
if (g == games_.end()) {
WRN_SERVER << network::ip_address(sock) << "\t" << pl->second.name()
<< "\tattempted to join unknown game:\t" << id << ".\n";
network::send_data(config("leave_game"), sock, send_gzipped_);
network::send_data(config("leave_game"), sock, true);
network::send_data(lobby_.construct_server_message(
"Attempt to join unknown game."), sock, send_gzipped_);
network::send_data(games_and_users_list_, sock, send_gzipped_);
"Attempt to join unknown game."), sock, true);
network::send_data(games_and_users_list_, sock, true);
return;
} else if (g->player_is_banned(sock)) {
DBG_SERVER << network::ip_address(sock) << "\tReject banned player: "
<< pl->second.name() << "\tfrom game:\t\"" << g->name()
<< "\" (" << id << ").\n";
network::send_data(config("leave_game"), sock, send_gzipped_);
network::send_data(config("leave_game"), sock, true);
network::send_data(lobby_.construct_server_message(
"You are banned from this game."), sock, send_gzipped_);
network::send_data(games_and_users_list_, sock, send_gzipped_);
"You are banned from this game."), sock, true);
network::send_data(games_and_users_list_, sock, true);
return;
} else if(!observer && !g->password_matches(password)) {
WRN_SERVER << network::ip_address(sock) << "\t" << pl->second.name()
<< "\tattempted to join game:\t\"" << g->name() << "\" ("
<< id << ") with bad password\n";
network::send_data(config("leave_game"), sock, send_gzipped_);
network::send_data(config("leave_game"), sock, true);
network::send_data(lobby_.construct_server_message(
"Incorrect password"), sock, send_gzipped_);
network::send_data(games_and_users_list_, sock, send_gzipped_);
"Incorrect password"), sock, true);
network::send_data(games_and_users_list_, sock, true);
return;
} else if (observer && !g->allow_observers()) {
WRN_SERVER << network::ip_address(sock) << "\t" << pl->second.name()
<< "\tattempted to observe game:\t\"" << g->name() << "\" ("
<< id << ") which doesn't allow observers.\n";
network::send_data(config("leave_game"), sock, send_gzipped_);
network::send_data(config("leave_game"), sock, true);
network::send_data(lobby_.construct_server_message(
"Attempt to observe a game that doesn't allow observers."),
sock, send_gzipped_);
network::send_data(games_and_users_list_, sock, send_gzipped_);
sock, true);
network::send_data(games_and_users_list_, sock, true);
return;
} else if (!g->level_init()) {
WRN_SERVER << network::ip_address(sock) << "\t" << pl->second.name()
<< "\tattempted to join uninitialized game:\t\"" << g->name()
<< "\" (" << id << ").\n";
network::send_data(config("leave_game"), sock, send_gzipped_);
network::send_data(config("leave_game"), sock, true);
network::send_data(lobby_.construct_server_message(
"Attempt to observe a game that doesn't allow observers."),
sock, send_gzipped_);
network::send_data(games_and_users_list_, sock, send_gzipped_);
sock, true);
network::send_data(games_and_users_list_, sock, true);
return;
}
LOG_SERVER << network::ip_address(sock) << "\t" << pl->second.name()
@ -946,7 +936,7 @@ void server::process_data_lobby(const network::connection sock, const config& da
} else if (pl->second.is_message_flooding()) {
network::send_data(lobby_.construct_server_message(
"Warning: you are sending too many messages too fast. "
"Your message has not been relayed."), pl->first, send_gzipped_);
"Your message has not been relayed."), pl->first, true);
return;
}
@ -969,7 +959,7 @@ void server::process_data_lobby(const network::connection sock, const config& da
// for example when cancelling the create game dialog
const config* const refresh = data.child("refresh_lobby");
if (refresh != NULL) {
network::send_data(games_and_users_list_, sock, send_gzipped_);
network::send_data(games_and_users_list_, sock, true);
}
}
@ -1174,7 +1164,7 @@ void server::process_data_game(const network::connection sock, const config& dat
// Send all other players in the lobby the update to the gamelist.
lobby_.send_data(games_and_users_list_diff(), sock);
// Send the player who has quit the gamelist.
network::send_data(games_and_users_list_, sock, send_gzipped_);
network::send_data(games_and_users_list_, sock, true);
}
return;
// If this is data describing side changes by the host.
@ -1207,7 +1197,7 @@ void server::process_data_game(const network::connection sock, const config& dat
} else if (data.child("muteall")) {
if (!g->is_owner(sock)) {
network::send_data(g->construct_server_message(
"You cannot mute: not the game host."), sock, send_gzipped_);
"You cannot mute: not the game host."), sock, true);
return;
}
if (g->mute_all_observers()) {
@ -1234,7 +1224,7 @@ void server::process_data_game(const network::connection sock, const config& dat
lobby_.send_data(games_and_users_list_diff(), sock);
}
// Send the removed user the lobby game list.
network::send_data(games_and_users_list_, user, send_gzipped_);
network::send_data(games_and_users_list_, user, true);
}
return;
// If info is being provided about the game state.