ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/include/client.h
(Generate patch)

Comparing:
ircd-hybrid-7.3/include/client.h (file contents), Revision 1115 by michael, Tue Dec 21 14:42:54 2010 UTC vs.
ircd-hybrid/branches/8.2.x/include/client.h (file contents), Revision 7341 by michael, Sat Feb 20 18:55:29 2016 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  client.h: The ircd client header.
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-2016 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 16 | 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
21 *
22 *  $Id$
20   */
21  
22 + /*! \file client.h
23 + * \brief Header including structures, macros and prototypes for client handling
24 + * \version $Id$
25 + */
26 +
27 +
28   #ifndef INCLUDED_client_h
29   #define INCLUDED_client_h
30  
31   #include "list.h"
32   #include "fdlist.h"
30 #include "config.h"
33   #include "ircd_defs.h"
32 #include "ircd_handler.h"
34   #include "dbuf.h"
35   #include "channel.h"
36 < #include "irc_res.h"
36 > #include "auth.h"
37  
37 #define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
38 #define PASSWDLEN       20
39 #define CIPHERKEYLEN    64 /* 512bit */
40 #define IDLEN           12 /* this is the maximum length, not the actual
41                              generated length; DO NOT CHANGE! */
38  
39   /*
40 < * pre declare structs
40 > * status macros.
41   */
42 < struct AccessItem;
43 < struct Whowas;
44 < struct Listener;
45 < struct Client;
46 < struct LocalUser;
42 > enum
43 > {
44 >  STAT_CONNECTING = 0x00000001U,
45 >  STAT_HANDSHAKE  = 0x00000002U,
46 >  STAT_ME         = 0x00000004U,
47 >  STAT_UNKNOWN    = 0x00000008U,
48 >  STAT_SERVER     = 0x00000010U,
49 >  STAT_CLIENT     = 0x00000020U
50 > };
51 >
52 > enum
53 > {
54 >  REG_NEED_USER = 0x00000001U,  /**< User must send USER command */
55 >  REG_NEED_NICK = 0x00000002U,  /**< User must send NICK command */
56 >  REG_NEED_CAP  = 0x00000004U,  /**< In middle of CAP negotiations */
57 >  REG_INIT      = REG_NEED_USER | REG_NEED_NICK
58 > };
59  
60 + #define ID_or_name(x,client_p)  ((IsServer(client_p->from) && (x)->id[0]) ? (x)->id : (x)->name)
61  
62 < struct Server
62 > #define IsConnecting(x)         ((x)->status == STAT_CONNECTING)
63 > #define IsHandshake(x)          ((x)->status == STAT_HANDSHAKE)
64 > #define IsMe(x)                 ((x)->status == STAT_ME)
65 > #define IsUnknown(x)            ((x)->status == STAT_UNKNOWN)
66 > #define IsServer(x)             ((x)->status == STAT_SERVER)
67 > #define IsClient(x)             ((x)->status == STAT_CLIENT)
68 >
69 > #define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
70 >                                 (x)->handler = UNREGISTERED_HANDLER; }
71 >
72 > #define SetHandshake(x)         {(x)->status = STAT_HANDSHAKE; \
73 >                                 (x)->handler = UNREGISTERED_HANDLER; }
74 >
75 > #define SetMe(x)                {(x)->status = STAT_ME; \
76 >                                 (x)->handler = UNREGISTERED_HANDLER; }
77 >
78 > #define SetUnknown(x)           {(x)->status = STAT_UNKNOWN; \
79 >                                 (x)->handler = UNREGISTERED_HANDLER; }
80 >
81 > #define SetServer(x)            {(x)->status = STAT_SERVER; \
82 >                                 (x)->handler = SERVER_HANDLER; }
83 >
84 > #define SetClient(x)            {(x)->status = STAT_CLIENT; \
85 >                                 (x)->handler = CLIENT_HANDLER; }
86 >
87 > #define MyConnect(x)            ((x)->connection != NULL)
88 > #define MyClient(x)             (MyConnect(x) && IsClient(x))
89 >
90 > /*
91 > * ts stuff
92 > */
93 > enum
94   {
95 <  struct ConfItem *sconf; /* ConfItem connect{} pointer for this server */
96 <  dlink_list server_list; /* Servers on this server            */
57 <  dlink_list client_list; /* Clients on this server            */
58 <  char by[NICKLEN];       /* who activated this connection     */
95 >  TS_CURRENT = 6,  /**< Current TS protocol version */
96 >  TS_MIN     = 6   /**< Minimum supported TS protocol version */
97   };
98  
99 < struct SlinkRpl
99 > enum
100   {
101 <  int command;
102 <  int datalen;
103 <  int gotdatalen;
104 <  int readdata;
105 <  unsigned char *data;
101 >  CAP_MULTI_PREFIX   = 0x00000001U,  /**< ircv3.1 multi-prefix client capability */
102 >  CAP_AWAY_NOTIFY    = 0x00000002U,  /**< ircv3.1 away-notify client capability */
103 >  CAP_UHNAMES        = 0x00000004U,  /**< ircv3.2 userhost-in-names client capability */
104 >  CAP_EXTENDED_JOIN  = 0x00000008U,  /**< ircv3.1 extended-join client capability */
105 >  CAP_ACCOUNT_NOTIFY = 0x00000010U,  /**< ircv3.1 account-notify client capability */
106 >  CAP_INVITE_NOTIFY  = 0x00000020U,  /**< ircv3.2 invite-notify client capability */
107 >  CAP_CHGHOST        = 0x00000040U   /**< ircv3.2 chghost client capability */
108   };
109  
110 < struct ZipStats
110 > #define HasCap(x, y) ((x)->connection->cap_active & (y))
111 >
112 >
113 > /* housekeeping flags */
114 > enum
115   {
116 <  uint64_t in;
117 <  uint64_t in_wire;
118 <  uint64_t out;
119 <  uint64_t out_wire;
120 <  double in_ratio;
121 <  double out_ratio;
116 >  FLAGS_PINGSENT      = 0x00000001U,  /**< Unreplied ping sent */
117 >  FLAGS_DEADSOCKET    = 0x00000002U,  /**< Local socket is dead--Exiting soon */
118 >  FLAGS_KILLED        = 0x00000004U,  /**< Prevents "QUIT" from being sent for this */
119 >  FLAGS_CLOSING       = 0x00000008U,  /**< Set when closing to suppress errors */
120 >  FLAGS_GOTID         = 0x00000010U,  /**< Successful ident lookup achieved */
121 >  FLAGS_SENDQEX       = 0x00000020U,  /**< Sendq exceeded */
122 >  FLAGS_IPHASH        = 0x00000040U,  /**< Iphashed this client */
123 >  FLAGS_MARK          = 0x00000080U,  /**< Marked client */
124 >  FLAGS_CANFLOOD      = 0x00000100U,  /**< Client has the ability to flood */
125 >  FLAGS_EXEMPTKLINE   = 0x00000200U,  /**< Client is exempt from k-lines */
126 >  FLAGS_NOLIMIT       = 0x00000400U,  /**< Client is exempt from limits */
127 >  FLAGS_PING_COOKIE   = 0x00000800U,  /**< PING Cookie */
128 >  FLAGS_FLOODDONE     = 0x00001000U,  /**< Flood grace period has been ended. */
129 >  FLAGS_EOB           = 0x00002000U,  /**< Server has sent us an EOB */
130 >  FLAGS_HIDDEN        = 0x00004000U,  /**< A hidden server. Not shown in /links */
131 >  FLAGS_BLOCKED       = 0x00008000U,  /**< Must wait for COMM_SELECT_WRITE */
132 >  FLAGS_USERHOST      = 0x00010000U,  /**< Client is in userhost hash */
133 >  FLAGS_BURSTED       = 0x00020000U,  /**< User was already bursted */
134 >  FLAGS_EXEMPTRESV    = 0x00040000U,  /**< Client is exempt from RESV */
135 >  FLAGS_GOTUSER       = 0x00080000U,  /**< If we received a USER command */
136 >  FLAGS_FINISHED_AUTH = 0x00100000U,  /**< Client has been released from auth */
137 >  FLAGS_FLOOD_NOTICED = 0x00200000U,  /**< Notice to opers about this flooder has been sent */
138 >  FLAGS_SERVICE       = 0x00400000U,  /**< Client/server is a network service */
139 >  FLAGS_SSL           = 0x00800000U,  /**< User is connected via TLS/SSL */
140 >  FLAGS_SQUIT         = 0x01000000U,
141 >  FLAGS_EXEMPTXLINE   = 0x02000000U   /**< Client is exempt from x-lines */
142   };
143  
144 < struct ListTask
144 > #define HasFlag(x, y) ((x)->flags &   (y))
145 > #define AddFlag(x, y) ((x)->flags |=  (y))
146 > #define DelFlag(x, y) ((x)->flags &= ~(y))
147 >
148 >
149 > /* umodes, settable flags */
150 > enum
151   {
152 <  unsigned int hash_index; /* the bucket we are currently in */
153 <  dlink_list show_mask; /* show these channels..          */
154 <  dlink_list hide_mask; /* ..and hide these ones          */
155 <  unsigned int users_min, users_max;
156 <  unsigned int created_min, created_max;
157 <  unsigned int topicts_min, topicts_max;
152 >  UMODE_SERVNOTICE   = 0x00000001U,  /**< Server notices such as kill */
153 >  UMODE_CCONN        = 0x00000002U,  /**< Can see client connection notices */
154 >  UMODE_REJ          = 0x00000004U,  /**< Bot Rejections */
155 >  UMODE_SKILL        = 0x00000008U,  /**< Server Killed */
156 >  UMODE_FULL         = 0x00000010U,  /**< Full messages */
157 >  UMODE_SPY          = 0x00000020U,  /**< See STATS / LINKS */
158 >  UMODE_DEBUG        = 0x00000040U,  /**< 'debugging' info */
159 >  UMODE_NCHANGE      = 0x00000080U,  /**< Nick change notice */
160 >  UMODE_WALLOP       = 0x00000100U,  /**< Send wallops to them */
161 >  UMODE_INVISIBLE    = 0x00000200U,  /**< Makes user invisible */
162 >  UMODE_BOTS         = 0x00000400U,  /**< Shows bots */
163 >  UMODE_EXTERNAL     = 0x00000800U,  /**< Show servers introduced and splitting */
164 >  UMODE_CALLERID     = 0x00001000U,  /**< Block unless caller id's */
165 >  UMODE_SOFTCALLERID = 0x00002000U,  /**< Block unless on common channel */
166 >  UMODE_UNAUTH       = 0x00004000U,  /**< Show unauth connects here */
167 >  UMODE_LOCOPS       = 0x00008000U,  /**< Can see LOCOPS messages */
168 >  UMODE_DEAF         = 0x00010000U,  /**< Don't receive channel messages */
169 >  UMODE_REGISTERED   = 0x00020000U,  /**< User has identified for that nick. */
170 >  UMODE_REGONLY      = 0x00040000U,  /**< Only registered nicks may PM */
171 >  UMODE_HIDDEN       = 0x00080000U,  /**< IRC operator status is hidden */
172 >  UMODE_OPER         = 0x00100000U,  /**< IRC operator */
173 >  UMODE_ADMIN        = 0x00200000U,  /**< Admin on server */
174 >  UMODE_FARCONNECT   = 0x00400000U,  /**< Can see remote client connects/exits */
175 >  UMODE_HIDDENHOST   = 0x00800000U,  /**< User's host is hidden */
176 >  UMODE_SSL          = 0x01000000U,  /**< User is connected via TLS/SSL */
177 >  UMODE_WEBIRC       = 0x02000000U,  /**< User connected via a webirc gateway */
178 >  UMODE_HIDEIDLE     = 0x04000000U,  /**< Hides idle and signon time in WHOIS */
179 >  UMODE_HIDECHANS    = 0x08000000U   /**< Hides channel list in WHOIS */
180   };
181  
182 < struct Client
182 > #define HasUMode(x, y) ((x)->umodes &   (y))
183 > #define AddUMode(x, y) ((x)->umodes |=  (y))
184 > #define DelUMode(x, y) ((x)->umodes &= ~(y))
185 >
186 >
187 > /** irc-operator privilege flags */
188 > enum
189   {
190 <  dlink_node node;
191 <  dlink_node lnode;             /* Used for Server->servers/users */
190 >  OPER_FLAG_ADMIN          = 0x00000001U,  /**< Oper can set user mode +a */
191 >  OPER_FLAG_CLOSE          = 0x00000002U,  /**< Oper can use CLOSE command */
192 >  OPER_FLAG_CONNECT        = 0x00000004U,  /**< Oper can do local CONNECT */
193 >  OPER_FLAG_CONNECT_REMOTE = 0x00000008U,  /**< Oper can do remote CONNECT */
194 >  OPER_FLAG_DIE            = 0x00000010U,  /**< Oper can use DIE command */
195 >  OPER_FLAG_DLINE          = 0x00000020U,  /**< Oper can use DLINE command */
196 >  OPER_FLAG_GLOBOPS        = 0x00000040U,  /**< Oper can use GLOBOPS command */
197 >  OPER_FLAG_JOIN_RESV      = 0x00000080U,  /**< Oper can use JOIN on resv {} channels */
198 >  OPER_FLAG_KILL           = 0x00000100U,  /**< Oper can KILL local users */
199 >  OPER_FLAG_KILL_REMOTE    = 0x00000200U,  /**< Oper can KILL remote users */
200 >  OPER_FLAG_KLINE          = 0x00000400U,  /**< Oper can use KLINE command */
201 >  OPER_FLAG_LOCOPS         = 0x00000800U,  /**< Oper can use LOCOPS command */
202 >  OPER_FLAG_MODULE         = 0x00001000U,  /**< Oper can use MODULE command */
203 >  OPER_FLAG_NICK_RESV      = 0x00002000U,  /**< Oper can use NICK on resv {} nicks */
204 >  OPER_FLAG_OPME           = 0x00004000U,  /**< Oper can use OPME command */
205 >  OPER_FLAG_REHASH         = 0x00008000U,  /**< Oper can use REHASH command */
206 >  OPER_FLAG_REHASH_REMOTE  = 0x00010000U,  /**< Oper can do remote REHASH command */
207 >  OPER_FLAG_REMOTEBAN      = 0x00020000U,  /**< Oper can set remote bans */
208 >  OPER_FLAG_RESTART        = 0x00040000U,  /**< Oper can use RESTART command */
209 >  OPER_FLAG_RESV           = 0x00080000U,  /**< Oper can use RESV command */
210 >  OPER_FLAG_SET            = 0x00100000U,  /**< Oper can use SET command */
211 >  OPER_FLAG_SQUIT          = 0x00200000U,  /**< Oper can do local SQUIT */
212 >  OPER_FLAG_SQUIT_REMOTE   = 0x00400000U,  /**< Oper can do remote SQUIT */
213 >  OPER_FLAG_UNDLINE        = 0x00800000U,  /**< Oper can use UNDLINE command */
214 >  OPER_FLAG_UNKLINE        = 0x01000000U,  /**< Oper can use UNKLINE command */
215 >  OPER_FLAG_UNRESV         = 0x02000000U,  /**< Oper can use UNRESV command */
216 >  OPER_FLAG_UNXLINE        = 0x04000000U,  /**< Oper can use UNXLINE command */
217 >  OPER_FLAG_WALLOPS        = 0x08000000U,  /**< Oper can use WALLOPS command */
218 >  OPER_FLAG_XLINE          = 0x10000000U   /**< Oper can use XLINE command */
219 > };
220  
221 <  struct LocalUser *localClient;
222 <  struct Client    *hnext;              /* For client hash table lookups by name */
223 <  struct Client    *idhnext;    /* For SID hash table lookups by sid */
224 <  struct Server    *serv;       /* ...defined, if this is a server */
99 <  struct Client    *servptr;    /* Points to server this Client is on */
100 <  struct Client    *from;       /* == self, if Local Client, *NEVER* NULL! */
101 <  struct Whowas    *whowas;     /* Pointers to whowas structs */
102 <  char             *away;
103 <
104 <  time_t            lasttime;   /* ...should be only LOCAL clients? --msa */
105 <  time_t            firsttime;  /* time client was created */
106 <  time_t            since;      /* last time we parsed something */
107 <  time_t            tsinfo;     /* TS on the nick, SVINFO on server */
108 <  uint64_t          flags;      /* client flags */
109 <
110 <  unsigned int      umodes;     /* opers, normal users subset */
111 <  unsigned int      hopcount;   /* number of servers to this 0 = local */
112 <  unsigned int      status;     /* Client type */
113 <  unsigned int      handler;    /* Handler index */
221 > #define HasOFlag(x, y) ((x)->connection->operflags &   (y))
222 > #define AddOFlag(x, y) ((x)->connection->operflags |=  (y))
223 > #define DelOFlag(x, y) ((x)->connection->operflags &= ~(y))
224 > #define ClrOFlag(x)    ((x)->connection->operflags = 0)
225  
115  dlink_list        channel;   /* chain of channel pointer blocks */
226  
117  /*
118   * client->name is the unique name for a client nick or host
119   */
120  char name[HOSTLEN + 1];
121  char id[IDLEN + 1];       /* client ID, unique ID per client */
227  
228 <  /*
229 <   * client->username is the username from ident or the USER message,
230 <   * If the client is idented the USER message is ignored, otherwise
231 <   * the username part of the USER message is put here prefixed with a
127 <   * tilde depending on the I:line, Once a client has registered, this
128 <   * field should be considered read-only.
129 <   */
130 <  char              username[USERLEN + 1]; /* client's username */
228 > /* flags macros. */
229 > #define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
230 > #define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
231 > #define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING|FLAGS_KILLED))
232  
233 <  /*
234 <   * client->host contains the resolved name or ip address
235 <   * as a string for the user, it may be fiddled with for oper spoofing etc.
135 <   * once it's changed the *real* address goes away. This should be
136 <   * considered a read-only field after the client has registered.
137 <   */
138 <  char              host[HOSTLEN + 1];     /* client's hostname */
233 > /* oper flags */
234 > #define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
235 >                                 if (MyClient((x))) (x)->handler = OPER_HANDLER;}
236  
237 <  /*
238 <   * client->info for unix clients will normally contain the info from the
239 <   * gcos field in /etc/passwd but anything can go here.
143 <   */
144 <  char              info[REALLEN + 1]; /* Free form additional client info */
237 > #define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
238 >                                 if (MyClient((x))) \
239 >                                  (x)->handler = CLIENT_HANDLER; }
240  
241 <  /*
242 <   * client->sockhost contains the ip address gotten from the socket as a
243 <   * string, this field should be considered read-only once the connection
244 <   * has been made. (set in s_bsd.c only)
245 <   */
246 <  char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
247 <                                                socket ip address as string */
241 > #define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
242 > #define IsHidden(x)             ((x)->flags &  FLAGS_HIDDEN)
243 >
244 >
245 > /*! \brief server ban types */
246 > enum
247 > {
248 >  CLIENT_BAN_KLINE,
249 >  CLIENT_BAN_DLINE,
250 >  CLIENT_BAN_XLINE
251   };
252  
253 < struct LocalUser
253 > /*! \brief addr_mask_type enumeration */
254 > enum addr_mask_type
255   {
256 <  /*
257 <   * The following fields are allocated only for local clients
258 <   * (directly connected to *this* server with a socket.
259 <   */
161 <  dlink_node   lclient_node;
256 >  HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
257 >  SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
258 >  MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
259 > };
260  
261 <  char         client_host[HOSTLEN + 1];
262 <  char         client_server[HOSTLEN + 1];
261 > struct ServicesTag
262 > {
263 >  dlink_node node;
264 >  char *tag;
265 >  unsigned int numeric;
266 >  unsigned int umodes;
267 > };
268  
269 <  unsigned int registration;
270 <  unsigned int cap_client;    /* Client capabilities (from us) */
271 <  unsigned int cap_active;    /* Active capabilities (to us) */
269 > /*! \brief Server structure */
270 > struct Server
271 > {
272 >  dlink_list server_list; /**< Servers on this server */
273 >  dlink_list client_list; /**< Clients on this server */
274 >  char by[NICKLEN + 1];   /**< Who activated this connection */
275 > };
276  
277 <  unsigned int operflags;     /* oper priv flags */
278 <  unsigned int random_ping;
277 > /*! \brief ListTask structure */
278 > struct ListTask
279 > {
280 >  dlink_node node;  /**< Embedded list node used to link into listing_client_list */
281 >  dlink_list show_mask; /**< Channels to show */
282 >  dlink_list hide_mask; /**< Channels to hide */
283 >
284 >  unsigned int hash_index; /**< The hash bucket we are currently in */
285 >  unsigned int users_min;
286 >  unsigned int users_max;
287 >  unsigned int created_min;
288 >  unsigned int created_max;
289 >  unsigned int topicts_min;
290 >  unsigned int topicts_max;
291 >  char topic[TOPICLEN + 1];
292 > };
293  
294 <  unsigned int serial;     /* used to enforce 1 send per nick */
294 > /*! \brief Connection structure
295 > *
296 > * Allocated only for local clients, that are directly connected
297 > * to \b this server with a socket.
298 > */
299 > struct Connection
300 > {
301 >  dlink_node   lclient_node;
302  
303 <  /* Anti flooding part, all because of lamers... */
304 <  time_t       last_knock;    /* time of last knock */
305 <  time_t       last_away; /* Away since... */
306 <  time_t       last_join_time;   /* when this client last
307 <                                    joined a channel */
308 <  time_t       last_leave_time;  /* when this client last
309 <                                       * left a channel */
310 <  int          join_leave_count; /* count of JOIN/LEAVE in less than
303 >  unsigned int registration;
304 >  unsigned int cap_client;  /**< Client capabilities (from us) */
305 >  unsigned int cap_active;  /**< Active capabilities (to us) */
306 >  unsigned int       caps;  /**< Capabilities bit-field */
307 >
308 >  unsigned int operflags;     /**< IRC Operator privilege flags */
309 >  unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
310 >
311 >  uintmax_t serial;     /**< Used to enforce 1 send per nick */
312 >
313 >  uintmax_t    lasttime;   /**< Last time data read from socket */
314 >  uintmax_t    firsttime;  /**< Time client was created */
315 >  uintmax_t    since;      /**< Last time we parsed something */
316 >  uintmax_t    last_join_time;   /**< When this client last joined a channel */
317 >  uintmax_t    last_leave_time;  /**< When this client last left a channel */
318 >  int          join_leave_count; /**< Count of JOIN/LEAVE in less than
319                                           MIN_JOIN_LEAVE_TIME seconds */
320 <  int          oper_warn_count_down; /* warn opers of this possible
320 >  int          oper_warn_count_down; /**< Warn opers of this possible
321                                            spambot every time this gets to 0 */
322 <  time_t       reject_delay;
323 <  time_t       last_caller_id_time;
324 <  time_t       first_received_message_time;
189 <  time_t       last_nick_change;
322 >  uintmax_t    last_caller_id_time;
323 >  uintmax_t    first_received_message_time;
324 >  uintmax_t    last_privmsg;  /**< Last time we got a PRIVMSG */
325  
326    int          received_number_of_privmsgs;
192  unsigned int number_of_nick_changes;
327  
328    struct ListTask  *list_task;
329 <  /* Send and receive dbufs .. */
329 >
330    struct dbuf_queue buf_sendq;
331    struct dbuf_queue buf_recvq;
332  
333 <  struct {
334 <    unsigned int messages;      /* Statistics: protocol messages sent/received */
335 <    uint64_t bytes;             /* Statistics: total bytes sent/received */
333 >  struct
334 >  {
335 >    unsigned int messages;      /**< Statistics: protocol messages sent/received */
336 >    uintmax_t bytes;             /**< Statistics: total bytes sent/received */
337    } recv, send;
338  
339 <  struct AuthRequest *auth;
340 <  struct Listener *listener;   /* listener accepted from */
341 <  dlink_list        acceptlist; /* clients I'll allow to talk to me */
342 <  dlink_list        watches;   /* chain of Watch pointer blocks */
343 <  dlink_list        confs;     /* Configuration record associated */
344 <  dlink_list        invited;   /* chain of invite pointer blocks */
339 >  struct
340 >  {
341 >    unsigned int count;  /**< How many AWAY/INVITE/KNOCK/NICK requests client has sent */
342 >    uintmax_t last_attempt;  /**< Last time the AWAY/INVITE/KNOCK/NICK request was issued */
343 >  } away, invite, knock, nick;
344 >
345 >  struct AuthRequest auth;
346 >  struct Listener *listener;   /**< Listener accepted from */
347 >  dlink_list        acceptlist; /**< Clients I'll allow to talk to me */
348 >  dlink_list        watches;   /**< Chain of Watch pointer blocks */
349 >  dlink_list        confs;     /**< Configuration record associated */
350 >  dlink_list        invited;   /**< Chain of invite pointer blocks */
351    struct irc_ssaddr ip;
352 <  int               aftype;     /* Makes life easier for DNS res in IPV6 */
353 <  time_t last; /* Last time we got a PRIVMSG */
213 <
214 <  char              *passwd;
215 <  unsigned int       caps;       /* capabilities bit-field */
216 <  unsigned int       enc_caps;   /* cipher capabilities bit-field */
217 <
218 < #ifdef HAVE_LIBCRYPTO
219 <  struct EncCapability *in_cipher;
220 <  struct EncCapability *out_cipher;
221 <
222 <  char              in_key[CIPHERKEYLEN];
223 <  char              out_key[CIPHERKEYLEN];
224 < #endif
352 >  int               aftype;    /**< Makes life easier for DNS res in IPV6 */
353 >  int               country_id; /**< ID corresponding to a ISO 3166 country code */
354  
355    fde_t             fd;
227  fde_t             ctrlfd;     /* For servers: control fd used for sending commands
228                                   to servlink */
229
230  struct SlinkRpl  slinkrpl;    /* slink reply being parsed */
231  char    *slinkq;              /* sendq for control data */
232  int              slinkq_ofs;  /* ofset into slinkq */
233  int              slinkq_len;  /* length remaining after slinkq_ofs */
234
235  struct ZipStats  zipstats;
356  
357    /* Anti-flood stuff. We track how many messages were parsed and how
358     * many we were allowed in the current second, and apply a simple
359     * decay to avoid flooding.
360     *   -- adrian
361     */
362 <  int allow_read;       /* how many we're allowed to read in this second */
363 <  int sent_parsed;      /* how many messages we've parsed in this second */
362 >  int allow_read;       /**< How many we're allowed to read in this second */
363 >  int sent_parsed;      /**< How many messages we've parsed in this second */
364  
365 <  char*          response;  /* expected response from client */
246 <  char*          auth_oper; /* Operator to become if they supply the response.*/
365 >  char *password;  /**< Password supplied by the client/server */
366   };
367  
368 < /*
369 < * status macros.
370 < */
371 < #define STAT_CONNECTING         0x01
372 < #define STAT_HANDSHAKE          0x02
254 < #define STAT_ME                 0x04
255 < #define STAT_UNKNOWN            0x08
256 < #define STAT_SERVER             0x10
257 < #define STAT_CLIENT             0x20
258 <
259 < #define REG_NEED_USER 0x1
260 < #define REG_NEED_NICK 0x2
261 < #define REG_NEED_CAP  0x4
262 < #define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
263 <
264 < #define HasID(x)                ((x)->id[0] != '\0')
265 < #define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
266 < #define ID_or_name(x,client_p)  ((IsCapable(client_p, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
267 <
268 < #define IsRegistered(x)         ((x)->status  > STAT_UNKNOWN)
269 < #define IsConnecting(x)         ((x)->status == STAT_CONNECTING)
270 < #define IsHandshake(x)          ((x)->status == STAT_HANDSHAKE)
271 < #define IsMe(x)                 ((x)->status == STAT_ME)
272 < #define IsUnknown(x)            ((x)->status == STAT_UNKNOWN)
273 < #define IsServer(x)             ((x)->status == STAT_SERVER)
274 < #define IsClient(x)             ((x)->status == STAT_CLIENT)
275 <
276 < #define IsOper(x)               ((x)->umodes & UMODE_OPER)
277 < #define IsAdmin(x)              ((x)->umodes & UMODE_ADMIN)
278 <
279 < #define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
280 <                                 (x)->handler = UNREGISTERED_HANDLER; }
281 <
282 < #define SetHandshake(x)         {(x)->status = STAT_HANDSHAKE; \
283 <                                 (x)->handler = UNREGISTERED_HANDLER; }
284 <
285 < #define SetMe(x)                {(x)->status = STAT_ME; \
286 <                                 (x)->handler = UNREGISTERED_HANDLER; }
287 <
288 < #define SetUnknown(x)           {(x)->status = STAT_UNKNOWN; \
289 <                                 (x)->handler = UNREGISTERED_HANDLER; }
290 <
291 < #define SetServer(x)            {(x)->status = STAT_SERVER; \
292 <                                 (x)->handler = SERVER_HANDLER; }
293 <
294 < #define SetClient(x)            {(x)->status = STAT_CLIENT; \
295 <                                 (x)->handler = IsOper((x)) ? \
296 <                                        OPER_HANDLER : CLIENT_HANDLER; }
297 <
298 < #define SetEob(x)               ((x)->flags |= FLAGS_EOB)
299 < #define HasSentEob(x)           ((x)->flags & FLAGS_EOB)
300 <
301 < /*
302 < * ts stuff
303 < */
304 < #define TS_CURRENT      6       /* current TS protocol version */
305 < #define TS_MIN          5       /* minimum supported TS protocol version */
306 < #define TS_DOESTS       0x20000000
307 < #define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
308 <
309 <
310 <
311 < #define CAP_MULTI_PREFIX  0x00000001
312 <
313 < /* housekeeping flags */
314 < #define FLAGS_PINGSENT      0x0000000000000001 /* Unreplied ping sent                      */
315 < #define FLAGS_DEADSOCKET    0x0000000000000002 /* Local socket is dead--Exiting soon       */
316 < #define FLAGS_KILLED        0x0000000000000004 /* Prevents "QUIT" from being sent for this */
317 < #define FLAGS_CLOSING       0x0000000000000008 /* set when closing to suppress errors      */
318 < #define FLAGS_GOTID         0x0000000000000010 /* successful ident lookup achieved         */
319 < #define FLAGS_NEEDID        0x0000000000000020 /* I-lines say must use ident return        */
320 < #define FLAGS_SENDQEX       0x0000000000000040 /* Sendq exceeded                           */
321 < #define FLAGS_IPHASH        0x0000000000000080 /* iphashed this client                     */
322 < #define FLAGS_CRYPTIN       0x0000000000000100 /* incoming data must be decrypted          */
323 < #define FLAGS_CRYPTOUT      0x0000000000000200 /* outgoing data must be encrypted          */
324 < #define FLAGS_WAITAUTH      0x0000000000000400 /* waiting for CRYPTLINK AUTH command       */
325 < #define FLAGS_SERVLINK      0x0000000000000800 /* servlink has servlink process            */
326 < #define FLAGS_MARK          0x0000000000001000 /* marked client                            */
327 < #define FLAGS_CANFLOOD      0x0000000000002000 /* client has the ability to flood          */
328 < #define FLAGS_EXEMPTGLINE   0x0000000000004000 /* client can't be G-lined                  */
329 < #define FLAGS_EXEMPTKLINE   0x0000000000008000 /* client is exempt from kline              */
330 < #define FLAGS_NOLIMIT       0x0000000000010000 /* client is exempt from limits             */
331 < #define FLAGS_RESTRICTED    0x0000000000020000 /* client cannot op others                  */
332 < #define FLAGS_PING_COOKIE   0x0000000000040000 /* PING Cookie                              */
333 < #define FLAGS_IDLE_LINED    0x0000000000080000 /* client is exempt from idle-time limits   */
334 < #define FLAGS_IP_SPOOFING   0x0000000000100000 /* client IP is spoofed                     */
335 < #define FLAGS_FLOODDONE     0x0000000000200000 /* Flood grace period has been ended.       */
336 < #define FLAGS_EOB           0x0000000000400000 /* server has received EOB                  */
337 < #define FLAGS_HIDDEN        0x0000000000800000 /* a hidden server. not shown in /links     */
338 < #define FLAGS_BLOCKED       0x0000000001000000 /* must wait for COMM_SELECT_WRITE          */
339 < #define FLAGS_SBLOCKED      0x0000000002000000 /* slinkq is blocked                        */
340 < #define FLAGS_USERHOST      0x0000000004000000 /* client is in userhost hash               */
341 < #define FLAGS_BURSTED       0x0000000008000000 /* user was already bursted                 */
342 < #define FLAGS_EXEMPTRESV    0x0000000010000000 /* client is exempt from RESV               */
343 < #define FLAGS_GOTUSER       0x0000000020000000 /* if we received a USER command            */
344 < #define FLAGS_PINGWARNING   0x0000000040000000 /* unreplied ping warning already sent      */
345 < #define FLAGS_FINISHED_AUTH 0x0000000080000000 /* Client has been released from auth       */
346 < #define FLAGS_FLOOD_NOTICED 0x0000000100000000
347 <
348 <
349 < /* umodes, settable flags */
350 < #define UMODE_SERVNOTICE   0x00000001 /* server notices such as kill */
351 < #define UMODE_CCONN        0x00000002 /* Client Connections */
352 < #define UMODE_REJ          0x00000004 /* Bot Rejections */
353 < #define UMODE_SKILL        0x00000008 /* Server Killed */
354 < #define UMODE_FULL         0x00000010 /* Full messages */
355 < #define UMODE_SPY          0x00000020 /* see STATS / LINKS */
356 < #define UMODE_DEBUG        0x00000040 /* 'debugging' info */
357 < #define UMODE_NCHANGE      0x00000080 /* Nick change notice */
358 < #define UMODE_WALLOP       0x00000100 /* send wallops to them */
359 < #define UMODE_OPERWALL     0x00000200 /* Operwalls */
360 < #define UMODE_INVISIBLE    0x00000400 /* makes user invisible */
361 < #define UMODE_BOTS         0x00000800 /* shows bots */
362 < #define UMODE_EXTERNAL     0x00001000 /* show servers introduced and splitting */
363 < #define UMODE_CALLERID     0x00002000 /* block unless caller id's */
364 < #define UMODE_SOFTCALLERID 0x00004000 /* block unless on common channel */
365 < #define UMODE_UNAUTH       0x00008000 /* show unauth connects here */
366 < #define UMODE_LOCOPS       0x00010000 /* show locops */
367 < #define UMODE_DEAF         0x00020000 /* don't receive channel messages */
368 < #define UMODE_CCONN_FULL   0x00040000 /* add unused fields to connection monitoring */
369 <
370 < /* user information flags, only settable by remote mode or local oper */
371 < #define UMODE_OPER         0x40000000 /* Operator */
372 < #define UMODE_ADMIN        0x80000000 /* Admin on server */
373 <
374 < #define UMODE_ALL          UMODE_SERVNOTICE
375 <
376 < #define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
377 <                      UMODE_ADMIN)
378 <
379 <
380 < /* oper priv flags */
381 < #define OPER_FLAG_GLOBAL_KILL  0x00000001 /* oper can global kill        */
382 < #define OPER_FLAG_REMOTE       0x00000002 /* oper can do squits/connects */
383 < #define OPER_FLAG_UNKLINE      0x00000004 /* oper can use unkline        */
384 < #define OPER_FLAG_GLINE        0x00000008 /* oper can use gline          */
385 < #define OPER_FLAG_N            0x00000010 /* oper can umode n            */
386 < #define OPER_FLAG_K            0x00000020 /* oper can kill/kline         */
387 < #define OPER_FLAG_X            0x00000040 /* oper can xline              */
388 < #define OPER_FLAG_DIE          0x00000080 /* oper can die                */
389 < #define OPER_FLAG_REHASH       0x00000100 /* oper can rehash             */
390 < #define OPER_FLAG_ADMIN        0x00000200 /* oper can set umode +a       */
391 < #define OPER_FLAG_HIDDEN_ADMIN 0x00000400 /* admin is hidden             */
392 < #define OPER_FLAG_OPERWALL     0x00000800 /* */
393 < #define OPER_FLAG_OPER_SPY     0x00001000 /* */
394 < #define OPER_FLAG_REMOTEBAN    0x00002000 /* */
395 < #define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
396 <
397 < #define SetOFlag(x, y) ((x)->localClient->operflags |= (y))
398 <
399 <
400 < /* flags macros. */
401 < #define IsMsgFloodNoticed(x)       ((x)->flags & FLAGS_FLOOD_NOTICED)
402 < #define SetMsgFloodNoticed(x)      ((x)->flags |= FLAGS_FLOOD_NOTICED)
403 < #define ClearMsgFloodNoticed(x)    ((x)->flags &= ~FLAGS_FLOOD_NOTICED)
404 < #define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
405 < #define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
406 < #define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
407 < #define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
408 < #define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
409 < #define IsKilled(x)             ((x)->flags & FLAGS_KILLED)
410 < #define SetKilled(x)            ((x)->flags |= FLAGS_KILLED)
411 < #define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
412 < #define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
413 < #define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
414 < #define SetCryptOut(x)          ((x)->flags |= FLAGS_CRYPTOUT)
415 < #define IsWaitAuth(x)           ((x)->flags &  FLAGS_WAITAUTH)
416 < #define SetWaitAuth(x)          ((x)->flags |= FLAGS_WAITAUTH)
417 < #define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
418 < #define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
419 < #define SetServlink(x)          ((x)->flags |= FLAGS_SERVLINK)
420 < #define MyConnect(x)            ((x)->localClient != NULL)
421 < #define MyClient(x)             (MyConnect(x) && IsClient(x))
422 < #define SetMark(x)              ((x)->flags |= FLAGS_MARK)
423 < #define ClearMark(x)            ((x)->flags &= ~FLAGS_MARK)
424 < #define IsMarked(x)             ((x)->flags & FLAGS_MARK)
425 < #define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
426 < #define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
427 < #define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
428 <                                               FLAGS_KILLED))
429 <
430 < /* oper flags */
431 < #define MyOper(x)               (MyConnect(x) && IsOper(x))
432 <
433 < #define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
434 <                                 if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
368 > /*! \brief Client structure */
369 > struct Client
370 > {
371 >  dlink_node node;
372 >  dlink_node lnode;             /**< Used for Server->servers/users */
373  
374 < #define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
375 <                                 if (!IsOper((x)) && !IsServer((x))) \
376 <                                  (x)->handler = CLIENT_HANDLER; }
374 >  struct Connection *connection;  /**< Connection structure associated with this client */
375 >  struct Client    *hnext;      /**< For client hash table lookups by name */
376 >  struct Client    *idhnext;    /**< For SID hash table lookups by sid */
377 >  struct Server    *serv;       /**< ...defined, if this is a server */
378 >  struct Client    *servptr;    /**< Points to server this Client is on */
379 >  struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
380 >
381 >  uintmax_t         tsinfo;     /**< TS on the nick, SVINFO on server */
382 >
383 >  unsigned int      flags;      /**< Client flags */
384 >  unsigned int      umodes;     /**< User modes this client has set */
385 >  unsigned int      hopcount;   /**< Number of servers to this 0 = local */
386 >  unsigned int      status;     /**< Client type */
387 >  unsigned int      handler;    /**< Handler index */
388 >
389 >  dlink_list        whowas;
390 >  dlink_list        channel;   /**< Chain of channel pointer blocks */
391 >  dlink_list        svstags;   /**< List of ServicesTag items */
392 >
393 >  char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
394 >  char name[HOSTLEN + 1]; /**< Unique name for a client nick or host */
395 >  char id[IDLEN + 1];       /**< Client ID, unique ID per client */
396 >  char account[ACCOUNTLEN + 1]; /**< Services account */
397  
398 < #define IsPrivileged(x)         (IsOper(x) || IsServer(x))
398 >  /*
399 >   * client->username is the username from ident or the USER message,
400 >   * If the client is idented the USER message is ignored, otherwise
401 >   * the username part of the USER message is put here prefixed with a
402 >   * tilde depending on the auth{} block. Once a client has registered,
403 >   * this field should be considered read-only.
404 >   */
405 >  char              username[USERLEN + 1]; /* client's username */
406  
407 < /* umode flags */
408 < #define IsInvisible(x)          ((x)->umodes & UMODE_INVISIBLE)
409 < #define SendWallops(x)          ((x)->umodes & UMODE_WALLOP)
410 < #define IsSetCallerId(x)        ((x)->umodes & \
411 <                                 (UMODE_CALLERID|UMODE_SOFTCALLERID))
412 < #define IsSoftCallerId(x)       ((x)->umodes & UMODE_SOFTCALLERID)
413 < #define IsDeaf(x)               ((x)->umodes & UMODE_DEAF)
449 < #define IsFull(x)               ((x)->umodes & UMODE_CCONN_FULL)
450 <
451 < #define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
452 < #define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
453 <
454 < #define SetIpHash(x)            ((x)->flags |= FLAGS_IPHASH)
455 < #define ClearIpHash(x)          ((x)->flags &= ~FLAGS_IPHASH)
456 < #define IsIpHash(x)             ((x)->flags & FLAGS_IPHASH)
457 <
458 < #define SetUserHost(x)          ((x)->flags |= FLAGS_USERHOST)
459 < #define ClearUserHost(x)        ((x)->flags &= ~FLAGS_USERHOST)
460 < #define IsUserHostIp(x)         ((x)->flags & FLAGS_USERHOST)
461 <
462 < #define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
463 < #define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
464 < #define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
465 <
466 < #define SetPingWarning(x)       ((x)->flags |= FLAGS_PINGWARNING)
467 < #define IsPingWarning(x)        ((x)->flags & FLAGS_PINGWARNING)
468 < #define ClearPingWarning(x)     ((x)->flags &= ~FLAGS_PINGWARNING)
469 <
470 < #define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
471 < #define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
472 <
473 < #define SetGotId(x)             ((x)->flags |= FLAGS_GOTID)
474 < #define IsGotId(x)              ((x)->flags & FLAGS_GOTID)
475 <
476 < #define IsExemptKline(x)        ((x)->flags & FLAGS_EXEMPTKLINE)
477 < #define SetExemptKline(x)       ((x)->flags |= FLAGS_EXEMPTKLINE)
478 < #define IsExemptLimits(x)       ((x)->flags & FLAGS_NOLIMIT)
479 < #define SetExemptLimits(x)      ((x)->flags |= FLAGS_NOLIMIT)
480 < #define IsExemptGline(x)        ((x)->flags & FLAGS_EXEMPTGLINE)
481 < #define SetExemptGline(x)       ((x)->flags |= FLAGS_EXEMPTGLINE)
482 < #define IsExemptResv(x)         ((x)->flags & FLAGS_EXEMPTRESV)
483 < #define SetExemptResv(x)        ((x)->flags |= FLAGS_EXEMPTRESV)
484 < #define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
485 < #define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
486 <
487 < #define IsIdlelined(x)          ((x)->flags &  FLAGS_IDLE_LINED)
488 < #define SetIdlelined(x)         ((x)->flags |= FLAGS_IDLE_LINED)
489 < #define IsRestricted(x)         ((x)->flags &  FLAGS_RESTRICTED)
490 < #define SetRestricted(x)        ((x)->flags |= FLAGS_RESTRICTED)
407 >  /*
408 >   * client->host contains the resolved name or ip address
409 >   * as a string for the user, it may be fiddled with for oper spoofing etc.
410 >   * once it's changed the *real* address goes away. This should be
411 >   * considered a read-only field after the client has registered.
412 >   */
413 >  char              host[HOSTLEN + 1];     /* client's hostname */
414  
415 < #define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
416 < #define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
417 < #define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
418 < #define SetPingCookie(x)        ((x)->flags |= FLAGS_PING_COOKIE)
419 < #define IsHidden(x)             ((x)->flags &  FLAGS_HIDDEN)
497 < #define SetHidden(x)            ((x)->flags |= FLAGS_HIDDEN)
415 >  /*
416 >   * client->info for unix clients will normally contain the info from the
417 >   * gcos field in /etc/passwd but anything can go here.
418 >   */
419 >  char              info[REALLEN + 1]; /* Free form additional client info */
420  
421 < #define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
422 < #define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
423 < #define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
424 < #define IsSlinkqBlocked(x)      ((x)->flags &  FLAGS_SBLOCKED)
425 < #define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
426 < #define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
427 <
428 < #define IsBursted(x)            ((x)->flags &  FLAGS_BURSTED)
429 < #define SetBursted(x)           ((x)->flags |= FLAGS_BURSTED)
508 < #define ClearBursted(x)         ((x)->flags &= ~FLAGS_BURSTED)
509 <
510 < #define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
511 < #define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
512 < #define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
513 <
514 < /* operflags macros */
515 < #define ClearOperFlags(x)       ((x)->localClient->operflags = 0)
516 < #define IsOperGlobalKill(x)     (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLOBAL_KILL : 0)
517 < #define IsOperRemote(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTE : 0)
518 < #define IsOperUnkline(x)        (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_UNKLINE : 0)
519 < #define IsOperGline(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLINE : 0)
520 < #define IsOperN(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_N : 0)
521 < #define IsOperK(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_K : 0)
522 < #define IsOperDie(x)            (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_DIE : 0)
523 < #define IsOperRehash(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REHASH : 0)
524 < #define IsOperAdmin(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_ADMIN : 0)
525 < #define IsOperHiddenAdmin(x)    (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_ADMIN : 0)
526 < #define IsOperX(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_X : 0)
527 < #define IsOperWall(x)           (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_OPERWALL : 0)
528 < #define IsOperRemoteBan(x)      (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTEBAN : 0)
529 < #define IsOperHidden(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_OPER : 0)
421 >  /*
422 >   * client->sockhost contains the ip address gotten from the socket as a
423 >   * string, this field should be considered read-only once the connection
424 >   * has been made. (set in s_bsd.c only)
425 >   */
426 >  char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
427 >                                                socket ip address as string */
428 >  char             *certfp;  /**< SSL certificate fingerprint */
429 > };
430  
531 /*
532 * definitions for get_client_name
533 * TBD - make this an enum
534 */
535 #define HIDE_IP 0
536 #define SHOW_IP 1
537 #define MASK_IP 2
431  
432   extern struct Client me;
433   extern dlink_list listing_client_list;
434   extern dlink_list global_client_list;
435 + extern dlink_list global_server_list;   /* global servers on the network              */
436 + extern dlink_list local_client_list;  /* local clients only ON this server          */
437 + extern dlink_list local_server_list;  /* local servers to this server ONLY          */
438 + extern dlink_list unknown_list;       /* unknown clients ON this server only        */
439 + extern dlink_list oper_list;          /* our opers, duplicated in local_client_list */
440  
441   extern int accept_message(struct Client *, struct Client *);
442 + extern unsigned int client_get_idle_time(const struct Client *, const struct Client *);
443   extern struct split_nuh_item *find_accept(const char *, const char *,
444 <                                          const char *, struct Client *, int);
444 >                                          const char *, struct Client *,
445 >                                          int (*)(const char *, const char *));
446 > extern void client_attach_svstag(struct Client *, unsigned int, const char *, const char *);
447 > extern void client_clear_svstags(struct Client *);
448   extern void del_accept(struct split_nuh_item *, struct Client *);
449   extern void del_all_accepts(struct Client *);
450 < extern void exit_client(struct Client *, struct Client *, const char *);
450 > extern void exit_client(struct Client *, const char *);
451 > extern void conf_try_ban(struct Client *, int, const char *);
452   extern void check_conf_klines(void);
453 < extern void init_client(void);
551 < extern void change_local_nick(struct Client *, struct Client *, const char *);
453 > extern void client_init(void);
454   extern void dead_link_on_write(struct Client *, int);
455   extern void dead_link_on_read(struct Client *, int);
456   extern void exit_aborted_clients(void);
457   extern void free_exited_clients(void);
458   extern struct Client *make_client(struct Client *);
459 < extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
459 > extern struct Client *find_chasing(struct Client *, const char *);
460   extern struct Client *find_person(const struct Client *const, const char *);
461 < extern const char *get_client_name(struct Client *, int);
461 > extern const char *get_client_name(const struct Client *, enum addr_mask_type);
462  
463   #endif /* INCLUDED_client_h */

Diff Legend

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