diff --git a/Connection.h b/Connection.h index 2b5ee34..483030b 100644 --- a/Connection.h +++ b/Connection.h @@ -19,7 +19,7 @@ private: recv = 20, send - }error; + }error = ErrorTypes::none; void p_HandleError(); diff --git a/Payload.cpp b/Payload.cpp index bb3b31d..88f1a09 100644 --- a/Payload.cpp +++ b/Payload.cpp @@ -15,3 +15,9 @@ void Payload::setData(std::vector m_data){ size_t Payload::getSize(){ return Data.size(); } + +Payload::Payload(){ } + +Payload::Payload(std::vector m_data) +: Data(m_data){} + diff --git a/Payload.h b/Payload.h index 11e7998..533bca8 100644 --- a/Payload.h +++ b/Payload.h @@ -15,6 +15,9 @@ public: void setData(std::vector); void push_char(unsigned char); + + Payload(); + Payload(std::vector); }; #endif /* PAYLOAD_H */ diff --git a/main.cpp b/main.cpp index d5412d8..ac44232 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,6 @@ #include "Connection.h" #include "Payload.h" +#include #include int main(int argc, char *argv[]) @@ -10,13 +11,19 @@ int main(int argc, char *argv[]) }else{ c = new Connection(argv[1], atoi(argv[2])); } - Payload p; - p.push_char(0xFE); - p.push_char(0x01); - p.push_char(0xFA); + if(c->status() != 0){ + return 1; + } + std::vector p_data{0xFE, 0x01, 0xFA, 0x00, 0x08, 0x00, 0x4D, 0x00, 0x43, 0x00, 0x7C, 0x00, 0x50, 0x00, 0x69, 0x00, 0x6E, 0x00, 0x67, 0x00, 0x48, 0x00, 0x6F, 0x00, 0x73, 0x00, 0x74}; + Payload p(p_data); + c->send(p, true); Payload response = c->recv(); std::cout << response.getData() << std::endl; return 0; } + +void test_server(std::string addr, int port, Payload p){ + Connection c(addr, port); +}