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.3/include/client.h (file contents), Revision 1146 by michael, Thu Jul 28 20:00:19 2011 UTC vs.
ircd-hybrid-8/include/client.h (file contents), Revision 1460 by michael, Fri Jul 6 14:32:53 2012 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"
35 #include "irc_res.h"
37  
38 < #define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
38 > #define HOSTIPLEN       45 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") */
39   #define PASSWDLEN       20
39 #define CIPHERKEYLEN    64 /* 512bit */
40   #define IDLEN           12 /* this is the maximum length, not the actual
41                                generated length; DO NOT CHANGE! */
42  
43 /*
44 * pre declare structs
45 */
46 struct AccessItem;
47 struct Whowas;
48 struct Listener;
49 struct Client;
50 struct LocalUser;
43  
44 <
45 < struct Server
44 > /*! \brief addr_mask_type enumeration */
45 > enum addr_mask_type
46   {
47 <  struct ConfItem *sconf; /* ConfItem connect{} pointer for this server */
48 <  dlink_list server_list; /* Servers on this server            */
49 <  dlink_list client_list; /* Clients on this server            */
58 <  char by[NICKLEN];       /* who activated this connection     */
47 >  HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
48 >  SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
49 >  MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
50   };
51  
52 < struct SlinkRpl
53 < {
63 <  int command;
64 <  int datalen;
65 <  int gotdatalen;
66 <  int readdata;
67 <  unsigned char *data;
68 < };
69 <
70 < struct ZipStats
52 > /*! \brief Server structure */
53 > struct Server
54   {
55 <  uint64_t in;
56 <  uint64_t in_wire;
57 <  uint64_t out;
75 <  uint64_t out_wire;
76 <  double in_ratio;
77 <  double out_ratio;
55 >  dlink_list server_list; /**< Servers on this server */
56 >  dlink_list client_list; /**< Clients on this server */
57 >  char by[NICKLEN + 1];   /**< who activated this connection */
58   };
59  
60 + /*! \brief ListTask structure */
61   struct ListTask
62   {
63 <  unsigned int hash_index; /* the bucket we are currently in */
64 <  dlink_list show_mask; /* show these channels..          */
84 <  dlink_list hide_mask; /* ..and hide these ones          */
85 <  unsigned int users_min, users_max;
86 <  unsigned int created_min, created_max;
87 <  unsigned int topicts_min, topicts_max;
88 < };
89 <
90 < struct Client
91 < {
92 <  dlink_node node;
93 <  dlink_node lnode;             /* Used for Server->servers/users */
94 <
95 <  struct LocalUser *localClient;
96 <  struct Client    *hnext;              /* For client hash table lookups by name */
97 <  struct Client    *idhnext;    /* For SID hash table lookups by sid */
98 <  struct Server    *serv;       /* ...defined, if this is a server */
99 <  struct Client    *servptr;    /* Points to server this Client is on */
100 <  struct Client    *from;       /* == self, if Local Client, *NEVER* NULL! */
101 <  struct Whowas    *whowas;     /* Pointers to whowas structs */
102 <  char             *away;
103 <
104 <  time_t            lasttime;   /* ...should be only LOCAL clients? --msa */
105 <  time_t            firsttime;  /* time client was created */
106 <  time_t            since;      /* last time we parsed something */
107 <  time_t            tsinfo;     /* TS on the nick, SVINFO on server */
108 <  uint64_t          flags;      /* client flags */
109 <
110 <  unsigned int      umodes;     /* opers, normal users subset */
111 <  unsigned int      hopcount;   /* number of servers to this 0 = local */
112 <  unsigned int      status;     /* Client type */
113 <  unsigned int      handler;    /* Handler index */
114 <
115 <  dlink_list        channel;   /* chain of channel pointer blocks */
116 <
117 <  /*
118 <   * client->name is the unique name for a client nick or host
119 <   */
120 <  char name[HOSTLEN + 1];
121 <  char id[IDLEN + 1];       /* client ID, unique ID per client */
122 <
123 <  /*
124 <   * client->username is the username from ident or the USER message,
125 <   * If the client is idented the USER message is ignored, otherwise
126 <   * the username part of the USER message is put here prefixed with a
127 <   * tilde depending on the I:line, Once a client has registered, this
128 <   * field should be considered read-only.
129 <   */
130 <  char              username[USERLEN + 1]; /* client's username */
131 <
132 <  /*
133 <   * client->host contains the resolved name or ip address
134 <   * as a string for the user, it may be fiddled with for oper spoofing etc.
135 <   * once it's changed the *real* address goes away. This should be
136 <   * considered a read-only field after the client has registered.
137 <   */
138 <  char              host[HOSTLEN + 1];     /* client's hostname */
139 <
140 <  /*
141 <   * client->info for unix clients will normally contain the info from the
142 <   * gcos field in /etc/passwd but anything can go here.
143 <   */
144 <  char              info[REALLEN + 1]; /* Free form additional client info */
63 >  dlink_list show_mask; /**< show these channels.. */
64 >  dlink_list hide_mask; /**< ..and hide these ones */
65  
66 <  /*
67 <   * client->sockhost contains the ip address gotten from the socket as a
68 <   * string, this field should be considered read-only once the connection
69 <   * has been made. (set in s_bsd.c only)
70 <   */
71 <  char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
72 <                                                socket ip address as string */
66 >  unsigned int hash_index; /**< the bucket we are currently in */
67 >  unsigned int users_min;
68 >  unsigned int users_max;
69 >  unsigned int created_min;
70 >  unsigned int created_max;
71 >  unsigned int topicts_min;
72 >  unsigned int topicts_max;
73   };
74  
75 + /*! \brief LocalUser structure
76 + *
77 + * Allocated only for local clients, that are directly connected
78 + * to \b this server with a socket.
79 + */
80   struct LocalUser
81   {
157  /*
158   * The following fields are allocated only for local clients
159   * (directly connected to *this* server with a socket.
160   */
82    dlink_node   lclient_node;
83  
84    char         client_host[HOSTLEN + 1];
85    char         client_server[HOSTLEN + 1];
86  
87    unsigned int registration;
88 <  unsigned int cap_client;    /* Client capabilities (from us) */
89 <  unsigned int cap_active;    /* Active capabilities (to us) */
90 <
91 <  unsigned int operflags;     /* oper priv flags */
92 <  unsigned int random_ping;
93 <
94 <  unsigned int serial;     /* used to enforce 1 send per nick */
95 <
96 <  /* Anti flooding part, all because of lamers... */
97 <  time_t       last_knock;    /* time of last knock */
98 <  time_t       last_away; /* Away since... */
99 <  time_t       last_join_time;   /* when this client last
88 >  unsigned int cap_client;    /**< Client capabilities (from us) */
89 >  unsigned int cap_active;    /**< Active capabilities (to us) */
90 >  unsigned int       caps;       /**< capabilities bit-field */
91 >
92 >  unsigned int operflags;     /**< IRC Operator privilege flags */
93 >  unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
94 >
95 >  unsigned int serial;     /**< used to enforce 1 send per nick */
96 >
97 >  time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
98 >  time_t       firsttime;  /**< time client was created */
99 >  time_t       since;      /**< last time we parsed something */
100 >  time_t       last_knock;    /**< time of last knock */
101 >  time_t       last_join_time;   /**< when this client last
102                                      joined a channel */
103 <  time_t       last_leave_time;  /* when this client last
103 >  time_t       last_leave_time;  /**< when this client last
104                                         * left a channel */
105 <  int          join_leave_count; /* count of JOIN/LEAVE in less than
105 >  int          join_leave_count; /**< count of JOIN/LEAVE in less than
106                                           MIN_JOIN_LEAVE_TIME seconds */
107 <  int          oper_warn_count_down; /* warn opers of this possible
107 >  int          oper_warn_count_down; /**< warn opers of this possible
108                                            spambot every time this gets to 0 */
109    time_t       reject_delay;
110    time_t       last_caller_id_time;
111    time_t       first_received_message_time;
112    time_t       last_nick_change;
113 +  time_t       last_privmsg; /**< Last time we got a PRIVMSG */
114  
115    int          received_number_of_privmsgs;
116    unsigned int number_of_nick_changes;
117  
118    struct ListTask  *list_task;
119 <  /* Send and receive dbufs .. */
119 >
120    struct dbuf_queue buf_sendq;
121    struct dbuf_queue buf_recvq;
122  
123    struct {
124 <    unsigned int messages;      /* Statistics: protocol messages sent/received */
125 <    uint64_t bytes;             /* Statistics: total bytes sent/received */
124 >    unsigned int messages;      /**< Statistics: protocol messages sent/received */
125 >    uint64_t bytes;             /**< Statistics: total bytes sent/received */
126    } recv, send;
127  
128    struct AuthRequest *auth;
129 <  struct Listener *listener;   /* listener accepted from */
130 <  dlink_list        acceptlist; /* clients I'll allow to talk to me */
131 <  dlink_list        watches;   /* chain of Watch pointer blocks */
132 <  dlink_list        confs;     /* Configuration record associated */
133 <  dlink_list        invited;   /* chain of invite pointer blocks */
129 >  struct Listener *listener;   /**< listener accepted from */
130 >  dlink_list        acceptlist; /**< clients I'll allow to talk to me */
131 >  dlink_list        watches;   /**< chain of Watch pointer blocks */
132 >  dlink_list        confs;     /**< Configuration record associated */
133 >  dlink_list        invited;   /**< chain of invite pointer blocks */
134    struct irc_ssaddr ip;
135 <  int               aftype;     /* Makes life easier for DNS res in IPV6 */
212 <  time_t last; /* Last time we got a PRIVMSG */
135 >  int               aftype;    /**< Makes life easier for DNS res in IPV6 */
136  
137    char              *passwd;
215  unsigned int       caps;       /* capabilities bit-field */
216  unsigned int       enc_caps;   /* cipher capabilities bit-field */
217
218 #ifdef HAVE_LIBCRYPTO
219  struct EncCapability *in_cipher;
220  struct EncCapability *out_cipher;
221
222  char              in_key[CIPHERKEYLEN];
223  char              out_key[CIPHERKEYLEN];
224 #endif
225
138    fde_t             fd;
227  fde_t             ctrlfd;     /* For servers: control fd used for sending commands
228                                   to servlink */
229
230  struct SlinkRpl  slinkrpl;    /* slink reply being parsed */
231  char    *slinkq;              /* sendq for control data */
232  int              slinkq_ofs;  /* ofset into slinkq */
233  int              slinkq_len;  /* length remaining after slinkq_ofs */
234
235  struct ZipStats  zipstats;
139  
140    /* Anti-flood stuff. We track how many messages were parsed and how
141     * many we were allowed in the current second, and apply a simple
142     * decay to avoid flooding.
143     *   -- adrian
144     */
145 <  int allow_read;       /* how many we're allowed to read in this second */
146 <  int sent_parsed;      /* how many messages we've parsed in this second */
145 >  int allow_read;       /**< how many we're allowed to read in this second */
146 >  int sent_parsed;      /**< how many messages we've parsed in this second */
147  
148 <  char*          response;  /* expected response from client */
149 <  char*          auth_oper; /* Operator to become if they supply the response.*/
148 >  char*          response;  /**< expected response from client */
149 >  char*          auth_oper; /**< Operator to become if they supply the response.*/
150 > };
151 >
152 > /*! \brief Client structure */
153 > struct Client
154 > {
155 >  dlink_node node;
156 >  dlink_node lnode;             /**< Used for Server->servers/users */
157 >
158 >  struct LocalUser *localClient;
159 >  struct Client    *hnext;      /**< For client hash table lookups by name */
160 >  struct Client    *idhnext;    /**< For SID hash table lookups by sid */
161 >  struct Server    *serv;       /**< ...defined, if this is a server */
162 >  struct Client    *servptr;    /**< Points to server this Client is on */
163 >  struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
164 >  char             *away;       /**< Client's AWAY message. Can be set/unset via AWAY command */
165 >
166 >  time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
167 >  time_t            servicestamp; /**< Last time client has been identified for its nick */
168 >
169 >  unsigned int      flags;      /**< client flags */
170 >  unsigned int      umodes;     /**< opers, normal users subset */
171 >  unsigned int      hopcount;   /**< number of servers to this 0 = local */
172 >  unsigned int      status;     /**< Client type */
173 >  unsigned int      handler;    /**< Handler index */
174 >
175 >  dlink_list        whowas;
176 >  dlink_list        channel;   /**< chain of channel pointer blocks */
177 >
178 >  char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
179 >  char id[IDLEN + 1];       /**< client ID, unique ID per client */
180 >
181 >  /*
182 >   * client->username is the username from ident or the USER message,
183 >   * If the client is idented the USER message is ignored, otherwise
184 >   * the username part of the USER message is put here prefixed with a
185 >   * tilde depending on the auth{} block. Once a client has registered,
186 >   * this field should be considered read-only.
187 >   */
188 >  char              username[USERLEN + 1]; /* client's username */
189 >
190 >  /*
191 >   * client->host contains the resolved name or ip address
192 >   * as a string for the user, it may be fiddled with for oper spoofing etc.
193 >   * once it's changed the *real* address goes away. This should be
194 >   * considered a read-only field after the client has registered.
195 >   */
196 >  char              host[HOSTLEN + 1];     /* client's hostname */
197 >
198 >  /*
199 >   * client->info for unix clients will normally contain the info from the
200 >   * gcos field in /etc/passwd but anything can go here.
201 >   */
202 >  char              info[REALLEN + 1]; /* Free form additional client info */
203 >
204 >  /*
205 >   * client->sockhost contains the ip address gotten from the socket as a
206 >   * string, this field should be considered read-only once the connection
207 >   * has been made. (set in s_bsd.c only)
208 >   */
209 >  char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
210 >                                                socket ip address as string */
211   };
212  
213   /*
# Line 273 | Line 237 | struct LocalUser
237   #define IsServer(x)             ((x)->status == STAT_SERVER)
238   #define IsClient(x)             ((x)->status == STAT_CLIENT)
239  
276 #define IsOper(x)               ((x)->umodes & UMODE_OPER)
277 #define IsAdmin(x)              ((x)->umodes & UMODE_ADMIN)
278
240   #define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
241                                   (x)->handler = UNREGISTERED_HANDLER; }
242  
# Line 292 | Line 253 | struct LocalUser
253                                   (x)->handler = SERVER_HANDLER; }
254  
255   #define SetClient(x)            {(x)->status = STAT_CLIENT; \
256 <                                 (x)->handler = IsOper((x)) ? \
256 >                                 (x)->handler = HasUMode(x, UMODE_OPER) ? \
257                                          OPER_HANDLER : CLIENT_HANDLER; }
258  
259 < #define SetEob(x)               ((x)->flags |= FLAGS_EOB)
260 < #define HasSentEob(x)           ((x)->flags & FLAGS_EOB)
259 > #define MyConnect(x)            ((x)->localClient != NULL)
260 > #define MyClient(x)             (MyConnect(x) && IsClient(x))
261  
262   /*
263   * ts stuff
264   */
265 < #define TS_CURRENT      6       /* current TS protocol version */
266 < #define TS_MIN          5       /* minimum supported TS protocol version */
265 > #define TS_CURRENT      6       /**< current TS protocol version */
266 > #define TS_MIN          5       /**< minimum supported TS protocol version */
267   #define TS_DOESTS       0x20000000
268   #define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
269  
# Line 313 | Line 274 | struct LocalUser
274   #define HasCap(x, y) ((x)->localClient->cap_active & (y))
275  
276   /* housekeeping flags */
277 < #define FLAGS_PINGSENT      0x0000000000000001 /* Unreplied ping sent                      */
278 < #define FLAGS_DEADSOCKET    0x0000000000000002 /* Local socket is dead--Exiting soon       */
279 < #define FLAGS_KILLED        0x0000000000000004 /* Prevents "QUIT" from being sent for this */
280 < #define FLAGS_CLOSING       0x0000000000000008 /* set when closing to suppress errors      */
281 < #define FLAGS_GOTID         0x0000000000000010 /* successful ident lookup achieved         */
282 < #define FLAGS_NEEDID        0x0000000000000020 /* I-lines say must use ident return        */
283 < #define FLAGS_SENDQEX       0x0000000000000040 /* Sendq exceeded                           */
284 < #define FLAGS_IPHASH        0x0000000000000080 /* iphashed this client                     */
285 < #define FLAGS_CRYPTIN       0x0000000000000100 /* incoming data must be decrypted          */
286 < #define FLAGS_CRYPTOUT      0x0000000000000200 /* outgoing data must be encrypted          */
287 < #define FLAGS_WAITAUTH      0x0000000000000400 /* waiting for CRYPTLINK AUTH command       */
288 < #define FLAGS_SERVLINK      0x0000000000000800 /* servlink has servlink process            */
289 < #define FLAGS_MARK          0x0000000000001000 /* marked client                            */
290 < #define FLAGS_CANFLOOD      0x0000000000002000 /* client has the ability to flood          */
291 < #define FLAGS_EXEMPTGLINE   0x0000000000004000 /* client can't be G-lined                  */
292 < #define FLAGS_EXEMPTKLINE   0x0000000000008000 /* client is exempt from kline              */
293 < #define FLAGS_NOLIMIT       0x0000000000010000 /* client is exempt from limits             */
294 < #define FLAGS_RESTRICTED    0x0000000000020000 /* client cannot op others                  */
295 < #define FLAGS_PING_COOKIE   0x0000000000040000 /* PING Cookie                              */
296 < #define FLAGS_IDLE_LINED    0x0000000000080000 /* client is exempt from idle-time limits   */
297 < #define FLAGS_IP_SPOOFING   0x0000000000100000 /* client IP is spoofed                     */
298 < #define FLAGS_FLOODDONE     0x0000000000200000 /* Flood grace period has been ended.       */
299 < #define FLAGS_EOB           0x0000000000400000 /* server has received EOB                  */
300 < #define FLAGS_HIDDEN        0x0000000000800000 /* a hidden server. not shown in /links     */
301 < #define FLAGS_BLOCKED       0x0000000001000000 /* must wait for COMM_SELECT_WRITE          */
302 < #define FLAGS_SBLOCKED      0x0000000002000000 /* slinkq is blocked                        */
303 < #define FLAGS_USERHOST      0x0000000004000000 /* client is in userhost hash               */
304 < #define FLAGS_BURSTED       0x0000000008000000 /* user was already bursted                 */
305 < #define FLAGS_EXEMPTRESV    0x0000000010000000 /* client is exempt from RESV               */
306 < #define FLAGS_GOTUSER       0x0000000020000000 /* if we received a USER command            */
307 < #define FLAGS_PINGWARNING   0x0000000040000000 /* unreplied ping warning already sent      */
347 < #define FLAGS_FINISHED_AUTH 0x0000000080000000 /* Client has been released from auth       */
348 < #define FLAGS_FLOOD_NOTICED 0x0000000100000000
277 > #define FLAGS_PINGSENT      0x00000001 /**< Unreplied ping sent */
278 > #define FLAGS_DEADSOCKET    0x00000002 /**< Local socket is dead--Exiting soon */
279 > #define FLAGS_KILLED        0x00000004 /**< Prevents "QUIT" from being sent for this */
280 > #define FLAGS_CLOSING       0x00000008 /**< set when closing to suppress errors */
281 > #define FLAGS_GOTID         0x00000010 /**< successful ident lookup achieved */
282 > #define FLAGS_NEEDID        0x00000020 /**< auth{} block say must use ident return */
283 > #define FLAGS_SENDQEX       0x00000040 /**< Sendq exceeded */
284 > #define FLAGS_IPHASH        0x00000080 /**< iphashed this client */
285 > #define FLAGS_MARK          0x00000100 /**< marked client */
286 > #define FLAGS_CANFLOOD      0x00000200 /**< client has the ability to flood */
287 > #define FLAGS_EXEMPTGLINE   0x00000400 /**< client can't be G-lined */
288 > #define FLAGS_EXEMPTKLINE   0x00000800 /**< client is exempt from kline */
289 > #define FLAGS_NOLIMIT       0x00001000 /**< client is exempt from limits */
290 > #define FLAGS_PING_COOKIE   0x00002000 /**< PING Cookie */
291 > #define FLAGS_IP_SPOOFING   0x00004000 /**< client IP is spoofed */
292 > #define FLAGS_FLOODDONE     0x00008000 /**< Flood grace period has been ended. */
293 > #define FLAGS_EOB           0x00010000 /**< server has sent us an EOB */
294 > #define FLAGS_HIDDEN        0x00020000 /**< a hidden server. not shown in /links */
295 > #define FLAGS_BLOCKED       0x00040000 /**< must wait for COMM_SELECT_WRITE */
296 > #define FLAGS_USERHOST      0x00080000 /**< client is in userhost hash */
297 > #define FLAGS_BURSTED       0x00100000 /**< user was already bursted */
298 > #define FLAGS_EXEMPTRESV    0x00200000 /**< client is exempt from RESV */
299 > #define FLAGS_GOTUSER       0x00400000 /**< if we received a USER command */
300 > #define FLAGS_PINGWARNING   0x00800000 /**< unreplied ping warning already sent */
301 > #define FLAGS_FINISHED_AUTH 0x01000000 /**< Client has been released from auth */
302 > #define FLAGS_FLOOD_NOTICED 0x02000000 /**< Notice to opers about this flooder has been sent */
303 > #define FLAGS_SERVICE       0x04000000 /**< Client/server is a network service */
304 >
305 > #define HasFlag(x, y) ((x)->flags &   (y))
306 > #define AddFlag(x, y) ((x)->flags |=  (y))
307 > #define DelFlag(x, y) ((x)->flags &= ~(y))
308  
309  
351 /* umodes, settable flags */
352 #define UMODE_SERVNOTICE   0x00000001 /* server notices such as kill */
353 #define UMODE_CCONN        0x00000002 /* Client Connections */
354 #define UMODE_REJ          0x00000004 /* Bot Rejections */
355 #define UMODE_SKILL        0x00000008 /* Server Killed */
356 #define UMODE_FULL         0x00000010 /* Full messages */
357 #define UMODE_SPY          0x00000020 /* see STATS / LINKS */
358 #define UMODE_DEBUG        0x00000040 /* 'debugging' info */
359 #define UMODE_NCHANGE      0x00000080 /* Nick change notice */
360 #define UMODE_WALLOP       0x00000100 /* send wallops to them */
361 #define UMODE_OPERWALL     0x00000200 /* Operwalls */
362 #define UMODE_INVISIBLE    0x00000400 /* makes user invisible */
363 #define UMODE_BOTS         0x00000800 /* shows bots */
364 #define UMODE_EXTERNAL     0x00001000 /* show servers introduced and splitting */
365 #define UMODE_CALLERID     0x00002000 /* block unless caller id's */
366 #define UMODE_SOFTCALLERID 0x00004000 /* block unless on common channel */
367 #define UMODE_UNAUTH       0x00008000 /* show unauth connects here */
368 #define UMODE_LOCOPS       0x00010000 /* show locops */
369 #define UMODE_DEAF         0x00020000 /* don't receive channel messages */
370 #define UMODE_CCONN_FULL   0x00040000 /* add unused fields to connection monitoring */
371
372 /* user information flags, only settable by remote mode or local oper */
373 #define UMODE_OPER         0x40000000 /* Operator */
374 #define UMODE_ADMIN        0x80000000 /* Admin on server */
310  
311 < #define UMODE_ALL          UMODE_SERVNOTICE
311 > /* umodes, settable flags */
312 > #define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
313 > #define UMODE_CCONN        0x00000002 /**< Client Connections */
314 > #define UMODE_REJ          0x00000004 /**< Bot Rejections */
315 > #define UMODE_SKILL        0x00000008 /**< Server Killed */
316 > #define UMODE_FULL         0x00000010 /**< Full messages */
317 > #define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
318 > #define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
319 > #define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
320 > #define UMODE_WALLOP       0x00000100 /**< send wallops to them */
321 > #define UMODE_OPERWALL     0x00000200 /**< Operwalls */
322 > #define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
323 > #define UMODE_BOTS         0x00000800 /**< shows bots */
324 > #define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
325 > #define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
326 > #define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
327 > #define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
328 > #define UMODE_LOCOPS       0x00010000 /**< show locops */
329 > #define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
330 > #define UMODE_CCONN_FULL   0x00040000 /**< add unused fields to connection monitoring */
331 > #define UMODE_REGISTERED   0x00080000 /**< User has identified for that nick. */
332 > #define UMODE_REGONLY      0x00100000 /**< Only registered nicks may PM */
333 > #define UMODE_HIDDEN       0x00200000 /**< Operator status is hidden */
334 > #define UMODE_OPER         0x00400000 /**< Operator */
335 > #define UMODE_ADMIN        0x00800000 /**< Admin on server */
336 >
337 > #define UMODE_ALL          UMODE_SERVNOTICE
338 >
339 > #define HasUMode(x, y) ((x)->umodes &   (y))
340 > #define AddUMode(x, y) ((x)->umodes |=  (y))
341 > #define DelUMode(x, y) ((x)->umodes &= ~(y))
342  
343   #define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
344 <                      UMODE_ADMIN)
344 >                      UMODE_REGISTERED | UMODE_ADMIN | UMODE_HIDDEN)
345 >
346  
347  
348   /* oper priv flags */
349 < #define OPER_FLAG_GLOBAL_KILL  0x00000001 /* oper can global kill        */
350 < #define OPER_FLAG_REMOTE       0x00000002 /* oper can do squits/connects */
351 < #define OPER_FLAG_UNKLINE      0x00000004 /* oper can use unkline        */
352 < #define OPER_FLAG_GLINE        0x00000008 /* oper can use gline          */
353 < #define OPER_FLAG_N            0x00000010 /* oper can umode n            */
354 < #define OPER_FLAG_K            0x00000020 /* oper can kill/kline         */
355 < #define OPER_FLAG_X            0x00000040 /* oper can xline              */
356 < #define OPER_FLAG_DIE          0x00000080 /* oper can die                */
357 < #define OPER_FLAG_REHASH       0x00000100 /* oper can rehash             */
358 < #define OPER_FLAG_ADMIN        0x00000200 /* oper can set umode +a       */
359 < #define OPER_FLAG_HIDDEN_ADMIN 0x00000400 /* admin is hidden             */
360 < #define OPER_FLAG_OPERWALL     0x00000800 /* */
361 < #define OPER_FLAG_OPER_SPY     0x00001000 /* */
362 < #define OPER_FLAG_REMOTEBAN    0x00002000 /* */
363 < #define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
349 > #define OPER_FLAG_GLOBAL_KILL  0x00000001 /**< Oper can global kill        */
350 > #define OPER_FLAG_REMOTE       0x00000002 /**> Oper can do squits/connects */
351 > #define OPER_FLAG_UNKLINE      0x00000004 /**< Oper can use unkline        */
352 > #define OPER_FLAG_GLINE        0x00000008 /**< Oper can use gline          */
353 > #define OPER_FLAG_N            0x00000010 /**< Oper can umode n            */
354 > #define OPER_FLAG_K            0x00000020 /**< Oper can kill/kline         */
355 > #define OPER_FLAG_X            0x00000040 /**< Oper can xline              */
356 > #define OPER_FLAG_DIE          0x00000080 /**< Oper can die                */
357 > #define OPER_FLAG_REHASH       0x00000100 /**< Oper can rehash             */
358 > #define OPER_FLAG_ADMIN        0x00000200 /**< Oper can set umode +a       */
359 > #define OPER_FLAG_OPERWALL     0x00000400 /**< Oper can use OPERWALL command */
360 > #define OPER_FLAG_OPER_SPY     0x00000800 /* */
361 > #define OPER_FLAG_REMOTEBAN    0x00001000 /**< Oper can set remote bans */
362 > #define OPER_FLAG_GLOBOPS      0x00002000 /**< Oper can use GLOBOPS command */
363 > #define OPER_FLAG_MODULE       0x00004000 /**< Oper can use MODULE commands */
364 > #define OPER_FLAG_RESTART      0x00008000 /**< Oper can use RESTART command */
365 > #define OPER_FLAG_DLINE        0x00010000 /**< Oper can use DLINE command   */
366 > #define OPER_FLAG_UNDLINE      0x00020000 /**< Oper can use UNDLINE command */
367 > #define OPER_FLAG_SET          0x00040000 /**< Oper can use SET command */
368 >
369 > #define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
370 > #define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
371 > #define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
372 > #define ClrOFlag(x)    ((x)->localClient->operflags = 0)
373  
399 #define SetOFlag(x, y) ((x)->localClient->operflags |= (y))
374  
375  
376   /* flags macros. */
403 #define IsMsgFloodNoticed(x)       ((x)->flags & FLAGS_FLOOD_NOTICED)
404 #define SetMsgFloodNoticed(x)      ((x)->flags |= FLAGS_FLOOD_NOTICED)
405 #define ClearMsgFloodNoticed(x)    ((x)->flags &= ~FLAGS_FLOOD_NOTICED)
377   #define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
378   #define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
379   #define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
380   #define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
381   #define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
411 #define IsKilled(x)             ((x)->flags & FLAGS_KILLED)
412 #define SetKilled(x)            ((x)->flags |= FLAGS_KILLED)
413 #define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
414 #define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
415 #define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
416 #define SetCryptOut(x)          ((x)->flags |= FLAGS_CRYPTOUT)
417 #define IsWaitAuth(x)           ((x)->flags &  FLAGS_WAITAUTH)
418 #define SetWaitAuth(x)          ((x)->flags |= FLAGS_WAITAUTH)
419 #define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
420 #define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
421 #define SetServlink(x)          ((x)->flags |= FLAGS_SERVLINK)
422 #define MyConnect(x)            ((x)->localClient != NULL)
423 #define MyClient(x)             (MyConnect(x) && IsClient(x))
424 #define SetMark(x)              ((x)->flags |= FLAGS_MARK)
425 #define ClearMark(x)            ((x)->flags &= ~FLAGS_MARK)
426 #define IsMarked(x)             ((x)->flags & FLAGS_MARK)
382   #define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
383   #define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
384   #define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
385                                                 FLAGS_KILLED))
386  
387   /* oper flags */
388 < #define MyOper(x)               (MyConnect(x) && IsOper(x))
388 > #define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
389  
390   #define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
391                                   if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
392  
393   #define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
394 <                                 if (!IsOper((x)) && !IsServer((x))) \
394 >                                 if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
395                                    (x)->handler = CLIENT_HANDLER; }
396  
442 #define IsPrivileged(x)         (IsOper(x) || IsServer(x))
443
444 /* umode flags */
445 #define IsInvisible(x)          ((x)->umodes & UMODE_INVISIBLE)
446 #define SendWallops(x)          ((x)->umodes & UMODE_WALLOP)
447 #define IsSetCallerId(x)        ((x)->umodes & \
448                                 (UMODE_CALLERID|UMODE_SOFTCALLERID))
449 #define IsSoftCallerId(x)       ((x)->umodes & UMODE_SOFTCALLERID)
450 #define IsDeaf(x)               ((x)->umodes & UMODE_DEAF)
451 #define IsFull(x)               ((x)->umodes & UMODE_CCONN_FULL)
452
397   #define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
398   #define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
399  
# Line 486 | Line 430 | struct LocalUser
430   #define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
431   #define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
432  
489 #define IsIdlelined(x)          ((x)->flags &  FLAGS_IDLE_LINED)
490 #define SetIdlelined(x)         ((x)->flags |= FLAGS_IDLE_LINED)
491 #define IsRestricted(x)         ((x)->flags &  FLAGS_RESTRICTED)
492 #define SetRestricted(x)        ((x)->flags |= FLAGS_RESTRICTED)
493
433   #define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
434   #define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
435   #define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
# Line 501 | Line 440 | struct LocalUser
440   #define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
441   #define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
442   #define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
504 #define IsSlinkqBlocked(x)      ((x)->flags &  FLAGS_SBLOCKED)
505 #define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
506 #define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
507
508 #define IsBursted(x)            ((x)->flags &  FLAGS_BURSTED)
509 #define SetBursted(x)           ((x)->flags |= FLAGS_BURSTED)
510 #define ClearBursted(x)         ((x)->flags &= ~FLAGS_BURSTED)
443  
444   #define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
445   #define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
446   #define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
447  
516 /* operflags macros */
517 #define ClearOperFlags(x)       ((x)->localClient->operflags = 0)
518 #define IsOperGlobalKill(x)     (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLOBAL_KILL : 0)
519 #define IsOperRemote(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTE : 0)
520 #define IsOperUnkline(x)        (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_UNKLINE : 0)
521 #define IsOperGline(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLINE : 0)
522 #define IsOperN(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_N : 0)
523 #define IsOperK(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_K : 0)
524 #define IsOperDie(x)            (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_DIE : 0)
525 #define IsOperRehash(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REHASH : 0)
526 #define IsOperAdmin(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_ADMIN : 0)
527 #define IsOperHiddenAdmin(x)    (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_ADMIN : 0)
528 #define IsOperX(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_X : 0)
529 #define IsOperWall(x)           (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_OPERWALL : 0)
530 #define IsOperRemoteBan(x)      (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTEBAN : 0)
531 #define IsOperHidden(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_OPER : 0)
532
533 /*
534 * definitions for get_client_name
535 * TBD - make this an enum
536 */
537 #define HIDE_IP 0
538 #define SHOW_IP 1
539 #define MASK_IP 2
448  
449   extern struct Client me;
450   extern dlink_list listing_client_list;
# Line 550 | Line 458 | extern void del_all_accepts(struct Clien
458   extern void exit_client(struct Client *, struct Client *, const char *);
459   extern void check_conf_klines(void);
460   extern void init_client(void);
553 extern void change_local_nick(struct Client *, struct Client *, const char *);
461   extern void dead_link_on_write(struct Client *, int);
462   extern void dead_link_on_read(struct Client *, int);
463   extern void exit_aborted_clients(void);
# Line 558 | Line 465 | extern void free_exited_clients(void);
465   extern struct Client *make_client(struct Client *);
466   extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
467   extern struct Client *find_person(const struct Client *const, const char *);
468 < extern const char *get_client_name(const struct Client *, int);
468 > extern const char *get_client_name(const struct Client *, enum addr_mask_type);
469  
470   #endif /* INCLUDED_client_h */

Diff Legend

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