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

Diff Legend

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