Move Blocking/NonBlocking to socket.cpp and make inline

[user/henk/code/inspircd.git] / include / connection.h

diff --git a/include/connection.h b/include/connection.h
index d3e635aa9eafe91b0598f8071f963c1513826562..2855fa2266650588835c3985d23edc75cd2bb465 100644 (file)
--- a/include/connection.h
+++ b/include/connection.h
@@ -14,26 +14,13 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
-#include "base.h"
-#include <string>
-#include <map>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <errno.h>
-#include <time.h>
-#include <vector>
-#include <deque>
-#include <sstream>
-
 #ifndef __CONNECTION_H__
 #define __CONNECTION_H__
 
-/** Please note: classes serverrec and userrec both inherit from class connection.
- */
+#include <time.h>
+#include "inspircd_config.h"
+#include "base.h"
+
 class connection : public Extensible
 {
  public:
@@ -41,14 +28,10 @@ class connection : public Extensible
         */
        int fd;
        
-       /** Hostname of connection. Not used if this is a serverrec
+       /** Hostname of connection
         */
-       char host[160];
-       
-       /** IP of connection.
-        */
-       char ip[16];
-       
+       char host[65];
+
        /** Stats counter for bytes inbound
         */
        int bytes_in;
@@ -65,16 +48,10 @@ class connection : public Extensible
         */
        int cmds_out;
 
-       /** True if server/user has authenticated, false if otherwise
+       /** True if user has authenticated, false if otherwise
         */
        bool haspassed;
 
-       /** Port number
-        * For a userrec, this is the port they connected to the network on.
-        * For a serverrec this is the current listening port of the serverrec object.
-        */
-       int port;
-       
        /** Used by userrec to indicate the registration status of the connection
         */
        char registered;
@@ -105,5 +82,3 @@ class connection : public Extensible
 
 
 #endif
-
-