1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
diff --git a/src/server/campaignd/server.cpp b/src/server/campaignd/server.cpp
index 31a7df8..88a141a 100644
--- a/src/server/campaignd/server.cpp
+++ b/src/server/campaignd/server.cpp
@@ -735,7 +735,7 @@ void server::handle_sighup(const boost::system::error_code&, int)
void server::flush_cfg()
{
- flush_timer_.expires_from_now(std::chrono::minutes(10));
+ flush_timer_.expires_after(std::chrono::minutes(10));
flush_timer_.async_wait(std::bind(&server::handle_flush, this, std::placeholders::_1));
}
diff --git a/src/server/common/forum_user_handler.cpp b/src/server/common/forum_user_handler.cpp
index ed689cb..1fbac6e 100644
--- a/src/server/common/forum_user_handler.cpp
+++ b/src/server/common/forum_user_handler.cpp
@@ -207,7 +207,7 @@ std::string fuh::get_tournaments(){
return conn_.get_tournaments();
}
-void fuh::async_get_and_send_game_history(boost::asio::io_service& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) {
+void fuh::async_get_and_send_game_history(boost::asio::io_context& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) {
boost::asio::post([this, &s, player, player_id, offset, &io_service, search_game_name, search_content_type, search_content] {
boost::asio::post(io_service, [player, &s, doc = conn_.get_game_history(player_id, offset, search_game_name, search_content_type, search_content)]{
s.send_to_player(player, *doc);
@@ -235,7 +235,7 @@ void fuh::db_set_oos_flag(const std::string& uuid, int game_id){
conn_.set_oos_flag(uuid, game_id);
}
-void fuh::async_test_query(boost::asio::io_service& io_service, int limit) {
+void fuh::async_test_query(boost::asio::io_context& io_service, int limit) {
boost::asio::post([this, limit, &io_service] {
ERR_UH << "async test query starts!";
int i = conn_.async_test_query(limit);
diff --git a/src/server/common/forum_user_handler.hpp b/src/server/common/forum_user_handler.hpp
index d050f90..f8c2b01 100644
--- a/src/server/common/forum_user_handler.hpp
+++ b/src/server/common/forum_user_handler.hpp
@@ -133,7 +133,7 @@ public:
* @param search_content_type The content type to query for (ie: scenario)
* @param search_content Query for games using this content ID. Supports leading and/or trailing wildcards.
*/
- void async_get_and_send_game_history(boost::asio::io_service& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content);
+ void async_get_and_send_game_history(boost::asio::io_context& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content);
/**
* Inserts game related information.
@@ -203,7 +203,7 @@ public:
* @param io_service The boost io_service to use to post the query results back to the main boost::asio thread.
* @param limit How many recursions to make in the query.
*/
- void async_test_query(boost::asio::io_service& io_service, int limit);
+ void async_test_query(boost::asio::io_context& io_service, int limit);
/**
* Checks whether a forum thread with @a topic_id exists.
diff --git a/src/server/common/server_base.cpp b/src/server/common/server_base.cpp
index 2c1a581..0aca915 100644
--- a/src/server/common/server_base.cpp
+++ b/src/server/common/server_base.cpp
@@ -41,6 +41,10 @@
#ifndef _WIN32
#include <boost/asio/read_until.hpp>
#endif
+#ifndef BOOST_NO_EXCEPTIONS
+#include <boost/exception/diagnostic_information.hpp>
+#endif
+
#include <boost/asio/write.hpp>
#include <array>
diff --git a/src/server/common/server_base.hpp b/src/server/common/server_base.hpp
index 94aac7e..e40b6ca 100644
--- a/src/server/common/server_base.hpp
+++ b/src/server/common/server_base.hpp
@@ -30,7 +30,7 @@
#include "serialization/unicode_cast.hpp"
#endif
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/io_context.hpp>
#include <boost/asio/ip/tcp.hpp>
#ifndef _WIN32
#include <boost/asio/posix/stream_descriptor.hpp>
@@ -150,7 +150,7 @@ public:
protected:
unsigned short port_;
bool keep_alive_;
- boost::asio::io_service io_service_;
+ boost::asio::io_context io_service_;
boost::asio::ssl::context tls_context_ { boost::asio::ssl::context::sslv23 };
bool tls_enabled_ { false };
boost::asio::ip::tcp::acceptor acceptor_v6_;
diff --git a/src/server/common/user_handler.hpp b/src/server/common/user_handler.hpp
index d8e72f1..24b727f 100644
--- a/src/server/common/user_handler.hpp
+++ b/src/server/common/user_handler.hpp
@@ -22,7 +22,7 @@ class config;
#include <ctime>
#include <string>
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/io_context.hpp>
#include "server/wesnothd/player_connection.hpp"
@@ -139,13 +139,13 @@ public:
virtual std::string get_uuid() = 0;
virtual std::string get_tournaments() = 0;
- virtual void async_get_and_send_game_history(boost::asio::io_service& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) =0;
+ virtual void async_get_and_send_game_history(boost::asio::io_context& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) =0;
virtual void db_insert_game_info(const std::string& uuid, int game_id, const std::string& version, const std::string& name, int reload, int observers, int is_public, int has_password) = 0;
virtual void db_update_game_end(const std::string& uuid, int game_id, const std::string& replay_location) = 0;
virtual void db_insert_game_player_info(const std::string& uuid, int game_id, const std::string& username, int side_number, int is_host, const std::string& faction, const std::string& version, const std::string& source, const std::string& current_user, const std::string& leaders) = 0;
virtual unsigned long long db_insert_game_content_info(const std::string& uuid, int game_id, const std::string& type, const std::string& name, const std::string& id, const std::string& addon_id, const std::string& addon_version) = 0;
virtual void db_set_oos_flag(const std::string& uuid, int game_id) = 0;
- virtual void async_test_query(boost::asio::io_service& io_service, int limit) = 0;
+ virtual void async_test_query(boost::asio::io_context& io_service, int limit) = 0;
virtual bool db_topic_id_exists(int topic_id) = 0;
virtual void db_insert_addon_info(const std::string& instance_version, const std::string& id, const std::string& name, const std::string& type, const std::string& version, bool forum_auth, int topic_id, const std::string uploader) = 0;
virtual unsigned long long db_insert_login(const std::string& username, const std::string& ip, const std::string& version) = 0;
diff --git a/src/server/wesnothd/game.cpp b/src/server/wesnothd/game.cpp
index faeb255..ec95bd4 100644
--- a/src/server/wesnothd/game.cpp
+++ b/src/server/wesnothd/game.cpp
@@ -27,6 +27,8 @@
#include <iomanip>
#include <sstream>
+#include <boost/coroutine/exceptions.hpp>
+
static lg::log_domain log_server("server");
#define ERR_GAME LOG_STREAM(err, log_server)
#define WRN_GAME LOG_STREAM(warn, log_server)
diff --git a/src/server/wesnothd/server.cpp b/src/server/wesnothd/server.cpp
index 7c4b2a0..587b02a 100644
--- a/src/server/wesnothd/server.cpp
+++ b/src/server/wesnothd/server.cpp
@@ -293,14 +293,14 @@ void server::handle_graceful_timeout(const boost::system::error_code& error)
process_command("msg All games ended. Shutting down now. Reconnect to the new server instance.", "system");
BOOST_THROW_EXCEPTION(server_shutdown("graceful shutdown timeout"));
} else {
- timer_.expires_from_now(std::chrono::seconds(1));
+ timer_.expires_after(std::chrono::seconds(1));
timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, std::placeholders::_1));
}
}
void server::start_lan_server_timer()
{
- lan_server_timer_.expires_from_now(std::chrono::seconds(lan_server_));
+ lan_server_timer_.expires_after(std::chrono::seconds(lan_server_));
lan_server_timer_.async_wait([this](const boost::system::error_code& ec) { handle_lan_server_shutdown(ec); });
}
@@ -2120,7 +2120,7 @@ void server::shut_down_handler(
acceptor_v6_.close();
acceptor_v4_.close();
- timer_.expires_from_now(std::chrono::seconds(10));
+ timer_.expires_after(std::chrono::seconds(10));
timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, std::placeholders::_1));
process_command(
@@ -2151,7 +2151,7 @@ void server::restart_handler(const std::string& issuer_name,
graceful_restart = true;
acceptor_v6_.close();
acceptor_v4_.close();
- timer_.expires_from_now(std::chrono::seconds(10));
+ timer_.expires_after(std::chrono::seconds(10));
timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, std::placeholders::_1));
start_new_server();
|
