Author: soliton
Date: Tue Mar 4 23:08:25 2008
New Revision: 24309
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24309&view=rev
Log:
* refactor filter_commands() and process_commands() into process_turn(); makes
it a bit more efficient and also detects illegal commands better
Modified:
trunk/src/server/game.cpp
trunk/src/server/game.hpp
Modified: trunk/src/server/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/server/game.cpp?rev=24309&r1=24308&r2=24309&view=diff
==============================================================================
--- trunk/src/server/game.cpp (original)
+++ trunk/src/server/game.cpp Tue Mar 4 23:08:25 2008
@@ -678,37 +678,45 @@
send_data(data, user->first);
}
-//! Process [turn].
+bool game::is_legal_command(const config& command, bool is_player) {
+ // Only single commands allowed.
+ if (command.all_children().size() != 1) return false;
+ // Chatting is never an illegal command.
+ if (command.child("speak")) return true;
+ if (is_player
+ && (command.child("label")
+ || command.child("clear_labels")
+ || command.child("rename")
+ || command.child("countdown_update")
+ /* || command.child("choose")*/))
+ {
+ return true;
+ }
+ return false;
+}
+
+//! Handles [end_turn], repackages [commands] with private [speak]s in them
+//! and sends the data.
+//! Also filters commands from all but the current player.
+//! Currently removes all commands but [speak] for observers and all but
+//! [speak], [label] and [rename] for players.
+//! Returns true if the turn ended.
bool game::process_turn(config data, const player_map::const_iterator user) {
+ //DBG_GAME << "processing commands: '" << cfg << "'\n";
if (!started_) return false;
config* const turn = data.child("turn");
- filter_commands(*turn, user);
- if (turn->all_children().size() == 0) return false;
- //! Return value that tells whether the description changed.
- const bool res = process_commands(data, user);
-
- return res;
-}
-
-//! Filter commands from all but the current player.
-//! Currently removes all commands but [speak] for observers and all but
-//! [speak], [label] and [rename] for players.
-void game::filter_commands(config& turn, const player_map::const_iterator
user) {
- if (is_current_player(user->first)) return;
+ bool turn_ended = false;
+ // Any private 'speak' commands must be repackaged separate
+ // to other commands, and re-sent, since they should only go
+ // to some clients.
+ bool repackage = false;
+ int index = 0;
std::vector<int> marked;
- int index = 0;
- const config::child_list& children = turn.get_children("command");
- for(config::child_list::const_iterator i = children.begin();
- i != children.end(); ++i)
- {
- // Only single commands allowed.
- if ((*i)->all_children().size() != 1
- // Chatting is never an illegal command.
- || !((*i)->child("speak") || (is_player(user->first)
- && ((*i)->child("label") || (*i)->child("clear_labels")
- || (*i)->child("rename") ||
(*i)->child("countdown_update")
- /* || (*i)->child("choose")*/))))
- {
+ const config::child_list& commands = turn->get_children("command");
+ config::child_list::const_iterator command;
+ for (command = commands.begin(); command != commands.end(); ++command) {
+ if (!is_current_player(user->first)
+ && !is_legal_command(**command, is_player(user->first))) {
std::stringstream msg;
msg << "Removing illegal command from: " <<
user->second.name()
<< ". Current player is: "
@@ -718,31 +726,9 @@
<< ".\n";
LOG_GAME << msg.str();
send_and_record_server_message(msg.str());
- LOG_GAME << (**i);
+ LOG_GAME << (**command);
marked.push_back(index - marked.size());
- }
- ++index;
- }
-
- for(std::vector<int>::const_iterator j = marked.begin(); j !=
marked.end(); ++j) {
- turn.remove_child("command",*j);
- }
-}
-
-//! Handles [end_turn], repackages [commands] with private [speak]s in them
-//! and sends the data.
-bool game::process_commands(const config& data, const
player_map::const_iterator user) {
- //DBG_GAME << "processing commands: '" << cfg << "'\n";
- const config* const turn = data.child("turn");
- bool turn_ended = false;
- // Any private 'speak' commands must be repackaged separate
- // to other commands, and re-sent, since they should only go
- // to some clients.
- bool repackage = false;
- const config::child_list& commands = turn->get_children("command");
- config::child_list::const_iterator command;
- for (command = commands.begin(); command != commands.end(); ++command) {
- if ((**command).child("speak")) {
+ } else if ((**command).child("speak")) {
config& speak = *(**command).child("speak");
if (!(speak.get_attribute("team_name") == "")
|| (is_muted_observer(user->first))) {
@@ -768,10 +754,15 @@
}
}
}
- } else if ((**command).child("end_turn")) {
+ } else if (is_current_player(user->first) &&
(**command).child("end_turn")) {
turn_ended = end_turn();
}
- }
+ ++index;
+ }
+ for(std::vector<int>::const_iterator j = marked.begin(); j !=
marked.end(); ++j) {
+ turn->remove_child("command",*j);
+ }
+ if (turn->all_children().size() == 0) return false;
if (!repackage) {
record_data(data);
send_data(data, user->first);
Modified: trunk/src/server/game.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/server/game.hpp?rev=24309&r1=24308&r2=24309&view=diff
==============================================================================
--- trunk/src/server/game.hpp (original)
+++ trunk/src/server/game.hpp Tue Mar 4 23:08:25 2008
@@ -78,7 +78,8 @@
void transfer_side_control(const network::connection sock, const
config& cfg);
void process_message(config data, const player_map::iterator user);
- //! Process [turn].
+ //! Filters and processes (some) commands.
+ //! Returns true iff the turn ended.
bool process_turn(config data, const player_map::const_iterator user);
//! Set the description to the number of available slots.
//! Returns true iff the number of slots has changed.
@@ -131,12 +132,6 @@
const player_map::const_iterator newplayer,
const bool player_left=true);
void transfer_ai_sides();
- //! Function which filters commands sent by a player to remove commands
- //! that they don't have permission to execute.
- void filter_commands(config& turn, const player_map::const_iterator
user);
- //! Function which will process game commands and update the state of
the
- //! game accordingly. Will return true iff the game's description
changes.
- bool process_commands(const config& cfg, const
player_map::const_iterator user);
void send_data_team(const config& data, const std::string& team,
const network::connection exclude=0) const;
void send_data_observers(const config& data, const network::connection
exclude=0) const;
@@ -150,6 +145,7 @@
bool observers_can_label() const { return false; }
bool observers_can_chat() const { return true; }
+ bool is_legal_command(const config& command, bool is_player);
//! Function which returns true iff 'player' is on 'team'.
bool is_on_team(const std::string& team, const network::connection
player) const;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
