Skip to content

Commit

Permalink
use boost asio on clientside wesnothd connection
Browse files Browse the repository at this point in the history 
The main advantage is that the new code is much shorter and easier to
understand then the preivous one.

It currently still used the network::error class on some places

This also removed support for 'ping' packages, the plan is to replace it
with SO_KEEPALIVE

Also this temporaily breaks the gui2 lobby since it still uses the old
network code.
  • Loading branch information
@gfgtdf
gfgtdf committed Jun 5, 2016
1 parent c27a026 commit a6b114f
Show file tree
Hide file tree
Showing 38 changed files with 692 additions and 354 deletions.
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Expand Up @@ -960,6 +960,7 @@ set(wesnoth-main_SRC
utils/markov_generator.cpp
variable.cpp
variable_info.cpp
wesnothd_connection.cpp
whiteboard/action.cpp
whiteboard/attack.cpp
whiteboard/highlighter.cpp
Expand Down
1 change: 1 addition & 0 deletions src/SConscript
View file
Expand Up @@ -563,6 +563,7 @@ wesnoth_sources = Split("""
utils/markov_generator.cpp
variable_info.cpp
variable.cpp
wesnothd_connection.cpp
whiteboard/action.cpp
whiteboard/attack.cpp
whiteboard/highlighter.cpp
Expand Down
27 changes: 23 additions & 4 deletions src/addon/client.cpp
View file
Expand Up @@ -293,16 +293,35 @@ void addons_client::send_simple_request(const std::string& request_string, confi
request.add_child(request_string);
this->send_request(request, response);
}

struct read_addon_connection_data : public gui2::tnetwork_transmission::connection_data
{
read_addon_connection_data(network_asio::connection& conn) : conn_(conn) {}
size_t total() override { return conn_.bytes_to_read(); }
virtual size_t current() override { return conn_.bytes_read(); }
virtual bool finished() override { return conn_.done(); }
virtual void cancel() override { return conn_.cancel(); }
virtual void poll() override { conn_.poll(); }
network_asio::connection& conn_;
};
struct write_addon_connection_data : public gui2::tnetwork_transmission::connection_data
{
write_addon_connection_data(network_asio::connection& conn) : conn_(conn) {}
size_t total() override { return conn_.bytes_to_write(); }
virtual size_t current() override { return conn_.bytes_written(); }
virtual bool finished() override { return conn_.done(); }
virtual void cancel() override { return conn_.cancel(); }
virtual void poll() override { conn_.poll(); }
network_asio::connection& conn_;
};
void addons_client::wait_for_transfer_done(const std::string& status_message, bool track_upload)
{
check_connected();

std::unique_ptr<gui2::tnetwork_transmission::connection_data> cd(track_upload ? new write_addon_connection_data{ *conn_ } : new write_addon_connection_data{ *conn_ });
if(!stat_) {
stat_ = new gui2::tnetwork_transmission(*conn_, _("Add-ons Manager"), status_message);
stat_ = new gui2::tnetwork_transmission(*cd, _("Add-ons Manager"), status_message);
} else {
stat_->set_subtitle(status_message);
stat_->set_track_upload(track_upload);
stat_->set_connection_data(*cd);
}

if(!stat_->show(v_)) {
Expand Down
136 changes: 27 additions & 109 deletions src/dialogs.cpp
View file
Expand Up @@ -14,7 +14,7 @@

/**
* @file
* Various dialogs: advance_unit, show_objectives, save+load game, network::connection.
* Various dialogs: advance_unit, show_objectives, save+load game
*/

#include "global.hpp"
Expand Down Expand Up @@ -59,8 +59,9 @@
#include "formula/string_utils.hpp"
#include "gui/dialogs/game_save.hpp"
#include "gui/dialogs/transient_message.hpp"
#include "gui/dialogs/network_transmission.hpp"
#include "ai/lua/aspect_advancements.hpp"

#include "wesnothd_connection.hpp"
#include <boost/make_shared.hpp>
#include <boost/shared_ptr.hpp>

Expand Down Expand Up @@ -1153,123 +1154,40 @@ void unit_types_preview_pane::process_event()
}



network::connection network_receive_dialog(CVideo& video, const std::string& msg, config& cfg, network::connection connection_num)
struct read_wesnothd_connection_data : public gui2::tnetwork_transmission::connection_data
{
const size_t width = 300;
const size_t height = 80;
const size_t border = 20;
const int left = video.getx()/2 - width/2;
const int top = video.gety()/2 - height/2;

const events::event_context dialog_events_context;

gui::button cancel_button(video, _("Cancel"));
std::vector<gui::button*> buttons_ptr(1,&cancel_button);

gui::dialog_frame frame(video, msg, gui::dialog_frame::default_style, true, &buttons_ptr);
SDL_Rect centered_layout = frame.layout(left,top,width,height).interior;
centered_layout.x = video.getx() / 2 - centered_layout.w / 2;
centered_layout.y = video.gety() / 2 - centered_layout.h / 2;
// HACK: otherwise we get an empty useless space in the dialog below the progressbar
centered_layout.h = height;
frame.layout(centered_layout);
frame.draw();

const SDL_Rect progress_rect = sdl::create_rect(centered_layout.x + border
, centered_layout.y + border
, centered_layout.w - border * 2
, centered_layout.h - border * 2);

gui::progress_bar progress(video);
progress.set_location(progress_rect);

events::raise_draw_event();
video.flip();

network::statistics old_stats = network::get_receive_stats(connection_num);

cfg.clear();
for(;;) {
const network::connection res = network::receive_data(cfg,connection_num,100);
const network::statistics stats = network::get_receive_stats(connection_num);
if(stats.current_max != 0 && stats != old_stats) {
old_stats = stats;
progress.set_progress_percent((stats.current*100)/stats.current_max);
std::ostringstream stream;
stream << utils::si_string(stats.current, true, _("unit_byte^B")) << "/" << utils::si_string(stats.current_max, true, _("unit_byte^B"));
progress.set_text(stream.str());
}

events::raise_draw_event();
video.flip();
events::pump();

if(res != 0) {
return res;
}


if(cancel_button.pressed()) {
return res;
}
}
}

} // end namespace dialogs

namespace {

class connect_waiter : public threading::waiter
{
public:
connect_waiter(CVideo& v, gui::button& button) : v_(v), button_(button)
{}
ACTION process();

private:
CVideo& v_;
gui::button& button_;
read_wesnothd_connection_data(twesnothd_connection& conn) : conn_(conn) {}
size_t total() override { return conn_.bytes_to_read(); }
virtual size_t current() override { return conn_.bytes_read(); }
virtual bool finished() override { return conn_.has_data_received(); }
virtual void cancel() override { }
virtual void poll() override { conn_.poll(); }
twesnothd_connection& conn_;
};

connect_waiter::ACTION connect_waiter::process()
bool network_receive_dialog(CVideo& video, const std::string& msg, config& cfg, twesnothd_connection& wesnothd_connection)
{
events::raise_draw_event();
v_.flip();
events::pump();
if(button_.pressed()) {
return ABORT;
} else {
return WAIT;
}
read_wesnothd_connection_data gui_data(wesnothd_connection);
gui2::tnetwork_transmission(gui_data, msg, _("Waiting")).show(video);
return wesnothd_connection.receive_data(cfg);
}

}

namespace dialogs
struct connect_wesnothd_connection_data : public gui2::tnetwork_transmission::connection_data
{
connect_wesnothd_connection_data(twesnothd_connection& conn) : conn_(conn) {}
virtual bool finished() override { return conn_.handshake_finished(); }
virtual void cancel() override { }
virtual void poll() override { conn_.poll(); }
twesnothd_connection& conn_;
};

network::connection network_connect_dialog(CVideo& v, const std::string& msg, const std::string& hostname, int port)
std::unique_ptr<twesnothd_connection> network_connect_dialog(CVideo& v, const std::string& msg, const std::string& hostname, int port)
{
const size_t width = 250;
const size_t height = 20;
const int left = v.getx()/2 - width/2;
const int top = v.gety()/2 - height/2;

const events::event_context dialog_events_context;

gui::button cancel_button(v,_("Cancel"));
std::vector<gui::button*> buttons_ptr(1,&cancel_button);

gui::dialog_frame frame(v, msg, gui::dialog_frame::default_style, true, &buttons_ptr);
frame.layout(left,top,width,height);
frame.draw();

events::raise_draw_event();
v.flip();
std::unique_ptr<twesnothd_connection> res(new twesnothd_connection(hostname, std::to_string(port)));
connect_wesnothd_connection_data gui_data(*res);
gui2::tnetwork_transmission(gui_data, msg, _("Connecting")).show(v);
return std::move(res);

connect_waiter waiter(v,cancel_button);
return network::connect(hostname,port,waiter);
}

} // end namespace dialogs
6 changes: 3 additions & 3 deletions src/dialogs.hpp
View file
Expand Up @@ -22,7 +22,7 @@ class unit;
class unit_map;
class unit_type;
class terrain_type;

class twesnothd_connection;
#include "map/location.hpp"
#include "construct_dialog.hpp"
#include "network.hpp"
Expand Down Expand Up @@ -137,8 +137,8 @@ class unit_types_preview_pane : public dialogs::unit_preview_pane
int side_;
};

network::connection network_receive_dialog(CVideo& video, const std::string& msg, config& cfg, network::connection connection_num=0);
network::connection network_connect_dialog(CVideo& video, const std::string& msg, const std::string& hostname, int port);
bool network_receive_dialog(CVideo& video, const std::string& msg, config& cfg, twesnothd_connection& wesnothd_connection);
std::unique_ptr<twesnothd_connection> network_connect_dialog(CVideo& video, const std::string& msg, const std::string& hostname, int port);

} //end namespace dialogs

Expand Down

0 comments on commit a6b114f

Please sign in to comment.