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 1015 by michael, Sun Oct 25 00:08:06 2009 UTC vs.
ircd-hybrid-8/include/client.h (file contents), Revision 1243 by michael, Fri Sep 30 10:47:53 2011 UTC

# Line 1 | Line 1
1   /*
2   *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 – *  client.h: The ircd client header.
3   *
4   *  Copyright (C) 2002 by the past and present ircd coders, and others.
5   *
# Line 18 | Line 17
17   *  along with this program; if not, write to the Free Software
18   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19   *  USA
21 – *
22 – *  $Id$
20   */
21  
22 + /*! \file client.h
23 + * \brief Header including structures, macros and prototypes for client handling
24 + * \version $Id$
25 + */
26 +
27 +
28   #ifndef INCLUDED_client_h
29   #define INCLUDED_client_h
30  
# Line 29 | Line 32
32   #include "fdlist.h"
33   #include "config.h"
34   #include "ircd_defs.h"
32 – #include "ircd_handler.h"
35   #include "dbuf.h"
36   #include "channel.h"
37   #include "irc_res.h"
38  
39 < #define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
39 > #define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
40   #define PASSWDLEN       20
41   #define CIPHERKEYLEN    64 /* 512bit */
42   #define IDLEN           12 /* this is the maximum length, not the actual
# Line 50 | Line 52 | struct Client;
52   struct LocalUser;
53  
54  
55 + /*! \brief Server structure */
56   struct Server
57   {
58 <  struct ConfItem *sconf; /* ConfItem connect{} pointer for this server */
59 <  dlink_list server_list; /* Servers on this server            */
60 <  dlink_list client_list; /* Clients on this server            */
61 <  char by[NICKLEN];       /* who activated this connection     */
58 >  struct ConfItem *sconf; /**< ConfItem connect{} pointer for this server */
59 >  dlink_list server_list; /**< Servers on this server */
60 >  dlink_list client_list; /**< Clients on this server */
61 >  char by[NICKLEN];       /**< who activated this connection */
62   };
63  
64 + /*! \brief SlinkRpl structure */
65   struct SlinkRpl
66   {
67    int command;
# Line 67 | Line 71 | struct SlinkRpl
71    unsigned char *data;
72   };
73  
74 + /*! \brief ZipStats structure */
75   struct ZipStats
76   {
77    uint64_t in;
# Line 77 | Line 82 | struct ZipStats
82    double out_ratio;
83   };
84  
85 + /*! \brief ListTask structure */
86   struct ListTask
87   {
88 <  unsigned int hash_index; /* the bucket we are currently in */
89 <  dlink_list show_mask; /* show these channels..          */
90 <  dlink_list hide_mask; /* ..and hide these ones          */
91 <  unsigned int users_min, users_max;
92 <  unsigned int created_min, created_max;
93 <  unsigned int topicts_min, topicts_max;
88 >  dlink_list show_mask; /**< show these channels.. */
89 >  dlink_list hide_mask; /**< ..and hide these ones */
90 >
91 >  unsigned int hash_index; /**< the bucket we are currently in */
92 >  unsigned int users_min;
93 >  unsigned int users_max;
94 >  unsigned int created_min;
95 >  unsigned int created_max;
96 >  unsigned int topicts_min;
97 >  unsigned int topicts_max;
98   };
99  
100 + /*! \brief Client structure */
101   struct Client
102   {
103    dlink_node node;
104 <  dlink_node lnode;             /* Used for Server->servers/users */
104 >  dlink_node lnode;             /**< Used for Server->servers/users */
105  
106    struct LocalUser *localClient;
107 <  struct Client    *hnext;              /* For client hash table lookups by name */
108 <  struct Client    *idhnext;    /* For SID hash table lookups by sid */
109 <  struct Server    *serv;       /* ...defined, if this is a server */
110 <  struct Client    *servptr;    /* Points to server this Client is on */
111 <  struct Client    *from;       /* == self, if Local Client, *NEVER* NULL! */
112 <  struct Whowas    *whowas;     /* Pointers to whowas structs */
113 <  char             *away;
114 <
115 <  time_t            lasttime;   /* ...should be only LOCAL clients? --msa */
116 <  time_t            firsttime;  /* time client was created */
117 <  time_t            since;      /* last time we parsed something */
118 <  time_t            tsinfo;     /* TS on the nick, SVINFO on server */
119 <  uint64_t          flags;      /* client flags */
120 <
121 <  unsigned int      umodes;     /* opers, normal users subset */
122 <  unsigned int      hopcount;   /* number of servers to this 0 = local */
112 <  unsigned int      status;     /* Client type */
113 <  unsigned int      handler;    /* Handler index */
114 <  unsigned int      serial;     /* used to enforce 1 send per nick */
107 >  struct Client    *hnext;      /**< For client hash table lookups by name */
108 >  struct Client    *idhnext;    /**< For SID hash table lookups by sid */
109 >  struct Server    *serv;       /**< ...defined, if this is a server */
110 >  struct Client    *servptr;    /**< Points to server this Client is on */
111 >  struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
112 >  struct Whowas    *whowas;     /**< Pointers to whowas structs */
113 >  char             *away;       /**< Client's AWAY message. Can be set/unset via AWAY command */
114 >
115 >  time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
116 >  time_t            servicestamp; /**< Last time client has been identified for its nick */
117 >  uint64_t          flags;      /**< client flags */
118 >
119 >  unsigned int      umodes;     /**< opers, normal users subset */
120 >  unsigned int      hopcount;   /**< number of servers to this 0 = local */
121 >  unsigned int      status;     /**< Client type */
122 >  unsigned int      handler;    /**< Handler index */
123  
124 <  dlink_list        channel;   /* chain of channel pointer blocks */
124 >  dlink_list        channel;   /**< chain of channel pointer blocks */
125  
126 <  /*
127 <   * client->name is the unique name for a client nick or host
120 <   */
121 <  char name[HOSTLEN + 1];
122 <  char id[IDLEN + 1];       /* client ID, unique ID per client */
126 >  char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
127 >  char id[IDLEN + 1];       /**< client ID, unique ID per client */
128  
129    /*
130     * client->username is the username from ident or the USER message,
131     * If the client is idented the USER message is ignored, otherwise
132     * the username part of the USER message is put here prefixed with a
133 <   * tilde depending on the I:line, Once a client has registered, this
134 <   * field should be considered read-only.
133 >   * tilde depending on the auth{} block. Once a client has registered,
134 >   * this field should be considered read-only.
135     */
136    char              username[USERLEN + 1]; /* client's username */
137  
# Line 143 | Line 148 | struct Client
148     * gcos field in /etc/passwd but anything can go here.
149     */
150    char              info[REALLEN + 1]; /* Free form additional client info */
146 –  char              client_host[HOSTLEN + 1];
147 –  char              client_server[HOSTLEN + 1];
151  
152 <  /* client->sockhost contains the ip address gotten from the socket as a
152 >  /*
153 >   * client->sockhost contains the ip address gotten from the socket as a
154     * string, this field should be considered read-only once the connection
155     * has been made. (set in s_bsd.c only)
156     */
# Line 154 | Line 158 | struct Client
158                                                  socket ip address as string */
159   };
160  
161 + /*! \brief LocalUser structure
162 + *
163 + * Allocated only for local clients, that are directly connected
164 + * to \b this server with a socket.
165 + */
166   struct LocalUser
167   {
168 <  /*
160 <   * The following fields are allocated only for local clients
161 <   * (directly connected to *this* server with a socket.
162 <   */
163 <  dlink_node        lclient_node;
164 <
168 >  dlink_node   lclient_node;
169  
170 +  char         client_host[HOSTLEN + 1];
171 +  char         client_server[HOSTLEN + 1];
172  
173    unsigned int registration;
174 <  unsigned int cap_client;    /* Client capabilities (from us) */
175 <  unsigned int cap_active;    /* Active capabilities (to us) */
174 >  unsigned int cap_client;    /**< Client capabilities (from us) */
175 >  unsigned int cap_active;    /**< Active capabilities (to us) */
176  
177 <  unsigned int operflags;     /* oper priv flags */
178 <  unsigned int random_ping;
177 >  unsigned int operflags;     /**< IRC Operator privilege flags */
178 >  unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
179  
180 +  unsigned int serial;     /**< used to enforce 1 send per nick */
181  
182 <  /* Anti flooding part, all because of lamers... */
183 <  time_t       last_knock;    /* time of last knock */
184 <  time_t       last_away; /* Away since... */
185 <  time_t       last_join_time;   /* when this client last
182 >  time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
183 >  time_t       firsttime;  /**< time client was created */
184 >  time_t       since;      /**< last time we parsed something */
185 >  time_t       last_knock;    /**< time of last knock */
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
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
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
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    time_t       last_nick_change;
199 +  time_t       last_privmsg; /**< Last time we got a PRIVMSG */
200  
201    int          received_number_of_privmsgs;
202    unsigned int number_of_nick_changes;
203  
204    struct ListTask  *list_task;
205 <  /* Send and receive dbufs .. */
205 >
206    struct dbuf_queue buf_sendq;
207    struct dbuf_queue buf_recvq;
208  
209    struct {
210 <    unsigned int messages;      /* Statistics: protocol messages sent/received */
211 <    uint64_t bytes;             /* Statistics: total bytes sent/received */
210 >    unsigned int messages;      /**< Statistics: protocol messages sent/received */
211 >    uint64_t bytes;             /**< Statistics: total bytes sent/received */
212    } recv, send;
213  
214    struct AuthRequest *auth;
215 <  struct Listener *listener;   /* listener accepted from */
216 <  dlink_list        acceptlist; /* clients I'll allow to talk to me */
217 <  dlink_list        watches;   /* chain of Watch pointer blocks */
218 <  dlink_list        confs;     /* Configuration record associated */
219 <  dlink_list        invited;   /* chain of invite pointer blocks */
215 >  struct Listener *listener;   /**< listener accepted from */
216 >  dlink_list        acceptlist; /**< clients I'll allow to talk to me */
217 >  dlink_list        watches;   /**< chain of Watch pointer blocks */
218 >  dlink_list        confs;     /**< Configuration record associated */
219 >  dlink_list        invited;   /**< chain of invite pointer blocks */
220    struct irc_ssaddr ip;
221 <  int               aftype;     /* Makes life easier for DNS res in IPV6 */
212 <  time_t last; /* Last time we got a PRIVMSG */
221 >  int               aftype;    /**< Makes life easier for DNS res in IPV6 */
222  
223    char              *passwd;
224 <  unsigned int       caps;       /* capabilities bit-field */
225 <  unsigned int       enc_caps;   /* cipher capabilities bit-field */
224 >  unsigned int       caps;       /**< capabilities bit-field */
225 >  unsigned int       enc_caps;   /**< cipher capabilities bit-field */
226  
227   #ifdef HAVE_LIBCRYPTO
228    struct EncCapability *in_cipher;
# Line 224 | Line 233 | struct LocalUser
233   #endif
234  
235    fde_t             fd;
236 <  fde_t             ctrlfd;     /* For servers: control fd used for sending commands
236 >  fde_t             ctrlfd;     /**< For servers: control fd used for sending commands
237                                     to servlink */
238  
239 <  struct SlinkRpl  slinkrpl;    /* slink reply being parsed */
240 <  char    *slinkq;              /* sendq for control data */
241 <  int              slinkq_ofs;  /* ofset into slinkq */
242 <  int              slinkq_len;  /* length remaining after slinkq_ofs */
239 >  struct SlinkRpl  slinkrpl;    /**< slink reply being parsed */
240 >  char    *slinkq;              /**< sendq for control data */
241 >  int              slinkq_ofs;  /**< ofset into slinkq */
242 >  int              slinkq_len;  /**< length remaining after slinkq_ofs */
243  
244    struct ZipStats  zipstats;
245  
# Line 239 | Line 248 | struct LocalUser
248     * decay to avoid flooding.
249     *   -- adrian
250     */
251 <  int allow_read;       /* how many we're allowed to read in this second */
252 <  int sent_parsed;      /* how many messages we've parsed in this second */
251 >  int allow_read;       /**< how many we're allowed to read in this second */
252 >  int sent_parsed;      /**< how many messages we've parsed in this second */
253  
254 <  char*          response;  /* expected response from client */
255 <  char*          auth_oper; /* Operator to become if they supply the response.*/
254 >  char*          response;  /**< expected response from client */
255 >  char*          auth_oper; /**< Operator to become if they supply the response.*/
256   };
257  
258   /*
# Line 273 | Line 282 | struct LocalUser
282   #define IsServer(x)             ((x)->status == STAT_SERVER)
283   #define IsClient(x)             ((x)->status == STAT_CLIENT)
284  
276 – #define IsOper(x)               ((x)->umodes & UMODE_OPER)
277 – #define IsAdmin(x)              ((x)->umodes & UMODE_ADMIN)
278 –
285   #define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
286                                   (x)->handler = UNREGISTERED_HANDLER; }
287  
# Line 292 | Line 298 | struct LocalUser
298                                   (x)->handler = SERVER_HANDLER; }
299  
300   #define SetClient(x)            {(x)->status = STAT_CLIENT; \
301 <                                 (x)->handler = IsOper((x)) ? \
301 >                                 (x)->handler = HasUMode(x, UMODE_OPER) ? \
302                                          OPER_HANDLER : CLIENT_HANDLER; }
303  
304 < #define SetEob(x)               ((x)->flags |= FLAGS_EOB)
305 < #define HasSentEob(x)           ((x)->flags & FLAGS_EOB)
304 > #define MyConnect(x)            ((x)->localClient != NULL)
305 > #define MyClient(x)             (MyConnect(x) && IsClient(x))
306  
307   /*
308   * ts stuff
309   */
310 < #define TS_CURRENT      6       /* current TS protocol version */
311 < #ifdef TS5_ONLY
306 < #define TS_MIN          5
307 < #else
308 < #define TS_MIN          3       /* minimum supported TS protocol version */
309 < #endif
310 > #define TS_CURRENT      6       /**< current TS protocol version */
311 > #define TS_MIN          5       /**< minimum supported TS protocol version */
312   #define TS_DOESTS       0x20000000
313   #define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
314  
# Line 314 | Line 316 | struct LocalUser
316  
317   #define CAP_MULTI_PREFIX  0x00000001
318  
319 + #define HasCap(x, y) ((x)->localClient->cap_active & (y))
320 +
321   /* housekeeping flags */
322 < #define FLAGS_PINGSENT      0x0000000000000001 /* Unreplied ping sent                      */
323 < #define FLAGS_DEADSOCKET    0x0000000000000002 /* Local socket is dead--Exiting soon       */
324 < #define FLAGS_KILLED        0x0000000000000004 /* Prevents "QUIT" from being sent for this */
325 < #define FLAGS_CLOSING       0x0000000000000008 /* set when closing to suppress errors      */
326 < #define FLAGS_GOTID         0x0000000000000010 /* successful ident lookup achieved         */
327 < #define FLAGS_NEEDID        0x0000000000000020 /* I-lines say must use ident return        */
328 < #define FLAGS_SENDQEX       0x0000000000000040 /* Sendq exceeded                           */
329 < #define FLAGS_IPHASH        0x0000000000000080 /* iphashed this client                     */
330 < #define FLAGS_CRYPTIN       0x0000000000000100 /* incoming data must be decrypted          */
331 < #define FLAGS_CRYPTOUT      0x0000000000000200 /* outgoing data must be encrypted          */
332 < #define FLAGS_WAITAUTH      0x0000000000000400 /* waiting for CRYPTLINK AUTH command       */
333 < #define FLAGS_SERVLINK      0x0000000000000800 /* servlink has servlink process            */
334 < #define FLAGS_MARK          0x0000000000001000 /* marked client                            */
335 < #define FLAGS_CANFLOOD      0x0000000000002000 /* client has the ability to flood          */
336 < #define FLAGS_EXEMPTGLINE   0x0000000000004000 /* client can't be G-lined                  */
337 < #define FLAGS_EXEMPTKLINE   0x0000000000008000 /* client is exempt from kline              */
338 < #define FLAGS_NOLIMIT       0x0000000000010000 /* client is exempt from limits             */
339 < #define FLAGS_RESTRICTED    0x0000000000020000 /* client cannot op others                  */
340 < #define FLAGS_PING_COOKIE   0x0000000000040000 /* PING Cookie                              */
341 < #define FLAGS_IDLE_LINED    0x0000000000080000 /* client is exempt from idle-time limits   */
342 < #define FLAGS_IP_SPOOFING   0x0000000000100000 /* client IP is spoofed                     */
343 < #define FLAGS_FLOODDONE     0x0000000000200000 /* Flood grace period has been ended.       */
344 < #define FLAGS_EOB           0x0000000000400000 /* server has received EOB                  */
345 < #define FLAGS_HIDDEN        0x0000000000800000 /* a hidden server. not shown in /links     */
346 < #define FLAGS_BLOCKED       0x0000000001000000 /* must wait for COMM_SELECT_WRITE          */
347 < #define FLAGS_SBLOCKED      0x0000000002000000 /* slinkq is blocked                        */
348 < #define FLAGS_USERHOST      0x0000000004000000 /* client is in userhost hash               */
349 < #define FLAGS_BURSTED       0x0000000008000000 /* user was already bursted                 */
350 < #define FLAGS_EXEMPTRESV    0x0000000010000000 /* client is exempt from RESV               */
351 < #define FLAGS_GOTUSER       0x0000000020000000 /* if we received a USER command            */
352 < #define FLAGS_PINGWARNING   0x0000000040000000 /* unreplied ping warning already sent      */
353 < #define FLAGS_FINISHED_AUTH 0x0000000080000000 /* Client has been released from auth       */
354 < #define FLAGS_FLOOD_NOTICED 0x0000000100000000
322 > #define FLAGS_PINGSENT      0x0000000000000001 /**< Unreplied ping sent */
323 > #define FLAGS_DEADSOCKET    0x0000000000000002 /**< Local socket is dead--Exiting soon */
324 > #define FLAGS_KILLED        0x0000000000000004 /**< Prevents "QUIT" from being sent for this */
325 > #define FLAGS_CLOSING       0x0000000000000008 /**< set when closing to suppress errors */
326 > #define FLAGS_GOTID         0x0000000000000010 /**< successful ident lookup achieved */
327 > #define FLAGS_NEEDID        0x0000000000000020 /**< auth{} block say must use ident return */
328 > #define FLAGS_SENDQEX       0x0000000000000040 /**< Sendq exceeded */
329 > #define FLAGS_IPHASH        0x0000000000000080 /**< iphashed this client */
330 > #define FLAGS_CRYPTIN       0x0000000000000100 /**< incoming data must be decrypted */
331 > #define FLAGS_CRYPTOUT      0x0000000000000200 /**< outgoing data must be encrypted */
332 > #define FLAGS_WAITAUTH      0x0000000000000400 /**< waiting for CRYPTLINK AUTH command */
333 > #define FLAGS_SERVLINK      0x0000000000000800 /**< servlink has servlink process */
334 > #define FLAGS_MARK          0x0000000000001000 /**< marked client */
335 > #define FLAGS_CANFLOOD      0x0000000000002000 /**< client has the ability to flood */
336 > #define FLAGS_EXEMPTGLINE   0x0000000000004000 /**< client can't be G-lined */
337 > #define FLAGS_EXEMPTKLINE   0x0000000000008000 /**< client is exempt from kline */
338 > #define FLAGS_NOLIMIT       0x0000000000010000 /**< client is exempt from limits */
339 > #define FLAGS_UNUSED___     0x0000000000020000 /**< Unused */
340 > #define FLAGS_PING_COOKIE   0x0000000000040000 /**< PING Cookie */
341 > #define FLAGS_UNUSED____    0x0000000000080000 /**< Unused */
342 > #define FLAGS_IP_SPOOFING   0x0000000000100000 /**< client IP is spoofed */
343 > #define FLAGS_FLOODDONE     0x0000000000200000 /**< Flood grace period has been ended. */
344 > #define FLAGS_EOB           0x0000000000400000 /**< server has sent us an EOB */
345 > #define FLAGS_HIDDEN        0x0000000000800000 /**< a hidden server. not shown in /links */
346 > #define FLAGS_BLOCKED       0x0000000001000000 /**< must wait for COMM_SELECT_WRITE */
347 > #define FLAGS_SBLOCKED      0x0000000002000000 /**< slinkq is blocked */
348 > #define FLAGS_USERHOST      0x0000000004000000 /**< client is in userhost hash */
349 > #define FLAGS_BURSTED       0x0000000008000000 /**< user was already bursted */
350 > #define FLAGS_EXEMPTRESV    0x0000000010000000 /**< client is exempt from RESV */
351 > #define FLAGS_GOTUSER       0x0000000020000000 /**< if we received a USER command */
352 > #define FLAGS_PINGWARNING   0x0000000040000000 /**< unreplied ping warning already sent */
353 > #define FLAGS_FINISHED_AUTH 0x0000000080000000 /**< Client has been released from auth */
354 > #define FLAGS_FLOOD_NOTICED 0x0000000100000000 /**< Notice to opers about this flooder has been sent */
355 > #define FLAGS_SERVICE       0x0000000200000000 /**< Client/server is a network service */
356 >
357 > #define HasFlag(x, y) ((x)->flags &   (y))
358 > #define AddFlag(x, y) ((x)->flags |=  (y))
359 > #define DelFlag(x, y) ((x)->flags &= ~(y))
360  
361  
353 – /* umodes, settable flags */
354 – #define UMODE_SERVNOTICE   0x00000001 /* server notices such as kill */
355 – #define UMODE_CCONN        0x00000002 /* Client Connections */
356 – #define UMODE_REJ          0x00000004 /* Bot Rejections */
357 – #define UMODE_SKILL        0x00000008 /* Server Killed */
358 – #define UMODE_FULL         0x00000010 /* Full messages */
359 – #define UMODE_SPY          0x00000020 /* see STATS / LINKS */
360 – #define UMODE_DEBUG        0x00000040 /* 'debugging' info */
361 – #define UMODE_NCHANGE      0x00000080 /* Nick change notice */
362 – #define UMODE_WALLOP       0x00000100 /* send wallops to them */
363 – #define UMODE_OPERWALL     0x00000200 /* Operwalls */
364 – #define UMODE_INVISIBLE    0x00000400 /* makes user invisible */
365 – #define UMODE_BOTS         0x00000800 /* shows bots */
366 – #define UMODE_EXTERNAL     0x00001000 /* show servers introduced and splitting */
367 – #define UMODE_CALLERID     0x00002000 /* block unless caller id's */
368 – #define UMODE_SOFTCALLERID 0x00004000 /* block unless on common channel */
369 – #define UMODE_UNAUTH       0x00008000 /* show unauth connects here */
370 – #define UMODE_LOCOPS       0x00010000 /* show locops */
371 – #define UMODE_DEAF         0x00020000 /* don't receive channel messages */
372 – #define UMODE_CCONN_FULL   0x00040000 /* add unused fields to connection monitoring */
373 –
374 – /* user information flags, only settable by remote mode or local oper */
375 – #define UMODE_OPER         0x40000000 /* Operator */
376 – #define UMODE_ADMIN        0x80000000 /* Admin on server */
362  
363 < #define UMODE_ALL          UMODE_SERVNOTICE
363 > /* umodes, settable flags */
364 > #define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
365 > #define UMODE_CCONN        0x00000002 /**< Client Connections */
366 > #define UMODE_REJ          0x00000004 /**< Bot Rejections */
367 > #define UMODE_SKILL        0x00000008 /**< Server Killed */
368 > #define UMODE_FULL         0x00000010 /**< Full messages */
369 > #define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
370 > #define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
371 > #define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
372 > #define UMODE_WALLOP       0x00000100 /**< send wallops to them */
373 > #define UMODE_OPERWALL     0x00000200 /**< Operwalls */
374 > #define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
375 > #define UMODE_BOTS         0x00000800 /**< shows bots */
376 > #define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
377 > #define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
378 > #define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
379 > #define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
380 > #define UMODE_LOCOPS       0x00010000 /**< show locops */
381 > #define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
382 > #define UMODE_CCONN_FULL   0x00040000 /**< add unused fields to connection monitoring */
383 > #define UMODE_REGISTERED   0x00080000 /**< User has identified for that nick. */
384 > #define UMODE_REGONLY      0x00100000 /**< Only registered nicks may PM */
385 > #define UMODE_OPER         0x40000000 /**< Operator */
386 > #define UMODE_ADMIN        0x80000000 /**< Admin on server */
387 >
388 > #define UMODE_ALL          UMODE_SERVNOTICE
389 >
390 > #define HasUMode(x, y) ((x)->umodes &   (y))
391 > #define AddUMode(x, y) ((x)->umodes |=  (y))
392 > #define DelUMode(x, y) ((x)->umodes &= ~(y))
393  
394   #define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
395 <                      UMODE_ADMIN)
395 >                      UMODE_REGISTERED | UMODE_ADMIN)
396 >
397  
398  
399   /* oper priv flags */
# Line 397 | Line 412 | struct LocalUser
412   #define OPER_FLAG_OPER_SPY     0x00001000 /* */
413   #define OPER_FLAG_REMOTEBAN    0x00002000 /* */
414   #define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
415 + #define OPER_FLAG_GLOBOPS      0x00008000
416 + #define OPER_FLAG_MODULE       0x00010000 /**< Oper can use MODULE commands */
417 + #define OPER_FLAG_RESTART      0x00020000 /**< Oper can use RESTART command */
418 +
419 + #define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
420 + #define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
421 + #define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
422 + #define ClrOFlag(x)    ((x)->localClient->operflags = 0)
423  
401 – #define SetOFlag(x, y) ((x)->localClient->operflags |= (y))
424  
425  
426   /* flags macros. */
405 – #define IsMsgFloodNoticed(x)       ((x)->flags & FLAGS_FLOOD_NOTICED)
406 – #define SetMsgFloodNoticed(x)      ((x)->flags |= FLAGS_FLOOD_NOTICED)
407 – #define ClearMsgFloodNoticed(x)    ((x)->flags &= ~FLAGS_FLOOD_NOTICED)
427   #define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
428   #define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
429   #define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
430   #define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
431   #define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
413 – #define IsKilled(x)             ((x)->flags & FLAGS_KILLED)
414 – #define SetKilled(x)            ((x)->flags |= FLAGS_KILLED)
432   #define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
433   #define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
434   #define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
# Line 421 | Line 438 | struct LocalUser
438   #define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
439   #define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
440   #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)
441   #define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
442   #define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
443   #define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
444                                                 FLAGS_KILLED))
445  
446   /* oper flags */
447 < #define MyOper(x)               (MyConnect(x) && IsOper(x))
447 > #define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
448  
449   #define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
450                                   if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
451  
452   #define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
453 <                                 if (!IsOper((x)) && !IsServer((x))) \
453 >                                 if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
454                                    (x)->handler = CLIENT_HANDLER; }
455  
444 – #define IsPrivileged(x)         (IsOper(x) || IsServer(x))
445 –
446 – /* umode flags */
447 – #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 – #define IsFull(x)               ((x)->umodes & UMODE_CCONN_FULL)
454 –
456   #define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
457   #define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
458  
# Line 488 | Line 489 | struct LocalUser
489   #define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
490   #define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
491  
491 – #define IsIdlelined(x)          ((x)->flags &  FLAGS_IDLE_LINED)
492 – #define SetIdlelined(x)         ((x)->flags |= FLAGS_IDLE_LINED)
493 – #define IsRestricted(x)         ((x)->flags &  FLAGS_RESTRICTED)
494 – #define SetRestricted(x)        ((x)->flags |= FLAGS_RESTRICTED)
495 –
492   #define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
493   #define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
494   #define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
# Line 507 | Line 503 | struct LocalUser
503   #define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
504   #define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
505  
510 – #define IsBursted(x)            ((x)->flags &  FLAGS_BURSTED)
511 – #define SetBursted(x)           ((x)->flags |= FLAGS_BURSTED)
512 – #define ClearBursted(x)         ((x)->flags &= ~FLAGS_BURSTED)
513 –
506   #define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
507   #define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
508   #define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
509  
518 – /* operflags macros */
519 – #define ClearOperFlags(x)       ((x)->localClient->operflags = 0)
520 – #define IsOperGlobalKill(x)     (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLOBAL_KILL : 0)
521 – #define IsOperRemote(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTE : 0)
522 – #define IsOperUnkline(x)        (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_UNKLINE : 0)
523 – #define IsOperGline(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLINE : 0)
524 – #define IsOperN(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_N : 0)
525 – #define IsOperK(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_K : 0)
526 – #define IsOperDie(x)            (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_DIE : 0)
527 – #define IsOperRehash(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REHASH : 0)
528 – #define IsOperAdmin(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_ADMIN : 0)
529 – #define IsOperHiddenAdmin(x)    (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_ADMIN : 0)
530 – #define IsOperX(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_X : 0)
531 – #define IsOperWall(x)           (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_OPERWALL : 0)
532 – #define IsOperRemoteBan(x)      (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTEBAN : 0)
533 – #define IsOperHidden(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_OPER : 0)
510  
511   /*
512   * definitions for get_client_name
# Line 552 | Line 528 | extern void del_all_accepts(struct Clien
528   extern void exit_client(struct Client *, struct Client *, const char *);
529   extern void check_conf_klines(void);
530   extern void init_client(void);
555 – extern void change_local_nick(struct Client *, struct Client *, const char *);
531   extern void dead_link_on_write(struct Client *, int);
532   extern void dead_link_on_read(struct Client *, int);
533   extern void exit_aborted_clients(void);
# Line 560 | Line 535 | extern void free_exited_clients(void);
535   extern struct Client *make_client(struct Client *);
536   extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
537   extern struct Client *find_person(const struct Client *const, const char *);
538 < extern const char *get_client_name(struct Client *, int);
538 > extern const char *get_client_name(const struct Client *, int);
539  
540   #endif /* INCLUDED_client_h */

Diff Legend

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