X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FClientSocket.h;h=ddbb60f815600d040bde2c65743f6c408fdbdcc2;hb=cdebdaa89c585c948a7abbfcda22fed6b029d9da;hp=13e499cf0c98268dc6754d36c5af30290318a6e8;hpb=6927fcd82e211ff0561ae50e0b9acebedbbe789a;p=NeonServV5.git diff --git a/src/ClientSocket.h b/src/ClientSocket.h index 13e499c..ddbb60f 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.5 + * 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 @@ -19,14 +19,25 @@ #include "main.h" -#define SOCKET_FLAG_DEAD 0x01 -#define SOCKET_FLAG_CONNECTED 0x02 -#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_DEAD 0x01 +#define SOCKET_FLAG_CONNECTED 0x02 +#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 SOCKET_FLAG_SILENT 0x400 +#define SOCKET_FLAG_CHANGENICK 0x800 +#define SOCKET_FLAG_REQUEST_INVITE 0x1000 +#define SOCKET_FLAG_REQUEST_OP 0x2000 +#define SOCKET_FLAG_SECRET_BOT 0x4000 + +#define SOCKET_HAVE_BOTCLASSVALUE1 0x10000000 +#define SOCKET_HAVE_BOTCLASSVALUE2 0x20000000 +#define SOCKET_HAVE_BOTCLASSVALUE3 0x40000000 #define BUF_SIZ 512 @@ -36,7 +47,7 @@ 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; @@ -47,6 +58,7 @@ struct ClientSocket { char *ident; char *realname; struct UserNode *user; + char *network_name; unsigned long traffic_in; unsigned long traffic_out; time_t connection_time; @@ -63,18 +75,29 @@ struct ClientSocket { int botid : 16; int clientid : 16; + void *botclassvalue1; + void *botclassvalue2; + void *botclassvalue3; + + void *changenick_channels; //parted channels due raw 437 + struct ClientSocket *next; }; -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); +#ifndef DND_FUNCTIONS +/* MODULAR ACCESSIBLE */ struct ClientSocket* create_socket(char *host, int port, char *bindto, char *pass, char *nick, char *ident, char *realname); +/* MODULAR ACCESSIBLE */ int connect_socket(struct ClientSocket *client); +/* MODULAR ACCESSIBLE */ int close_socket(struct ClientSocket *client); +/* MODULAR ACCESSIBLE */ 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); -void putsock(struct ClientSocket *client, const char *text, ...) PRINTF_LIKE(2, 3); -struct ClientSocket* getBots(int flags, struct ClientSocket* last_bot); +/* MODULAR ACCESSIBLE */ int write_socket(struct ClientSocket *client, char* msg, int len); +#ifdef HAVE_THREADS +int clientsocket_parseorder_top(unsigned int tid); +#endif +int socket_loop(int timeout_seconds); +/* MODULAR ACCESSIBLE */ void putsock(struct ClientSocket *client, const char *text, ...) PRINTF_LIKE(2, 3); +/* MODULAR ACCESSIBLE */ struct ClientSocket* getBots(int flags, struct ClientSocket* last_bot); +void init_sockets(); void free_sockets(); - -#endif \ No newline at end of file +#endif +#endif