Область видимості outerSocket, outerAddr і outerAddrLen звужено до

[stg.git] / projects / stargazer / plugins / other / userstat / datathread.h

diff --git a/projects/stargazer/plugins/other/userstat/datathread.h b/projects/stargazer/plugins/other/userstat/datathread.h
index cd9a87b6a26f13f6419a898289fd8b9880bf003d..4371516e4f552ceea3ef84c957e9340e43abc136 100644 (file)
--- a/projects/stargazer/plugins/other/userstat/datathread.h
+++ b/projects/stargazer/plugins/other/userstat/datathread.h
@@ -1,58 +1,87 @@
 #ifndef __DATATHREAD_H__
 #define __DATATHREAD_H__
 
 #ifndef __DATATHREAD_H__
 #define __DATATHREAD_H__
 

-#include "../../../users.h"
-#include "base_store.h"
-#include <pthread.h>
+#include <map>
+#include <string>
+

 #include <expat.h>
 #include <expat.h>

+#include <pthread.h>
+
+#include "common.h"
+#include "../../../users.h"
+
+uint32_t n2l(unsigned char * c)
+{
+    uint32_t t = *c++ << 24;
+    t += *c++ << 16;
+    t += *c++ << 8;
+    t += *c;
+    return t;
+}
+
+void l2n(uint32_t t, unsigned char * c)
+{
+    *c++ = t >> 24 & 0x000000FF;
+    *c++ = t >> 16 & 0x000000FF;
+    *c++ = t >> 8 & 0x000000FF;
+    *c++ = t & 0x000000FF;
+}
+
+typedef std::map<std::string, std::string> PV_LIST;

 
 class DataThread {
 public:
 
 class DataThread {
 public:

-    DataThread() : done(false), sock(-1) { Init(); };
-    DataThread(USERS * u, BASE_STORE * s, int sd)
-        : users(u),
-          store(s),
-          sock(sd),
-          done(false)
-    {
-        Init();
-    };
+    DataThread();

     ~DataThread();
 
     void SetUsers(USERS * u) { users = u; };
     void SetStore(BASE_STORE * s) { store = s; };
     ~DataThread();
 
     void SetUsers(USERS * u) { users = u; };
     void SetStore(BASE_STORE * s) { store = s; };

-    void SetSocket(int s) { sock = s; };

 
     bool isDone() const { return done; };
 
     bool isDone() const { return done; };

-    bool Init();
-
-    bool Start();
-    bool Stop();
-
-    static void * Run(void *);

 
 

+    bool Handle(int s);

 
 

+    friend void DTXMLStart(void * data, const char * name, const char ** attr);
+    friend void DTXMLEnd(void * data, const char * name);

 private:
 private:

-    pthread_t thread;
+    pthread_t tid;

     USERS * users;
     BASE_STORE * store;
     USERS * users;
     BASE_STORE * store;

-    XML_Parser parser;

     int sock;
     bool done;
     int sock;
     bool done;

-    bool running;
-    bool stopped;
-    BLOWFISH_CTX ctx;
-    std::string password;
-    std::string reply;
-
-    void Handle();
-    bool PrepareContect();
-    void Encode(const std::string &, char *);
-    void Decode(char *, const std::string &);
-
-    friend void StartHandler(void *data, const char *el, const char **attr);
-    friend void EndHandler(void *data, const char *el);
-    friend void DataHandler(void *data, const char *el);
+    struct Request {
+        PV_LIST conf;
+        PV_LIST stat;
+        std::string login;
+        bool isOk;
+        bool isBad;
+    } request;
+    PV_LIST * pvList;
+    char * data;
+    int32_t dataSize;
+
+    std::string login;
+    user_iter uit;
+
+    XML_Parser xmlParser;
+
+    static void * Run(void * self);
+
+    bool ReadRequest();
+    bool DecodeRequest();
+    bool ParseRequest();
+    bool MakeAnswer();
+
+    bool MakeConf();
+    bool MakeStat();
+    bool SendAnswer();
+
+    void Cleanup();
+
+    void ParseTag(const std::string & name, const char ** attr);

 };
 
 };
 

+void DTXMLStart(void * data, const char * name, const char ** attr);
+void DTXMLEnd(void * data, const char * name);
+

 #endif
 #endif