1 files changed, 177 insertions, 185 deletions

diff --git a/src/sock/sock.cpp b/src/sock/sock.cpp
index 802a980..2964160 100755
--- a/src/sock/sock.cpp
+++ b/src/sock/sock.cpp
@@ -13,296 +13,288 @@ using namespace std;
 
 sock::sock()
 {
-  this->b_run      = true;
-  this->i_req      = 0;
-  this->i_threads  = 0;
-  this->req_parser = new reqp();
-  this->thrd_pool  = new pool();
+    this->b_run      = true;
+    this->i_req      = 0;
+    this->i_threads  = 0;
+    this->req_parser = new reqp();
+    this->thrd_pool  = new pool();
 #ifdef LOGGING
+    this->log_daemon = new logd( wrap::CONF->get_elem( "httpd.logging.accessfile" ),
 
-  this->log_daemon = new logd( wrap::CONF->get_elem( "httpd.logging.accessfile" ),
-
-                               wrap::CONF->get_elem( "httpd.logging.accesslines" ) );
+                                 wrap::CONF->get_elem( "httpd.logging.accesslines" ) );
 #endif
 }
 
 sock::~sock()
-{}
+{
+}
 
 //<<*
 void
 sock::chat_stream( int i_sock, user *p_user, hashmap<string> &map_params )
 {
-  string s_msg( "\n" );
+    string s_msg( "\n" );
 
-  for ( int i = 0; i < PUSHSTR; i++ )
-    send( i_sock, s_msg.c_str(), s_msg.size(), 0 );
+    for ( int i = 0; i < PUSHSTR; i++ )
+     send( i_sock, s_msg.c_str(), s_msg.size(), 0 );
 
-  pthread_mutex_t mutex;
-  pthread_mutex_init( &mutex, NULL );
-  pthread_mutex_lock( &mutex );
+    pthread_mutex_t mutex;
+    pthread_mutex_init( &mutex, NULL ); 
+    pthread_mutex_lock( &mutex );
 
-  do
-  {
-    s_msg = p_user->get_mess( );
-
-    if ( 0 > send( i_sock, s_msg.c_str(), s_msg.size(), 0 ) )
+    do
     {
-      p_user->set_online( false );
-      break;
-    }
+        s_msg = p_user->get_mess( );
 
-    pthread_cond_wait( &(p_user->cond_message), &mutex );
-  }
-  while( p_user->get_online() );
+        if ( 0 > send( i_sock, s_msg.c_str(), s_msg.size(), 0 ) )
+	{
+            p_user->set_online( false );
+	    break;
+	}
 
-  pthread_mutex_destroy( &mutex );
+        pthread_cond_wait( &(p_user->cond_message), &mutex );
+    }
+    while( p_user->get_online() );
 
-  // if there is still a message to send:
-  s_msg = p_user->get_mess( );
+    pthread_mutex_destroy( &mutex );
+ 
+    // if there is still a message to send:
+    s_msg = p_user->get_mess( );
 
-  if ( ! s_msg.empty() )
-    send( i_sock, s_msg.c_str(), s_msg.size(), 0 );
+    if ( ! s_msg.empty() )
+        send( i_sock, s_msg.c_str(), s_msg.size(), 0 );
 
-  // remove the user from its room.
-  string s_user( p_user->get_name() );
-  string s_user_lowercase( p_user->get_lowercase_name() );
+    // remove the user from its room.
+    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 );
+    p_user->get_room()->del_elem( s_user_lowercase );
 
-  // post the room that the user has left the chat.
-  s_msg = wrap::TIMR->get_time() + " "
+    // post the room that the user has left the chat.
+    s_msg = wrap::TIMR->get_time() + " " 
           + p_user->get_colored_bold_name()
           + wrap::CONF->get_elem( "chat.msgs.userleaveschat" )
           + "<br>\n";
 
-  p_user->get_room()->msg_post( &s_msg );
-  p_user->get_room()->reload_onlineframe();
+    p_user->get_room()->msg_post( &s_msg );
+    p_user->get_room()->reload_onlineframe();
 
 #ifdef VERBOSE
-
-  cout << REMUSER << s_user << endl;
+    cout << REMUSER << s_user << endl;
 #endif
 
