1 files changed, 60 insertions, 43 deletions
diff --git a/src/sock/sock.h b/src/sock/sock.h
index 6f3419e..6e93468 100755
--- a/src/sock/sock.h
+++ b/src/sock/sock.h
@@ -3,69 +3,86 @@
 #ifndef SOCK_H
 #define SOCK_H
 
-
 #include <queue>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include "../thrd/pool.h"
-#include "../thrd/thrd.h"
+
 #include "../reqp.h"
 #include "../chat/user.h"
+
+#include "../thrd/pool.h"
+#include "../maps/shashmap.h"
+
+#ifdef LOGGING
 #include "../logd.h"
+#endif
 
 using namespace std;
 
-class sock
+class sock : public shashmap
+      < string, uint32_t, self_hash<uint32_t>, equals_allocator<uint32_t> >
 {
-private:
-    // total number of server requests.
-    unsigned long long int i_req;
+protected:
+#ifdef LOGGING
+
+  logd *log_daemon; // the log daemon
+#endif
 
-    bool  b_run;      // true while socket manager is running.
-    reqp* req_parser; // parses the http requests from clients.
-    pool* thrd_pool;  // the thread pool.
-    logd* log_daemon; // the log daemon
-    char* c_buffer;   // char buffer!
+  int i_server_sock;
+  int i_server_port;
 
-    int   i_threads;     // total amount of threads inside the thread pool.
-    pthread_mutex_t mut_threads;
-    pthread_mutex_t mut_hits;
+  // total number of server requests.
+  unsigned long long i_req;
+  bool  b_run;      // true while socket manager is running.
+  reqp *req_parser; // parses the http requests from clients.
+  char *c_buffer;   // char buffer!
+  pthread_mutex_t mut_hits;
 
+  static string inet_ntoa_callback(void* p_void);
 
 public:
-    // creates a server socket.
-    int make_server_socket( int port );
-
-    // small inline methods:
-    bool get_run() const
-    {
-        return b_run;
-    }
-    bool set_run( bool b_run )
-    {
-        this->b_run = b_run;
-    }
-
-    // public methods.
-    explicit sock( ); // simple constructor.
-    ~sock( );
-    virtual int  read_write( thrd* p_thrd, int filedes   );
-    virtual int  start();
-
-    // the chat stream there all the chat messages will sent through.
-    static void chat_stream( int i_sock, user* p_user, map_string &map_params ); //<<
-
-    void increase_num_threads();
-    void decrease_num_threads();
-#ifdef NCURSES
+  // creates a server socket.
+  int read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int  &i_payloadoffset);
+  string read_http_line(socketcontainer *p_sock);
+
+  // small inline methods:
+  bool get_server_() const
+  {
+    return b_run;
+  }
+  // small inline methods:
+  bool get_run() const
+  {
+    return b_run;
+  }
+  bool set_run( bool b_run )
+  {
+    this->b_run = b_run;
+  }
+
+  sock();
+
+  int read_write( socketcontainer* p_sock );
+
+  int start();
+  void clean_ipcache();
+
+  // the chat stream there all the chat messages will sent through.
+  void chat_stream( socketcontainer* p_sock, user* p_user, map<string,string> &map_params ); //<<
+  virtual inline int _send(socketcontainer *p_sock, const char *sz, int len);
+  virtual inline int _read(socketcontainer *p_sock, char *sz, int len);
+  virtual inline int _close(socketcontainer *p_sock);
+  virtual void _main_loop_init();
+  virtual inline socketcontainer* _create_container(int& i_sock);
+  virtual int _make_server_socket(int i_port);
 
-    void print_threads();
-    void print_hits();
+#ifdef NCURSES
+  void print_server_port();
+  void print_hits();
 #endif
 
 };
-
 #endif