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 5563 by michael, Sat Feb 14 20:07:46 2015 UTC vs.
Revision 8210 by michael, Sun Apr 16 10:46:46 2017 UTC

# Line 1 | Line 1
1   /*
2   *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (c) 1997-2015 ircd-hybrid development team
4 > *  Copyright (c) 1997-2017 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 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"
38   #include "motd.h"
39   #include "numeric.h"
40   #include "conf.h"
41 + #include "conf_gecos.h"
42   #include "log.h"
43   #include "server.h"
44   #include "send.h"
# Line 47 | Line 49
49   #include "misc.h"
50   #include "parse.h"
51   #include "watch.h"
52 + #include "isupport.h"
53 + #include "tls.h"
54  
55 < static char umode_buffer[IRCD_BUFSIZE];
52 < static const char *uid_get(void);
53 <
54 < /* Used for building up the isupport string,
55 < * used with init_isupport, add_isupport, delete_isupport
56 < */
57 < struct Isupport
58 < {
59 <  dlink_node node;
60 <  char *name;
61 <  char *options;
62 <  int number;
63 < };
64 <
65 < static dlink_list support_list;
66 < static dlink_list support_list_lines;
55 > static char umode_buffer[UMODE_MAX_STR];
56  
57   const struct user_modes *umode_map[256];
58   const struct user_modes  umode_tab[] =
# Line 94 | Line 83 | const struct user_modes  umode_tab[] =
83    { 's', UMODE_SERVNOTICE   },
84    { 'u', UMODE_UNAUTH       },
85    { 'w', UMODE_WALLOP       },
97  { 'x', UMODE_HIDDENHOST   },
86    { 'y', UMODE_SPY          },
87    { '\0', 0 }
88   };
89  
90   void
91 < user_usermodes_init(void)
91 > user_modes_init(void)
92   {
93    char *umode_buffer_ptr = umode_buffer;
94  
# Line 120 | Line 108 | user_usermodes_init(void)
108   * side effects - display to client user counts etc.
109   */
110   void
111 < show_lusers(struct Client *source_p)
111 > show_lusers(struct Client *client_p)
112   {
113 <  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
114 <    sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
113 >  if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
114 >    sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (dlink_list_length(&global_client_list) - Count.invisi),
115                         Count.invisi, dlink_list_length(&global_server_list));
116    else
117 <    sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117 >    sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (dlink_list_length(&global_client_list) - Count.invisi),
118                         Count.invisi, 1);
119  
120    if (Count.oper)
121 <    sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
121 >    sendto_one_numeric(client_p, &me, RPL_LUSEROP, Count.oper);
122  
123    if (dlink_list_length(&unknown_list))
124 <    sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124 >    sendto_one_numeric(client_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
125  
126    if (dlink_list_length(&channel_list))
127 <    sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
127 >    sendto_one_numeric(client_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
128  
129 <  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129 >  if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
130    {
131 <    sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
132 <    sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
131 >    sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&local_client_list), dlink_list_length(&local_server_list));
132 >    sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&local_client_list), Count.max_loc);
133 >    sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
134 >    sendto_one_numeric(client_p, &me, RPL_STATSCONN, Count.max_loc_con, Count.max_loc, Count.totalrestartcount);
135    }
136    else
137    {
138 <    sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
139 <    sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
138 >    sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&global_client_list), 0);
139 >    sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
140 >    sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
141    }
151
152  sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
153
154  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
155    sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
156                       Count.max_loc_cli, Count.totalrestartcount);
157
158  if (Count.local > Count.max_loc_cli)
159    Count.max_loc_cli = Count.local;
160
161  if ((Count.local + Count.myserver) > Count.max_loc_con)
162    Count.max_loc_con = Count.local + Count.myserver;
163 }
164
165 /* show_isupport()
166 *
167 * inputs       - pointer to client
168 * output       - NONE
169 * side effects - display to client what we support (for them)
170 */
171 void
172 show_isupport(struct Client *source_p)
173 {
174  const dlink_node *node = NULL;
175
176  DLINK_FOREACH(node, support_list_lines.head)
177    sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
142   }
143  
180
144   /* report_and_set_user_flags()
145   *
146 < * inputs       - pointer to source_p
146 > * inputs       - pointer to client_p
147   *              - pointer to conf for this user
148   * output       - NONE
149   * side effects - Report to user any special flags
150   *                they are getting, and set them.
151   */
152   static void
153 < report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
153 > report_and_set_user_flags(struct Client *client_p, const struct MaskItem *conf)
154   {
155    /* If this user is being spoofed, tell them so */
156    if (IsConfDoSpoofIp(conf))
157 <    sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
157 >    sendto_one_notice(client_p, &me, ":*** Spoofing your IP");
158  
159    /* If this user is in the exception class, set it "E lined" */
160    if (IsConfExemptKline(conf))
161    {
162 <    SetExemptKline(source_p);
163 <    sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
162 >    AddFlag(client_p, FLAGS_EXEMPTKLINE);
163 >    sendto_one_notice(client_p, &me, ":*** You are exempt from K/D lines");
164    }
165  
166 <  /*
204 <   * The else here is to make sure that G line exempt users
205 <   * do not get noticed twice.
206 <   */
207 <  else if (IsConfExemptGline(conf))
166 >  if (IsConfExemptXline(conf))
167    {
168 <    SetExemptGline(source_p);
169 <    sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
168 >    AddFlag(client_p, FLAGS_EXEMPTXLINE);
169 >    sendto_one_notice(client_p, &me, ":*** You are exempt from X lines");
170    }
171  
172    if (IsConfExemptResv(conf))
173    {
174 <    SetExemptResv(source_p);
175 <    sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
174 >    AddFlag(client_p, FLAGS_EXEMPTRESV);
175 >    sendto_one_notice(client_p, &me, ":*** You are exempt from resvs");
176    }
177  
178    /* If this user is exempt from user limits set it "F lined" */
179    if (IsConfExemptLimits(conf))
180    {
181 <    SetExemptLimits(source_p);
182 <    sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
181 >    AddFlag(client_p, FLAGS_NOLIMIT);
182 >    sendto_one_notice(client_p, &me, ":*** You are exempt from user limits");
183    }
184  
185    if (IsConfCanFlood(conf))
186    {
187 <    SetCanFlood(source_p);
188 <    sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
230 <                      "protection, aren't you fearsome.");
187 >    AddFlag(client_p, FLAGS_CANFLOOD);
188 >    sendto_one_notice(client_p, &me, ":*** You are exempt from flood protection");
189    }
190   }
191  
192   /* introduce_client()
193   *
194 < * inputs       - source_p
194 > * inputs       - client_p
195   * output       - NONE
196   * side effects - This common function introduces a client to the rest
197   *                of the net, either from a local client connect or
198   *                from a remote connect.
199   */
200   static void
201 < introduce_client(struct Client *source_p)
201 > introduce_client(struct Client *client_p)
202   {
203 <  dlink_node *node = NULL;
204 <  char ubuf[IRCD_BUFSIZE] = "";
247 <
248 <  if (MyClient(source_p))
249 <    send_umode(source_p, source_p, 0, ubuf);
250 <  else
251 <    send_umode(NULL, source_p, 0, ubuf);
203 >  dlink_node *node;
204 >  char buf[UMODE_MAX_STR] = "";
205  
206 <  watch_check_hash(source_p, RPL_LOGON);
206 >  send_umode(client_p, MyConnect(client_p), 0, buf);
207 >  watch_check_hash(client_p, RPL_LOGON);
208  
209 <  if (ubuf[0] == '\0')
209 >  if (buf[0] == '\0')
210    {
211 <    ubuf[0] = '+';
212 <    ubuf[1] = '\0';
211 >    buf[0] = '+';
212 >    buf[1] = '\0';
213    }
214  
215    DLINK_FOREACH(node, local_server_list.head)
216    {
217 <    struct Client *server = node->data;
217 >    struct Client *server_p = node->data;
218  
219 <    if (server == source_p->from)
219 >    if (server_p == client_p->from)
220        continue;
221  
222 <    if (IsCapable(server, CAP_SVS))
223 <      sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
224 <                 source_p->servptr->id,
225 <                 source_p->name, source_p->hopcount+1,
226 <                 (unsigned long)source_p->tsinfo,
227 <                 ubuf, source_p->username, source_p->host,
228 <                 source_p->sockhost, source_p->id,
229 <                 source_p->account,
276 <                 source_p->info);
277 <    else
278 <      sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
279 <                 source_p->servptr->id,
280 <                 source_p->name, source_p->hopcount+1,
281 <                 (unsigned long)source_p->tsinfo,
282 <                 ubuf, source_p->username, source_p->host,
283 <                 source_p->sockhost, source_p->id, source_p->info);
222 >    sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
223 >               client_p->servptr->id,
224 >               client_p->name, client_p->hopcount+1,
225 >               client_p->tsinfo,
226 >               buf, client_p->username, client_p->host,
227 >               client_p->sockhost, client_p->id,
228 >               client_p->account,
229 >               client_p->info);
230  
231 <    if (!EmptyString(source_p->certfp))
232 <      sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
231 >    if (!EmptyString(client_p->certfp))
232 >      sendto_one(server_p, ":%s CERTFP %s", client_p->id, client_p->certfp);
233    }
234   }
235  
# Line 294 | Line 240 | introduce_client(struct Client *source_p
240   * side effects -
241   */
242   static void
243 < user_welcome(struct Client *source_p)
243 > user_welcome(struct Client *client_p)
244   {
299 #if defined(__TIME__) && defined(__DATE__)
245    static const char built_date[] = __DATE__ " at " __TIME__;
301 #else
302  static const char built_date[] = "unknown";
303 #endif
304
305 #ifdef HAVE_LIBCRYPTO
306  if (HasFlag(source_p, FLAGS_SSL))
307  {
308    AddUMode(source_p, UMODE_SSL);
309    sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
310                      ssl_get_cipher(source_p->connection->fd.ssl));
311  }
312 #endif
313
314  sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
315                     source_p->name);
316  sendto_one_numeric(source_p, &me, RPL_YOURHOST,
317                     get_listener_name(source_p->connection->listener), ircd_version);
318  sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
319  sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
320  show_isupport(source_p);
321  sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
246  
247 <  show_lusers(source_p);
248 <  motd_signon(source_p);
247 >  if (HasFlag(client_p, FLAGS_SSL))
248 >  {
249 >    AddUMode(client_p, UMODE_SSL);
250 >    sendto_one_notice(client_p, &me, ":*** Connected securely via %s",
251 >                      tls_get_cipher(&client_p->connection->fd.ssl));
252 >  }
253 >
254 >  sendto_one_numeric(client_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
255 >                     client_p->name);
256 >  sendto_one_numeric(client_p, &me, RPL_YOURHOST,
257 >                     listener_get_name(client_p->connection->listener), ircd_version);
258 >  sendto_one_numeric(client_p, &me, RPL_CREATED, built_date);
259 >  sendto_one_numeric(client_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
260 >
261 >  isupport_show(client_p);
262 >  show_lusers(client_p);
263 >  motd_signon(client_p);
264   }
265  
266   /* check_xline()
# Line 331 | Line 270 | user_welcome(struct Client *source_p)
270   * side effects -
271   */
272   static int
273 < check_xline(struct Client *source_p)
273 > check_xline(struct Client *client_p)
274   {
275 <  struct MaskItem *conf = NULL;
275 >  const struct GecosItem *gecos = NULL;
276 >
277 >  if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
278 >    return 0;
279  
280 <  if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
280 >  if ((gecos = gecos_find(client_p->info, match)))
281    {
340    ++conf->count;
282      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
283                           "X-line Rejecting [%s] [%s], user %s [%s]",
284 <                         source_p->info, conf->reason,
285 <                         get_client_name(source_p, HIDE_IP),
286 <                         source_p->sockhost);
284 >                         client_p->info, gecos->reason,
285 >                         client_get_name(client_p, HIDE_IP),
286 >                         client_p->sockhost);
287  
288      ++ServerStats.is_ref;
289 <    exit_client(source_p, "Bad user info");
289 >    exit_client(client_p, "Bad user info");
290      return 1;
291    }
292  
# Line 355 | Line 296 | check_xline(struct Client *source_p)
296   /*! \brief This function is called when both NICK and USER messages
297   *      have been accepted for the client, in whatever order. Only
298   *      after this, is the UID message propagated.
299 < * \param source_p Pointer to given client to introduce
299 > * \param client_p Pointer to given client to introduce
300   */
301   void
302 < register_local_user(struct Client *source_p)
302 > register_local_user(struct Client *client_p)
303   {
363  const char *id = NULL;
304    const struct MaskItem *conf = NULL;
305  
306 <  assert(source_p == source_p->from);
307 <  assert(MyConnect(source_p));
308 <  assert(!source_p->connection->registration);
306 >  assert(client_p == client_p->from);
307 >  assert(MyConnect(client_p));
308 >  assert(IsUnknown(client_p));
309 >  assert(!client_p->connection->registration);
310  
311    if (ConfigGeneral.ping_cookie)
312    {
313 <    if (!IsPingSent(source_p) && !source_p->connection->random_ping)
313 >    if (!HasFlag(client_p, FLAGS_PINGSENT) && !client_p->connection->random_ping)
314      {
315        do
316 <        source_p->connection->random_ping = genrand_int32();
317 <      while (!source_p->connection->random_ping);
316 >        client_p->connection->random_ping = genrand_int32();
317 >      while (!client_p->connection->random_ping);
318  
319 <      sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
320 <      SetPingSent(source_p);
319 >      sendto_one(client_p, "PING :%u", client_p->connection->random_ping);
320 >      AddFlag(client_p, FLAGS_PINGSENT);
321        return;
322      }
323  
324 <    if (!HasPingCookie(source_p))
324 >    if (!HasFlag(client_p, FLAGS_PING_COOKIE))
325        return;
326    }
327  
328 <  source_p->connection->last_privmsg = CurrentTime;
328 >  client_p->connection->last_privmsg = CurrentTime;
329    /* Straight up the maximum rate of flooding... */
330 <  source_p->connection->allow_read = MAX_FLOOD_BURST;
330 >  client_p->connection->allow_read = MAX_FLOOD_BURST;
331  
332 <  if (!check_client(source_p))
332 >  if (!check_client(client_p))
333      return;
334  
335 <  if (!valid_hostname(source_p->host))
335 >  if (!valid_hostname(client_p->host))
336    {
337 <    sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
337 >    sendto_one_notice(client_p, &me, ":*** Notice -- You have an illegal "
338                        "character in your hostname");
339 <    strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
339 >    strlcpy(client_p->host, client_p->sockhost, sizeof(client_p->host));
340    }
341  
342 <  conf = source_p->connection->confs.head->data;
342 >  conf = client_p->connection->confs.head->data;
343  
344 <  if (!IsGotId(source_p))
344 >  if (!HasFlag(client_p, FLAGS_GOTID))
345    {
346      char username[USERLEN + 1] = "";
406    const char *p = username;
347      unsigned int i = 0;
348  
349      if (IsNeedIdentd(conf))
350      {
351        ++ServerStats.is_ref;
352 <      sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
352 >      sendto_one_notice(client_p, &me, ":*** Notice -- You need to install "
353                          "identd to use this server");
354 <      exit_client(source_p, "Install identd");
354 >      exit_client(client_p, "Install identd");
355        return;
356      }
357  
358 <    strlcpy(username, source_p->username, sizeof(username));
358 >    strlcpy(username, client_p->username, sizeof(username));
359  
360      if (!IsNoTilde(conf))
361 <      source_p->username[i++] = '~';
361 >      client_p->username[i++] = '~';
362  
363 <    for (; *p && i < USERLEN; ++p)
364 <      source_p->username[i++] = *p;
363 >    for (const char *p = username; *p && i < USERLEN; ++p)
364 >      client_p->username[i++] = *p;
365  
366 <    source_p->username[i] = '\0';
366 >    client_p->username[i] = '\0';
367    }
368  
369    /* Password check */
370    if (!EmptyString(conf->passwd))
371    {
372 <    if (!match_conf_password(source_p->connection->password, conf))
372 >    if (!match_conf_password(client_p->connection->password, conf))
373      {
374        ++ServerStats.is_ref;
375  
376 <      sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
377 <      exit_client(source_p, "Bad Password");
376 >      sendto_one_numeric(client_p, &me, ERR_PASSWDMISMATCH);
377 >      exit_client(client_p, "Bad Password");
378        return;
379      }
380    }
381  
382    /*
383 <   * Don't free source_p->connection->password here - it can be required
383 >   * Don't free client_p->connection->password here - it can be required
384     * by masked /stats I if there are auth {} blocks with need_password = no;
385     * --adx
386     */
387  
388    /*
389 <   * Report if user has &^>= etc. and set flags as needed in source_p
389 >   * Report if user has &^>= etc. and set flags as needed in client_p
390     */
391 <  report_and_set_user_flags(source_p, conf);
391 >  report_and_set_user_flags(client_p, conf);
392  
393 <  if (IsDead(source_p))
393 >  if (IsDead(client_p))
394      return;
395  
396    /*
# Line 461 | Line 401 | register_local_user(struct Client *sourc
401     * probably be just a percentage of the MAXCLIENTS...
402     *   -Taner
403     */
404 <  if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
405 <      (Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
404 >  if ((dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
405 >      (dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients && !HasFlag(client_p, FLAGS_NOLIMIT)))
406    {
407      sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
408                           "Too many clients, rejecting %s[%s].",
409 <                         source_p->name, source_p->host);
409 >                         client_p->name, client_p->host);
410      ++ServerStats.is_ref;
411 <    exit_client(source_p, "Sorry, server is full - try later");
411 >    exit_client(client_p, "Sorry, server is full - try later");
412      return;
413    }
414  
415 <  if (!valid_username(source_p->username, 1))
415 >  if (!valid_username(client_p->username, 1))
416    {
417      char buf[IRCD_BUFSIZE] = "";
418  
419      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
420                           "Invalid username: %s (%s@%s)",
421 <                         source_p->name, source_p->username, source_p->host);
421 >                         client_p->name, client_p->username, client_p->host);
422      ++ServerStats.is_ref;
423 <    snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
424 <    exit_client(source_p, buf);
423 >    snprintf(buf, sizeof(buf), "Invalid username [%s]", client_p->username);
424 >    exit_client(client_p, buf);
425      return;
426    }
427  
428 <  if (check_xline(source_p))
428 >  if (check_xline(client_p))
429      return;
430  
431 +  const char *id;
432    while (hash_find_id((id = uid_get())))
433      ;
434  
435 <  strlcpy(source_p->id, id, sizeof(source_p->id));
436 <  hash_add_id(source_p);
435 >  strlcpy(client_p->id, id, sizeof(client_p->id));
436 >  hash_add_id(client_p);
437  
438    sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
439                         "Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
440 <                       source_p->name, source_p->username, source_p->host,
441 <                       source_p->sockhost,
442 <                       get_client_class(&source_p->connection->confs),
443 <                       source_p->info, source_p->id);
440 >                       client_p->name, client_p->username, client_p->host,
441 >                       client_p->sockhost,
442 >                       get_client_class(&client_p->connection->confs),
443 >                       client_p->info, client_p->id);
444  
445    if (ConfigGeneral.invisible_on_connect)
446    {
447 <    AddUMode(source_p, UMODE_INVISIBLE);
447 >    AddUMode(client_p, UMODE_INVISIBLE);
448      ++Count.invisi;
449    }
450  
451 <  if (++Count.local > Count.max_loc)
451 >  assert(client_p->servptr == &me);
452 >  SetClient(client_p);
453 >  dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
454 >  dlinkAdd(client_p, &client_p->node, &global_client_list);
455 >
456 >  assert(dlinkFind(&unknown_list, client_p));
457 >
458 >  dlink_move_node(&client_p->connection->lclient_node,
459 >                  &unknown_list, &local_client_list);
460 >
461 >  if (dlink_list_length(&local_client_list) > Count.max_loc)
462    {
463 <    Count.max_loc = Count.local;
463 >    Count.max_loc = dlink_list_length(&local_client_list);
464  
465      if (!(Count.max_loc % 10))
466 <      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
466 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
467                             "New maximum local client connections: %u",
468                             Count.max_loc);
469    }
470  
471 <  if (++Count.total > Count.max_tot)
472 <    Count.max_tot = Count.total;
473 <  ++Count.totalrestartcount;
474 <
524 <  assert(source_p->servptr == &me);
525 <  SetClient(source_p);
526 <  dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
527 <  dlinkAdd(source_p, &source_p->node, &global_client_list);
528 <
529 <  assert(dlinkFind(&unknown_list, source_p));
471 >  if ((dlink_list_length(&local_client_list) +
472 >       dlink_list_length(&local_server_list)) > Count.max_loc_con)
473 >    Count.max_loc_con = dlink_list_length(&local_client_list) +
474 >                        dlink_list_length(&local_server_list);
475  
476 <  dlink_move_node(&source_p->connection->lclient_node,
477 <                  &unknown_list, &local_client_list);
476 >  if (dlink_list_length(&global_client_list) > Count.max_tot)
477 >    Count.max_tot = dlink_list_length(&global_client_list);
478 >  ++Count.totalrestartcount;
479  
480 <  user_welcome(source_p);
481 <  add_user_host(source_p->username, source_p->host, 0);
482 <  SetUserHost(source_p);
480 >  user_welcome(client_p);
481 >  userhost_add(client_p->sockhost, 0);
482 >  AddFlag(client_p, FLAGS_USERHOST);
483  
484 <  introduce_client(source_p);
484 >  introduce_client(client_p);
485   }
486  
487   /* register_remote_user()
488   *
489 < * inputs       - source_p remote or directly connected client
489 > * inputs       - client_p remote or directly connected client
490   *              - username to register as
491   *              - host name to register as
492   *              - server name
# Line 549 | Line 495 | register_local_user(struct Client *sourc
495   *                is introduced by a server.
496   */
497   void
498 < register_remote_user(struct Client *source_p)
498 > register_remote_user(struct Client *client_p)
499   {
500 <  const struct Client *target_p = NULL;
555 <
556 <  if ((target_p = source_p->servptr) && target_p->from != source_p->from)
557 <  {
558 <    sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
559 <                         "Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
560 <                         source_p->from->name, source_p->name, source_p->username,
561 <                         source_p->host, source_p->servptr->name,
562 <                         target_p->name, target_p->from->name);
563 <    sendto_one(source_p->from,
564 <               ":%s KILL %s :%s (UID from wrong direction (%s != %s))",
565 <               me.id, source_p->id, me.name, source_p->servptr->name,
566 <               target_p->from->name);
567 <
568 <    AddFlag(source_p, FLAGS_KILLED);
569 <    exit_client(source_p, "UID server wrong direction");
570 <    return;
571 <  }
500 >  assert(client_p->servptr->from == client_p->from);
501  
502    /*
503     * If the nick has been introduced by a services server,
504     * make it a service as well.
505     */
506 <  if (HasFlag(source_p->servptr, FLAGS_SERVICE))
507 <    AddFlag(source_p, FLAGS_SERVICE);
579 <
580 <  if (++Count.total > Count.max_tot)
581 <    Count.max_tot = Count.total;
506 >  if (HasFlag(client_p->servptr, FLAGS_SERVICE))
507 >    AddFlag(client_p, FLAGS_SERVICE);
508  
509 <  SetClient(source_p);
510 <  dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
511 <  dlinkAdd(source_p, &source_p->node, &global_client_list);
512 <  add_user_host(source_p->username, source_p->host, 1);
513 <  SetUserHost(source_p);
514 <
515 <  if (HasFlag(source_p->servptr, FLAGS_EOB))
516 <  {
517 <    if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
518 <      sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
519 <                           "Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
520 <                           source_p->servptr->name,
521 <                           source_p->name, source_p->username, source_p->host,
522 <                           source_p->sockhost, source_p->info, source_p->id);
523 <    else
524 <      sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
599 <                           "Client connecting at %s: %s (%s@%s) [%s] <%s>",
600 <                           source_p->servptr->name,
601 <                           source_p->name, source_p->username, source_p->host,
602 <                           source_p->info, source_p->id);
603 <  }
509 >  SetClient(client_p);
510 >  dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
511 >  dlinkAdd(client_p, &client_p->node, &global_client_list);
512 >
513 >  if (dlink_list_length(&global_client_list) > Count.max_tot)
514 >    Count.max_tot = dlink_list_length(&global_client_list);
515 >
516 >  userhost_add(client_p->sockhost, 1);
517 >  AddFlag(client_p, FLAGS_USERHOST);
518 >
519 >  if (HasFlag(client_p->servptr, FLAGS_EOB))
520 >    sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
521 >                         "Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
522 >                         client_p->servptr->name,
523 >                         client_p->name, client_p->username, client_p->host,
524 >                         client_p->sockhost, client_p->info, client_p->id);
525  
526 <  introduce_client(source_p);
526 >  introduce_client(client_p);
527   }
528  
529   /* valid_hostname()
# Line 645 | Line 566 | valid_hostname(const char *hostname)
566   int
567   valid_username(const char *username, const int local)
568   {
648  unsigned int dots = 0;
569    const char *p = username;
570  
571    assert(p);
# Line 663 | Line 583 | valid_username(const char *username, con
583  
584    if (local)
585    {
586 +    unsigned int dots = 0;
587 +
588      while (*++p)
589      {
590        if (*p == '.' && ConfigGeneral.dots_in_ident)
# Line 713 | Line 635 | valid_nickname(const char *nickname, con
635    return p - nickname <= NICKLEN;
636   }
637  
638 < /* send_umode()
639 < * send the MODE string for user (user) to connection client_p
640 < * -avalon
641 < *
642 < * inputs       - client_p
721 < *              - source_p
722 < *              - int old
723 < *              - sendmask mask of modes to send
724 < *              - suplied umode_buf
725 < * output       - NONE
638 > /*! \brief Builds a mode change string to buffer pointed by \a buf
639 > * \param client_p  Pointer to client
640 > * \param dispatch  Whether to send a MODE message to client_p
641 > * \param old       Old user mode to compare against when building new mode buffer
642 > * \param buf       Pointer to buffer to build string in
643   */
644   void
645 < send_umode(struct Client *client_p, struct Client *source_p,
646 <           unsigned int old, char *umode_buf)
645 > send_umode(struct Client *client_p, unsigned int dispatch,
646 >           unsigned int old, char *buf)
647   {
648 <  char *m = umode_buf;
648 >  char *m = buf;
649    int what = 0;
650  
651    /*
652     * Build a string in umode_buf to represent the change in the user's
653 <   * mode between the new (source_p->umodes) and 'old'.
653 >   * mode between the new (client_p->umodes) and 'old'.
654     */
655    for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
656    {
657 <    if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
657 >    if ((tab->flag & old) && !HasUMode(client_p, tab->flag))
658      {
659        if (what == MODE_DEL)
660          *m++ = tab->c;
# Line 748 | Line 665 | send_umode(struct Client *client_p, stru
665          *m++ = tab->c;
666        }
667      }
668 <    else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
668 >    else if (!(tab->flag & old) && HasUMode(client_p, tab->flag))
669      {
670        if (what == MODE_ADD)
671          *m++ = tab->c;
# Line 763 | Line 680 | send_umode(struct Client *client_p, stru
680  
681    *m = '\0';
682  
683 <  if (*umode_buf && client_p)
683 >  if (dispatch && *buf)
684      sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
685                 client_p->name, client_p->username,
686 <               client_p->host, client_p->name, umode_buf);
686 >               client_p->host, client_p->name, buf);
687   }
688  
689   /* send_umode_out()
# Line 776 | Line 693 | send_umode(struct Client *client_p, stru
693   * side effects - Only send ubuf out to servers that know about this client
694   */
695   void
696 < send_umode_out(struct Client *source_p, unsigned int old)
696 > send_umode_out(struct Client *client_p, unsigned int old)
697   {
698 <  char buf[IRCD_BUFSIZE] = "";
698 >  char buf[UMODE_MAX_STR] = "";
699  
700 <  send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
700 >  send_umode(client_p, MyConnect(client_p), old, buf);
701  
702    if (buf[0])
703 <    sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
704 <                  source_p->id, source_p->id, buf);
703 >    sendto_server(client_p, 0, 0, ":%s MODE %s :%s",
704 >                  client_p->id, client_p->id, buf);
705   }
706  
707   void
708 < user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
708 > user_set_hostmask(struct Client *client_p, const char *hostname)
709   {
710 <  dlink_node *node = NULL;
710 >  dlink_node *node;
711  
712 <  if (!strcmp(target_p->host, hostname))
712 >  if (!strcmp(client_p->host, hostname))
713      return;
714  
798  switch (what)
799  {
800    case MODE_ADD:
801      AddUMode(target_p, UMODE_HIDDENHOST);
802      break;
803    case MODE_DEL:
804      DelUMode(target_p, UMODE_HIDDENHOST);
805      break;
806    default: return;
807  }
808
715    if (ConfigGeneral.cycle_on_host_change)
716 <    sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
717 <                                 target_p->name, target_p->username, target_p->host);
812 <
813 <  if (IsUserHostIp(target_p))
814 <    delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
716 >    sendto_common_channels_local(client_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
717 >                                 client_p->name, client_p->username, client_p->host);
718  
719 <  strlcpy(target_p->host, hostname, sizeof(target_p->host));
719 >  sendto_common_channels_local(client_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
720 >                               client_p->name, client_p->username,
721 >                               client_p->host, client_p->username, hostname);
722  
723 <  add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
819 <  SetUserHost(target_p);
723 >  strlcpy(client_p->host, hostname, sizeof(client_p->host));
724  
725 <  if (MyClient(target_p))
725 >  if (MyConnect(client_p))
726    {
727 <    sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
728 <    clear_ban_cache_client(target_p);
727 >    sendto_one_numeric(client_p, &me, RPL_VISIBLEHOST, client_p->host);
728 >    clear_ban_cache_list(&client_p->channel);
729    }
730  
731    if (!ConfigGeneral.cycle_on_host_change)
732      return;
733  
734 <  DLINK_FOREACH(node, target_p->channel.head)
734 >  DLINK_FOREACH(node, client_p->channel.head)
735    {
736 <    char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
736 >    char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
737 >    char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
738      char *p = modebuf;
739      int len = 0;
740      const struct Membership *member = node->data;
# Line 837 | Line 742 | user_set_hostmask(struct Client *target_
742      if (has_member_flags(member, CHFL_CHANOP))
743      {
744        *p++ = 'o';
745 <      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
745 >      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
746      }
747  
748      if (has_member_flags(member, CHFL_HALFOP))
749      {
750        *p++ = 'h';
751 <      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
751 >      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
752      }
753  
754      if (has_member_flags(member, CHFL_VOICE))
755      {
756        *p++ = 'v';
757 <      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
757 >      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
758      }
759  
760      *p = '\0';
761  
762 <
763 <    sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
764 <                                target_p->name, target_p->username,
765 <                                target_p->host, member->chptr->name,
766 <                                (!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
767 <                                target_p->info);
768 <    sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
864 <                                target_p->name, target_p->username,
865 <                                target_p->host, member->chptr->name);
762 >    sendto_channel_local(client_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
763 >                         client_p->name, client_p->username,
764 >                         client_p->host, member->chptr->name,
765 >                         client_p->account, client_p->info);
766 >    sendto_channel_local(client_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
767 >                         client_p->name, client_p->username,
768 >                         client_p->host, member->chptr->name);
769  
770      if (nickbuf[0])
771 <      sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
772 <                                  target_p->servptr->name, member->chptr->name,
773 <                                  modebuf, nickbuf);
871 <
771 >      sendto_channel_local(client_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
772 >                           client_p->servptr->name, member->chptr->name,
773 >                           modebuf, nickbuf);
774    }
775  
776 <  if (target_p->away[0])
777 <    sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
776 >  if (client_p->away[0])
777 >    sendto_common_channels_local(client_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
778                                   ":%s!%s@%s AWAY :%s",
779 <                                 target_p->name, target_p->username,
780 <                                 target_p->host, target_p->away);
879 < }
880 <
881 < /*! \brief Blindly opers up given source_p, using conf info.
882 < *         All checks on passwords have already been done.
883 < * \param source_p Pointer to given client to oper
884 < */
885 < void
886 < oper_up(struct Client *source_p)
887 < {
888 <  const unsigned int old = source_p->umodes;
889 <  const struct MaskItem *const conf = source_p->connection->confs.head->data;
890 <
891 <  assert(source_p->connection->confs.head);
892 <
893 <  ++Count.oper;
894 <  SetOper(source_p);
895 <
896 <  if (conf->modes)
897 <    AddUMode(source_p, conf->modes);
898 <  else if (ConfigGeneral.oper_umodes)
899 <    AddUMode(source_p, ConfigGeneral.oper_umodes);
900 <
901 <  if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
902 <    ++Count.invisi;
903 <  if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
904 <    --Count.invisi;
905 <
906 <  assert(dlinkFind(&oper_list, source_p) == NULL);
907 <  dlinkAdd(source_p, make_dlink_node(), &oper_list);
908 <
909 <  AddOFlag(source_p, conf->port);
910 <
911 <  if (HasOFlag(source_p, OPER_FLAG_ADMIN))
912 <    AddUMode(source_p, UMODE_ADMIN);
913 <
914 <  if (!EmptyString(conf->whois))
915 <  {
916 <    client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
917 <    sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
918 <                  me.id, source_p->id, (unsigned long)source_p->tsinfo,
919 <                  RPL_WHOISOPERATOR, conf->whois);
920 <  }
921 <
922 <  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
923 <                       get_oper_name(source_p));
924 <  sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
925 <                me.id, get_oper_name(source_p));
926 <  send_umode_out(source_p, old);
927 <  sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
928 < }
929 <
930 < static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
931 <
932 < int
933 < valid_sid(const char *sid)
934 < {
935 <  if (strlen(sid) == IRC_MAXSID)
936 <    if (IsDigit(*sid))
937 <      if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
938 <        return 1;
939 <
940 <  return 0;
941 < }
942 <
943 < /*
944 < * init_uid()
945 < *
946 < * inputs       - NONE
947 < * output       - NONE
948 < * side effects - new_uid is filled in with server id portion (sid)
949 < *                (first 3 bytes) or defaulted to 'A'.
950 < *                Rest is filled in with 'A'
951 < */
952 < void
953 < init_uid(void)
954 < {
955 <  memset(new_uid, 0, sizeof(new_uid));
956 <
957 <  if (!EmptyString(ConfigServerInfo.sid))
958 <    strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
959 <
960 <  for (unsigned int i = 0; i < IRC_MAXSID; ++i)
961 <    if (new_uid[i] == '\0')
962 <      new_uid[i] = 'A';
963 <
964 <  /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
965 <  memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
966 < }
967 <
968 < /*
969 < * add_one_to_uid
970 < *
971 < * inputs       - index number into new_uid
972 < * output       - NONE
973 < * side effects - new_uid is incremented by one
974 < *                note this is a recursive function
975 < */
976 < static void
977 < add_one_to_uid(unsigned int i)
978 < {
979 <  if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
980 <  {
981 <    if (new_uid[i] == 'Z')
982 <      new_uid[i] = '0';
983 <    else if (new_uid[i] == '9')
984 <    {
985 <      new_uid[i] = 'A';
986 <      add_one_to_uid(i - 1);
987 <    }
988 <    else
989 <      ++new_uid[i];
990 <  }
991 <  else
992 <  {
993 <    /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
994 <    if (new_uid[i] == 'Z')
995 <      memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
996 <    else
997 <      ++new_uid[i];
998 <  }
999 < }
1000 <
1001 < /*
1002 < * uid_get
1003 < *
1004 < * inputs       - struct Client *
1005 < * output       - new UID is returned to caller
1006 < * side effects - new_uid is incremented by one.
1007 < */
1008 < static const char *
1009 < uid_get(void)
1010 < {
1011 <  add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1012 <  return new_uid;
1013 < }
1014 <
1015 < /*
1016 < * init_isupport()
1017 < *
1018 < * input        - NONE
1019 < * output       - NONE
1020 < * side effects - Must be called before isupport is enabled
1021 < */
1022 < void
1023 < init_isupport(void)
1024 < {
1025 <  add_isupport("CALLERID", NULL, -1);
1026 <  add_isupport("CASEMAPPING", "rfc1459", -1);
1027 <  add_isupport("DEAF", "D", -1);
1028 <  add_isupport("KICKLEN", NULL, KICKLEN);
1029 <  add_isupport("MODES", NULL, MAXMODEPARAMS);
1030 <  add_isupport("PREFIX", "(ohv)@%+", -1);
1031 <  add_isupport("STATUSMSG", "@%+", -1);
1032 <  add_isupport("EXCEPTS", NULL, -1);
1033 <  add_isupport("INVEX", NULL, -1);
1034 < }
1035 <
1036 < /*
1037 < * add_isupport()
1038 < *
1039 < * input        - name of supported function
1040 < *              - options if any
1041 < *              - number if any
1042 < * output       - NONE
1043 < * side effects - Each supported item must call this when activated
1044 < */
1045 < void
1046 < add_isupport(const char *name, const char *options, int n)
1047 < {
1048 <  dlink_node *node = NULL;
1049 <  struct Isupport *support = NULL;
1050 <
1051 <  DLINK_FOREACH(node, support_list.head)
1052 <  {
1053 <    support = node->data;
1054 <    if (irccmp(support->name, name) == 0)
1055 <    {
1056 <      MyFree(support->name);
1057 <      MyFree(support->options);
1058 <      break;
1059 <    }
1060 <  }
1061 <
1062 <  if (node == NULL)
1063 <  {
1064 <    support = MyCalloc(sizeof(*support));
1065 <    dlinkAddTail(support, &support->node, &support_list);
1066 <  }
1067 <
1068 <  support->name = xstrdup(name);
1069 <  if (options)
1070 <    support->options = xstrdup(options);
1071 <  support->number = n;
1072 <
1073 <  rebuild_isupport_message_line();
1074 < }
1075 <
1076 < /*
1077 < * delete_isupport()
1078 < *
1079 < * input        - name of supported function
1080 < * output       - NONE
1081 < * side effects - Each supported item must call this when deactivated
1082 < */
1083 < void
1084 < delete_isupport(const char *name)
1085 < {
1086 <  dlink_node *node = NULL;
1087 <
1088 <  DLINK_FOREACH(node, support_list.head)
1089 <  {
1090 <    struct Isupport *support = node->data;
1091 <
1092 <    if (irccmp(support->name, name) == 0)
1093 <    {
1094 <      dlinkDelete(node, &support_list);
1095 <      MyFree(support->name);
1096 <      MyFree(support->options);
1097 <      MyFree(support);
1098 <      break;
1099 <    }
1100 <  }
1101 <
1102 <  rebuild_isupport_message_line();
1103 < }
1104 <
1105 < /*
1106 < * rebuild_isupport_message_line
1107 < *
1108 < * input        - NONE
1109 < * output       - NONE
1110 < * side effects - Destroy the isupport MessageFile lines, and rebuild.
1111 < */
1112 < void
1113 < rebuild_isupport_message_line(void)
1114 < {
1115 <  char isupportbuffer[IRCD_BUFSIZE];
1116 <  char *p = isupportbuffer;
1117 <  dlink_node *node = NULL, *node_next = NULL;
1118 <  int n = 0;
1119 <  int tokens = 0;
1120 <  size_t len = 0;
1121 <  size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1122 <
1123 <  DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1124 <  {
1125 <    dlinkDelete(node, &support_list_lines);
1126 <    MyFree(node->data);
1127 <    free_dlink_node(node);
1128 <  }
1129 <
1130 <  DLINK_FOREACH(node, support_list.head)
1131 <  {
1132 <    struct Isupport *support = node->data;
1133 <
1134 <    p += (n = sprintf(p, "%s", support->name));
1135 <    len += n;
1136 <
1137 <    if (support->options)
1138 <    {
1139 <      p += (n = sprintf(p, "=%s", support->options));
1140 <      len += n;
1141 <    }
1142 <
1143 <    if (support->number > 0)
1144 <    {
1145 <      p += (n = sprintf(p, "=%d", support->number));
1146 <      len += n;
1147 <    }
1148 <
1149 <    *p++ = ' ';
1150 <    len++;
1151 <    *p = '\0';
1152 <
1153 <    if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1154 <    { /* arbritrary for now */
1155 <      if (*--p == ' ')
1156 <        *p = '\0';
1157 <
1158 <      dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1159 <      p = isupportbuffer;
1160 <      len = 0;
1161 <      n = tokens = 0;
1162 <    }
1163 <  }
1164 <
1165 <  if (len)
1166 <  {
1167 <    if (*--p == ' ')
1168 <      *p = '\0';
1169 <    dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1170 <  }
779 >                                 client_p->name, client_p->username,
780 >                                 client_p->host, client_p->away);
781   }

Comparing ircd-hybrid/trunk/src/user.c (property svn:keywords):
Revision 5563 by michael, Sat Feb 14 20:07:46 2015 UTC vs.
Revision 8210 by michael, Sun Apr 16 10:46:46 2017 UTC

# Line 1 | Line 1
1 < Id Revision
1 > Id

Diff Legend

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