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-8/include/client.h (file contents), Revision 1497 by michael, Sun Aug 5 13:22:54 2012 UTC vs.
ircd-hybrid/trunk/include/client.h (file contents), Revision 2345 by michael, Wed Jul 3 18:17:39 2013 UTC

# Line 34 | Line 34
34   #include "ircd_defs.h"
35   #include "dbuf.h"
36   #include "channel.h"
37 <
38 <
39 < /*! \brief addr_mask_type enumeration */
40 < enum addr_mask_type
41 < {
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 < /*! \brief Server structure */
48 < struct Server
49 < {
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 <  dlink_list show_mask; /**< show these channels.. */
59 <  dlink_list hide_mask; /**< ..and hide these ones */
60 <
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 < {
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 <  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
99 <                                       * left a channel */
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
103 <                                          spambot every time this gets to 0 */
104 <  time_t       reject_delay;
105 <  time_t       last_caller_id_time;
106 <  time_t       first_received_message_time;
107 <  time_t       last_nick_change;
108 <  time_t       last_privmsg; /**< Last time we got a PRIVMSG */
109 <  time_t       last_away; /**< Away since... */
110 <
111 <  int          received_number_of_privmsgs;
112 <  unsigned int number_of_nick_changes;
113 <
114 <  struct ListTask  *list_task;
115 <
116 <  struct dbuf_queue buf_sendq;
117 <  struct dbuf_queue buf_recvq;
118 <
119 <  struct {
120 <    unsigned int messages;      /**< Statistics: protocol messages sent/received */
121 <    uint64_t bytes;             /**< Statistics: total bytes sent/received */
122 <  } recv, send;
123 <
124 <  struct AuthRequest *auth;
125 <  struct Listener *listener;   /**< listener accepted from */
126 <  dlink_list        acceptlist; /**< clients I'll allow to talk to me */
127 <  dlink_list        watches;   /**< chain of Watch pointer blocks */
128 <  dlink_list        confs;     /**< Configuration record associated */
129 <  dlink_list        invited;   /**< chain of invite pointer blocks */
130 <  struct irc_ssaddr ip;
131 <  int               aftype;    /**< Makes life easier for DNS res in IPV6 */
132 <
133 <  char              *passwd;
134 <  fde_t             fd;
135 <
136 <  /* Anti-flood stuff. We track how many messages were parsed and how
137 <   * many we were allowed in the current second, and apply a simple
138 <   * decay to avoid flooding.
139 <   *   -- adrian
140 <   */
141 <  int allow_read;       /**< how many we're allowed to read in this second */
142 <  int sent_parsed;      /**< how many messages we've parsed in this second */
143 <
144 <  char*          response;  /**< expected response from client */
145 <  char*          auth_oper; /**< Operator to become if they supply the response.*/
146 < };
147 <
148 < /*! \brief Client structure */
149 < struct Client
150 < {
151 <  dlink_node node;
152 <  dlink_node lnode;             /**< Used for Server->servers/users */
153 <
154 <  struct LocalUser *localClient;
155 <  struct Client    *hnext;      /**< For client hash table lookups by name */
156 <  struct Client    *idhnext;    /**< For SID hash table lookups by sid */
157 <  struct Server    *serv;       /**< ...defined, if this is a server */
158 <  struct Client    *servptr;    /**< Points to server this Client is on */
159 <  struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
160 <
161 <  time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
162 <  time_t            servicestamp; /**< Last time client has been identified for its nick */
163 <
164 <  unsigned int      flags;      /**< client flags */
165 <  unsigned int      umodes;     /**< opers, normal users subset */
166 <  unsigned int      hopcount;   /**< number of servers to this 0 = local */
167 <  unsigned int      status;     /**< Client type */
168 <  unsigned int      handler;    /**< Handler index */
169 <
170 <  dlink_list        whowas;
171 <  dlink_list        channel;   /**< chain of channel pointer blocks */
172 <
173 <  char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
174 <  char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
175 <  char id[IDLEN + 1];       /**< client ID, unique ID per client */
176 <
177 <  /*
178 <   * client->username is the username from ident or the USER message,
179 <   * If the client is idented the USER message is ignored, otherwise
180 <   * the username part of the USER message is put here prefixed with a
181 <   * tilde depending on the auth{} block. Once a client has registered,
182 <   * this field should be considered read-only.
183 <   */
184 <  char              username[USERLEN + 1]; /* client's username */
185 <
186 <  /*
187 <   * client->host contains the resolved name or ip address
188 <   * as a string for the user, it may be fiddled with for oper spoofing etc.
189 <   * once it's changed the *real* address goes away. This should be
190 <   * considered a read-only field after the client has registered.
191 <   */
192 <  char              host[HOSTLEN + 1];     /* client's hostname */
193 <
194 <  /*
195 <   * client->info for unix clients will normally contain the info from the
196 <   * gcos field in /etc/passwd but anything can go here.
197 <   */
198 <  char              info[REALLEN + 1]; /* Free form additional client info */
199 <
200 <  /*
201 <   * client->sockhost contains the ip address gotten from the socket as a
202 <   * string, this field should be considered read-only once the connection
203 <   * has been made. (set in s_bsd.c only)
204 <   */
205 <  char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
206 <                                                socket ip address as string */
207 < };
37 > #include "s_auth.h"
38  
39   /*
40   * status macros.
# Line 266 | Line 96 | struct Client
96  
97  
98   #define CAP_MULTI_PREFIX  0x00000001
99 + #define CAP_AWAY_NOTIFY   0x00000002
100  
101   #define HasCap(x, y) ((x)->localClient->cap_active & (y))
102  
103   /* housekeeping flags */
104 < #define FLAGS_PINGSENT      0x00000001 /**< Unreplied ping sent */
105 < #define FLAGS_DEADSOCKET    0x00000002 /**< Local socket is dead--Exiting soon */
106 < #define FLAGS_KILLED        0x00000004 /**< Prevents "QUIT" from being sent for this */
107 < #define FLAGS_CLOSING       0x00000008 /**< set when closing to suppress errors */
108 < #define FLAGS_GOTID         0x00000010 /**< successful ident lookup achieved */
109 < #define FLAGS_NEEDID        0x00000020 /**< auth{} block say must use ident return */
110 < #define FLAGS_SENDQEX       0x00000040 /**< Sendq exceeded */
111 < #define FLAGS_IPHASH        0x00000080 /**< iphashed this client */
112 < #define FLAGS_MARK          0x00000100 /**< marked client */
113 < #define FLAGS_CANFLOOD      0x00000200 /**< client has the ability to flood */
114 < #define FLAGS_EXEMPTGLINE   0x00000400 /**< client can't be G-lined */
115 < #define FLAGS_EXEMPTKLINE   0x00000800 /**< client is exempt from kline */
116 < #define FLAGS_NOLIMIT       0x00001000 /**< client is exempt from limits */
117 < #define FLAGS_PING_COOKIE   0x00002000 /**< PING Cookie */
118 < #define FLAGS_IP_SPOOFING   0x00004000 /**< client IP is spoofed */
119 < #define FLAGS_FLOODDONE     0x00008000 /**< Flood grace period has been ended. */
120 < #define FLAGS_EOB           0x00010000 /**< server has sent us an EOB */
121 < #define FLAGS_HIDDEN        0x00020000 /**< a hidden server. not shown in /links */
122 < #define FLAGS_BLOCKED       0x00040000 /**< must wait for COMM_SELECT_WRITE */
123 < #define FLAGS_USERHOST      0x00080000 /**< client is in userhost hash */
124 < #define FLAGS_BURSTED       0x00100000 /**< user was already bursted */
125 < #define FLAGS_EXEMPTRESV    0x00200000 /**< client is exempt from RESV */
126 < #define FLAGS_GOTUSER       0x00400000 /**< if we received a USER command */
127 < #define FLAGS_PINGWARNING   0x00800000 /**< unreplied ping warning already sent */
128 < #define FLAGS_FINISHED_AUTH 0x01000000 /**< Client has been released from auth */
129 < #define FLAGS_FLOOD_NOTICED 0x02000000 /**< Notice to opers about this flooder has been sent */
130 < #define FLAGS_SERVICE       0x04000000 /**< Client/server is a network service */
104 > #define FLAGS_PINGSENT       0x00000001 /**< Unreplied ping sent */
105 > #define FLAGS_DEADSOCKET     0x00000002 /**< Local socket is dead--Exiting soon */
106 > #define FLAGS_KILLED         0x00000004 /**< Prevents "QUIT" from being sent for this */
107 > #define FLAGS_CLOSING        0x00000008 /**< set when closing to suppress errors */
108 > #define FLAGS_GOTID          0x00000010 /**< successful ident lookup achieved */
109 > #define FLAGS_NEEDID         0x00000020 /**< auth{} block say must use ident return */
110 > #define FLAGS_SENDQEX        0x00000040 /**< Sendq exceeded */
111 > #define FLAGS_IPHASH         0x00000080 /**< iphashed this client */
112 > #define FLAGS_MARK           0x00000100 /**< marked client */
113 > #define FLAGS_CANFLOOD       0x00000200 /**< client has the ability to flood */
114 > #define FLAGS_EXEMPTGLINE    0x00000400 /**< client can't be G-lined */
115 > #define FLAGS_EXEMPTKLINE    0x00000800 /**< client is exempt from kline */
116 > #define FLAGS_NOLIMIT        0x00001000 /**< client is exempt from limits */
117 > #define FLAGS_PING_COOKIE    0x00002000 /**< PING Cookie */
118 > #define FLAGS_IP_SPOOFING    0x00004000 /**< client IP is spoofed */
119 > #define FLAGS_FLOODDONE      0x00008000 /**< Flood grace period has been ended. */
120 > #define FLAGS_EOB            0x00010000 /**< server has sent us an EOB */
121 > #define FLAGS_HIDDEN         0x00020000 /**< a hidden server. not shown in /links */
122 > #define FLAGS_BLOCKED        0x00040000 /**< must wait for COMM_SELECT_WRITE */
123 > #define FLAGS_USERHOST       0x00080000 /**< client is in userhost hash */
124 > #define FLAGS_BURSTED        0x00100000 /**< user was already bursted */
125 > #define FLAGS_EXEMPTRESV     0x00200000 /**< client is exempt from RESV */
126 > #define FLAGS_GOTUSER        0x00400000 /**< if we received a USER command */
127 > #define FLAGS_FINISHED_AUTH  0x00800000 /**< Client has been released from auth */
128 > #define FLAGS_FLOOD_NOTICED  0x01000000 /**< Notice to opers about this flooder has been sent */
129 > #define FLAGS_SERVICE        0x02000000 /**< Client/server is a network service */
130 > #define FLAGS_AUTH_SPOOF     0x04000000 /**< user's hostname has been spoofed by an auth{} spoof*/
131 > #define FLAGS_SSL            0x08000000 /**< User is connected via TLS/SSL */
132  
133   #define HasFlag(x, y) ((x)->flags &   (y))
134   #define AddFlag(x, y) ((x)->flags |=  (y))
# Line 323 | Line 155 | struct Client
155   #define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
156   #define UMODE_LOCOPS       0x00010000 /**< show locops */
157   #define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
158 < #define UMODE_CCONN_FULL   0x00040000 /**< add unused fields to connection monitoring */
159 < #define UMODE_REGISTERED   0x00080000 /**< User has identified for that nick. */
160 < #define UMODE_REGONLY      0x00100000 /**< Only registered nicks may PM */
161 < #define UMODE_HIDDEN       0x00200000 /**< Operator status is hidden */
162 < #define UMODE_OPER         0x00400000 /**< Operator */
163 < #define UMODE_ADMIN        0x00800000 /**< Admin on server */
158 > #define UMODE_REGISTERED   0x00040000 /**< User has identified for that nick. */
159 > #define UMODE_REGONLY      0x00080000 /**< Only registered nicks may PM */
160 > #define UMODE_HIDDEN       0x00100000 /**< Operator status is hidden */
161 > #define UMODE_OPER         0x00200000 /**< Operator */
162 > #define UMODE_ADMIN        0x00400000 /**< Admin on server */
163 > #define UMODE_FARCONNECT   0x00800000 /**< Can see remote client connects/exits */
164 > #define UMODE_HIDDENHOST   0x01000000 /**< User's host is hidden */
165 > #define UMODE_SSL          0x02000000 /**< User is connected via TLS/SSL */
166 >
167  
168   #define UMODE_ALL          UMODE_SERVNOTICE
169  
# Line 338 | Line 173 | struct Client
173  
174   #define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP |\
175                        UMODE_REGONLY | UMODE_REGISTERED | UMODE_ADMIN |\
176 <                      UMODE_HIDDEN)
176 >                      UMODE_HIDDEN | UMODE_HIDDENHOST | UMODE_SSL)
177  
178  
179  
180   /* oper priv flags */
181 < #define OPER_FLAG_GLOBAL_KILL  0x00000001 /**< Oper can global kill        */
182 < #define OPER_FLAG_REMOTE       0x00000002 /**> Oper can do squits/connects */
183 < #define OPER_FLAG_UNKLINE      0x00000004 /**< Oper can use unkline        */
184 < #define OPER_FLAG_GLINE        0x00000008 /**< Oper can use gline          */
185 < #define OPER_FLAG_N            0x00000010 /**< Oper can umode n            */
186 < #define OPER_FLAG_K            0x00000020 /**< Oper can kill/kline         */
187 < #define OPER_FLAG_X            0x00000040 /**< Oper can xline              */
188 < #define OPER_FLAG_DIE          0x00000080 /**< Oper can die                */
189 < #define OPER_FLAG_REHASH       0x00000100 /**< Oper can rehash             */
190 < #define OPER_FLAG_ADMIN        0x00000200 /**< Oper can set umode +a       */
191 < #define OPER_FLAG_OPERWALL     0x00000400 /**< Oper can use OPERWALL command */
192 < #define OPER_FLAG_OPER_SPY     0x00000800 /* */
193 < #define OPER_FLAG_REMOTEBAN    0x00001000 /**< Oper can set remote bans */
194 < #define OPER_FLAG_GLOBOPS      0x00002000 /**< Oper can use GLOBOPS command */
195 < #define OPER_FLAG_MODULE       0x00004000 /**< Oper can use MODULE commands */
196 < #define OPER_FLAG_RESTART      0x00008000 /**< Oper can use RESTART command */
197 < #define OPER_FLAG_DLINE        0x00010000 /**< Oper can use DLINE command   */
198 < #define OPER_FLAG_UNDLINE      0x00020000 /**< Oper can use UNDLINE command */
199 < #define OPER_FLAG_SET          0x00040000 /**< Oper can use SET command */
181 > #define OPER_FLAG_KILL_REMOTE    0x00000001 /**< Oper can global kill        */
182 > #define OPER_FLAG_KILL           0x00000002 /**< Oper can do local KILL      */
183 > #define OPER_FLAG_UNKLINE        0x00000004 /**< Oper can use unkline        */
184 > #define OPER_FLAG_GLINE          0x00000008 /**< Oper can use gline          */
185 > #define OPER_FLAG_K              0x00000010 /**< Oper can kill/kline         */
186 > #define OPER_FLAG_X              0x00000020 /**< Oper can xline              */
187 > #define OPER_FLAG_DIE            0x00000040 /**< Oper can die                */
188 > #define OPER_FLAG_REHASH         0x00000080 /**< Oper can rehash             */
189 > #define OPER_FLAG_ADMIN          0x00000100 /**< Oper can set umode +a       */
190 > #define OPER_FLAG_OPERWALL       0x00000200 /**< Oper can use OPERWALL command */
191 > #define OPER_FLAG_REMOTEBAN      0x00000400 /**< Oper can set remote bans */
192 > #define OPER_FLAG_GLOBOPS        0x00000800 /**< Oper can use GLOBOPS command */
193 > #define OPER_FLAG_MODULE         0x00001000 /**< Oper can use MODULE commands */
194 > #define OPER_FLAG_RESTART        0x00002000 /**< Oper can use RESTART command */
195 > #define OPER_FLAG_DLINE          0x00004000 /**< Oper can use DLINE command   */
196 > #define OPER_FLAG_UNDLINE        0x00008000 /**< Oper can use UNDLINE command */
197 > #define OPER_FLAG_SET            0x00010000 /**< Oper can use SET command */
198 > #define OPER_FLAG_SQUIT          0x00020000 /**< Oper can do local SQUIT */
199 > #define OPER_FLAG_SQUIT_REMOTE   0x00040000 /**< Oper can do global SQUIT */
200 > #define OPER_FLAG_CONNECT        0x00080000 /**< Oper can do local CONNECT */
201 > #define OPER_FLAG_CONNECT_REMOTE 0x00100000 /**< Oper can do global CONNECT */
202 > #define OPER_FLAG_WALLOPS        0x00200000 /**< Oper can do WALLOPS */
203 > #define OPER_FLAG_LOCOPS         0x00400000 /**< Oper can do LOCOPS */
204  
205   #define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
206   #define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
# Line 406 | Line 245 | struct Client
245   #define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
246   #define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
247  
409 #define SetPingWarning(x)       ((x)->flags |= FLAGS_PINGWARNING)
410 #define IsPingWarning(x)        ((x)->flags & FLAGS_PINGWARNING)
411 #define ClearPingWarning(x)     ((x)->flags &= ~FLAGS_PINGWARNING)
412
248   #define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
249   #define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
250  
# Line 426 | Line 261 | struct Client
261   #define SetExemptResv(x)        ((x)->flags |= FLAGS_EXEMPTRESV)
262   #define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
263   #define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
264 + #define DelIPSpoof(x)           ((x)->flags &= ~FLAGS_IP_SPOOFING)
265  
266   #define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
267   #define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
# Line 438 | Line 274 | struct Client
274   #define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
275   #define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
276  
277 < #define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
278 < #define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
279 < #define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
277 >
278 > /*! \brief addr_mask_type enumeration */
279 > enum addr_mask_type
280 > {
281 >  HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
282 >  SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
283 >  MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
284 > };
285 >
286 > /*! \brief Server structure */
287 > struct Server
288 > {
289 >  dlink_list server_list; /**< Servers on this server */
290 >  dlink_list client_list; /**< Clients on this server */
291 >  char by[NICKLEN + 1];   /**< who activated this connection */
292 > };
293 >
294 > /*! \brief ListTask structure */
295 > struct ListTask
296 > {
297 >  dlink_list show_mask; /**< show these channels.. */
298 >  dlink_list hide_mask; /**< ..and hide these ones */
299 >
300 >  unsigned int hash_index; /**< the bucket we are currently in */
301 >  unsigned int users_min;
302 >  unsigned int users_max;
303 >  unsigned int created_min;
304 >  unsigned int created_max;
305 >  unsigned int topicts_min;
306 >  unsigned int topicts_max;
307 > };
308 >
309 > /*! \brief LocalUser structure
310 > *
311 > * Allocated only for local clients, that are directly connected
312 > * to \b this server with a socket.
313 > */
314 > struct LocalUser
315 > {
316 >  dlink_node   lclient_node;
317 >
318 >  unsigned int registration;
319 >  unsigned int cap_client;    /**< Client capabilities (from us) */
320 >  unsigned int cap_active;    /**< Active capabilities (to us) */
321 >  unsigned int       caps;       /**< capabilities bit-field */
322 >
323 >  unsigned int operflags;     /**< IRC Operator privilege flags */
324 >  unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
325 >
326 >  unsigned int serial;     /**< used to enforce 1 send per nick */
327 >
328 >  time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
329 >  time_t       firsttime;  /**< time client was created */
330 >  time_t       since;      /**< last time we parsed something */
331 >  time_t       last_knock;    /**< time of last knock */
332 >  time_t       last_join_time;   /**< when this client last
333 >                                    joined a channel */
334 >  time_t       last_leave_time;  /**< when this client last
335 >                                       * left a channel */
336 >  int          join_leave_count; /**< count of JOIN/LEAVE in less than
337 >                                         MIN_JOIN_LEAVE_TIME seconds */
338 >  int          oper_warn_count_down; /**< warn opers of this possible
339 >                                          spambot every time this gets to 0 */
340 >  time_t       last_caller_id_time;
341 >  time_t       first_received_message_time;
342 >  time_t       last_nick_change;
343 >  time_t       last_privmsg; /**< Last time we got a PRIVMSG */
344 >  time_t       last_away; /**< Away since... */
345 >
346 >  int          received_number_of_privmsgs;
347 >  unsigned int number_of_nick_changes;
348 >
349 >  struct ListTask  *list_task;
350 >
351 >  struct dbuf_queue buf_sendq;
352 >  struct dbuf_queue buf_recvq;
353 >
354 >  struct {
355 >    unsigned int messages;      /**< Statistics: protocol messages sent/received */
356 >    uint64_t bytes;             /**< Statistics: total bytes sent/received */
357 >  } recv, send;
358 >
359 >  struct AuthRequest auth;
360 >  struct Listener *listener;   /**< listener accepted from */
361 >  dlink_list        acceptlist; /**< clients I'll allow to talk to me */
362 >  dlink_list        watches;   /**< chain of Watch pointer blocks */
363 >  dlink_list        confs;     /**< Configuration record associated */
364 >  dlink_list        invited;   /**< chain of invite pointer blocks */
365 >  struct irc_ssaddr ip;
366 >  int               aftype;    /**< Makes life easier for DNS res in IPV6 */
367 >  int               country_id; /**< ID corresponding to a ISO 3166 country code */
368 >
369 >  char              *passwd;
370 >  fde_t             fd;
371 >  /* Anti-flood stuff. We track how many messages were parsed and how
372 >   * many we were allowed in the current second, and apply a simple
373 >   * decay to avoid flooding.
374 >   *   -- adrian
375 >   */
376 >  int allow_read;       /**< how many we're allowed to read in this second */
377 >  int sent_parsed;      /**< how many messages we've parsed in this second */
378 >
379 >  char*          response;  /**< expected response from client */
380 >  char*          auth_oper; /**< Operator to become if they supply the response.*/
381 > };
382 >
383 > /*! \brief Client structure */
384 > struct Client
385 > {
386 >  dlink_node node;
387 >  dlink_node lnode;             /**< Used for Server->servers/users */
388 >
389 >  struct LocalUser *localClient;
390 >  struct Client    *hnext;      /**< For client hash table lookups by name */
391 >  struct Client    *idhnext;    /**< For SID hash table lookups by sid */
392 >  struct Server    *serv;       /**< ...defined, if this is a server */
393 >  struct Client    *servptr;    /**< Points to server this Client is on */
394 >  struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
395 >
396 >  time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
397 >
398 >  unsigned int      flags;      /**< client flags */
399 >  unsigned int      umodes;     /**< opers, normal users subset */
400 >  unsigned int      hopcount;   /**< number of servers to this 0 = local */
401 >  unsigned int      status;     /**< Client type */
402 >  unsigned int      handler;    /**< Handler index */
403 >
404 >  dlink_list        whowas;
405 >  dlink_list        channel;   /**< chain of channel pointer blocks */
406 >
407 >  char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
408 >  char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
409 >  char svid[HOSTLEN + 1]; /**< Services ID. XXX: Going with HOSTLEN for now. NICKLEN might be too small
410 >                                if dealing with timestamps */
411 >  char id[IDLEN + 1];       /**< client ID, unique ID per client */
412 >  /*
413 >   * client->username is the username from ident or the USER message,
414 >   * If the client is idented the USER message is ignored, otherwise
415 >   * the username part of the USER message is put here prefixed with a
416 >   * tilde depending on the auth{} block. Once a client has registered,
417 >   * this field should be considered read-only.
418 >   */
419 >  char              username[USERLEN + 1]; /* client's username */
420 >  /*
421 >   * client->host contains the resolved name or ip address
422 >   * as a string for the user, it may be fiddled with for oper spoofing etc.
423 >   * once it's changed the *real* address goes away. This should be
424 >   * considered a read-only field after the client has registered.
425 >   */
426 >  char              host[HOSTLEN + 1];     /* client's hostname */
427 >
428 >  /*
429 >   * client->info for unix clients will normally contain the info from the
430 >   * gcos field in /etc/passwd but anything can go here.
431 >   */
432 >  char              info[REALLEN + 1]; /* Free form additional client info */
433 >
434 >  /*
435 >   * client->sockhost contains the ip address gotten from the socket as a
436 >   * string, this field should be considered read-only once the connection
437 >   * has been made. (set in s_bsd.c only)
438 >   */
439 >  char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
440 >                                                socket ip address as string */
441 >  char             *certfp;
442 > };
443  
444  
445   extern struct Client me;
446   extern dlink_list listing_client_list;
447   extern dlink_list global_client_list;
448 + extern dlink_list unknown_list;       /* unknown clients ON this server only        */
449 + extern dlink_list local_client_list;  /* local clients only ON this server          */
450 + extern dlink_list serv_list;          /* local servers to this server ONLY          */
451 + extern dlink_list global_serv_list;   /* global servers on the network              */
452 + extern dlink_list oper_list;          /* our opers, duplicated in local_client_list */
453  
454   extern int accept_message(struct Client *, struct Client *);
455 + extern unsigned int idle_time_get(const struct Client *, const struct Client *);
456   extern struct split_nuh_item *find_accept(const char *, const char *,
457                                            const char *, struct Client *, int);
458   extern void del_accept(struct split_nuh_item *, struct Client *);
459   extern void del_all_accepts(struct Client *);
460   extern void exit_client(struct Client *, struct Client *, const char *);
461   extern void check_conf_klines(void);
462 < extern void init_client(void);
462 > extern void client_init(void);
463   extern void dead_link_on_write(struct Client *, int);
464   extern void dead_link_on_read(struct Client *, int);
465   extern void exit_aborted_clients(void);

Diff Legend

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