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

Comparing ircd-hybrid/trunk/src/user.c (property svn:keywords):
Revision 6156 by michael, Thu Jun 18 09:19:25 2015 UTC vs.
Revision 8063 by michael, Thu Mar 23 17:13:50 2017 UTC

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

Diff Legend

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