1 files changed, 111 insertions, 104 deletions

diff --git a/src/sock/sock.cpp b/src/sock/sock.cpp
index 8a020d7..0bfd57e 100644
--- a/src/sock/sock.cpp
+++ b/src/sock/sock.cpp
@@ -1,7 +1,7 @@
 /*:*
  *: File: ./src/sock/sock.cpp
  *: 
- *: yChat; Homepage: www.yChat.org; Version 0.7.9.5-RELEASE
+ *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT
  *: 
  *: Copyright (C) 2003 Paul C. Buetow, Volker Richter
  *: Copyright (C) 2004 Paul C. Buetow
@@ -39,39 +39,53 @@ sock::sock()
   this->b_run      = true;
   this->i_req      = 0;
   this->req_parser = new reqp();
-#ifdef LOGGING
-
-  this->log_daemon = new logd( wrap::CONF->get_elem( "httpd.logging.accessfile" ),
 
+#ifdef LOGGING
+  this->log_daemon = new logd( wrap::CONF->get_elem( "httpd.logging.accessfile" ), 
                                wrap::CONF->get_elem( "httpd.logging.access_lines" ) );
 #endif
 }
 
+  this->ip_cache_map = new shashmap
+	< string, unsigned, self_hash<unsigned>, equals_allocator<unsigned> >;
+}
+
 int
-sock::_send(socketcontainer *p_sock, const char *sz, int len)
+sock::_send(_socket *p_sock, const char *sz, int len)
 {
-
-  return send( p_sock->i_sock, sz, len, 0 );
+#ifdef OPENSSL
+  return send(p_sock->i_sock, sz, len, 0);
+#else
+  return send(*p_sock, sz, len, 0);
+#endif
 }
 
 int
-sock::_read(socketcontainer *p_sock,  char *sz, int len)
+sock::_read(_socket *p_sock,  char *sz, int len)
 {
-
-  return read( p_sock->i_sock, sz, len );
+#ifdef OPENSSL
+  return read(p_sock->i_sock, sz, len);
+#else
+  return read(*p_sock, sz, len);
+#endif
 }
 
 int
-sock::_close(socketcontainer *p_sock)
+sock::_close(_socket *p_sock)
 {
+#ifdef OPENSSL
   shutdown( p_sock->i_sock, 2 );
   close   ( p_sock->i_sock    );
+#else
+  shutdown( *p_sock, 2 );
+  close   ( *p_sock    );
+#endif
   delete p_sock;
 }
 
 //<<*
 void
-sock::chat_stream( socketcontainer *p_sock, user *p_user, map<string,string> &map_params )
+sock::chat_stream( _socket *p_sock, user *p_user, map<string,string> &map_params )
 {
   string s_msg( "\n" );
 
@@ -108,7 +122,8 @@ sock::chat_stream( socketcontainer *p_sock, user *p_user, map<string,string> &ma
   string s_user( p_user->get_name() );
   string s_user_lowercase( p_user->get_lowercase_name() );
 
-  p_user->get_room()->del_elem( s_user_lowercase );
+  room* p_room = p_user->get_room();
+  p_room->del_elem( s_user_lowercase );
 
   // post the room that the user has left the chat.
   s_msg = wrap::TIMR->get_time() + " "
@@ -116,11 +131,10 @@ sock::chat_stream( socketcontainer *p_sock, user *p_user, map<string,string> &ma
           + wrap::CONF->get_elem( "chat.msgs.userleaveschat" )
           + "<br>\n";
 
-  p_user->get_room()->msg_post( &s_msg );
-  p_user->get_room()->reload_onlineframe();
+  p_room->msg_post( &s_msg );
+  p_room->reload_onlineframe();
 
 #ifdef VERBOSE
-
   cout << REMUSER << s_user << endl;
 #endif
 
@@ -158,7 +172,6 @@ sock::_make_server_socket( int i_port )
 
   if ( bind(i_sock, (struct sockaddr *) &name, sizeof (name)) < 0 )
   {
-
     wrap::system_message( BINDERR );
 
     if ( ++i_port > MAXPORT )
@@ -179,7 +192,7 @@ sock::_make_server_socket( int i_port )
 }
 
 string
-sock::read_http_line(socketcontainer *p_sock)
+sock::read_http_line(_socket *p_sock)
 {
   string s_line;
   int i_total = 0;
@@ -188,7 +201,7 @@ sock::read_http_line(socketcontainer *p_sock)
 
   do
   {
-    i_read = _read(p_sock, &ch, sizeof(ch));
+    i_read = _read(p_sock, &ch, sizeof(char));
 
     if(i_read <= 0)
       return "";
@@ -207,7 +220,7 @@ sock::read_http_line(socketcontainer *p_sock)
   return s_line;
 }
 int
-sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_postpayloadoffset)
+sock::read_http(_socket *p_sock, char *c_zbuf, int &i_postpayloadoffset)
 {
   /*
   **  1)  Read the first line
@@ -225,8 +238,10 @@ sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_post
   string s_line = read_http_line(p_sock);
 
   i_postpayloadoffset = 0;
-  if(s_line.length() <= 0)
+  if(s_line.empty()) {
+    wrap::system_message(SOCKER4);
     return -1;
+  }
 
   /*
   **  GET yada\r\n Followed by stuff we don't care about :) heh.
@@ -238,20 +253,16 @@ sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_post
   **  Content-Length: NNN\n
   **  \n
   */
