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/trunk/include/client.h (file contents):
Revision 2852 by michael, Sat Jan 18 16:30:48 2014 UTC vs.
Revision 2865 by michael, Sun Jan 19 14:35:22 2014 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
2 > *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (C) 2002 by the past and present ircd coders, and others.
4 > *  Copyright (c) 1997-2014 ircd-hybrid development team
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 53 | Line 53 | struct MaskItem;
53   #define REG_NEED_CAP  0x4
54   #define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
55  
56 < #define HasID(x)                ((x)->id[0] != '\0')
57 < #define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
58 < #define ID_or_name(x,client_p)  ((IsCapable(client_p->from, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
56 > #define HasID(x)                ((x)->id[0] != '\0')
57 > #define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
58 > #define ID_or_name(x,client_p)  ((IsCapable(client_p->from, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
59  
60   #define IsRegistered(x)         ((x)->status  > STAT_UNKNOWN)
61   #define IsConnecting(x)         ((x)->status == STAT_CONNECTING)
# Line 66 | Line 66 | struct MaskItem;
66   #define IsClient(x)             ((x)->status == STAT_CLIENT)
67  
68   #define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
69 <                                 (x)->handler = UNREGISTERED_HANDLER; }
69 >                                 (x)->handler = UNREGISTERED_HANDLER; }
70  
71   #define SetHandshake(x)         {(x)->status = STAT_HANDSHAKE; \
72 <                                 (x)->handler = UNREGISTERED_HANDLER; }
72 >                                 (x)->handler = UNREGISTERED_HANDLER; }
73  
74   #define SetMe(x)                {(x)->status = STAT_ME; \
75 <                                 (x)->handler = UNREGISTERED_HANDLER; }
75 >                                 (x)->handler = UNREGISTERED_HANDLER; }
76  
77   #define SetUnknown(x)           {(x)->status = STAT_UNKNOWN; \
78 <                                 (x)->handler = UNREGISTERED_HANDLER; }
78 >                                 (x)->handler = UNREGISTERED_HANDLER; }
79  
80   #define SetServer(x)            {(x)->status = STAT_SERVER; \
81 <                                 (x)->handler = SERVER_HANDLER; }
81 >                                 (x)->handler = SERVER_HANDLER; }
82  
83   #define SetClient(x)            {(x)->status = STAT_CLIENT; \
84 <                                 (x)->handler = HasUMode(x, UMODE_OPER) ? \
85 <                                        OPER_HANDLER : CLIENT_HANDLER; }
84 >                                 (x)->handler = HasUMode(x, UMODE_OPER) ? \
85 >                                 OPER_HANDLER : CLIENT_HANDLER; }
86  
87   #define MyConnect(x)            ((x)->localClient != NULL)
88   #define MyClient(x)             (MyConnect(x) && IsClient(x))
# Line 219 | Line 219 | struct MaskItem;
219   #define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
220   #define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
221   #define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
222 < #define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
223 < #define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
224 < #define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
225 < #define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
226 < #define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
227 <                                               FLAGS_KILLED))
222 > #define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
223 > #define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
224 > #define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
225 > #define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
226 > #define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING|FLAGS_KILLED))
227  
228   /* oper flags */
229   #define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
230  
231   #define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
232 <                                 if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
232 >                                 if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
233  
234   #define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
235 <                                 if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
236 <                                  (x)->handler = CLIENT_HANDLER; }
235 >                                 if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
236 >                                  (x)->handler = CLIENT_HANDLER; }
237  
238 < #define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
239 < #define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
238 > #define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
239 > #define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
240  
241   #define SetIpHash(x)            ((x)->flags |= FLAGS_IPHASH)
242   #define ClearIpHash(x)          ((x)->flags &= ~FLAGS_IPHASH)
# Line 247 | Line 246 | struct MaskItem;
246   #define ClearUserHost(x)        ((x)->flags &= ~FLAGS_USERHOST)
247   #define IsUserHostIp(x)         ((x)->flags & FLAGS_USERHOST)
248  
249 < #define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
250 < #define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
251 < #define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
249 > #define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
250 > #define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
251 > #define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
252  
253   #define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
254   #define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
# Line 415 | Line 414 | struct Client
414    char svid[HOSTLEN + 1]; /**< Services ID. XXX: Going with HOSTLEN for now. NICKLEN might be too small
415                                  if dealing with timestamps */
416    char id[IDLEN + 1];       /**< client ID, unique ID per client */
417 <  /*
417 >  /*
418     * client->username is the username from ident or the USER message,
419     * If the client is idented the USER message is ignored, otherwise
420     * the username part of the USER message is put here prefixed with a

Diff Legend

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