Minor fix.

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

diff --git a/stglibs/srvconf.lib/netunit.h b/stglibs/srvconf.lib/netunit.h
index 6b6cef53d12a9a7ac0dc63aab94f439bb21553c7..b6584ee57b46e68fdf75253b91e1202eb2304c04 100644 (file)
--- a/stglibs/srvconf.lib/netunit.h
+++ b/stglibs/srvconf.lib/netunit.h
@@ -18,12 +18,6 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

- /*
- $Revision: 1.6 $
- $Date: 2010/02/11 12:32:53 $
- $Author: faust $
- */
-

 #ifndef NetUnitH
 #define NetUnitH
 
 #ifndef NetUnitH
 #define NetUnitH
 


@@ -31,44 +25,42 @@
 
 #include <string>
 
 
 #include <string>
 

-typedef bool (* RxCallback_t)(void *, const std::string &, bool);
-
-//---------------------------------------------------------------------------

 class NETTRANSACT
 {
 public:
 class NETTRANSACT
 {
 public:

+    typedef bool (* CALLBACK)(const std::string &, bool, void *);
+

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

-    int     Transact(const char * data);
+    NETTRANSACT(const std::string & server, uint16_t port,
+                const std::string & localAddress, uint16_t localPort,
+                const std::string & login, const std::string & password);
+    int Transact(const std::string & request, CALLBACK f, void * data);

     const std::string & GetError() const { return errorMsg; }
 
     const std::string & GetError() const { return errorMsg; }
 

-    void    SetRxCallback(void * data, RxCallback_t cb);
-    RxCallback_t GetRxCallback() const { return dataRxCallBack; }
-
-    int     Connect();
-    int     Disconnect();
+    int  Connect();
+    void Disconnect();

 private:
 private:

-    int     TxHeader();
-    int     RxHeaderAnswer();
+    int  TxHeader();
+    int  RxHeaderAnswer();

 
 

-    int     TxLogin();
-    int     RxLoginAnswer();
+    int  TxLogin();
+    int  RxLoginAnswer();

 
 

-    int     TxLoginS();
-    int     RxLoginSAnswer();
+    int  TxLoginS();
+    int  RxLoginSAnswer();

 
 

-    int     TxData(const char * text);
-    int     TxData(char * data);
-    int     RxDataAnswer();
+    int  TxData(const std::string & text);
+    int  RxDataAnswer(CALLBACK f, void * data);

 
     std::string server;
     uint16_t  port;
 
     std::string server;
     uint16_t  port;

+    std::string localAddress;
+    uint16_t localPort;

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

-    RxCallback_t RxCallBack;
-    void * dataRxCallBack;

     std::string errorMsg;
 };
     std::string errorMsg;
 };

-//---------------------------------------------------------------------------
+

 #endif
 #endif