1 files changed, 12 insertions, 26 deletions

diff --git a/src/sock/sock.h b/src/sock/sock.h
index 6e93468..62f32ae 100755
--- a/src/sock/sock.h
+++ b/src/sock/sock.h
@@ -12,7 +12,6 @@
 
 #include "../reqp.h"
 #include "../chat/user.h"
-
 #include "../thrd/pool.h"
 #include "../maps/shashmap.h"
 
@@ -22,22 +21,19 @@
 
 using namespace std;
 
-class sock : public shashmap
-      < string, uint32_t, self_hash<uint32_t>, equals_allocator<uint32_t> >
+class sock : protected shashmap
+< string, uint32_t, self_hash<uint32_t>, equals_allocator<uint32_t> >
 {
-protected:
+private:
 #ifdef LOGGING
-
   logd *log_daemon; // the log daemon
 #endif
 
-  int i_server_sock;
-  int i_server_port;
-
   // 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;
 
@@ -45,44 +41,34 @@ protected:
 
 public:
   // 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);
+  int make_server_socket( int i_port );
 
   // 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 );
+  sock( );
+  ~sock( );
 
+  int read_write( int* 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);
+  static void chat_stream( int i_sock, user* p_user, map<string,string> &map_params ); //<<
 
 #ifdef NCURSES
-  void print_server_port();
+
   void print_hits();
 #endif
 
 };
+
 #endif