ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/user.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/user.c (file contents):
Revision 3896 by michael, Fri Jun 6 19:08:47 2014 UTC vs.
Revision 6827 by michael, Fri Nov 20 19:48:05 2015 UTC

# Line 1 | Line 1
1   /*
2   *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (c) 1997-2014 ircd-hybrid development team
4 > *  Copyright (c) 1997-2015 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 15 | Line 15
15   *
16   *  You should have received a copy of the GNU General Public License
17   *  along with this program; if not, write to the Free Software
18 < *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18 > *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19   *  USA
20   */
21  
22 < /*! \file s_user.c
22 > /*! \file user.c
23   * \brief User related functions.
24   * \version $Id$
25   */
# Line 31 | Line 31
31   #include "channel_mode.h"
32   #include "client.h"
33   #include "hash.h"
34 + #include "id.h"
35   #include "irc_string.h"
36   #include "ircd.h"
37   #include "listener.h"
# Line 40 | Line 41
41   #include "log.h"
42   #include "server.h"
43   #include "send.h"
43 #include "supported.h"
44   #include "memory.h"
45   #include "packet.h"
46   #include "rng_mt.h"
# Line 48 | Line 48
48   #include "misc.h"
49   #include "parse.h"
50   #include "watch.h"
51 + #include "isupport.h"
52  
53   static char umode_buffer[IRCD_BUFSIZE];
53 static const char *uid_get(void);
54  
55 < /* Used for building up the isupport string,
56 < * used with init_isupport, add_isupport, delete_isupport
57 < */
58 < struct Isupport
59 < {
60 <  dlink_node node;
61 <  char *name;
62 <  char *options;
63 <  int number;
64 < };
65 <
66 < static dlink_list support_list;
67 < static dlink_list support_list_lines;
68 <
69 < /* memory is cheap. map 0-255 to equivalent mode */
70 < const unsigned int user_modes[256] =
55 > const struct user_modes *umode_map[256];
56 > const struct user_modes  umode_tab[] =
57   {
58 <  /* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
59 <  /* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
60 <  /* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
61 <  /* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
62 <  0,                  /* @ */
63 <  0,                  /* A */
64 <  0,                  /* B */
65 <  0,                  /* C */
66 <  UMODE_DEAF,         /* D */
67 <  0,                  /* E */
68 <  UMODE_FARCONNECT,   /* F */
69 <  UMODE_SOFTCALLERID, /* G */
70 <  UMODE_HIDDEN,       /* H */
71 <  0,                  /* I */
72 <  0,                  /* J */
73 <  0,                  /* K */
74 <  0,                  /* L */
75 <  0,                  /* M */
76 <  0,                  /* N */
77 <  0,                  /* O */
78 <  0,                  /* P */
79 <  0,                  /* Q */
80 <  UMODE_REGONLY,      /* R */
81 <  UMODE_SSL,          /* S */
82 <  0,                  /* T */
83 <  0,                  /* U */
84 <  0,                  /* V */
85 <  UMODE_WEBIRC,       /* W */
86 <  0,                  /* X */
101 <  0,                  /* Y */
102 <  0,                  /* Z 0x5A */
103 <  0, 0, 0, 0, 0,      /* 0x5F   */
104 <  0,                  /* 0x60   */
105 <  UMODE_ADMIN,        /* a */
106 <  UMODE_BOTS,         /* b */
107 <  UMODE_CCONN,        /* c */
108 <  UMODE_DEBUG,        /* d */
109 <  UMODE_EXTERNAL,     /* e */
110 <  UMODE_FULL,         /* f */
111 <  UMODE_CALLERID,     /* g */
112 <  0,                  /* h */
113 <  UMODE_INVISIBLE,    /* i */
114 <  UMODE_REJ,          /* j */
115 <  UMODE_SKILL,        /* k */
116 <  UMODE_LOCOPS,       /* l */
117 <  0,                  /* m */
118 <  UMODE_NCHANGE,      /* n */
119 <  UMODE_OPER,         /* o */
120 <  UMODE_HIDECHANS,    /* p */
121 <  UMODE_HIDEIDLE,     /* q */
122 <  UMODE_REGISTERED,   /* r */
123 <  UMODE_SERVNOTICE,   /* s */
124 <  0,                  /* t */
125 <  UMODE_UNAUTH,       /* u */
126 <  0,                  /* v */
127 <  UMODE_WALLOP,       /* w */
128 <  UMODE_HIDDENHOST,   /* x */
129 <  UMODE_SPY,          /* y */
130 <  0,                  /* z      0x7A */
131 <  0,0,0,0,0,          /* 0x7B - 0x7F */
132 <
133 <  /* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
134 <  /* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
135 <  /* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
136 <  /* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
137 <  /* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
138 <  /* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
139 <  /* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
140 <  /* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
58 >  { 'D', UMODE_DEAF         },
59 >  { 'F', UMODE_FARCONNECT   },
60 >  { 'G', UMODE_SOFTCALLERID },
61 >  { 'H', UMODE_HIDDEN       },
62 >  { 'R', UMODE_REGONLY      },
63 >  { 'S', UMODE_SSL          },
64 >  { 'W', UMODE_WEBIRC       },
65 >  { 'a', UMODE_ADMIN        },
66 >  { 'b', UMODE_BOTS         },
67 >  { 'c', UMODE_CCONN        },
68 >  { 'd', UMODE_DEBUG        },
69 >  { 'e', UMODE_EXTERNAL     },
70 >  { 'f', UMODE_FULL         },
71 >  { 'g', UMODE_CALLERID     },
72 >  { 'i', UMODE_INVISIBLE    },
73 >  { 'j', UMODE_REJ          },
74 >  { 'k', UMODE_SKILL        },
75 >  { 'l', UMODE_LOCOPS       },
76 >  { 'n', UMODE_NCHANGE      },
77 >  { 'o', UMODE_OPER         },
78 >  { 'p', UMODE_HIDECHANS    },
79 >  { 'q', UMODE_HIDEIDLE     },
80 >  { 'r', UMODE_REGISTERED   },
81 >  { 's', UMODE_SERVNOTICE   },
82 >  { 'u', UMODE_UNAUTH       },
83 >  { 'w', UMODE_WALLOP       },
84 >  { 'x', UMODE_HIDDENHOST   },
85 >  { 'y', UMODE_SPY          },
86 >  { '\0', 0 }
87   };
88  
89   void
90 < assemble_umode_buffer(void)
90 > user_modes_init(void)
91   {
146  unsigned int idx = 0;
92    char *umode_buffer_ptr = umode_buffer;
93  
94 <  for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
95 <    if (user_modes[idx])
96 <      *umode_buffer_ptr++ = idx;
94 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
95 >  {
96 >    umode_map[tab->c] = tab;
97 >    *umode_buffer_ptr++ = tab->c;
98 >  }
99  
100    *umode_buffer_ptr = '\0';
101   }
# Line 163 | Line 110 | void
110   show_lusers(struct Client *source_p)
111   {
112    if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113 <    sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
114 <                       Count.invisi, dlink_list_length(&global_serv_list));
113 >    sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114 >                       Count.invisi, dlink_list_length(&global_server_list));
115    else
116 <    sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
117 <                       (Count.total - Count.invisi), Count.invisi, 1);
116 >    sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117 >                       Count.invisi, 1);
118  
119    if (Count.oper)
120      sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
# Line 175 | Line 122 | show_lusers(struct Client *source_p)
122    if (dlink_list_length(&unknown_list))
123      sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124  
125 <  if (dlink_list_length(&global_channel_list))
126 <    sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
125 >  if (dlink_list_length(&channel_list))
126 >    sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
127  
128    if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129    {
# Line 202 | Line 149 | show_lusers(struct Client *source_p)
149      Count.max_loc_con = Count.local + Count.myserver;
150   }
151  
205 /* show_isupport()
206 *
207 * inputs       - pointer to client
208 * output       - NONE
209 * side effects - display to client what we support (for them)
210 */
211 void
212 show_isupport(struct Client *source_p)
213 {
214  const dlink_node *ptr = NULL;
215
216  DLINK_FOREACH(ptr, support_list_lines.head)
217    sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
218 }
219
220
152   /* report_and_set_user_flags()
153   *
154   * inputs       - pointer to source_p
# Line 231 | Line 162 | report_and_set_user_flags(struct Client
162   {
163    /* If this user is being spoofed, tell them so */
164    if (IsConfDoSpoofIp(conf))
165 <    sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
165 >    sendto_one_notice(source_p, &me, ":*** Spoofing your IP");
166  
167 <  /* If this user is in the exception class, Set it "E lined" */
167 >  /* If this user is in the exception class, set it "E lined" */
168    if (IsConfExemptKline(conf))
169    {
170 <    SetExemptKline(source_p);
171 <    sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
170 >    AddFlag(source_p, FLAGS_EXEMPTKLINE);
171 >    sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines");
172    }
173  
174 <  /*
244 <   * The else here is to make sure that G line exempt users
245 <   * do not get noticed twice.
246 <   */
247 <  else if (IsConfExemptGline(conf))
174 >  if (IsConfExemptXline(conf))
175    {
176 <    SetExemptGline(source_p);
177 <    sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
176 >    AddFlag(source_p, FLAGS_EXEMPTXLINE);
177 >    sendto_one_notice(source_p, &me, ":*** You are exempt from X lines");
178    }
179  
180    if (IsConfExemptResv(conf))
181    {
182 <    SetExemptResv(source_p);
183 <    sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
182 >    AddFlag(source_p, FLAGS_EXEMPTRESV);
183 >    sendto_one_notice(source_p, &me, ":*** You are exempt from resvs");
184    }
185  
186    /* If this user is exempt from user limits set it "F lined" */
187    if (IsConfExemptLimits(conf))
188    {
189 <    SetExemptLimits(source_p);
190 <    sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
189 >    AddFlag(source_p, FLAGS_NOLIMIT);
190 >    sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
191    }
192  
193    if (IsConfCanFlood(conf))
194    {
195 <    SetCanFlood(source_p);
196 <    sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
270 <                      "protection, aren't you fearsome.");
195 >    AddFlag(source_p, FLAGS_CANFLOOD);
196 >    sendto_one_notice(source_p, &me, ":*** You are exempt from flood protection");
197    }
198   }
199  
# Line 282 | Line 208 | report_and_set_user_flags(struct Client
208   static void
209   introduce_client(struct Client *source_p)
210   {
211 <  dlink_node *ptr = NULL;
211 >  dlink_node *node = NULL;
212    char ubuf[IRCD_BUFSIZE] = "";
213  
214    if (MyClient(source_p))
215 <    send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
215 >    send_umode(source_p, source_p, 0, ubuf);
216    else
217 <    send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
217 >    send_umode(NULL, source_p, 0, ubuf);
218  
219    watch_check_hash(source_p, RPL_LOGON);
220  
# Line 298 | Line 224 | introduce_client(struct Client *source_p
224      ubuf[1] = '\0';
225    }
226  
227 <  DLINK_FOREACH(ptr, serv_list.head)
227 >  DLINK_FOREACH(node, local_server_list.head)
228    {
229 <    struct Client *server = ptr->data;
229 >    struct Client *server = node->data;
230  
231      if (server == source_p->from)
232        continue;
233  
234 <    if (IsCapable(server, CAP_SVS))
235 <      sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
234 >    if (IsCapable(server, CAPAB_SVS))
235 >      sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
236                   source_p->servptr->id,
237                   source_p->name, source_p->hopcount+1,
238 <                 (unsigned long)source_p->tsinfo,
238 >                 source_p->tsinfo,
239                   ubuf, source_p->username, source_p->host,
240 <                 (MyClient(source_p) && IsIPSpoof(source_p)) ?
241 <                 "0" : source_p->sockhost, source_p->id,
316 <                 source_p->svid,
240 >                 source_p->sockhost, source_p->id,
241 >                 source_p->account,
242                   source_p->info);
243      else
244 <      sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
244 >      sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s :%s",
245                   source_p->servptr->id,
246                   source_p->name, source_p->hopcount+1,
247 <                 (unsigned long)source_p->tsinfo,
247 >                 source_p->tsinfo,
248                   ubuf, source_p->username, source_p->host,
249 <                 (MyClient(source_p) && IsIPSpoof(source_p)) ?
325 <                 "0" : source_p->sockhost, source_p->id, source_p->info);
249 >                 source_p->sockhost, source_p->id, source_p->info);
250  
251      if (!EmptyString(source_p->certfp))
252        sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
# Line 338 | Line 262 | introduce_client(struct Client *source_p
262   static void
263   user_welcome(struct Client *source_p)
264   {
341 #if defined(__TIME__) && defined(__DATE__)
265    static const char built_date[] = __DATE__ " at " __TIME__;
343 #else
344  static const char built_date[] = "unknown";
345 #endif
266  
267   #ifdef HAVE_LIBCRYPTO
268    if (HasFlag(source_p, FLAGS_SSL))
269    {
270      AddUMode(source_p, UMODE_SSL);
271      sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
272 <                      ssl_get_cipher(source_p->localClient->fd.ssl));
272 >                      ssl_get_cipher(source_p->connection->fd.ssl));
273    }
274   #endif
275  
276 <  sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
276 >  sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
277                       source_p->name);
278    sendto_one_numeric(source_p, &me, RPL_YOURHOST,
279 <                     get_listener_name(source_p->localClient->listener), ircd_version);
279 >                     listener_get_name(source_p->connection->listener), ircd_version);
280    sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
281    sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
362  show_isupport(source_p);
363
364  if (source_p->id[0])
365    sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
282  
283 +  isupport_show(source_p);
284    show_lusers(source_p);
285    motd_signon(source_p);
286   }
# Line 378 | Line 295 | static int
295   check_xline(struct Client *source_p)
296   {
297    struct MaskItem *conf = NULL;
298 <  const char *reason = NULL;
298 >
299 >  if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
300 >    return 0;
301  
302    if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
303    {
304      ++conf->count;
386
387    if (conf->reason)
388      reason = conf->reason;
389    else
390      reason = CONF_NOREASON;
391
305      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
306                           "X-line Rejecting [%s] [%s], user %s [%s]",
307 <                         source_p->info, reason,
307 >                         source_p->info, conf->reason,
308                           get_client_name(source_p, HIDE_IP),
309                           source_p->sockhost);
310  
# Line 416 | Line 329 | register_local_user(struct Client *sourc
329  
330    assert(source_p == source_p->from);
331    assert(MyConnect(source_p));
332 <  assert(!source_p->localClient->registration);
332 >  assert(IsUnknown(source_p));
333 >  assert(!source_p->connection->registration);
334  
335 <  ClearCap(source_p, CAP_TS6);
422 <
423 <  if (ConfigFileEntry.ping_cookie)
335 >  if (ConfigGeneral.ping_cookie)
336    {
337 <    if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
337 >    if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
338      {
339        do
340 <        source_p->localClient->random_ping = genrand_int32();
341 <      while (!source_p->localClient->random_ping);
340 >        source_p->connection->random_ping = genrand_int32();
341 >      while (!source_p->connection->random_ping);
342  
343 <      sendto_one(source_p, "PING :%u",
344 <                 source_p->localClient->random_ping);
433 <      SetPingSent(source_p);
343 >      sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
344 >      AddFlag(source_p, FLAGS_PINGSENT);
345        return;
346      }
347  
348 <    if (!HasPingCookie(source_p))
348 >    if (!HasFlag(source_p, FLAGS_PING_COOKIE))
349        return;
350    }
351  
352 <  source_p->localClient->last_privmsg = CurrentTime;
352 >  source_p->connection->last_privmsg = CurrentTime;
353    /* Straight up the maximum rate of flooding... */
354 <  source_p->localClient->allow_read = MAX_FLOOD_BURST;
354 >  source_p->connection->allow_read = MAX_FLOOD_BURST;
355  
356    if (!check_client(source_p))
357      return;
# Line 449 | Line 360 | register_local_user(struct Client *sourc
360    {
361      sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
362                        "character in your hostname");
363 <    strlcpy(source_p->host, source_p->sockhost,
453 <            sizeof(source_p->host));
363 >    strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
364    }
365  
366 <  conf = source_p->localClient->confs.head->data;
366 >  conf = source_p->connection->confs.head->data;
367  
368 <  if (!IsGotId(source_p))
368 >  if (!HasFlag(source_p, FLAGS_GOTID))
369    {
370      char username[USERLEN + 1] = "";
461    const char *p = username;
371      unsigned int i = 0;
372  
373      if (IsNeedIdentd(conf))
# Line 475 | Line 384 | register_local_user(struct Client *sourc
384      if (!IsNoTilde(conf))
385        source_p->username[i++] = '~';
386  
387 <    for (; *p && i < USERLEN; ++p)
388 <      if (*p != '[')
480 <        source_p->username[i++] = *p;
387 >    for (const char *p = username; *p && i < USERLEN; ++p)
388 >      source_p->username[i++] = *p;
389  
390      source_p->username[i] = '\0';
391    }
# Line 485 | Line 393 | register_local_user(struct Client *sourc
393    /* Password check */
394    if (!EmptyString(conf->passwd))
395    {
396 <    if (!match_conf_password(source_p->localClient->passwd, conf))
396 >    if (!match_conf_password(source_p->connection->password, conf))
397      {
398        ++ServerStats.is_ref;
399  
# Line 496 | Line 404 | register_local_user(struct Client *sourc
404    }
405  
406    /*
407 <   * Don't free source_p->localClient->passwd here - it can be required
408 <   * by masked /stats I if there are auth{} blocks with need_password = no;
407 >   * Don't free source_p->connection->password here - it can be required
408 >   * by masked /stats I if there are auth {} blocks with need_password = no;
409     * --adx
410     */
411  
# Line 517 | Line 425 | register_local_user(struct Client *sourc
425     * probably be just a percentage of the MAXCLIENTS...
426     *   -Taner
427     */
428 <  if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
429 <      (Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
428 >  if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
429 >      (Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
430    {
431      sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
432                           "Too many clients, rejecting %s[%s].",
# Line 553 | Line 461 | register_local_user(struct Client *sourc
461    sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
462                         "Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
463                         source_p->name, source_p->username, source_p->host,
464 <                       ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
465 <                       "255.255.255.255" : source_p->sockhost,
558 <                       get_client_class(&source_p->localClient->confs),
464 >                       source_p->sockhost,
465 >                       get_client_class(&source_p->connection->confs),
466                         source_p->info, source_p->id);
467  
468 <  if (ConfigFileEntry.invisible_on_connect)
468 >  if (ConfigGeneral.invisible_on_connect)
469    {
470      AddUMode(source_p, UMODE_INVISIBLE);
471      ++Count.invisi;
# Line 569 | Line 476 | register_local_user(struct Client *sourc
476      Count.max_loc = Count.local;
477  
478      if (!(Count.max_loc % 10))
479 <      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
480 <                           "New Max Local Clients: %d",
479 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
480 >                           "New maximum local client connections: %u",
481                             Count.max_loc);
482    }
483  
# Line 581 | Line 488 | register_local_user(struct Client *sourc
488    assert(source_p->servptr == &me);
489    SetClient(source_p);
490    dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
491 +  dlinkAdd(source_p, &source_p->node, &global_client_list);
492  
493    assert(dlinkFind(&unknown_list, source_p));
494  
495 <  dlink_move_node(&source_p->localClient->lclient_node,
495 >  dlink_move_node(&source_p->connection->lclient_node,
496                    &unknown_list, &local_client_list);
497  
498    user_welcome(source_p);
499 <  add_user_host(source_p->username, source_p->host, 0);
500 <  SetUserHost(source_p);
499 >  userhost_add(source_p->username, source_p->host, 0);
500 >  AddFlag(source_p, FLAGS_USERHOST);
501  
502    introduce_client(source_p);
503   }
# Line 605 | Line 513 | register_local_user(struct Client *sourc
513   *                is introduced by a server.
514   */
515   void
516 < register_remote_user(struct Client *source_p, const char *username,
609 <                     const char *host, const char *server)
516 > register_remote_user(struct Client *source_p)
517   {
518 <  struct Client *target_p = NULL;
612 <
613 <  assert(source_p->username != username);
614 <
615 <  strlcpy(source_p->host, host, sizeof(source_p->host));
616 <  strlcpy(source_p->username, username, sizeof(source_p->username));
617 <
618 <  /*
619 <   * Coming from another server, take the servers word for it
620 <   */
621 <  source_p->servptr = hash_find_server(server);
622 <
623 <  /*
624 <   * Super GhostDetect:
625 <   * If we can't find the server the user is supposed to be on,
626 <   * then simply blow the user away.        -Taner
627 <   */
628 <  if (source_p->servptr == NULL)
629 <  {
630 <    sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
631 <                         "No server %s for user %s[%s@%s] from %s",
632 <                         server, source_p->name, source_p->username,
633 <                         source_p->host, source_p->from->name);
634 <    sendto_one(source_p->from,
635 <               ":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
636 <               me.id, source_p->id, me.name, server);
637 <
638 <    AddFlag(source_p, FLAGS_KILLED);
639 <    exit_client(source_p, "Ghosted Client");
640 <    return;
641 <  }
518 >  const struct Client *target_p = NULL;
519  
520    if ((target_p = source_p->servptr) && target_p->from != source_p->from)
521    {
# Line 648 | Line 525 | register_remote_user(struct Client *sour
525                           source_p->host, source_p->servptr->name,
526                           target_p->name, target_p->from->name);
527      sendto_one(source_p->from,
528 <               ":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
528 >               ":%s KILL %s :%s (UID from wrong direction (%s != %s))",
529                 me.id, source_p->id, me.name, source_p->servptr->name,
530                 target_p->from->name);
531  
532      AddFlag(source_p, FLAGS_KILLED);
533 <    exit_client(source_p, "USER server wrong direction");
533 >    exit_client(source_p, "UID server wrong direction");
534      return;
535    }
536  
# Line 669 | Line 546 | register_remote_user(struct Client *sour
546  
547    SetClient(source_p);
548    dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
549 <  add_user_host(source_p->username, source_p->host, 1);
550 <  SetUserHost(source_p);
549 >  dlinkAdd(source_p, &source_p->node, &global_client_list);
550 >  userhost_add(source_p->username, source_p->host, 1);
551 >  AddFlag(source_p, FLAGS_USERHOST);
552  
553    if (HasFlag(source_p->servptr, FLAGS_EOB))
554      sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
555 <                         "Client connecting at %s: %s (%s@%s) [%s] <%s>",
555 >                         "Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
556                           source_p->servptr->name,
557                           source_p->name, source_p->username, source_p->host,
558 <                         source_p->info, source_p->id);
558 >                         source_p->sockhost, source_p->info, source_p->id);
559  
560    introduce_client(source_p);
561   }
# Line 722 | Line 600 | valid_hostname(const char *hostname)
600   int
601   valid_username(const char *username, const int local)
602   {
725  unsigned int dots = 0;
603    const char *p = username;
604  
605    assert(p);
# Line 740 | Line 617 | valid_username(const char *username, con
617  
618    if (local)
619    {
620 +    unsigned int dots = 0;
621 +
622      while (*++p)
623      {
624 <      if (*p == '.' && ConfigFileEntry.dots_in_ident)
624 >      if (*p == '.' && ConfigGeneral.dots_in_ident)
625        {
626 <        if (++dots > ConfigFileEntry.dots_in_ident)
626 >        if (++dots > ConfigGeneral.dots_in_ident)
627            return 0;
628          if (!IsUserChar(*(p + 1)))
629            return 0;
# Line 775 | Line 654 | valid_nickname(const char *nickname, con
654   {
655    const char *p = nickname;
656  
657 <  assert(nickname && *nickname);
657 >  assert(p);
658  
659    /*
660     * Nicks can't start with a digit or - or be 0 length.
661     */
662 <  if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
662 >  if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
663      return 0;
664  
665    for (; *p; ++p)
# Line 797 | Line 676 | valid_nickname(const char *nickname, con
676   * inputs       - client_p
677   *              - source_p
678   *              - int old
800 *              - sendmask mask of modes to send
679   *              - suplied umode_buf
680   * output       - NONE
681   */
682   void
683   send_umode(struct Client *client_p, struct Client *source_p,
684 <           unsigned int old, unsigned int sendmask, char *umode_buf)
684 >           unsigned int old, char *umode_buf)
685   {
686    char *m = umode_buf;
687    int what = 0;
# Line 812 | Line 690 | send_umode(struct Client *client_p, stru
690     * Build a string in umode_buf to represent the change in the user's
691     * mode between the new (source_p->umodes) and 'old'.
692     */
693 <  for (unsigned int i = 0; i < 128; ++i)
693 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
694    {
695 <    unsigned int flag = user_modes[i];
818 <
819 <    if (!flag)
820 <      continue;
821 <
822 <    if (MyClient(source_p) && !(flag & sendmask))
823 <      continue;
824 <
825 <    if ((flag & old) && !HasUMode(source_p, flag))
695 >    if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
696      {
697        if (what == MODE_DEL)
698 <        *m++ = (char)i;
698 >        *m++ = tab->c;
699        else
700        {
701          what = MODE_DEL;
702          *m++ = '-';
703 <        *m++ = (char)i;
703 >        *m++ = tab->c;
704        }
705      }
706 <    else if (!(flag & old) && HasUMode(source_p, flag))
706 >    else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
707      {
708        if (what == MODE_ADD)
709 <        *m++ = (char)i;
709 >        *m++ = tab->c;
710        else
711        {
712          what = MODE_ADD;
713          *m++ = '+';
714 <        *m++ = (char)i;
714 >        *m++ = tab->c;
715        }
716      }
717    }
# Line 850 | Line 720 | send_umode(struct Client *client_p, stru
720  
721    if (*umode_buf && client_p)
722      sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
723 <               source_p->name, source_p->username,
724 <               source_p->host, source_p->name, umode_buf);
723 >               client_p->name, client_p->username,
724 >               client_p->host, client_p->name, umode_buf);
725   }
726  
727   /* send_umode_out()
# Line 861 | Line 731 | send_umode(struct Client *client_p, stru
731   * side effects - Only send ubuf out to servers that know about this client
732   */
733   void
734 < send_umode_out(struct Client *client_p, struct Client *source_p,
865 <               unsigned int old)
734 > send_umode_out(struct Client *source_p, unsigned int old)
735   {
736    char buf[IRCD_BUFSIZE] = "";
737  
738 <  send_umode(NULL, source_p, old, SEND_UMODES, buf);
738 >  send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
739  
740    if (buf[0])
741 <    sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
741 >    sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
742                    source_p->id, source_p->id, buf);
874
875  if (client_p && MyClient(client_p))
876    send_umode(client_p, source_p, old, 0xffffffff, buf);
743   }
744  
745   void
746   user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
747   {
748 <  dlink_node *ptr = NULL;
748 >  dlink_node *node = NULL;
749  
750    if (!strcmp(target_p->host, hostname))
751      return;
# Line 888 | Line 754 | user_set_hostmask(struct Client *target_
754    {
755      case MODE_ADD:
756        AddUMode(target_p, UMODE_HIDDENHOST);
891      AddFlag(target_p, FLAGS_IP_SPOOFING);
757        break;
758      case MODE_DEL:
759        DelUMode(target_p, UMODE_HIDDENHOST);
895
896      if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
897        DelFlag(target_p, FLAGS_IP_SPOOFING);
760        break;
761      default: return;
762    }
763  
764 <  if (ConfigFileEntry.cycle_on_host_change)
765 <    sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
764 >  if (ConfigGeneral.cycle_on_host_change)
765 >    sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
766                                   target_p->name, target_p->username, target_p->host);
767  
768 <  if (IsUserHostIp(target_p))
769 <    delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
768 >  sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
769 >                               target_p->name, target_p->username,
770 >                               target_p->host, target_p->username, hostname);
771 >
772 >  if (HasFlag(target_p, FLAGS_USERHOST))
773 >    userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
774  
775    strlcpy(target_p->host, hostname, sizeof(target_p->host));
776  
777 <  add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
778 <  SetUserHost(target_p);
777 >  userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
778 >  AddFlag(target_p, FLAGS_USERHOST);
779  
780 <  if (MyClient(target_p))
780 >  if (MyConnect(target_p))
781    {
782 <    sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
782 >    sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
783      clear_ban_cache_client(target_p);
784    }
785  
786 <  if (!ConfigFileEntry.cycle_on_host_change)
786 >  if (!ConfigGeneral.cycle_on_host_change)
787      return;
788  
789 <  DLINK_FOREACH(ptr, target_p->channel.head)
789 >  DLINK_FOREACH(node, target_p->channel.head)
790    {
791      char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
792      char *p = modebuf;
793      int len = 0;
794 <    const struct Membership *ms = ptr->data;
794 >    const struct Membership *member = node->data;
795  
796 <    if (has_member_flags(ms, CHFL_CHANOP))
796 >    if (has_member_flags(member, CHFL_CHANOP))
797      {
798        *p++ = 'o';
799        len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
800      }
801  
802 <    if (has_member_flags(ms, CHFL_HALFOP))
802 >    if (has_member_flags(member, CHFL_HALFOP))
803      {
804        *p++ = 'h';
805        len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
806      }
807  
808 <    if (has_member_flags(ms, CHFL_VOICE))
808 >    if (has_member_flags(member, CHFL_VOICE))
809      {
810        *p++ = 'v';
811        len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
# Line 947 | Line 813 | user_set_hostmask(struct Client *target_
813  
814      *p = '\0';
815  
816 <    sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
817 <                                target_p->name, target_p->username, target_p->host,
818 <                                ms->chptr->chname);
819 <    if (nickbuf[0])
820 <      sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
821 <                                  target_p->servptr->name, ms->chptr->chname,
822 <                                  modebuf, nickbuf);
816 >    sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
817 >                         target_p->name, target_p->username,
818 >                         target_p->host, member->chptr->name,
819 >                         target_p->account, target_p->info);
820 >    sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
821 >                         target_p->name, target_p->username,
822 >                         target_p->host, member->chptr->name);
823  
824 +    if (nickbuf[0])
825 +      sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
826 +                           target_p->servptr->name, member->chptr->name,
827 +                           modebuf, nickbuf);
828    }
829  
830    if (target_p->away[0])
831 <    sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
831 >    sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
832                                   ":%s!%s@%s AWAY :%s",
833                                   target_p->name, target_p->username,
834                                   target_p->host, target_p->away);
835   }
966
967 /*! \brief Blindly opers up given source_p, using conf info.
968 *         All checks on passwords have already been done.
969 * \param source_p Pointer to given client to oper
970 */
971 void
972 oper_up(struct Client *source_p)
973 {
974  const unsigned int old = source_p->umodes;
975  const struct MaskItem *conf = source_p->localClient->confs.head->data;
976
977  assert(source_p->localClient->confs.head);
978
979  ++Count.oper;
980  SetOper(source_p);
981
982  if (conf->modes)
983    AddUMode(source_p, conf->modes);
984  else if (ConfigFileEntry.oper_umodes)
985    AddUMode(source_p, ConfigFileEntry.oper_umodes);
986
987  if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
988    ++Count.invisi;
989  if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
990    --Count.invisi;
991
992  assert(dlinkFind(&oper_list, source_p) == NULL);
993  dlinkAdd(source_p, make_dlink_node(), &oper_list);
994
995  AddOFlag(source_p, conf->port);
996
997  if (HasOFlag(source_p, OPER_FLAG_ADMIN))
998    AddUMode(source_p, UMODE_ADMIN);
999
1000  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1001                       get_oper_name(source_p));
1002  send_umode_out(source_p, source_p, old);
1003  sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1004 }
1005
1006 static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1007
1008 int
1009 valid_sid(const char *sid)
1010 {
1011  if (strlen(sid) == IRC_MAXSID)
1012    if (IsDigit(*sid))
1013      if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1014        return 1;
1015
1016  return 0;
1017 }
1018
1019 /*
1020 * init_uid()
1021 *
1022 * inputs       - NONE
1023 * output       - NONE
1024 * side effects - new_uid is filled in with server id portion (sid)
1025 *                (first 3 bytes) or defaulted to 'A'.
1026 *                Rest is filled in with 'A'
1027 */
1028 void
1029 init_uid(void)
1030 {
1031  memset(new_uid, 0, sizeof(new_uid));
1032
1033  if (!EmptyString(ServerInfo.sid))
1034    strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1035
1036  for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1037    if (new_uid[i] == '\0')
1038      new_uid[i] = 'A';
1039
1040  /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1041  memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1042 }
1043
1044 /*
1045 * add_one_to_uid
1046 *
1047 * inputs       - index number into new_uid
1048 * output       - NONE
1049 * side effects - new_uid is incremented by one
1050 *                note this is a recursive function
1051 */
1052 static void
1053 add_one_to_uid(unsigned int i)
1054 {
1055  if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1056  {
1057    if (new_uid[i] == 'Z')
1058      new_uid[i] = '0';
1059    else if (new_uid[i] == '9')
1060    {
1061      new_uid[i] = 'A';
1062      add_one_to_uid(i - 1);
1063    }
1064    else
1065      ++new_uid[i];
1066  }
1067  else
1068  {
1069    /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1070    if (new_uid[i] == 'Z')
1071      memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1072    else
1073      ++new_uid[i];
1074  }
1075 }
1076
1077 /*
1078 * uid_get
1079 *
1080 * inputs       - struct Client *
1081 * output       - new UID is returned to caller
1082 * side effects - new_uid is incremented by one.
1083 */
1084 static const char *
1085 uid_get(void)
1086 {
1087  add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1088  return new_uid;
1089 }
1090
1091 /*
1092 * init_isupport()
1093 *
1094 * input        - NONE
1095 * output       - NONE
1096 * side effects - Must be called before isupport is enabled
1097 */
1098 void
1099 init_isupport(void)
1100 {
1101  add_isupport("CALLERID", NULL, -1);
1102  add_isupport("CASEMAPPING", CASEMAP, -1);
1103  add_isupport("DEAF", "D", -1);
1104  add_isupport("KICKLEN", NULL, KICKLEN);
1105  add_isupport("MODES", NULL, MAXMODEPARAMS);
1106  add_isupport("PREFIX", "(ohv)@%+", -1);
1107  add_isupport("STATUSMSG", "@%+", -1);
1108  add_isupport("EXCEPTS", "e", -1);
1109  add_isupport("INVEX", "I", -1);
1110 }
1111
1112 /*
1113 * add_isupport()
1114 *
1115 * input        - name of supported function
1116 *              - options if any
1117 *              - number if any
1118 * output       - NONE
1119 * side effects - Each supported item must call this when activated
1120 */
1121 void
1122 add_isupport(const char *name, const char *options, int n)
1123 {
1124  dlink_node *ptr;
1125  struct Isupport *support = NULL;
1126
1127  DLINK_FOREACH(ptr, support_list.head)
1128  {
1129    support = ptr->data;
1130    if (irccmp(support->name, name) == 0)
1131    {
1132      MyFree(support->name);
1133      MyFree(support->options);
1134      break;
1135    }
1136  }
1137
1138  if (ptr == NULL)
1139  {
1140    support = MyCalloc(sizeof(*support));
1141    dlinkAddTail(support, &support->node, &support_list);
1142  }
1143
1144  support->name = xstrdup(name);
1145  if (options)
1146    support->options = xstrdup(options);
1147  support->number = n;
1148
1149  rebuild_isupport_message_line();
1150 }
1151
1152 /*
1153 * delete_isupport()
1154 *
1155 * input        - name of supported function
1156 * output       - NONE
1157 * side effects - Each supported item must call this when deactivated
1158 */
1159 void
1160 delete_isupport(const char *name)
1161 {
1162  dlink_node *ptr;
1163  struct Isupport *support;
1164
1165  DLINK_FOREACH(ptr, support_list.head)
1166  {
1167    support = ptr->data;
1168    if (irccmp(support->name, name) == 0)
1169    {
1170      dlinkDelete(ptr, &support_list);
1171      MyFree(support->name);
1172      MyFree(support->options);
1173      MyFree(support);
1174      break;
1175    }
1176  }
1177
1178  rebuild_isupport_message_line();
1179 }
1180
1181 /*
1182 * rebuild_isupport_message_line
1183 *
1184 * input        - NONE
1185 * output       - NONE
1186 * side effects - Destroy the isupport MessageFile lines, and rebuild.
1187 */
1188 void
1189 rebuild_isupport_message_line(void)
1190 {
1191  char isupportbuffer[IRCD_BUFSIZE];
1192  char *p = isupportbuffer;
1193  dlink_node *ptr = NULL, *ptr_next = NULL;
1194  int n = 0;
1195  int tokens = 0;
1196  size_t len = 0;
1197  size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1198
1199  DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1200  {
1201    dlinkDelete(ptr, &support_list_lines);
1202    MyFree(ptr->data);
1203    free_dlink_node(ptr);
1204  }
1205
1206  DLINK_FOREACH(ptr, support_list.head)
1207  {
1208    struct Isupport *support = ptr->data;
1209
1210    p += (n = sprintf(p, "%s", support->name));
1211    len += n;
1212
1213    if (support->options)
1214    {
1215      p += (n = sprintf(p, "=%s", support->options));
1216      len += n;
1217    }
1218
1219    if (support->number > 0)
1220    {
1221      p += (n = sprintf(p, "=%d", support->number));
1222      len += n;
1223    }
1224
1225    *p++ = ' ';
1226    len++;
1227    *p = '\0';
1228
1229    if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1230    { /* arbritrary for now */
1231      if (*--p == ' ')
1232        *p = '\0';
1233
1234      dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1235      p = isupportbuffer;
1236      len = 0;
1237      n = tokens = 0;
1238    }
1239  }
1240
1241  if (len)
1242  {
1243    if (*--p == ' ')
1244      *p = '\0';
1245    dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1246  }
1247 }

Diff Legend

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