ViewVC Help

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

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

Comparing ircd-hybrid/trunk/include/client.h (file contents):
Revision 2345 by michael, Wed Jul 3 18:17:39 2013 UTC vs.
Revision 5555 by michael, Fri Feb 13 18:56:09 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 34 | Line 34
34		#include "ircd_defs.h"
35		#include "dbuf.h"
36		#include "channel.h"
37	<	#include "s_auth.h"
37	>	#include "auth.h"
38	>
39	>	struct MaskItem;
40
41		/*
42		* status macros.
43		*/
44	<	#define STAT_CONNECTING         0x01
45	<	#define STAT_HANDSHAKE          0x02
46	<	#define STAT_ME                 0x04
47	<	#define STAT_UNKNOWN            0x08
48	<	#define STAT_SERVER             0x10
49	<	#define STAT_CLIENT             0x20
50	<
51	<	#define REG_NEED_USER 0x1
52	<	#define REG_NEED_NICK 0x2
53	<	#define REG_NEED_CAP  0x4
54	<	#define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
55	<
56	<	#define HasID(x)                ((x)->id[0] != '\0')
55	<	#define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
56	<	#define ID_or_name(x,client_p)  ((IsCapable(client_p, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
44	>	#define STAT_CONNECTING  0x00000001U
45	>	#define STAT_HANDSHAKE   0x00000002U
46	>	#define STAT_ME          0x00000004U
47	>	#define STAT_UNKNOWN     0x00000008U
48	>	#define STAT_SERVER      0x00000010U
49	>	#define STAT_CLIENT      0x00000020U
50	>
51	>	#define REG_NEED_USER    0x00000001U  /**< User must send USER command */
52	>	#define REG_NEED_NICK    0x00000002U  /**< User must send NICK command */
53	>	#define REG_NEED_CAP     0x00000004U  /**< In middle of CAP negotiations */
54	>	#define REG_INIT  (REG_NEED_USER|REG_NEED_NICK)
55	>
56	>	#define ID_or_name(x,client_p)  ((IsCapable(client_p->from, CAP_TS6) && (x)->id[0]) ? (x)->id : (x)->name)
57
58		#define IsRegistered(x)         ((x)->status  > STAT_UNKNOWN)
59		#define IsConnecting(x)         ((x)->status == STAT_CONNECTING)
#	Line 64 | Line 64
64		#define IsClient(x)             ((x)->status == STAT_CLIENT)
65
66		#define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
67	<	(x)->handler = UNREGISTERED_HANDLER; }
67	>	(x)->handler = UNREGISTERED_HANDLER; }
68
69		#define SetHandshake(x)         {(x)->status = STAT_HANDSHAKE; \
70	<	(x)->handler = UNREGISTERED_HANDLER; }
70	>	(x)->handler = UNREGISTERED_HANDLER; }
71
72		#define SetMe(x)                {(x)->status = STAT_ME; \
73	<	(x)->handler = UNREGISTERED_HANDLER; }
73	>	(x)->handler = UNREGISTERED_HANDLER; }
74
75		#define SetUnknown(x)           {(x)->status = STAT_UNKNOWN; \
76	<	(x)->handler = UNREGISTERED_HANDLER; }
76	>	(x)->handler = UNREGISTERED_HANDLER; }
77
78		#define SetServer(x)            {(x)->status = STAT_SERVER; \
79	<	(x)->handler = SERVER_HANDLER; }
79	>	(x)->handler = SERVER_HANDLER; }
80
81		#define SetClient(x)            {(x)->status = STAT_CLIENT; \
82	<	(x)->handler = HasUMode(x, UMODE_OPER) ? \
83	<	OPER_HANDLER : CLIENT_HANDLER; }
82	>	(x)->handler = HasUMode(x, UMODE_OPER) ? \
83	>	OPER_HANDLER : CLIENT_HANDLER; }
84
85	<	#define MyConnect(x)            ((x)->localClient != NULL)
85	>	#define MyConnect(x)            ((x)->connection != NULL)
86		#define MyClient(x)             (MyConnect(x) && IsClient(x))
87
88		/*
89		* ts stuff
90		*/
91	<	#define TS_CURRENT      6       /**< current TS protocol version */
92	<	#define TS_MIN          5       /**< minimum supported TS protocol version */
91	>	#define TS_CURRENT      6  /**< Current TS protocol version */
92	>	#define TS_MIN          6  /**< Minimum supported TS protocol version */
93		#define TS_DOESTS       0x20000000
94		#define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
95
96
97
98	<	#define CAP_MULTI_PREFIX  0x00000001
99	<	#define CAP_AWAY_NOTIFY   0x00000002
98	>	#define CAP_MULTI_PREFIX  0x00000001U
99	>	#define CAP_AWAY_NOTIFY   0x00000002U
100	>	#define CAP_UHNAMES       0x00000004U
101	>	#define CAP_EXTENDED_JOIN 0x00000008U
102	>
103	>	#define HasCap(x, y) ((x)->connection->cap_active & (y))
104
101	–	#define HasCap(x, y) ((x)->localClient->cap_active & (y))
105
106		/* housekeeping flags */
107	<	#define FLAGS_PINGSENT       0x00000001 /**< Unreplied ping sent */
108	<	#define FLAGS_DEADSOCKET     0x00000002 /**< Local socket is dead--Exiting soon */
109	<	#define FLAGS_KILLED         0x00000004 /**< Prevents "QUIT" from being sent for this */
110	<	#define FLAGS_CLOSING        0x00000008 /**< set when closing to suppress errors */
111	<	#define FLAGS_GOTID          0x00000010 /**< successful ident lookup achieved */
112	<	#define FLAGS_NEEDID         0x00000020 /**< auth{} block say must use ident return */
113	<	#define FLAGS_SENDQEX        0x00000040 /**< Sendq exceeded */
114	<	#define FLAGS_IPHASH         0x00000080 /**< iphashed this client */
115	<	#define FLAGS_MARK           0x00000100 /**< marked client */
116	<	#define FLAGS_CANFLOOD       0x00000200 /**< client has the ability to flood */
117	<	#define FLAGS_EXEMPTGLINE    0x00000400 /**< client can't be G-lined */
118	<	#define FLAGS_EXEMPTKLINE    0x00000800 /**< client is exempt from kline */
119	<	#define FLAGS_NOLIMIT        0x00001000 /**< client is exempt from limits */
120	<	#define FLAGS_PING_COOKIE    0x00002000 /**< PING Cookie */
121	<	#define FLAGS_IP_SPOOFING    0x00004000 /**< client IP is spoofed */
122	<	#define FLAGS_FLOODDONE      0x00008000 /**< Flood grace period has been ended. */
123	<	#define FLAGS_EOB            0x00010000 /**< server has sent us an EOB */
124	<	#define FLAGS_HIDDEN         0x00020000 /**< a hidden server. not shown in /links */
125	<	#define FLAGS_BLOCKED        0x00040000 /**< must wait for COMM_SELECT_WRITE */
126	<	#define FLAGS_USERHOST       0x00080000 /**< client is in userhost hash */
127	<	#define FLAGS_BURSTED        0x00100000 /**< user was already bursted */
128	<	#define FLAGS_EXEMPTRESV     0x00200000 /**< client is exempt from RESV */
129	<	#define FLAGS_GOTUSER        0x00400000 /**< if we received a USER command */
130	<	#define FLAGS_FINISHED_AUTH  0x00800000 /**< Client has been released from auth */
131	<	#define FLAGS_FLOOD_NOTICED  0x01000000 /**< Notice to opers about this flooder has been sent */
132	<	#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	<	#define FLAGS_SSL            0x08000000 /**< User is connected via TLS/SSL */
107	>	#define FLAGS_PINGSENT       0x00000001U  /**< Unreplied ping sent */
108	>	#define FLAGS_DEADSOCKET     0x00000002U  /**< Local socket is dead--Exiting soon */
109	>	#define FLAGS_KILLED         0x00000004U  /**< Prevents "QUIT" from being sent for this */
110	>	#define FLAGS_CLOSING        0x00000008U  /**< Set when closing to suppress errors */
111	>	#define FLAGS_GOTID          0x00000010U  /**< Successful ident lookup achieved */
112	>	#define FLAGS_SENDQEX        0x00000020U  /**< Sendq exceeded */
113	>	#define FLAGS_IPHASH         0x00000040U  /**< Iphashed this client */
114	>	#define FLAGS_MARK           0x00000080U  /**< Marked client */
115	>	#define FLAGS_CANFLOOD       0x00000100U  /**< Client has the ability to flood */
116	>	#define FLAGS_EXEMPTGLINE    0x00000200U  /**< Client can't be G-lined */
117	>	#define FLAGS_EXEMPTKLINE    0x00000400U  /**< Client is exempt from kline */
118	>	#define FLAGS_NOLIMIT        0x00000800U  /**< Client is exempt from limits */
119	>	#define FLAGS_PING_COOKIE    0x00001000U  /**< PING Cookie */
120	>	#define FLAGS_FLOODDONE      0x00002000U  /**< Flood grace period has been ended. */
121	>	#define FLAGS_EOB            0x00004000U  /**< Server has sent us an EOB */
122	>	#define FLAGS_HIDDEN         0x00008000U  /**< A hidden server. Not shown in /links */
123	>	#define FLAGS_BLOCKED        0x00010000U  /**< Must wait for COMM_SELECT_WRITE */
124	>	#define FLAGS_USERHOST       0x00020000U  /**< Client is in userhost hash */
125	>	#define FLAGS_BURSTED        0x00040000U  /**< User was already bursted */
126	>	#define FLAGS_EXEMPTRESV     0x00080000U  /**< Client is exempt from RESV */
127	>	#define FLAGS_GOTUSER        0x00100000U  /**< If we received a USER command */
128	>	#define FLAGS_FINISHED_AUTH  0x00200000U  /**< Client has been released from auth */
129	>	#define FLAGS_FLOOD_NOTICED  0x00400000U  /**< Notice to opers about this flooder has been sent */
130	>	#define FLAGS_SERVICE        0x00800000U  /**< Client/server is a network service */
131	>	#define FLAGS_SSL            0x01000000U  /**< User is connected via TLS/SSL */
132	>	#define FLAGS_SQUIT          0x02000000U
133
134		#define HasFlag(x, y) ((x)->flags &   (y))
135		#define AddFlag(x, y) ((x)->flags |=  (y))
#	Line 137 | Line 138
138
139
140		/* umodes, settable flags */
141	<	#define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
142	<	#define UMODE_CCONN        0x00000002 /**< Client Connections */
143	<	#define UMODE_REJ          0x00000004 /**< Bot Rejections */
144	<	#define UMODE_SKILL        0x00000008 /**< Server Killed */
145	<	#define UMODE_FULL         0x00000010 /**< Full messages */
146	<	#define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
147	<	#define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
148	<	#define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
149	<	#define UMODE_WALLOP       0x00000100 /**< send wallops to them */
150	<	#define UMODE_OPERWALL     0x00000200 /**< Operwalls */
151	<	#define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
152	<	#define UMODE_BOTS         0x00000800 /**< shows bots */
153	<	#define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
154	<	#define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
155	<	#define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
156	<	#define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
157	<	#define UMODE_LOCOPS       0x00010000 /**< show locops */
158	<	#define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
159	<	#define UMODE_REGISTERED   0x00040000 /**< User has identified for that nick. */
160	<	#define UMODE_REGONLY      0x00080000 /**< Only registered nicks may PM */
161	<	#define UMODE_HIDDEN       0x00100000 /**< Operator status is hidden */
162	<	#define UMODE_OPER         0x00200000 /**< Operator */
163	<	#define UMODE_ADMIN        0x00400000 /**< Admin on server */
164	<	#define UMODE_FARCONNECT   0x00800000 /**< Can see remote client connects/exits */
165	<	#define UMODE_HIDDENHOST   0x01000000 /**< User's host is hidden */
166	<	#define UMODE_SSL          0x02000000 /**< User is connected via TLS/SSL */
167	<
141	>	#define UMODE_SERVNOTICE   0x00000001U  /**< Server notices such as kill */
142	>	#define UMODE_CCONN        0x00000002U  /**< Can see client connection notices */
143	>	#define UMODE_REJ          0x00000004U  /**< Bot Rejections */
144	>	#define UMODE_SKILL        0x00000008U  /**< Server Killed */
145	>	#define UMODE_FULL         0x00000010U  /**< Full messages */
146	>	#define UMODE_SPY          0x00000020U  /**< See STATS / LINKS */
147	>	#define UMODE_DEBUG        0x00000040U  /**< 'debugging' info */
148	>	#define UMODE_NCHANGE      0x00000080U  /**< Nick change notice */
149	>	#define UMODE_WALLOP       0x00000100U  /**< Send wallops to them */
150	>	#define UMODE_INVISIBLE    0x00000200U  /**< Makes user invisible */
151	>	#define UMODE_BOTS         0x00000400U  /**< Shows bots */
152	>	#define UMODE_EXTERNAL     0x00000800U  /**< Show servers introduced and splitting */
153	>	#define UMODE_CALLERID     0x00001000U  /**< Block unless caller id's */
154	>	#define UMODE_SOFTCALLERID 0x00002000U  /**< Block unless on common channel */
155	>	#define UMODE_UNAUTH       0x00004000U  /**< Show unauth connects here */
156	>	#define UMODE_LOCOPS       0x00008000U  /**< Can see LOCOPS messages */
157	>	#define UMODE_DEAF         0x00010000U  /**< Don't receive channel messages */
158	>	#define UMODE_REGISTERED   0x00020000U  /**< User has identified for that nick. */
159	>	#define UMODE_REGONLY      0x00040000U  /**< Only registered nicks may PM */
160	>	#define UMODE_HIDDEN       0x00080000U  /**< IRC operator status is hidden */
161	>	#define UMODE_OPER         0x00100000U  /**< IRC operator */
162	>	#define UMODE_ADMIN        0x00200000U  /**< Admin on server */
163	>	#define UMODE_FARCONNECT   0x00400000U  /**< Can see remote client connects/exits */
164	>	#define UMODE_HIDDENHOST   0x00800000U  /**< User's host is hidden */
165	>	#define UMODE_SSL          0x01000000U  /**< User is connected via TLS/SSL */
166	>	#define UMODE_WEBIRC       0x02000000U  /**< User connected via a webirc gateway */
167	>	#define UMODE_HIDEIDLE     0x04000000U  /**< Hides idle and signon time in WHOIS */
168	>	#define UMODE_HIDECHANS    0x08000000U  /**< Hides channel list in WHOIS */
169
170		#define UMODE_ALL          UMODE_SERVNOTICE
171
#	Line 171 | Line 173
173		#define AddUMode(x, y) ((x)->umodes |=  (y))
174		#define DelUMode(x, y) ((x)->umodes &= ~(y))
175
174	–	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP |\
175	–	UMODE_REGONLY | UMODE_REGISTERED | UMODE_ADMIN |\
176	–	UMODE_HIDDEN | UMODE_HIDDENHOST | UMODE_SSL)
177	–
178	–
176
177		/* oper priv flags */
178	<	#define OPER_FLAG_KILL_REMOTE    0x00000001 /**< Oper can global kill        */
179	<	#define OPER_FLAG_KILL           0x00000002 /**< Oper can do local KILL      */
180	<	#define OPER_FLAG_UNKLINE        0x00000004 /**< Oper can use unkline        */
181	<	#define OPER_FLAG_GLINE          0x00000008 /**< Oper can use gline          */
182	<	#define OPER_FLAG_K              0x00000010 /**< Oper can kill/kline         */
183	<	#define OPER_FLAG_X              0x00000020 /**< Oper can xline              */
184	<	#define OPER_FLAG_DIE            0x00000040 /**< Oper can die                */
185	<	#define OPER_FLAG_REHASH         0x00000080 /**< Oper can rehash             */
186	<	#define OPER_FLAG_ADMIN          0x00000100 /**< Oper can set umode +a       */
187	<	#define OPER_FLAG_OPERWALL       0x00000200 /**< Oper can use OPERWALL command */
188	<	#define OPER_FLAG_REMOTEBAN      0x00000400 /**< Oper can set remote bans */
189	<	#define OPER_FLAG_GLOBOPS        0x00000800 /**< Oper can use GLOBOPS command */
190	<	#define OPER_FLAG_MODULE         0x00001000 /**< Oper can use MODULE commands */
191	<	#define OPER_FLAG_RESTART        0x00002000 /**< Oper can use RESTART command */
192	<	#define OPER_FLAG_DLINE          0x00004000 /**< Oper can use DLINE command   */
193	<	#define OPER_FLAG_UNDLINE        0x00008000 /**< Oper can use UNDLINE command */
194	<	#define OPER_FLAG_SET            0x00010000 /**< Oper can use SET command */
195	<	#define OPER_FLAG_SQUIT          0x00020000 /**< Oper can do local SQUIT */
196	<	#define OPER_FLAG_SQUIT_REMOTE   0x00040000 /**< Oper can do global SQUIT */
197	<	#define OPER_FLAG_CONNECT        0x00080000 /**< Oper can do local CONNECT */
198	<	#define OPER_FLAG_CONNECT_REMOTE 0x00100000 /**< Oper can do global CONNECT */
199	<	#define OPER_FLAG_WALLOPS        0x00200000 /**< Oper can do WALLOPS */
200	<	#define OPER_FLAG_LOCOPS         0x00400000 /**< Oper can do LOCOPS */
201	<
202	<	#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
203	<	#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
204	<	#define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
205	<	#define ClrOFlag(x)    ((x)->localClient->operflags = 0)
178	>	#define OPER_FLAG_KILL_REMOTE    0x00000001U  /**< Oper can KILL remote users */
179	>	#define OPER_FLAG_KILL           0x00000002U  /**< Oper can KILL local users */
180	>	#define OPER_FLAG_UNKLINE        0x00000004U  /**< Oper can use UNKLINE command */
181	>	#define OPER_FLAG_GLINE          0x00000008U  /**< Oper can use GLINE command */
182	>	#define OPER_FLAG_KLINE          0x00000010U  /**< Oper can use KLINE command */
183	>	#define OPER_FLAG_XLINE          0x00000020U  /**< Oper can use XLINE command */
184	>	#define OPER_FLAG_DIE            0x00000040U  /**< Oper can use DIE command */
185	>	#define OPER_FLAG_REHASH         0x00000080U  /**< Oper can use REHASH command */
186	>	#define OPER_FLAG_ADMIN          0x00000100U  /**< Oper can set user mode +a */
187	>	#define OPER_FLAG_REMOTEBAN      0x00000200U  /**< Oper can set remote bans */
188	>	#define OPER_FLAG_GLOBOPS        0x00000400U  /**< Oper can use GLOBOPS command */
189	>	#define OPER_FLAG_MODULE         0x00000800U  /**< Oper can use MODULE command */
190	>	#define OPER_FLAG_RESTART        0x00001000U  /**< Oper can use RESTART command */
191	>	#define OPER_FLAG_DLINE          0x00002000U  /**< Oper can use DLINE command */
192	>	#define OPER_FLAG_UNDLINE        0x00004000U  /**< Oper can use UNDLINE command */
193	>	#define OPER_FLAG_SET            0x00008000U  /**< Oper can use SET command */
194	>	#define OPER_FLAG_SQUIT          0x00010000U  /**< Oper can do local SQUIT */
195	>	#define OPER_FLAG_SQUIT_REMOTE   0x00020000U  /**< Oper can do remote SQUIT */
196	>	#define OPER_FLAG_CONNECT        0x00040000U  /**< Oper can do local CONNECT */
197	>	#define OPER_FLAG_CONNECT_REMOTE 0x00080000U  /**< Oper can do remote CONNECT */
198	>	#define OPER_FLAG_WALLOPS        0x00100000U  /**< Oper can use WALLOPS command */
199	>	#define OPER_FLAG_LOCOPS         0x00200000U  /**< Oper can use LOCOPS command */
200	>	#define OPER_FLAG_UNXLINE        0x00400000U  /**< Oper can use UNXLINE command */
201	>	#define OPER_FLAG_OPME           0x00800000U  /**< Oper can use OPME command */
202	>
203	>
204	>	#define HasOFlag(x, y) (MyConnect(x) ? (x)->connection->operflags & (y) : 0)
205	>	#define AddOFlag(x, y) ((x)->connection->operflags |=  (y))
206	>	#define DelOFlag(x, y) ((x)->connection->operflags &= ~(y))
207	>	#define ClrOFlag(x)    ((x)->connection->operflags = 0)
208
209
210
#	Line 213 | Line 212
212		#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
213		#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
214		#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
215	<	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
216	<	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
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| \
221	<	FLAGS_KILLED))
215	>	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
216	>	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
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|FLAGS_KILLED))
220
221		/* oper flags */
222		#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
223
224		#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
225	<	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
225	>	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
226
227		#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
228	<	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
229	<	(x)->handler = CLIENT_HANDLER; }
232	<
233	<	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
234	<	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
228	>	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
229	>	(x)->handler = CLIENT_HANDLER; }
230
231	<	#define SetIpHash(x)            ((x)->flags |= FLAGS_IPHASH)
232	<	#define ClearIpHash(x)          ((x)->flags &= ~FLAGS_IPHASH)
238	<	#define IsIpHash(x)             ((x)->flags & FLAGS_IPHASH)
231	>	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
232	>	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
233
234		#define SetUserHost(x)          ((x)->flags |= FLAGS_USERHOST)
241	–	#define ClearUserHost(x)        ((x)->flags &= ~FLAGS_USERHOST)
235		#define IsUserHostIp(x)         ((x)->flags & FLAGS_USERHOST)
236
237	<	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
238	<	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
239	<	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
247	<
248	<	#define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
249	<	#define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
237	>	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
238	>	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
239	>	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
240
241		#define SetGotId(x)             ((x)->flags |= FLAGS_GOTID)
242		#define IsGotId(x)              ((x)->flags & FLAGS_GOTID)
#	Line 259 | Line 249
249		#define SetExemptGline(x)       ((x)->flags |= FLAGS_EXEMPTGLINE)
250		#define IsExemptResv(x)         ((x)->flags & FLAGS_EXEMPTRESV)
251		#define SetExemptResv(x)        ((x)->flags |= FLAGS_EXEMPTRESV)
262	–	#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
263	–	#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
264	–	#define DelIPSpoof(x)           ((x)->flags &= ~FLAGS_IP_SPOOFING)
252
253		#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
254		#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
#	Line 270 | Line 257
257		#define IsHidden(x)             ((x)->flags &  FLAGS_HIDDEN)
258		#define SetHidden(x)            ((x)->flags |= FLAGS_HIDDEN)
259
273	–	#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
274	–	#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
275	–	#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
276	–
260
261		/*! \brief addr_mask_type enumeration */
262		enum addr_mask_type
#	Line 283 | Line 266 | enum addr_mask_type
266		MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
267		};
268
269	+	struct ServicesTag
270	+	{
271	+	dlink_node node;
272	+	char *tag;
273	+	unsigned int numeric;
274	+	unsigned int privilege;
275	+	};
276	+
277		/*! \brief Server structure */
278		struct Server
279		{
280		dlink_list server_list; /**< Servers on this server */
281		dlink_list client_list; /**< Clients on this server */
282	<	char by[NICKLEN + 1];   /**< who activated this connection */
282	>	char by[NICKLEN + 1];   /**< Who activated this connection */
283		};
284
285		/*! \brief ListTask structure */
286		struct ListTask
287		{
288	<	dlink_list show_mask; /**< show these channels.. */
289	<	dlink_list hide_mask; /**< ..and hide these ones */
288	>	dlink_list show_mask; /**< Channels to show */
289	>	dlink_list hide_mask; /**< Channels to hide */
290
291	<	unsigned int hash_index; /**< the bucket we are currently in */
291	>	unsigned int hash_index; /**< The hash bucket we are currently in */
292		unsigned int users_min;
293		unsigned int users_max;
294		unsigned int created_min;
295		unsigned int created_max;
296		unsigned int topicts_min;
297		unsigned int topicts_max;
298	+	char topic[TOPICLEN + 1];
299		};
300
301	<	/*! \brief LocalUser structure
301	>	/*! \brief Connection structure
302		*
303		* Allocated only for local clients, that are directly connected
304		* to \b this server with a socket.
305		*/
306	<	struct LocalUser
306	>	struct Connection
307		{
308		dlink_node   lclient_node;
309
310		unsigned int registration;
311	<	unsigned int cap_client;    /**< Client capabilities (from us) */
312	<	unsigned int cap_active;    /**< Active capabilities (to us) */
313	<	unsigned int       caps;       /**< capabilities bit-field */
311	>	unsigned int cap_client;  /**< Client capabilities (from us) */
312	>	unsigned int cap_active;  /**< Active capabilities (to us) */
313	>	unsigned int       caps;  /**< Capabilities bit-field */
314
315		unsigned int operflags;     /**< IRC Operator privilege flags */
316		unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
317
318	<	unsigned int serial;     /**< used to enforce 1 send per nick */
318	>	uint64_t serial;     /**< Used to enforce 1 send per nick */
319
320		time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
321	<	time_t       firsttime;  /**< time client was created */
322	<	time_t       since;      /**< last time we parsed something */
323	<	time_t       last_knock;    /**< time of last knock */
324	<	time_t       last_join_time;   /**< when this client last
325	<	joined a channel */
334	<	time_t       last_leave_time;  /**< when this client last
335	<	* left a channel */
336	<	int          join_leave_count; /**< count of JOIN/LEAVE in less than
321	>	time_t       firsttime;  /**< Time client was created */
322	>	time_t       since;      /**< Last time we parsed something */
323	>	time_t       last_join_time;   /**< When this client last joined a channel */
324	>	time_t       last_leave_time;  /**< When this client last left a channel */
325	>	int          join_leave_count; /**< Count of JOIN/LEAVE in less than
326		MIN_JOIN_LEAVE_TIME seconds */
327	<	int          oper_warn_count_down; /**< warn opers of this possible
327	>	int          oper_warn_count_down; /**< Warn opers of this possible
328		spambot every time this gets to 0 */
329		time_t       last_caller_id_time;
330		time_t       first_received_message_time;
331	<	time_t       last_nick_change;
343	<	time_t       last_privmsg; /**< Last time we got a PRIVMSG */
344	<	time_t       last_away; /**< Away since... */
331	>	time_t       last_privmsg;  /**< Last time we got a PRIVMSG */
332
333		int          received_number_of_privmsgs;
347	–	unsigned int number_of_nick_changes;
334
335		struct ListTask  *list_task;
336
337		struct dbuf_queue buf_sendq;
338		struct dbuf_queue buf_recvq;
339
340	<	struct {
340	>	struct
341	>	{
342		unsigned int messages;      /**< Statistics: protocol messages sent/received */
343		uint64_t bytes;             /**< Statistics: total bytes sent/received */
344		} recv, send;
345
346	+	struct
347	+	{
348	+	unsigned int count;  /**< How many AWAY/INVITE/KNOCK/NICK requests client has sent */
349	+	time_t last_attempt;  /**< Last time the AWAY/INVITE/KNOCK/NICK request was issued */
350	+	} away, invite, knock, nick;
351	+
352		struct AuthRequest auth;
353	<	struct Listener *listener;   /**< listener accepted from */
354	<	dlink_list        acceptlist; /**< clients I'll allow to talk to me */
355	<	dlink_list        watches;   /**< chain of Watch pointer blocks */
353	>	struct Listener *listener;   /**< Listener accepted from */
354	>	dlink_list        acceptlist; /**< Clients I'll allow to talk to me */
355	>	dlink_list        watches;   /**< Chain of Watch pointer blocks */
356		dlink_list        confs;     /**< Configuration record associated */
357	<	dlink_list        invited;   /**< chain of invite pointer blocks */
357	>	dlink_list        invited;   /**< Chain of invite pointer blocks */
358		struct irc_ssaddr ip;
359		int               aftype;    /**< Makes life easier for DNS res in IPV6 */
360		int               country_id; /**< ID corresponding to a ISO 3166 country code */
361
369	–	char              *passwd;
362		fde_t             fd;
363	+
364		/* Anti-flood stuff. We track how many messages were parsed and how
365		* many we were allowed in the current second, and apply a simple
366		* decay to avoid flooding.
367		*   -- adrian
368		*/
369	<	int allow_read;       /**< how many we're allowed to read in this second */
370	<	int sent_parsed;      /**< how many messages we've parsed in this second */
369	>	int allow_read;       /**< How many we're allowed to read in this second */
370	>	int sent_parsed;      /**< How many messages we've parsed in this second */
371
372	<	char*          response;  /**< expected response from client */
373	<	char*          auth_oper; /**< Operator to become if they supply the response.*/
372	>	char *password;  /**< Password supplied by the client/server */
373	>	char *challenge_response;  /**< Expected CHALLENGE response from client */
374	>	char *challenge_operator;  /**< Operator to become if they supply the response */
375		};
376
377		/*! \brief Client structure */
#	Line 386 | Line 380 | struct Client
380		dlink_node node;
381		dlink_node lnode;             /**< Used for Server->servers/users */
382
383	<	struct LocalUser *localClient;
383	>	struct Connection *connection;
384		struct Client    *hnext;      /**< For client hash table lookups by name */
385		struct Client    *idhnext;    /**< For SID hash table lookups by sid */
386		struct Server    *serv;       /**< ...defined, if this is a server */
#	Line 395 | Line 389 | struct Client
389
390		time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
391
392	<	unsigned int      flags;      /**< client flags */
393	<	unsigned int      umodes;     /**< opers, normal users subset */
394	<	unsigned int      hopcount;   /**< number of servers to this 0 = local */
392	>	unsigned int      flags;      /**< Client flags */
393	>	unsigned int      umodes;     /**< Opers, normal users subset */
394	>	unsigned int      hopcount;   /**< Number of servers to this 0 = local */
395		unsigned int      status;     /**< Client type */
396		unsigned int      handler;    /**< Handler index */
397
398		dlink_list        whowas;
399	<	dlink_list        channel;   /**< chain of channel pointer blocks */
399	>	dlink_list        channel;   /**< Chain of channel pointer blocks */
400	>	dlink_list        svstags;   /**< List of ServicesTag items */
401
402		char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
403	<	char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
404	<	char svid[HOSTLEN + 1]; /**< Services ID. XXX: Going with HOSTLEN for now. NICKLEN might be too small
405	<	if dealing with timestamps */
406	<	char id[IDLEN + 1];       /**< client ID, unique ID per client */
407	<	/*
403	>	char name[HOSTLEN + 1]; /**< Unique name for a client nick or host */
404	>	char id[IDLEN + 1];       /**< Client ID, unique ID per client */
405	>	char account[SVIDLEN + 1]; /**< Services account */
406	>
407	>	/*
408		* client->username is the username from ident or the USER message,
409		* If the client is idented the USER message is ignored, otherwise
410		* the username part of the USER message is put here prefixed with a
#	Line 417 | Line 412 | struct Client
412		* this field should be considered read-only.
413		*/
414		char              username[USERLEN + 1]; /* client's username */
415	+
416		/*
417		* client->host contains the resolved name or ip address
418		* as a string for the user, it may be fiddled with for oper spoofing etc.
#	Line 445 | Line 441 | struct Client
441		extern struct Client me;
442		extern dlink_list listing_client_list;
443		extern dlink_list global_client_list;
444	<	extern dlink_list unknown_list;       /* unknown clients ON this server only        */
444	>	extern dlink_list global_server_list;   /* global servers on the network              */
445		extern dlink_list local_client_list;  /* local clients only ON this server          */
446	<	extern dlink_list serv_list;          /* local servers to this server ONLY          */
447	<	extern dlink_list global_serv_list;   /* global servers on the network              */
446	>	extern dlink_list local_server_list;  /* local servers to this server ONLY          */
447	>	extern dlink_list unknown_list;       /* unknown clients ON this server only        */
448		extern dlink_list oper_list;          /* our opers, duplicated in local_client_list */
449
450		extern int accept_message(struct Client *, struct Client *);
451	<	extern unsigned int idle_time_get(const struct Client *, const struct Client *);
451	>	extern unsigned int client_get_idle_time(const struct Client *, const struct Client *);
452		extern struct split_nuh_item *find_accept(const char *, const char *,
453	<	const char *, struct Client *, int);
453	>	const char *, struct Client *,
454	>	int (*)(const char *, const char *));
455	>	extern void client_attach_svstag(struct Client *, unsigned int, unsigned int, const char *const);
456	>	extern void client_clear_svstags(struct Client *);
457		extern void del_accept(struct split_nuh_item *, struct Client *);
458		extern void del_all_accepts(struct Client *);
459	<	extern void exit_client(struct Client *, struct Client *, const char *);
459	>	extern void exit_client(struct Client *, const char *);
460	>	extern void conf_try_ban(struct Client *, struct MaskItem *);
461		extern void check_conf_klines(void);
462		extern void client_init(void);
463		extern void dead_link_on_write(struct Client *, int);
#	Line 465 | Line 465 | extern void dead_link_on_read(struct Cli
465		extern void exit_aborted_clients(void);
466		extern void free_exited_clients(void);
467		extern struct Client *make_client(struct Client *);
468	<	extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
468	>	extern struct Client *find_chasing(struct Client *, const char *);
469		extern struct Client *find_person(const struct Client *const, const char *);
470		extern const char *get_client_name(const struct Client *, enum addr_mask_type);
471

Diff Legend

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