Mercurial > irccd
annotate irccdctl/server_join_cli.cpp @ 674:5d0ed41be10c
Irccd: do not own a queue in irc::connection class, closes #791 @1h
Since the server is an automatic state machine that recreate a new session after
a connection failure, we may have some invalid references in the irc::connection
class if there are still handler running.
Because server is already a std::shared_ptr that manages itself, it was heavy to
do the same in irc::connection class. Therefore, the irc::connection class is
now only responsible of connecting/receiving/sending data (and parsing it).
Update the server class to use a send queue and allow the user sending command
at any time which will be postponed once connected.
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 11 Apr 2018 21:01:10 +0200 |
parents | 27587ff92a64 |
children | d615af5e505b |
rev | line source |
---|---|
528
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
1 /* |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
2 * server_join_cli.cpp -- implementation of irccdctl server-join |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
3 * |
628
27587ff92a64
Misc: update copyrights
David Demelier <markand@malikania.fr>
parents:
528
diff
changeset
|
4 * Copyright (c) 2013-2018 David Demelier <markand@malikania.fr> |
528
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
5 * |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
6 * Permission to use, copy, modify, and/or distribute this software for any |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
7 * purpose with or without fee is hereby granted, provided that the above |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
8 * copyright notice and this permission notice appear in all copies. |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
9 * |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
17 */ |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
18 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
19 #include "server_join_cli.hpp" |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
20 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
21 namespace irccd { |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
22 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
23 namespace ctl { |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
24 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
25 std::string server_join_cli::name() const |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
26 { |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
27 return "server-join"; |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
28 } |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
29 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
30 void server_join_cli::exec(ctl::controller& ctl, const std::vector<std::string>& args) |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
31 { |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
32 if (args.size() < 2) |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
33 throw std::invalid_argument("server-join requires at least 2 arguments"); |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
34 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
35 auto object = nlohmann::json::object({ |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
36 { "server", args[0] }, |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
37 { "channel", args[1] } |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
38 }); |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
39 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
40 if (args.size() == 3) |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
41 object["password"] = args[2]; |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
42 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
43 request(ctl, object); |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
44 } |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
45 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
46 } // !ctl |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
47 |
9daccaeedcce
Irccdctl: split cli.hpp, closes #726
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
48 } // !irccd |