X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FClientSocket.h;h=78e207c0144b2372ca0967701d13c01691c87895;hb=a0f5e337ee57df78939e9ddaccf9a18bcf811435;hp=527d17e2abb10fef8efd8400fc1ae251db006f45;hpb=3114e0ba66f59644658b554b022cd19877ac3ff2;p=NeonServV5.git

diff --git a/src/ClientSocket.h b/src/ClientSocket.h
index 527d17e..78e207c 100644
--- a/src/ClientSocket.h
+++ b/src/ClientSocket.h
@@ -1,5 +1,5 @@
-/* ClientSocket.h - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* ClientSocket.h - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,44 +25,71 @@
 #define SOCKET_FLAG_PREFERRED 0x08 /* prefered bot to send datas to the IRC World (NOTICE's WHO's etc pp) */
 #define SOCKET_FLAG_USE_QUEUE 0x10
 #define SOCKET_FLAG_RECONNECT 0x20
+#define SOCKET_FLAG_SSL       0x40
+#define SOCKET_FLAG_HAVE_SSL  0x80
+#define SOCKET_FLAG_QUITTED   0x100
+#define SOCKET_FLAG_FAST_JUMP 0x200
+#define SOCKET_FLAG_SILENT    0x400
+
+#define SOCKET_HAVE_BOTCLASSVALUE1 0x10000000
+#define SOCKET_HAVE_BOTCLASSVALUE2 0x20000000
+#define SOCKET_HAVE_BOTCLASSVALUE3 0x40000000
 
 #define BUF_SIZ 512
 
 struct UserNode;
 struct trigger_cache;
+struct SSLConnection;
 
 struct ClientSocket {
     int sock;
-    unsigned char flags;
+    unsigned int flags;
     char buffer[BUF_SIZ*2]; //we need to store up to 2 full commands at once
     unsigned int bufferpos;
     char *host;
     int port;
+    char *bind;
     char *pass;
+    char *nick;
+    char *ident;
+    char *realname;
     struct UserNode *user;
     unsigned long traffic_in;
     unsigned long traffic_out;
     time_t connection_time;
+    struct SSLConnection *sslconn;
     
     struct BotQueue *queue;
     
     struct WHOQueueEntry *whoqueue_first;
     struct WHOQueueEntry *whoqueue_last;
+    
+    struct HandleInfoQueueEntry *handleinfo_first;
+    struct HandleInfoQueueEntry *handleinfo_last;
 	
 	int botid : 16;
     int clientid : 16;
     
+    void *botclassvalue1;
+    void *botclassvalue2;
+    void *botclassvalue3;
+    
     struct ClientSocket *next;
 };
 
-struct ClientSocket* create_socket(char *host, int port, char *pass, struct UserNode *user);
+struct ClientSocket* create_socket(char *host, int port, char *bindto, char *pass, char *nick, char *ident, char *realname);
 int connect_socket(struct ClientSocket *client);
 int close_socket(struct ClientSocket *client);
+int disconnect_socket(struct ClientSocket *client);
 int write_socket_force(struct ClientSocket *client, char* msg, int len);
 int write_socket(struct ClientSocket *client, char* msg, int len);
-void socket_loop(int timeout_seconds);
+#ifdef HAVE_THREADS
+int clientsocket_parseorder_top(unsigned int tid);
+#endif
+int socket_loop(int timeout_seconds);
 void putsock(struct ClientSocket *client, const char *text, ...) PRINTF_LIKE(2, 3);
 struct ClientSocket* getBots(int flags, struct ClientSocket* last_bot);
+void init_sockets();
 void free_sockets();
 
 #endif
\ No newline at end of file