X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FClientSocket.h;h=a5ba352067377e1323ab4fa252fef3fe51856dbb;hb=bb5692b9cbff069abbf9573c81e86c3cd2061ceb;hp=7926767c973b0135b6077c2cc1f3938e8ee2884b;hpb=c254e7d9a1622b19aae9b4ebecb4082657288f4a;p=NeonServV5.git

diff --git a/src/ClientSocket.h b/src/ClientSocket.h
index 7926767..a5ba352 100644
--- a/src/ClientSocket.h
+++ b/src/ClientSocket.h
@@ -1,5 +1,5 @@
-/* ClientSocket.h - NeonServ v5.1
- * 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
@@ -24,26 +24,43 @@
 #define SOCKET_FLAG_READY     0x04
 #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 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;
@@ -51,9 +68,10 @@ struct ClientSocket {
     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);