X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/e9cb0683c0b33d8458c1d9b2558bbeb5d101e680..0093be0eb4dbe201a7d63da1de47f98c68987b1d:/stglibs/srvconf.lib/include/stg/netunit.h?ds=inline diff --git a/stglibs/srvconf.lib/include/stg/netunit.h b/stglibs/srvconf.lib/include/stg/netunit.h index d40b4c6a..9e120855 100644 --- a/stglibs/srvconf.lib/include/stg/netunit.h +++ b/stglibs/srvconf.lib/include/stg/netunit.h @@ -29,7 +29,6 @@ #include "stg/blowfish.h" -#include #include #include @@ -49,7 +48,7 @@ #define MAX_ERR_STR_LEN (64) -typedef int(*RxCallback_t)(void *, std::list *); +typedef bool (* RxCallback_t)(void *, const std::string &, bool); enum status { @@ -78,21 +77,15 @@ confData class NETTRANSACT { public: - NETTRANSACT(); + NETTRANSACT(const std::string & server, uint16_t port, + const std::string & login, const std::string & password); int Transact(const char * data); const std::string & GetError() const; void SetRxCallback(void * data, RxCallback_t); - void SetServer(const char * serverName); - void SetServerPort(short unsigned p); - - void SetLogin(const char * l); - void SetPassword(const char * p); - //////////////////////////////////////////// int Connect(); int Disconnect(); - void Reset(); private: int TxHeader(); int RxHeaderAnswer(); @@ -107,16 +100,11 @@ private: int TxData(char * data); int RxDataAnswer(); - void Encrypt(char * d, const char * s, BLOWFISH_CTX *ctx); - void EnDecryptInit(const char * passwd, int passwdLen, BLOWFISH_CTX *ctx); - void Decrypt(char * d, const char * s, BLOWFISH_CTX *ctx); - std::string server; - short unsigned port; + uint16_t port; std::string login; std::string password; int outerSocket; - std::list answerList; RxCallback_t RxCallBack; void * dataRxCallBack; std::string errorMsg;