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

Diff Legend

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