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

Comparing:
ircd-hybrid/include/client.h (property svn:keywords), Revision 30 by adx, Sun Oct 2 20:03:27 2005 UTC vs.
ircd-hybrid/trunk/include/client.h (property svn:keywords), Revision 4967 by michael, Mon Dec 1 14:34:29 2014 UTC

# Line 1 | Line 1
1 < "Id Revision"
1 > Id Revision

Diff Legend

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