SeanOMik
/
libki
mirror of https://github.com/SeanOMik/libki.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

protocol: Add override specifier 

I thought final implied it
This commit is contained in:
Joshua Scott 2018-04-03 17:02:30 +01:00
parent bd57a3db9d
commit e0b5ca7923
5 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/ki/protocol/Packet.h
View File

@ -9,7 +9,7 @@ namespace ki
{ {
namespace protocol namespace protocol
{ {
class Packet : public util::Serializable class Packet final : public util::Serializable
{ {
public: public:
Packet(bool control = false, uint8_t opcode = 0); Packet(bool control = false, uint8_t opcode = 0);
@ -45,9 +45,9 @@ namespace protocol
return data; return data;
} }
virtual void write_to(std::ostream &ostream) const final; void write_to(std::ostream &ostream) const override final;
virtual void read_from(std::istream &istream) final; void read_from(std::istream &istream) override final;
virtual size_t get_size() const final; size_t get_size() const override final;
private: private:
bool m_control; bool m_control;
uint8_t m_opcode; uint8_t m_opcode;

8
include/ki/protocol/control/ClientHello.h
View File

@ -11,7 +11,7 @@ namespace protocol
{ {
namespace control namespace control
{ {
class ClientHello : public util::Serializable class ClientHello final : public util::Serializable
{ {
public: public:
ClientHello(uint16_t session_id = 0, ClientHello(uint16_t session_id = 0,
@ -27,9 +27,9 @@ namespace control
uint32_t get_milliseconds() const; uint32_t get_milliseconds() const;
void set_milliseconds(uint32_t milliseconds); void set_milliseconds(uint32_t milliseconds);
void write_to(std::ostream &ostream) const final; void write_to(std::ostream &ostream) const override final;
void read_from(std::istream &istream) final; void read_from(std::istream &istream) override final;
size_t get_size() const final; size_t get_size() const override final;
static Packet *create_packet(uint16_t session_id = 0, static Packet *create_packet(uint16_t session_id = 0,
uint64_t timestamp = 0, uint32_t milliseconds = 0) uint64_t timestamp = 0, uint32_t milliseconds = 0)

76
include/ki/protocol/control/Ping.h
View File

@ -6,45 +6,45 @@
namespace ki namespace ki
{ {
namespace protocol namespace protocol
{
namespace control
{
class Ping final : public util::Serializable
{ {
namespace control public:
Ping(uint16_t session_id = 0,
uint16_t milliseconds = 0, uint8_t minutes = 0);
virtual ~Ping() = default;
uint16_t get_session_id() const;
void set_session_id(uint16_t session_id);
uint16_t get_milliseconds() const;
void set_milliseconds(uint16_t milliseconds);
uint8_t get_minutes() const;
void set_minutes(uint8_t minutes);
void write_to(std::ostream &ostream) const override final;
void read_from(std::istream &istream) override final;
size_t get_size() const override final;
static Packet *create_packet(uint16_t session_id = 0,
uint16_t milliseconds = 0, uint8_t minutes = 0,
bool response = false)
{ {
class Ping : public util::Serializable Ping data(session_id, milliseconds, minutes);
{ auto *packet = new Packet(true,
public: (uint8_t)(response ? Opcode::PING_RSP : Opcode::PING));
Ping(uint16_t session_id = 0, packet->set_payload_data(data);
uint16_t milliseconds = 0, uint8_t minutes = 0); return packet;
virtual ~Ping() = default;
uint16_t get_session_id() const;
void set_session_id(uint16_t session_id);
uint16_t get_milliseconds() const;
void set_milliseconds(uint16_t milliseconds);
uint8_t get_minutes() const;
void set_minutes(uint8_t minutes);
void write_to(std::ostream &ostream) const final;
void read_from(std::istream &istream) final;
size_t get_size() const final;
static Packet *create_packet(uint16_t session_id = 0,
uint16_t milliseconds = 0, uint8_t minutes = 0,
bool response = false)
{
Ping data(session_id, milliseconds, minutes);
auto *packet = new Packet(true,
(uint8_t)(response ? Opcode::PING_RSP : Opcode::PING));
packet->set_payload_data(data);
return packet;
}
private:
uint16_t m_session_id;
uint16_t m_milliseconds;
uint8_t m_minutes;
};
} }
} private:
uint16_t m_session_id;
uint16_t m_milliseconds;
uint8_t m_minutes;
};
}
}
} }

8
include/ki/protocol/control/ServerHello.h
View File

@ -11,7 +11,7 @@ namespace protocol
{ {
namespace control namespace control
{ {
class ServerHello : public util::Serializable class ServerHello final : public util::Serializable
{ {
public: public:
ServerHello(uint16_t session_id = 0, ServerHello(uint16_t session_id = 0,
@ -27,9 +27,9 @@ namespace control
uint32_t get_milliseconds() const; uint32_t get_milliseconds() const;
void set_milliseconds(uint32_t milliseconds); void set_milliseconds(uint32_t milliseconds);
void write_to(std::ostream &ostream) const final; void write_to(std::ostream &ostream) const override final;
void read_from(std::istream &istream) final; void read_from(std::istream &istream) override final;
size_t get_size() const final; size_t get_size() const override final;
static Packet *create_packet(uint16_t session_id = 0, static Packet *create_packet(uint16_t session_id = 0,
uint64_t timestamp = 0, uint32_t milliseconds = 0) uint64_t timestamp = 0, uint32_t milliseconds = 0)

8
include/ki/protocol/dml/Message.h
View File

@ -9,7 +9,7 @@ namespace protocol
{ {
namespace dml namespace dml
{ {
class Message : public util::Serializable class Message final : public util::Serializable
{ {
public: public:
Message(uint8_t service_id = 0, uint8_t type = 0); Message(uint8_t service_id = 0, uint8_t type = 0);
@ -25,9 +25,9 @@ namespace dml
const ki::dml::Record &get_record() const; const ki::dml::Record &get_record() const;
void set_record(const ki::dml::Record &record); void set_record(const ki::dml::Record &record);
void write_to(std::ostream &ostream) const final; void write_to(std::ostream &ostream) const override final;
void read_from(std::istream &istream) final; void read_from(std::istream &istream) override final;
size_t get_size() const final; size_t get_size() const override final;
private: private:
uint8_t m_service_id; uint8_t m_service_id;
uint8_t m_type; uint8_t m_type;