ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/include/client.h

Comparing:
ircd-hybrid-8/include/client.h (file contents), Revision 1241 by michael, Thu Sep 29 20:26:09 2011 UTC vs.
ircd-hybrid/trunk/include/client.h (file contents), Revision 2181 by michael, Tue Jun 4 11:03:41 2013 UTC

#	Line 32 | Line 32
32		#include "fdlist.h"
33		#include "config.h"
34		#include "ircd_defs.h"
35	–	#include "ircd_handler.h"
35		#include "dbuf.h"
36		#include "channel.h"
37	<	#include "irc_res.h"
39	<
40	<	#define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
41	<	#define PASSWDLEN       20
42	<	#define CIPHERKEYLEN    64 /* 512bit */
43	<	#define IDLEN           12 /* this is the maximum length, not the actual
44	<	generated length; DO NOT CHANGE! */
45	<
46	<	/*
47	<	* pre declare structs
48	<	*/
49	<	struct AccessItem;
50	<	struct Whowas;
51	<	struct Listener;
52	<	struct Client;
53	<	struct LocalUser;
54	<
55	<
56	<	/*! \brief Server structure */
57	<	struct Server
58	<	{
59	<	struct ConfItem *sconf; /**< ConfItem connect{} pointer for this server */
60	<	dlink_list server_list; /**< Servers on this server */
61	<	dlink_list client_list; /**< Clients on this server */
62	<	char by[NICKLEN];       /**< who activated this connection */
63	<	};
64	<
65	<	/*! \brief SlinkRpl structure */
66	<	struct SlinkRpl
67	<	{
68	<	int command;
69	<	int datalen;
70	<	int gotdatalen;
71	<	int readdata;
72	<	unsigned char *data;
73	<	};
74	<
75	<	/*! \brief ZipStats structure */
76	<	struct ZipStats
77	<	{
78	<	uint64_t in;
79	<	uint64_t in_wire;
80	<	uint64_t out;
81	<	uint64_t out_wire;
82	<	double in_ratio;
83	<	double out_ratio;
84	<	};
85	<
86	<	/*! \brief ListTask structure */
87	<	struct ListTask
88	<	{
89	<	dlink_list show_mask; /**< show these channels.. */
90	<	dlink_list hide_mask; /**< ..and hide these ones */
91	<
92	<	unsigned int hash_index; /**< the bucket we are currently in */
93	<	unsigned int users_min;
94	<	unsigned int users_max;
95	<	unsigned int created_min;
96	<	unsigned int created_max;
97	<	unsigned int topicts_min;
98	<	unsigned int topicts_max;
99	<	};
100	<
101	<	/*! \brief Client structure */
102	<	struct Client
103	<	{
104	<	dlink_node node;
105	<	dlink_node lnode;             /**< Used for Server->servers/users */
106	<
107	<	struct LocalUser *localClient;
108	<	struct Client    *hnext;      /**< For client hash table lookups by name */
109	<	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
110	<	struct Server    *serv;       /**< ...defined, if this is a server */
111	<	struct Client    *servptr;    /**< Points to server this Client is on */
112	<	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
113	<	struct Whowas    *whowas;     /**< Pointers to whowas structs */
114	<	char             *away;       /**< Client's AWAY message. Can be set/unset via AWAY command */
115	<
116	<	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
117	<	time_t            servicestamp; /**< Last time client has been identified for its nick */
118	<	uint64_t          flags;      /**< client flags */
119	<
120	<	unsigned int      umodes;     /**< opers, normal users subset */
121	<	unsigned int      hopcount;   /**< number of servers to this 0 = local */
122	<	unsigned int      status;     /**< Client type */
123	<	unsigned int      handler;    /**< Handler index */
124	<
125	<	dlink_list        channel;   /**< chain of channel pointer blocks */
126	<
127	<	char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
128	<	char id[IDLEN + 1];       /**< client ID, unique ID per client */
129	<
130	<	/*
131	<	* client->username is the username from ident or the USER message,
132	<	* If the client is idented the USER message is ignored, otherwise
133	<	* the username part of the USER message is put here prefixed with a
134	<	* tilde depending on the auth{} block. Once a client has registered,
135	<	* this field should be considered read-only.
136	<	*/
137	<	char              username[USERLEN + 1]; /* client's username */
138	<
139	<	/*
140	<	* client->host contains the resolved name or ip address
141	<	* as a string for the user, it may be fiddled with for oper spoofing etc.
142	<	* once it's changed the *real* address goes away. This should be
143	<	* considered a read-only field after the client has registered.
144	<	*/
145	<	char              host[HOSTLEN + 1];     /* client's hostname */
146	<
147	<	/*
148	<	* client->info for unix clients will normally contain the info from the
149	<	* gcos field in /etc/passwd but anything can go here.
150	<	*/
151	<	char              info[REALLEN + 1]; /* Free form additional client info */
152	<
153	<	/*
154	<	* client->sockhost contains the ip address gotten from the socket as a
155	<	* string, this field should be considered read-only once the connection
156	<	* has been made. (set in s_bsd.c only)
157	<	*/
158	<	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
159	<	socket ip address as string */
160	<	};
161	<
162	<	/*! \brief LocalUser structure
163	<	*
164	<	* Allocated only for local clients, that are directly connected
165	<	* to \b this server with a socket.
166	<	*/
167	<	struct LocalUser
168	<	{
169	<	dlink_node   lclient_node;
170	<
171	<	char         client_host[HOSTLEN + 1];
172	<	char         client_server[HOSTLEN + 1];
173	<
174	<	unsigned int registration;
175	<	unsigned int cap_client;    /**< Client capabilities (from us) */
176	<	unsigned int cap_active;    /**< Active capabilities (to us) */
177	<
178	<	unsigned int operflags;     /**< IRC Operator privilege flags */
179	<	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
180	<
181	<	unsigned int serial;     /**< used to enforce 1 send per nick */
182	<
183	<	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
184	<	time_t       firsttime;  /**< time client was created */
185	<	time_t       since;      /**< last time we parsed something */
186	<	time_t       last_knock;    /**< time of last knock */
187	<	time_t       last_away; /**< Away since... */
188	<	time_t       last_join_time;   /**< when this client last
189	<	joined a channel */
190	<	time_t       last_leave_time;  /**< when this client last
191	<	* left a channel */
192	<	int          join_leave_count; /**< count of JOIN/LEAVE in less than
193	<	MIN_JOIN_LEAVE_TIME seconds */
194	<	int          oper_warn_count_down; /**< warn opers of this possible
195	<	spambot every time this gets to 0 */
196	<	time_t       reject_delay;
197	<	time_t       last_caller_id_time;
198	<	time_t       first_received_message_time;
199	<	time_t       last_nick_change;
200	<	time_t       last_privmsg; /**< Last time we got a PRIVMSG */
201	<
202	<	int          received_number_of_privmsgs;
203	<	unsigned int number_of_nick_changes;
204	<
205	<	struct ListTask  *list_task;
206	<
207	<	struct dbuf_queue buf_sendq;
208	<	struct dbuf_queue buf_recvq;
209	<
210	<	struct {
211	<	unsigned int messages;      /**< Statistics: protocol messages sent/received */
212	<	uint64_t bytes;             /**< Statistics: total bytes sent/received */
213	<	} recv, send;
214	<
215	<	struct AuthRequest *auth;
216	<	struct Listener *listener;   /**< listener accepted from */
217	<	dlink_list        acceptlist; /**< clients I'll allow to talk to me */
218	<	dlink_list        watches;   /**< chain of Watch pointer blocks */
219	<	dlink_list        confs;     /**< Configuration record associated */
220	<	dlink_list        invited;   /**< chain of invite pointer blocks */
221	<	struct irc_ssaddr ip;
222	<	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
223	<
224	<	char              *passwd;
225	<	unsigned int       caps;       /**< capabilities bit-field */
226	<	unsigned int       enc_caps;   /**< cipher capabilities bit-field */
227	<
228	<	#ifdef HAVE_LIBCRYPTO
229	<	struct EncCapability *in_cipher;
230	<	struct EncCapability *out_cipher;
231	<
232	<	char              in_key[CIPHERKEYLEN];
233	<	char              out_key[CIPHERKEYLEN];
234	<	#endif
235	<
236	<	fde_t             fd;
237	<	fde_t             ctrlfd;     /**< For servers: control fd used for sending commands
238	<	to servlink */
239	<
240	<	struct SlinkRpl  slinkrpl;    /**< slink reply being parsed */
241	<	char    *slinkq;              /**< sendq for control data */
242	<	int              slinkq_ofs;  /**< ofset into slinkq */
243	<	int              slinkq_len;  /**< length remaining after slinkq_ofs */
244	<
245	<	struct ZipStats  zipstats;
246	<
247	<	/* Anti-flood stuff. We track how many messages were parsed and how
248	<	* many we were allowed in the current second, and apply a simple
249	<	* decay to avoid flooding.
250	<	*   -- adrian
251	<	*/
252	<	int allow_read;       /**< how many we're allowed to read in this second */
253	<	int sent_parsed;      /**< how many messages we've parsed in this second */
254	<
255	<	char*          response;  /**< expected response from client */
256	<	char*          auth_oper; /**< Operator to become if they supply the response.*/
257	<	};
37	>	#include "s_auth.h"
38
39		/*
40		* status macros.
#	Line 316 | Line 96 | struct LocalUser
96
97
98		#define CAP_MULTI_PREFIX  0x00000001
99	+	#define CAP_AWAY_NOTIFY   0x00000002
100
101		#define HasCap(x, y) ((x)->localClient->cap_active & (y))
102
103		/* housekeeping flags */
104	<	#define FLAGS_PINGSENT      0x0000000000000001 /**< Unreplied ping sent */
105	<	#define FLAGS_DEADSOCKET    0x0000000000000002 /**< Local socket is dead--Exiting soon */
106	<	#define FLAGS_KILLED        0x0000000000000004 /**< Prevents "QUIT" from being sent for this */
107	<	#define FLAGS_CLOSING       0x0000000000000008 /**< set when closing to suppress errors */
108	<	#define FLAGS_GOTID         0x0000000000000010 /**< successful ident lookup achieved */
109	<	#define FLAGS_NEEDID        0x0000000000000020 /**< auth{} block say must use ident return */
110	<	#define FLAGS_SENDQEX       0x0000000000000040 /**< Sendq exceeded */
111	<	#define FLAGS_IPHASH        0x0000000000000080 /**< iphashed this client */
112	<	#define FLAGS_CRYPTIN       0x0000000000000100 /**< incoming data must be decrypted */
113	<	#define FLAGS_CRYPTOUT      0x0000000000000200 /**< outgoing data must be encrypted */
114	<	#define FLAGS_WAITAUTH      0x0000000000000400 /**< waiting for CRYPTLINK AUTH command */
115	<	#define FLAGS_SERVLINK      0x0000000000000800 /**< servlink has servlink process */
116	<	#define FLAGS_MARK          0x0000000000001000 /**< marked client */
117	<	#define FLAGS_CANFLOOD      0x0000000000002000 /**< client has the ability to flood */
118	<	#define FLAGS_EXEMPTGLINE   0x0000000000004000 /**< client can't be G-lined */
119	<	#define FLAGS_EXEMPTKLINE   0x0000000000008000 /**< client is exempt from kline */
120	<	#define FLAGS_NOLIMIT       0x0000000000010000 /**< client is exempt from limits */
121	<	#define FLAGS_UNUSED___     0x0000000000020000 /**< Unused */
122	<	#define FLAGS_PING_COOKIE   0x0000000000040000 /**< PING Cookie */
123	<	#define FLAGS_UNUSED____    0x0000000000080000 /**< Unused */
124	<	#define FLAGS_IP_SPOOFING   0x0000000000100000 /**< client IP is spoofed */
125	<	#define FLAGS_FLOODDONE     0x0000000000200000 /**< Flood grace period has been ended. */
126	<	#define FLAGS_EOB           0x0000000000400000 /**< server has sent us an EOB */
127	<	#define FLAGS_HIDDEN        0x0000000000800000 /**< a hidden server. not shown in /links */
128	<	#define FLAGS_BLOCKED       0x0000000001000000 /**< must wait for COMM_SELECT_WRITE */
129	<	#define FLAGS_SBLOCKED      0x0000000002000000 /**< slinkq is blocked */
130	<	#define FLAGS_USERHOST      0x0000000004000000 /**< client is in userhost hash */
350	<	#define FLAGS_BURSTED       0x0000000008000000 /**< user was already bursted */
351	<	#define FLAGS_EXEMPTRESV    0x0000000010000000 /**< client is exempt from RESV */
352	<	#define FLAGS_GOTUSER       0x0000000020000000 /**< if we received a USER command */
353	<	#define FLAGS_PINGWARNING   0x0000000040000000 /**< unreplied ping warning already sent */
354	<	#define FLAGS_FINISHED_AUTH 0x0000000080000000 /**< Client has been released from auth */
355	<	#define FLAGS_FLOOD_NOTICED 0x0000000100000000 /**< Notice to opers about this flooder has been sent */
356	<	#define FLAGS_SERVICE       0x0000000200000000 /**< Client/server is a network service */
104	>	#define FLAGS_PINGSENT       0x00000001 /**< Unreplied ping sent */
105	>	#define FLAGS_DEADSOCKET     0x00000002 /**< Local socket is dead--Exiting soon */
106	>	#define FLAGS_KILLED         0x00000004 /**< Prevents "QUIT" from being sent for this */
107	>	#define FLAGS_CLOSING        0x00000008 /**< set when closing to suppress errors */
108	>	#define FLAGS_GOTID          0x00000010 /**< successful ident lookup achieved */
109	>	#define FLAGS_NEEDID         0x00000020 /**< auth{} block say must use ident return */
110	>	#define FLAGS_SENDQEX        0x00000040 /**< Sendq exceeded */
111	>	#define FLAGS_IPHASH         0x00000080 /**< iphashed this client */
112	>	#define FLAGS_MARK           0x00000100 /**< marked client */
113	>	#define FLAGS_CANFLOOD       0x00000200 /**< client has the ability to flood */
114	>	#define FLAGS_EXEMPTGLINE    0x00000400 /**< client can't be G-lined */
115	>	#define FLAGS_EXEMPTKLINE    0x00000800 /**< client is exempt from kline */
116	>	#define FLAGS_NOLIMIT        0x00001000 /**< client is exempt from limits */
117	>	#define FLAGS_PING_COOKIE    0x00002000 /**< PING Cookie */
118	>	#define FLAGS_IP_SPOOFING    0x00004000 /**< client IP is spoofed */
119	>	#define FLAGS_FLOODDONE      0x00008000 /**< Flood grace period has been ended. */
120	>	#define FLAGS_EOB            0x00010000 /**< server has sent us an EOB */
121	>	#define FLAGS_HIDDEN         0x00020000 /**< a hidden server. not shown in /links */
122	>	#define FLAGS_BLOCKED        0x00040000 /**< must wait for COMM_SELECT_WRITE */
123	>	#define FLAGS_USERHOST       0x00080000 /**< client is in userhost hash */
124	>	#define FLAGS_BURSTED        0x00100000 /**< user was already bursted */
125	>	#define FLAGS_EXEMPTRESV     0x00200000 /**< client is exempt from RESV */
126	>	#define FLAGS_GOTUSER        0x00400000 /**< if we received a USER command */
127	>	#define FLAGS_FINISHED_AUTH  0x00800000 /**< Client has been released from auth */
128	>	#define FLAGS_FLOOD_NOTICED  0x01000000 /**< Notice to opers about this flooder has been sent */
129	>	#define FLAGS_SERVICE        0x02000000 /**< Client/server is a network service */
130	>	#define FLAGS_AUTH_SPOOF     0x04000000 /**< user's hostname has been spoofed by an auth{} spoof*/
131
132		#define HasFlag(x, y) ((x)->flags &   (y))
133		#define AddFlag(x, y) ((x)->flags |=  (y))
#	Line 383 | Line 157 | struct LocalUser
157		#define UMODE_CCONN_FULL   0x00040000 /**< add unused fields to connection monitoring */
158		#define UMODE_REGISTERED   0x00080000 /**< User has identified for that nick. */
159		#define UMODE_REGONLY      0x00100000 /**< Only registered nicks may PM */
160	<	#define UMODE_OPER         0x40000000 /**< Operator */
161	<	#define UMODE_ADMIN        0x80000000 /**< Admin on server */
160	>	#define UMODE_HIDDEN       0x00200000 /**< Operator status is hidden */
161	>	#define UMODE_OPER         0x00400000 /**< Operator */
162	>	#define UMODE_ADMIN        0x00800000 /**< Admin on server */
163	>	#define UMODE_FARCONNECT   0x01000000 /**< Can see remote client connects/exits */
164	>	#define UMODE_HIDDENHOST   0x02000000 /**< User's host is hidden */
165	>
166
167		#define UMODE_ALL          UMODE_SERVNOTICE
168
#	Line 392 | Line 170 | struct LocalUser
170		#define AddUMode(x, y) ((x)->umodes |=  (y))
171		#define DelUMode(x, y) ((x)->umodes &= ~(y))
172
173	<	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
174	<	UMODE_REGISTERED | UMODE_ADMIN)
173	>	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP |\
174	>	UMODE_REGONLY | UMODE_REGISTERED | UMODE_ADMIN |\
175	>	UMODE_HIDDEN)
176
177
178
179		/* oper priv flags */
180	<	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /* oper can global kill        */
181	<	#define OPER_FLAG_REMOTE       0x00000002 /* oper can do squits/connects */
182	<	#define OPER_FLAG_UNKLINE      0x00000004 /* oper can use unkline        */
183	<	#define OPER_FLAG_GLINE        0x00000008 /* oper can use gline          */
184	<	#define OPER_FLAG_N            0x00000010 /* oper can umode n            */
185	<	#define OPER_FLAG_K            0x00000020 /* oper can kill/kline         */
186	<	#define OPER_FLAG_X            0x00000040 /* oper can xline              */
187	<	#define OPER_FLAG_DIE          0x00000080 /* oper can die                */
188	<	#define OPER_FLAG_REHASH       0x00000100 /* oper can rehash             */
189	<	#define OPER_FLAG_ADMIN        0x00000200 /* oper can set umode +a       */
190	<	#define OPER_FLAG_HIDDEN_ADMIN 0x00000400 /* admin is hidden             */
191	<	#define OPER_FLAG_OPERWALL     0x00000800 /* */
192	<	#define OPER_FLAG_OPER_SPY     0x00001000 /* */
193	<	#define OPER_FLAG_REMOTEBAN    0x00002000 /* */
194	<	#define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
195	<	#define OPER_FLAG_GLOBOPS      0x00008000
196	<	#define OPER_FLAG_MODULE       0x00010000 /**< Oper can use MODULE commands */
197	<	#define OPER_FLAG_RESTART      0x00020000 /**< Oper can use RESTART command */
180	>	#define OPER_FLAG_KILL_REMOTE    0x00000001 /**< Oper can global kill        */
181	>	#define OPER_FLAG_KILL           0x00000002 /**< Oper can do local KILL      */
182	>	#define OPER_FLAG_UNKLINE        0x00000004 /**< Oper can use unkline        */
183	>	#define OPER_FLAG_GLINE          0x00000008 /**< Oper can use gline          */
184	>	#define OPER_FLAG_K              0x00000010 /**< Oper can kill/kline         */
185	>	#define OPER_FLAG_X              0x00000020 /**< Oper can xline              */
186	>	#define OPER_FLAG_DIE            0x00000040 /**< Oper can die                */
187	>	#define OPER_FLAG_REHASH         0x00000080 /**< Oper can rehash             */
188	>	#define OPER_FLAG_ADMIN          0x00000100 /**< Oper can set umode +a       */
189	>	#define OPER_FLAG_OPERWALL       0x00000200 /**< Oper can use OPERWALL command */
190	>	#define OPER_FLAG_REMOTEBAN      0x00000400 /**< Oper can set remote bans */
191	>	#define OPER_FLAG_GLOBOPS        0x00000800 /**< Oper can use GLOBOPS command */
192	>	#define OPER_FLAG_MODULE         0x00001000 /**< Oper can use MODULE commands */
193	>	#define OPER_FLAG_RESTART        0x00002000 /**< Oper can use RESTART command */
194	>	#define OPER_FLAG_DLINE          0x00004000 /**< Oper can use DLINE command   */
195	>	#define OPER_FLAG_UNDLINE        0x00008000 /**< Oper can use UNDLINE command */
196	>	#define OPER_FLAG_SET            0x00010000 /**< Oper can use SET command */
197	>	#define OPER_FLAG_SQUIT          0x00020000 /**< Oper can do local SQUIT */
198	>	#define OPER_FLAG_SQUIT_REMOTE   0x00040000 /**< Oper can do global SQUIT */
199	>	#define OPER_FLAG_CONNECT        0x00080000 /**< Oper can do local CONNECT */
200	>	#define OPER_FLAG_CONNECT_REMOTE 0x00100000 /**< Oper can do global CONNECT */
201	>	#define OPER_FLAG_WALLOPS        0x00200000 /**< Oper can do WALLOPS */
202	>	#define OPER_FLAG_LOCOPS         0x00400000 /**< Oper can do LOCOPS */
203
204		#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
205		#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
#	Line 430 | Line 214 | struct LocalUser
214		#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
215		#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
216		#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
433	–	#define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
434	–	#define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
435	–	#define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
436	–	#define SetCryptOut(x)          ((x)->flags |= FLAGS_CRYPTOUT)
437	–	#define IsWaitAuth(x)           ((x)->flags &  FLAGS_WAITAUTH)
438	–	#define SetWaitAuth(x)          ((x)->flags |= FLAGS_WAITAUTH)
439	–	#define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
440	–	#define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
441	–	#define SetServlink(x)          ((x)->flags |= FLAGS_SERVLINK)
217		#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
218		#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
219		#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
#	Line 469 | Line 244 | struct LocalUser
244		#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
245		#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
246
472	–	#define SetPingWarning(x)       ((x)->flags |= FLAGS_PINGWARNING)
473	–	#define IsPingWarning(x)        ((x)->flags & FLAGS_PINGWARNING)
474	–	#define ClearPingWarning(x)     ((x)->flags &= ~FLAGS_PINGWARNING)
475	–
247		#define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
248		#define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
249
#	Line 489 | Line 260 | struct LocalUser
260		#define SetExemptResv(x)        ((x)->flags |= FLAGS_EXEMPTRESV)
261		#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
262		#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
263	+	#define DelIPSpoof(x)           ((x)->flags &= ~FLAGS_IP_SPOOFING)
264
265		#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
266		#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
#	Line 500 | Line 272 | struct LocalUser
272		#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
273		#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
274		#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
503	–	#define IsSlinkqBlocked(x)      ((x)->flags &  FLAGS_SBLOCKED)
504	–	#define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
505	–	#define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
506	–
507	–	#define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
508	–	#define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
509	–	#define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
275
276
277	<	/*
278	<	* definitions for get_client_name
279	<	* TBD - make this an enum
277	>	/*! \brief addr_mask_type enumeration */
278	>	enum addr_mask_type
279	>	{
280	>	HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
281	>	SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
282	>	MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
283	>	};
284	>
285	>	/*! \brief Server structure */
286	>	struct Server
287	>	{
288	>	dlink_list server_list; /**< Servers on this server */
289	>	dlink_list client_list; /**< Clients on this server */
290	>	char by[NICKLEN + 1];   /**< who activated this connection */
291	>	};
292	>
293	>	/*! \brief ListTask structure */
294	>	struct ListTask
295	>	{
296	>	dlink_list show_mask; /**< show these channels.. */
297	>	dlink_list hide_mask; /**< ..and hide these ones */
298	>
299	>	unsigned int hash_index; /**< the bucket we are currently in */
300	>	unsigned int users_min;
301	>	unsigned int users_max;
302	>	unsigned int created_min;
303	>	unsigned int created_max;
304	>	unsigned int topicts_min;
305	>	unsigned int topicts_max;
306	>	};
307	>
308	>	/*! \brief LocalUser structure
309	>	*
310	>	* Allocated only for local clients, that are directly connected
311	>	* to \b this server with a socket.
312		*/
313	<	#define HIDE_IP 0
314	<	#define SHOW_IP 1
315	<	#define MASK_IP 2
313	>	struct LocalUser
314	>	{
315	>	dlink_node   lclient_node;
316	>
317	>	char         client_host[HOSTLEN + 1];
318	>	char         client_server[HOSTLEN + 1];
319	>
320	>	unsigned int registration;
321	>	unsigned int cap_client;    /**< Client capabilities (from us) */
322	>	unsigned int cap_active;    /**< Active capabilities (to us) */
323	>	unsigned int       caps;       /**< capabilities bit-field */
324	>
325	>	unsigned int operflags;     /**< IRC Operator privilege flags */
326	>	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
327	>
328	>	unsigned int serial;     /**< used to enforce 1 send per nick */
329	>
330	>	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
331	>	time_t       firsttime;  /**< time client was created */
332	>	time_t       since;      /**< last time we parsed something */
333	>	time_t       last_knock;    /**< time of last knock */
334	>	time_t       last_join_time;   /**< when this client last
335	>	joined a channel */
336	>	time_t       last_leave_time;  /**< when this client last
337	>	* left a channel */
338	>	int          join_leave_count; /**< count of JOIN/LEAVE in less than
339	>	MIN_JOIN_LEAVE_TIME seconds */
340	>	int          oper_warn_count_down; /**< warn opers of this possible
341	>	spambot every time this gets to 0 */
342	>	time_t       last_caller_id_time;
343	>	time_t       first_received_message_time;
344	>	time_t       last_nick_change;
345	>	time_t       last_privmsg; /**< Last time we got a PRIVMSG */
346	>	time_t       last_away; /**< Away since... */
347	>
348	>	int          received_number_of_privmsgs;
349	>	unsigned int number_of_nick_changes;
350	>
351	>	struct ListTask  *list_task;
352	>
353	>	struct dbuf_queue buf_sendq;
354	>	struct dbuf_queue buf_recvq;
355	>
356	>	struct {
357	>	unsigned int messages;      /**< Statistics: protocol messages sent/received */
358	>	uint64_t bytes;             /**< Statistics: total bytes sent/received */
359	>	} recv, send;
360	>
361	>	struct AuthRequest auth;
362	>	struct Listener *listener;   /**< listener accepted from */
363	>	dlink_list        acceptlist; /**< clients I'll allow to talk to me */
364	>	dlink_list        watches;   /**< chain of Watch pointer blocks */
365	>	dlink_list        confs;     /**< Configuration record associated */
366	>	dlink_list        invited;   /**< chain of invite pointer blocks */
367	>	struct irc_ssaddr ip;
368	>	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
369	>	int               country_id; /**< ID corresponding to a ISO 3166 country code */
370	>
371	>	char              *passwd;
372	>	fde_t             fd;
373	>	/* Anti-flood stuff. We track how many messages were parsed and how
374	>	* many we were allowed in the current second, and apply a simple
375	>	* decay to avoid flooding.
376	>	*   -- adrian
377	>	*/
378	>	int allow_read;       /**< how many we're allowed to read in this second */
379	>	int sent_parsed;      /**< how many messages we've parsed in this second */
380	>
381	>	char*          response;  /**< expected response from client */
382	>	char*          auth_oper; /**< Operator to become if they supply the response.*/
383	>	};
384	>
385	>	/*! \brief Client structure */
386	>	struct Client
387	>	{
388	>	dlink_node node;
389	>	dlink_node lnode;             /**< Used for Server->servers/users */
390	>
391	>	struct LocalUser *localClient;
392	>	struct Client    *hnext;      /**< For client hash table lookups by name */
393	>	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
394	>	struct Server    *serv;       /**< ...defined, if this is a server */
395	>	struct Client    *servptr;    /**< Points to server this Client is on */
396	>	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
397	>
398	>	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
399	>
400	>	unsigned int      flags;      /**< client flags */
401	>	unsigned int      umodes;     /**< opers, normal users subset */
402	>	unsigned int      hopcount;   /**< number of servers to this 0 = local */
403	>	unsigned int      status;     /**< Client type */
404	>	unsigned int      handler;    /**< Handler index */
405	>
406	>	dlink_list        whowas;
407	>	dlink_list        channel;   /**< chain of channel pointer blocks */
408	>
409	>	char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
410	>	char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
411	>	char svid[HOSTLEN + 1]; /**< Services ID. XXX: Going with HOSTLEN for now. NICKLEN might be too small
412	>	if dealing with timestamps */
413	>	char id[IDLEN + 1];       /**< client ID, unique ID per client */
414	>	/*
415	>	* client->username is the username from ident or the USER message,
416	>	* If the client is idented the USER message is ignored, otherwise
417	>	* the username part of the USER message is put here prefixed with a
418	>	* tilde depending on the auth{} block. Once a client has registered,
419	>	* this field should be considered read-only.
420	>	*/
421	>	char              username[USERLEN + 1]; /* client's username */
422	>	/*
423	>	* client->host contains the resolved name or ip address
424	>	* as a string for the user, it may be fiddled with for oper spoofing etc.
425	>	* once it's changed the *real* address goes away. This should be
426	>	* considered a read-only field after the client has registered.
427	>	*/
428	>	char              host[HOSTLEN + 1];     /* client's hostname */
429	>
430	>	/*
431	>	* client->info for unix clients will normally contain the info from the
432	>	* gcos field in /etc/passwd but anything can go here.
433	>	*/
434	>	char              info[REALLEN + 1]; /* Free form additional client info */
435	>
436	>	/*
437	>	* client->sockhost contains the ip address gotten from the socket as a
438	>	* string, this field should be considered read-only once the connection
439	>	* has been made. (set in s_bsd.c only)
440	>	*/
441	>	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
442	>	socket ip address as string */
443	>	};
444	>
445
446		extern struct Client me;
447		extern dlink_list listing_client_list;
448		extern dlink_list global_client_list;
449	+	extern dlink_list unknown_list;       /* unknown clients ON this server only        */
450	+	extern dlink_list local_client_list;  /* local clients only ON this server          */
451	+	extern dlink_list serv_list;          /* local servers to this server ONLY          */
452	+	extern dlink_list global_serv_list;   /* global servers on the network              */
453	+	extern dlink_list oper_list;          /* our opers, duplicated in local_client_list */
454
455		extern int accept_message(struct Client *, struct Client *);
456	+	extern unsigned int idle_time_get(const struct Client *, const struct Client *);
457		extern struct split_nuh_item *find_accept(const char *, const char *,
458		const char *, struct Client *, int);
459		extern void del_accept(struct split_nuh_item *, struct Client *);
460		extern void del_all_accepts(struct Client *);
461		extern void exit_client(struct Client *, struct Client *, const char *);
462		extern void check_conf_klines(void);
463	<	extern void init_client(void);
463	>	extern void client_init(void);
464		extern void dead_link_on_write(struct Client *, int);
465		extern void dead_link_on_read(struct Client *, int);
466		extern void exit_aborted_clients(void);
#	Line 536 | Line 468 | extern void free_exited_clients(void);
468		extern struct Client *make_client(struct Client *);
469		extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
470		extern struct Client *find_person(const struct Client *const, const char *);
471	<	extern const char *get_client_name(const struct Client *, int);
471	>	extern const char *get_client_name(const struct Client *, enum addr_mask_type);
472
473		#endif /* INCLUDED_client_h */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)