-  if(s_line.substr(0,3) == "GET")
+  if(s_line.substr(0, 3) == "GET")
   {
-    if(s_line.length() > i_buflen)
-    {
+    if(s_line.length() > READSOCK)
       /*
       **  Buffer overflow
       */
-      return -1;
-    }
-    else
-    {
-      memcpy(c_zbuf,s_line.c_str(),s_line.length());
-      return s_line.length();
-    }
+	  s_line = s_line.substr(0, READSOCK);
+
+    memcpy(c_zbuf,s_line.c_str(),s_line.length());
+    return s_line.length();
   }
 
   else
@@ -260,8 +271,10 @@ sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_post
     **  POST yada
     **  01234
     */
-    if(s_line.substr(0,4) != "POST")
+    if(s_line.substr(0, 4) != "POST") {
+      wrap::system_message(SOCKER4);
       return -1;
+    }
 
     /*
     **  Get us to the Content-Length:
@@ -269,7 +282,7 @@ sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_post
     s_post_return += s_line;
     i_postpayloadoffset += s_line.length();
 
-    for(x=0 ;x < MAXLINES; x++)
+    for(x =0; x < MAXLINES; ++x)
     {
       s_line = read_http_line(p_sock);
       s_post_return += s_line;
@@ -280,13 +293,12 @@ sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_post
 
       // Match found on Content-Length:...  process, and then break out and get us to the promised land
       s_content_length = s_line.substr( 16 /*strlen("Content-Length: ")*/, 
-		s_line.length() - 16 /*strlen("Content-Length: ")*/);
+		         s_line.length() - 16 /*strlen("Content-Length: ")*/);
 
       /*
       **  Content-Length: 333\n
       **  0123456789abcdefghijklmnopqrstuvwxyzAB
       */
-
       z = 0;
 
       do
@@ -295,16 +307,17 @@ sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_post
         if(isdigit(ch))
           s_cl += ch;
 
-        z++;
-        
+        ++z;
       }
       while(ch != '\n');
 
       break;
     }
 
-    if(s_cl.length() <= 0)
+    if(s_cl.empty()) {
+      wrap::system_message(SOCKER4);
       return -1;
+    }
 
     z = atoi(s_cl.c_str());
 
@@ -312,13 +325,15 @@ sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_post
     **  If we are going to overflow the buffer just by the payload, leave
     **  of, if z did not convert correctly. (should have been ok by isdigit)
     */
