Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / stglibs / srvconf.lib / include / stg / netunit.h

diff --git a/stglibs/srvconf.lib/include/stg/netunit.h b/stglibs/srvconf.lib/include/stg/netunit.h
index cc5eac273d16ce86e53fb1c3e57c85792f3d5240..664eee633328978d5ff304129d03e6a32b3c1dfc 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/netunit.h
+++ b/stglibs/srvconf.lib/include/stg/netunit.h
@@ -27,14 +27,14 @@
 #ifndef NetUnitH
 #define NetUnitH
 
 #ifndef NetUnitH
 #define NetUnitH
 

-#include "stg/blowfish.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>

 
 #include <list>
 #include <string>
 
 
 #include <list>
 #include <string>
 

-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
+#include "stg/blowfish.h"

 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"


@@ -78,13 +78,18 @@ confData
 class NETTRANSACT
 {
 public:
 class NETTRANSACT
 {
 public:

-    NETTRANSACT(const std::string & server, uint16_t port,
-                const std::string & login, const std::string & password);
+    NETTRANSACT();

     int     Transact(const char * data);
     const std::string & GetError() const;
 
     void    SetRxCallback(void * data, RxCallback_t);
 
     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();
     int     Connect();
     int     Disconnect();
     void    Reset();


@@ -99,11 +104,10 @@ private:
     int     RxLoginSAnswer();
 
     int     TxData(const char * text);
     int     RxLoginSAnswer();
 
     int     TxData(const char * text);

-    int     TxData(char * data);

     int     RxDataAnswer();
 
     std::string server;
     int     RxDataAnswer();
 
     std::string server;

-    uint16_t  port;
+    short unsigned  port;

     std::string login;
     std::string password;
     int     outerSocket;
     std::string login;
     std::string password;
     int     outerSocket;