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

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

Diff Legend

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