-    if(z > i_buflen || z < 0)
+    if(z > READSOCK || z < 0) {
+      wrap::system_message(SOCKER4);
       return -1;
+    }
 
     /*
     **  We have MAXLINES to get to the blank line separating POST data.
     */
-    for(x=0 ;x < MAXLINES; x++)
+    for(x = 0; x < MAXLINES; ++x)
     {
       s_line = read_http_line(p_sock);
       s_post_return += s_line;
@@ -331,19 +346,25 @@ sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_post
     /*
     **  funny business
     */
-    if(x == MAXLINES)
+    if(x == MAXLINES) {
+      wrap::system_message(SOCKER4);
       return -1;
+    }
 
-    for(x=0; x < z; x++)
+    for(x = 0; x < z; ++x)
     {
-      if(_read(p_sock,&ch,sizeof(ch)) != 1)
+      if(_read(p_sock,&ch,sizeof(ch)) != 1) {
+        wrap::system_message(SOCKER4);
         return -1;
+      }
 
       s_post_return += ch;
     }
 
-    if(s_post_return.length() > i_buflen)
+    if(s_post_return.length() > READSOCK) {
+      wrap::system_message(SOCKER4);
       return -1;
+    }
 
     memcpy(c_zbuf,s_post_return.c_str(),s_post_return.length());
     return s_post_return.length();
@@ -351,20 +372,25 @@ sock::read_http(socketcontainer *p_sock, char *c_zbuf, int i_buflen, int &i_post
 }
 
 int
-sock::read_write(socketcontainer* p_sock)
+sock::read_write(_socket* p_sock)
 {
   int i_postpayloadoffset;
-  int i_sock = p_sock->i_sock;
 
-  char c_req[READSOCK];
+#ifdef OPENSSL
+  int i_sock = p_sock->i_sock;
+#else
+  int i_sock = *p_sock;
+#endif
 
-  memset(c_req,0,sizeof(c_req));
+  char c_req[READSOCK+1];
+  memset(c_req, 0, sizeof(c_req));
 
-  int i_bytes = read_http(p_sock, c_req, READSOCK-1,i_postpayloadoffset);
+  int i_bytes = read_http(p_sock, c_req, i_postpayloadoffset);
 
   if (i_bytes <= 0)
   {
     wrap::system_message( READERR );
+
   }
 
   else
@@ -378,18 +404,17 @@ sock::read_write(socketcontainer* p_sock)
 
     getpeername(i_sock, (struct sockaddr *)&client, &size);
 
-    uint32_t &s_addr = client.sin_addr.s_addr;
-    if ( (map_params["REMOTE_ADDR"] = get_elem(s_addr)) == "" )
+    unsigned &s_addr = client.sin_addr.s_addr;
+    if ( (map_params["REMOTE_ADDR"] = ip_cache_map->get_elem(s_addr)) == "" )
     {
       map_params["REMOTE_ADDR"] = string(inet_ntoa(client.sin_addr));
-      set_elem(map_params["REMOTE_ADDR"], s_addr);
+      ip_cache_map->set_elem(map_params["REMOTE_ADDR"], s_addr);
       wrap::system_message(SOCKCAC+map_params["REMOTE_ADDR"]);
     }
 
     string s_rep = req_parser->parse(p_sock, string(c_req), map_params, i_postpayloadoffset);
 
 #ifdef LOGGING
-
     log_daemon->log_access(map_params);
 #endif
 
@@ -413,11 +438,25 @@ sock::_main_loop_init()
   wrap::system_message(SOCKUNS);
 }
 
-socketcontainer*
+#ifdef OPENSSL
+// This method is virtual, and is overloaded by sslsock!
+bool
+sock::_main_loop_do_ssl_stuff(int &i_new_sock)
+{
+  return 0;
+}
+#endif
+
+_socket*
 sock::_create_container(int &i_sock)
 {
-  socketcontainer* p_sock = new socketcontainer;
+  _socket* p_sock = new _socket;
+
+#ifdef OPENSSL
   p_sock->i_sock = i_sock;
+#else
+  *p_sock = i_sock;
+#endif
   return p_sock;
 }
 
@@ -425,16 +464,9 @@ int
 sock::start()
 {
   wrap::system_message( SOCKSRV );
-  pool* p_pool = wrap::POOL;
   int i_sock = i_server_sock;
 
-#ifdef NCURSES
-
-  print_hits();
-  p_pool->print_pool_size();
-#endif
-
-  int i_port = tool::string2int( wrap::CONF->get_elem( "httpd.serverport" ) );
+  int i_port = tool::string2int( wrap::CONF->get_elem("httpd.serverport") );
   _main_loop_init();
 
   int i;
@@ -454,39 +486,34 @@ sock::start()
   FD_ZERO (&active_fd_set);
   FD_SET  (i_sock, &active_fd_set);
 
-  print_server_port();
-
-  while( b_run )
+  while(b_run)
   {
     // block until input arrives on one or more active sockets.
     read_fd_set = active_fd_set;
     if (select (FD_SETSIZE, &read_fd_set, NULL, NULL, NULL) < 0)
     {
       wrap::system_message( SELCERR );
-
-      exit( EXIT_FAILURE );
+      exit(EXIT_FAILURE);
     }
 
     // service all the sockets with input pending.
-    for ( i = 0; i < FD_SETSIZE; i++ )
-      if ( FD_ISSET (i, &read_fd_set) )
+    for (i = 0; i < FD_SETSIZE; ++i)
+      if (FD_ISSET(i, &read_fd_set))
       {
-        if ( i == i_sock )
+        if (i == i_sock)
         {
-          // connection request on original socket.
-          ++i_req;
-
-#ifdef NCURSES
-
-          print_hits();
-#endif
+          ++i_req; // connection request on original socket.
 
           int i_new_sock;
           size = sizeof(clientname);
-          i_new_sock = accept (i_sock, (struct sockaddr *) &clientname, &size);
+          i_new_sock = accept(i_sock, (struct sockaddr *) &clientname, &size);
 
-#ifdef VERBOSE
+#ifdef OPENSSL
+          if (_main_loop_do_ssl_stuff(i_new_sock))
+            continue;
+#endif
 
+#ifdef VERBOSE
           wrap::system_message(NEWREQU
                                + tool::int2string(i_req) +  " "
                                + string(inet_ntoa( clientname.sin_addr )) + ":"
@@ -494,13 +521,13 @@ sock::start()
                               );
 #endif
 
-          FD_SET (i_new_sock, &active_fd_set);
+          FD_SET(i_new_sock, &active_fd_set);
 
         }
         else
         {
-          socketcontainer *p_sock = _create_container(i);
-          p_pool->run( (void*) p_sock );
+          _socket *p_sock = _create_container(i);
+          pool::run( (void*) p_sock );
           FD_CLR( i, &active_fd_set );
         }
       }
@@ -511,32 +538,12 @@ void
 sock::clean_ipcache()
 {
   int i_ipcachesize = wrap::CONF->get_int("httpd.ipcachesize");
-  int i_currentsize = size();
+  int i_currentsize = ip_cache_map->size();
 
   if ( i_currentsize > 0 && (i_ipcachesize == 0 || i_ipcachesize <= i_currentsize) )
   {
     wrap::system_message(
       SOCKCA2+tool::int2string(i_currentsize)+","+tool::int2string(i_ipcachesize)+")");
-#ifdef NCURSES
-    clear();
-#endif
-  }
-}
-
-#ifdef NCURSES
-void
-sock::print_server_port() {
-  mvprintw( NCUR_PORT_X,NCUR_PORT_Y, "Port: %d ", i_server_port);
-  refresh();
-}
-
-void
-sock::print_hits()
-{
-  if ( wrap::NCUR->is_ready() )
-  {
-    mvprintw( NCUR_HITS_X,NCUR_HITS_Y, "Hits: %d ", i_req);
-    refresh();
   }
 }
 #endif