diff options
| author | 2017-07-08 16:47:24 +0200 | |
|---|---|---|
| committer | 2017-07-16 21:29:02 +0200 | |
| commit | 2af9a7146d17e89840c2c9c4f9134c992d27361c (patch) | |
| tree | f52f855e81dcf75a1b46e6b6189f0e5f5c095989 /src/network/room.h | |
| parent | Network: Added Packet class for serialization (diff) | |
| download | yuzu-2af9a7146d17e89840c2c9c4f9134c992d27361c.tar.gz yuzu-2af9a7146d17e89840c2c9c4f9134c992d27361c.tar.xz yuzu-2af9a7146d17e89840c2c9c4f9134c992d27361c.zip | |
Network: Handle join request in Room
Diffstat (limited to 'src/network/room.h')
| -rw-r--r-- | src/network/room.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/network/room.h b/src/network/room.h index 0a6217c11..ca663058f 100644 --- a/src/network/room.h +++ b/src/network/room.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <array> | ||
| 7 | #include <memory> | 8 | #include <memory> |
| 8 | #include <string> | 9 | #include <string> |
| 9 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| @@ -18,6 +19,11 @@ struct RoomInformation { | |||
| 18 | u32 member_slots; ///< Maximum number of members in this room | 19 | u32 member_slots; ///< Maximum number of members in this room |
| 19 | }; | 20 | }; |
| 20 | 21 | ||
| 22 | using MacAddress = std::array<uint8_t, 6>; | ||
| 23 | /// A special MAC address that tells the room we're joining to assign us a MAC address | ||
| 24 | /// automatically. | ||
| 25 | const MacAddress NoPreferredMac = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; | ||
| 26 | |||
| 21 | // The different types of messages that can be sent. The first byte of each packet defines the type | 27 | // The different types of messages that can be sent. The first byte of each packet defines the type |
| 22 | typedef uint8_t MessageID; | 28 | typedef uint8_t MessageID; |
| 23 | enum RoomMessageTypes { | 29 | enum RoomMessageTypes { |