-  wrap::GCOL->add_user_to_garbage( p_user );
+    wrap::GCOL->add_user_to_garbage( p_user );
 }
 //*>>
 
 int
 sock::make_server_socket( int i_port )
 {
-  size_t i_sock;
-  struct sockaddr_in name;
+    size_t i_sock;
+    struct sockaddr_in name;
 
-  // create the server socket.
-  i_sock = socket (PF_INET, SOCK_STREAM, 0);
-  if (i_sock < 0)
-  {
-    wrap::system_message( SOCKERR );
+    // create the server socket.
+    i_sock = socket (PF_INET, SOCK_STREAM, 0);
+    if (i_sock < 0)
+    {
+        wrap::system_message( SOCKERR );
 
-    if ( ++i_port > MAXPORT )
-      exit(1);
+        if ( ++i_port > MAXPORT )
+            exit(1);
 
-    wrap::system_message( SOCKERR );
+        wrap::system_message( SOCKERR );
 
-    return make_server_socket( i_port );
-  }
+        return make_server_socket( i_port );
+    }
 
-  // give the server socket a name.
-  name.sin_family = AF_INET;
-  name.sin_port = htons(i_port);
-  name.sin_addr.s_addr = htonl(INADDR_ANY);
-  int i_optval = 1;
+    // give the server socket a name.
+    name.sin_family = AF_INET;
+    name.sin_port = htons(i_port);
+    name.sin_addr.s_addr = htonl(INADDR_ANY);
+    int i_optval = 1;
 
-  setsockopt( i_sock, SOL_SOCKET, SO_REUSEADDR, (char*)&i_optval, sizeof(int) );
+    setsockopt( i_sock, SOL_SOCKET, SO_REUSEADDR, (char*)&i_optval, sizeof(int) );
 
-  if ( bind(i_sock, (struct sockaddr *) &name, sizeof (name)) < 0 )
-  {
+    if ( bind(i_sock, (struct sockaddr *) &name, sizeof (name)) < 0 )
+    {
 
-    wrap::system_message( BINDERR );
+     wrap::system_message( BINDERR );
 
-    if ( ++i_port > MAXPORT )
-      exit(1);
+        if ( ++i_port > MAXPORT )
+            exit(1);
 
-    wrap::system_message( string(SOCKERR) + tool::int2string(i_port) );
+        wrap::system_message( string(SOCKERR) + tool::int2string(i_port) );
 
-    // Rerun recursive.
-    return make_server_socket( i_port );
-  }
+        // Rerun recursive.
+        return make_server_socket( i_port );
+    }
 
-  wrap::system_message( SOCKCRT + string("localhost:") + tool::int2string(i_port) );
+    wrap::system_message( SOCKCRT + string("localhost:") + tool::int2string(i_port) );
 
 #ifdef NCURSES
-
-  mvprintw( NCUR_PORT_X,NCUR_PORT_Y, "Port: %d ", i_port);
-  refresh();
+    mvprintw( NCUR_PORT_X,NCUR_PORT_Y, "Port: %d ", i_port);
+    refresh();
 #endif
 
-  return i_sock;
+    return i_sock;
 }
 
 int
 sock::read_write( int* p_sock )
 {
-  int i_sock = *p_sock;
-  char c_req[READSOCK];
-  int i_bytes = read(i_sock, c_req, READSOCK);
-
-  if (i_bytes <= 0)
-  {
-    wrap::system_message( READERR );
-  }
-  else
-  {
-    // stores the request params.
-    hashmap<string> map_params;
-
-    // get the s_rep ( s_html response which will be send imediatly to the client
-    struct sockaddr_in client;
-    size_t size = sizeof(client);
+    int i_sock = *p_sock; 	
+    char c_req[READSOCK];
+    int i_bytes = read(i_sock, c_req, READSOCK);
 
-#ifdef CYGWIN
+    if (i_bytes <= 0)
+    {
+     wrap::system_message( READERR );
+    }
 
-    getpeername( i_sock, (struct sockaddr *)&client, (int*)&size);
-#else
+    else
+    {
+        // stores the request params.
+        hashmap<string> map_params;
+
+        // get the s_rep ( s_html response which will be send imediatly to the client
+        struct sockaddr_in client;
+        size_t size = sizeof(client);
 
-    getpeername( i_sock, (struct sockaddr *)&client, &size);
+#ifdef CYGWIN
+        getpeername( i_sock, (struct sockaddr *)&client, (int*)&size);
+#else
+        getpeername( i_sock, (struct sockaddr *)&client, &size);
 #endif
 
-    map_params["REMOTE_ADDR"] = inet_ntoa(client.sin_addr);
-    //map_params["REMOTE_PORT"] = ntohs(client.sin_port);
+        map_params["REMOTE_ADDR"] = inet_ntoa(client.sin_addr);
+        //map_params["REMOTE_PORT"] = ntohs(client.sin_port);
 
-    string s_rep = req_parser->parse( i_sock, string( c_req ), map_params );
+        string s_rep = req_parser->parse( i_sock, string( c_req ), map_params );
 
 #ifdef LOGGING
-
-    log_daemon->log_access(map_params);
+        log_daemon->log_access(map_params);
 #endif
 
-    // send s_rep to the client.
-    send(i_sock, s_rep.c_str(), s_rep.size(), 0);
+        // send s_rep to the client.
+        send(i_sock, s_rep.c_str(), s_rep.size(), 0);
 
-    // dont need those vals anymore.
-    map_params.clear();
+        // dont need those vals anymore.
+        map_params.clear();
 
-    shutdown( i_sock, 2 );
-    close   ( i_sock    );
+	shutdown( i_sock, 2 );
+	close   ( i_sock    );
 
-    return 0;
-  }
+        return 0;
+    }
 
-  shutdown( i_sock, 2 );
-  close   ( i_sock    );
+    shutdown( i_sock, 2 );
+    close   ( i_sock    );
 
-  return 1;
+    return 1;
 }
 
 int
 sock::start()
 {
-  wrap::system_message( SOCKSRV );
+    wrap::system_message( SOCKSRV );
 
 #ifdef NCURSES
-
-  print_hits();
-  thrd_pool->print_pool_size();
+    print_hits();
+    thrd_pool->print_pool_size();
 #endif
 
-  int i_port = tool::string2int( wrap::CONF->get_elem( "httpd.serverport" ) );
-  int i_sock, i;
-  fd_set active_fd_set, read_fd_set;
-  struct sockaddr_in clientname;
-  size_t size;
+    int i_port = tool::string2int( wrap::CONF->get_elem( "httpd.serverport" ) );
+    int i_sock, i;
+    fd_set active_fd_set, read_fd_set;
+    struct sockaddr_in clientname;
+    size_t size;
 
 
-  // create the server socket and set it up to accept connections.
-  i_sock = make_server_socket ( i_port );
+    // create the server socket and set it up to accept connections.
+    i_sock = make_server_socket ( i_port );
 
-  if (listen (i_sock, 1) < 0)
-  {
-    wrap::system_message( LISTERR );
-    exit( EXIT_FAILURE );
-  }
+    if (listen (i_sock, 1) < 0)
+    {
+      wrap::system_message( LISTERR );
+      exit( EXIT_FAILURE );
+    }
 
-  wrap::system_message( SOCKRDY );
+    wrap::system_message( SOCKRDY );
 
-  // initialize the set of active sockets.
-  FD_ZERO (&active_fd_set);
-  FD_SET  (i_sock, &active_fd_set);
+    // initialize the set of active sockets.
+    FD_ZERO (&active_fd_set);
+    FD_SET  (i_sock, &active_fd_set);
 
-  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)
+    while( b_run )
     {
-      wrap::system_message( SELCERR );
+        // 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) )
-      {
-        if ( i == i_sock )
-        {
-          // connection request on original socket.
-          ++i_req;
+        // service all the sockets with input pending.
+        for ( i = 0; i < FD_SETSIZE; i++ )
+            if ( FD_ISSET (i, &read_fd_set) )
+            {
+                if ( i == i_sock )
+                {
+                    // connection request on original socket.
+                    ++i_req;
 
 #ifdef NCURSES
-
-          print_hits();
+                    print_hits();
 #endif
-
-          int i_new_sock;
-          size = sizeof(clientname);
+                    int i_new_sock;
+                    size = sizeof(clientname);
 #ifdef CYGWIN
-
-          i_new_sock = accept (i_sock, (struct sockaddr *) &clientname, (int*)&size);
+                    i_new_sock = accept (i_sock, (struct sockaddr *) &clientname, (int*)&size);
 #else
-
-          i_new_sock = accept (i_sock, (struct sockaddr *) &clientname, &size);
+                    i_new_sock = accept (i_sock, (struct sockaddr *) &clientname, &size);
 #endif
 
-          if (i_new_sock < 0)
-          {
-            wrap::system_message( ACCPERR );
-            close(i_new_sock);
-          }
-          else
-          {
+                    if (i_new_sock < 0)
+                    {
+	             wrap::system_message( ACCPERR );
+                     close(i_new_sock);
+                    }
+		
+                    else	
+		    {
 #ifdef VERBOSE
-            wrap::system_message(NEWREQU
-                                 + tool::int2string(i_req) +  " "
-                                 + string(inet_ntoa( clientname.sin_addr )) + ":"
-                                 + tool::int2string(ntohs ( clientname.sin_port ))
-                                );
+                     wrap::system_message(NEWREQU 
+			+ tool::int2string(i_req) +  " "
+                     	+ string(inet_ntoa( clientname.sin_addr )) + ":"
+                     	+ tool::int2string(ntohs ( clientname.sin_port ))
+			);
 #endif
-
-            FD_SET (i_new_sock, &active_fd_set);
-          }
-        }
-        else
-        {
-          int *p_sock = new int;
-          *p_sock = i;
-          thrd_pool->run( (void*) p_sock );
-          FD_CLR( i, &active_fd_set );
-        }
-      }
-  }
+                     FD_SET (i_new_sock, &active_fd_set);
+                    }
+                }
+
+                else
+                {
+		    int *p_sock = new int;
+		    *p_sock = i;
+                    thrd_pool->run( (void*) p_sock );
+                    FD_CLR( i, &active_fd_set );
+                }
+            }
+    }
 }
 
 #ifdef NCURSES
 void
 sock::print_hits()
 {
-  if ( wrap::NCUR->is_ready() )
-  {
-    mvprintw( NCUR_HITS_X,NCUR_HITS_Y, "Hits: %d ", i_req);
-    refresh();
-  }
+    if ( wrap::NCUR->is_ready() )
+    {
+     mvprintw( NCUR_HITS_X,NCUR_HITS_Y, "Hits: %d ", i_req);
+     refresh();
+    }
 }
 #endif