diff options
| author | 2017-07-07 21:34:15 +0200 | |
|---|---|---|
| committer | 2017-07-07 15:34:15 -0400 | |
| commit | 2e37ce01c9dcdc5932cf5fe47a1ade0e0d2b7cf8 (patch) | |
| tree | b5298b3c528d9acc1f3fa48f19c9f9c19c97d036 /src/network/room_member.cpp | |
| parent | Merge pull request #2814 from Kloen/macro-remove (diff) | |
| download | yuzu-2e37ce01c9dcdc5932cf5fe47a1ade0e0d2b7cf8.tar.gz yuzu-2e37ce01c9dcdc5932cf5fe47a1ade0e0d2b7cf8.tar.xz yuzu-2e37ce01c9dcdc5932cf5fe47a1ade0e0d2b7cf8.zip | |
Implement basic virtual Room support based on enet (#2803)
* Added support for network with ENet lib,
connecting is possible, but data can't be sent, yet.
* fixup! Added support for network with ENet lib,
* fixup! CLang
* fixup! Added support for network with ENet lib,
* fixup! Added support for network with ENet lib,
* fixup! Clang format
* More fixups!
* Moved ENetHost* and ENetPeer* into pimpl classes
* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
* fixup! Clang again
* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
Diffstat (limited to 'src/network/room_member.cpp')
| -rw-r--r-- | src/network/room_member.cpp | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/src/network/room_member.cpp b/src/network/room_member.cpp new file mode 100644 index 000000000..c87f009f4 --- /dev/null +++ b/src/network/room_member.cpp | |||
| @@ -0,0 +1,74 @@ | |||
| 1 | // Copyright 2017 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include "common/assert.h" | ||
| 6 | #include "enet/enet.h" | ||
| 7 | #include "network/room_member.h" | ||
| 8 | |||
| 9 | namespace Network { | ||
| 10 | |||
| 11 | constexpr u32 ConnectionTimeoutMs = 5000; | ||
| 12 | |||
| 13 | class RoomMember::RoomMemberImpl { | ||
| 14 | public: | ||
| 15 | ENetHost* client = nullptr; ///< ENet network interface. | ||
| 16 | ENetPeer* server = nullptr; ///< The server peer the client is connected to | ||
| 17 | |||
| 18 | std::atomic<State> state{State::Idle}; ///< Current state of the RoomMember. | ||
| 19 | |||
| 20 | std::string nickname; ///< The nickname of this member. | ||
| 21 | }; | ||
| 22 | |||
| 23 | RoomMember::RoomMember() : room_member_impl{std::make_unique<RoomMemberImpl>()} { | ||
| 24 | room_member_impl->client = enet_host_create(nullptr, 1, NumChannels, 0, 0); | ||
| 25 | ASSERT_MSG(room_member_impl->client != nullptr, "Could not create client"); | ||
| 26 | } | ||
| 27 | |||
| 28 | RoomMember::~RoomMember() { | ||
| 29 | ASSERT_MSG(!IsConnected(), "RoomMember is being destroyed while connected"); | ||
| 30 | enet_host_destroy(room_member_impl->client); | ||
| 31 | } | ||
| 32 | |||
| 33 | RoomMember::State RoomMember::GetState() const { | ||
| 34 | return room_member_impl->state; | ||
| 35 | } | ||
| 36 | |||
| 37 | void RoomMember::Join(const std::string& nick, const char* server_addr, u16 server_port, | ||
| 38 | u16 client_port) { | ||
| 39 | ENetAddress address{}; | ||
| 40 | enet_address_set_host(&address, server_addr); | ||
| 41 | address.port = server_port; | ||
| 42 | |||
| 43 | room_member_impl->server = | ||
| 44 | enet_host_connect(room_member_impl->client, &address, NumChannels, 0); | ||
| 45 | |||
| 46 | if (!room_member_impl->server) { | ||
| 47 | room_member_impl->state = State::Error; | ||
| 48 | return; | ||
| 49 | } | ||
| 50 | |||
| 51 | ENetEvent event{}; | ||
| 52 | int net = enet_host_service(room_member_impl->client, &event, ConnectionTimeoutMs); | ||
| 53 | if (net > 0 && event.type == ENET_EVENT_TYPE_CONNECT) { | ||
| 54 | room_member_impl->nickname = nick; | ||
| 55 | room_member_impl->state = State::Joining; | ||
| 56 | // TODO(B3N30): Send a join request with the nickname to the server | ||
| 57 | // TODO(B3N30): Start the receive thread | ||
| 58 | } else { | ||
| 59 | room_member_impl->state = State::CouldNotConnect; | ||
| 60 | } | ||
| 61 | } | ||
| 62 | |||
| 63 | bool RoomMember::IsConnected() const { | ||
| 64 | return room_member_impl->state == State::Joining || room_member_impl->state == State::Joined; | ||
| 65 | } | ||
| 66 | |||
| 67 | void RoomMember::Leave() { | ||
| 68 | enet_peer_disconnect(room_member_impl->server, 0); | ||
| 69 | room_member_impl->state = State::Idle; | ||
| 70 | // TODO(B3N30): Close the receive thread | ||
| 71 | enet_peer_reset(room_member_impl->server); | ||
| 72 | } | ||
| 73 | |||
| 74 | } // namespace Network | ||