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

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1899 by michael, Sat Apr 27 18:55:28 2013 UTC vs.
ircd-hybrid/branches/8.2.x/src/user.c (file contents), Revision 8751 by michael, Tue Jan 1 11:06:50 2019 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  s_user.c: User related functions.
2 > *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (C) 2002 by the past and present ircd coders, and others.
4 > *  Copyright (c) 1997-2019 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 16 | Line 15
15   *
16   *  You should have received a copy of the GNU General Public License
17   *  along with this program; if not, write to the Free Software
18 < *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18 > *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19   *  USA
20 < *
21 < *  $Id$
20 > */
21 >
22 > /*! \file user.c
23 > * \brief User related functions.
24 > * \version $Id$
25   */
26  
27   #include "stdinc.h"
28   #include "list.h"
29 < #include "s_user.h"
28 < #include "s_misc.h"
29 > #include "user.h"
30   #include "channel.h"
31   #include "channel_mode.h"
32   #include "client.h"
32 #include "fdlist.h"
33   #include "hash.h"
34 + #include "id.h"
35   #include "irc_string.h"
35 #include "s_bsd.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 "s_serv.h"
43 > #include "server.h"
44 > #include "server_capab.h" /* TBR: RHOST compatibility mode */
45   #include "send.h"
44 #include "supported.h"
45 #include "whowas.h"
46   #include "memory.h"
47   #include "packet.h"
48   #include "rng_mt.h"
49 < #include "userhost.h"
50 < #include "hook.h"
51 < #include "s_misc.h"
49 > #include "misc.h"
50   #include "parse.h"
51   #include "watch.h"
52 <
53 <
54 < struct Callback *entering_umode_cb = NULL;
55 < struct Callback *umode_cb = NULL;
56 <
57 < static char umode_buffer[IRCD_BUFSIZE];
58 <
59 < static void user_welcome(struct Client *);
60 < static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
61 < static int check_xline(struct Client *);
62 < static void introduce_client(struct Client *);
63 < static const char *uid_get(void);
64 <
65 < /* Used for building up the isupport string,
66 < * used with init_isupport, add_isupport, delete_isupport
67 < */
68 <
69 < struct Isupport
70 < {
71 <  dlink_node node;
72 <  char *name;
73 <  char *options;
74 <  int number;
75 < };
76 <
77 < static dlink_list support_list = { NULL, NULL, 0 };
78 < MessageFile *isupportFile;
79 <
80 < /* memory is cheap. map 0-255 to equivalent mode */
81 < unsigned int user_modes[256] =
82 < {
83 <  /* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
84 <  /* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
85 <  /* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
86 <  /* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
87 <  0,                  /* @ */
88 <  0,                  /* A */
91 <  0,                  /* B */
92 <  UMODE_CCONN_FULL,   /* C */
93 <  UMODE_DEAF,         /* D */
94 <  0,                  /* E */
95 <  0,                  /* F */
96 <  UMODE_SOFTCALLERID, /* G */
97 <  UMODE_HIDDEN,       /* H */
98 <  0,                  /* I */
99 <  0,                  /* J */
100 <  0,                  /* K */
101 <  0,                  /* L */
102 <  0,                  /* M */
103 <  0,                  /* N */
104 <  0,                  /* O */
105 <  0,                  /* P */
106 <  0,                  /* Q */
107 <  UMODE_REGONLY,      /* R */
108 <  0,                  /* S */
109 <  0,                  /* T */
110 <  0,                  /* U */
111 <  0,                  /* V */
112 <  0,                  /* W */
113 <  0,                  /* X */
114 <  0,                  /* Y */
115 <  0,                  /* Z 0x5A */
116 <  0, 0, 0, 0, 0,      /* 0x5F   */
117 <  0,                  /* 0x60   */
118 <  UMODE_ADMIN,        /* a */
119 <  UMODE_BOTS,         /* b */
120 <  UMODE_CCONN,        /* c */
121 <  UMODE_DEBUG,        /* d */
122 <  UMODE_EXTERNAL,     /* e */
123 <  UMODE_FULL,         /* f */
124 <  UMODE_CALLERID,     /* g */
125 <  0,                  /* h */
126 <  UMODE_INVISIBLE,    /* i */
127 <  UMODE_REJ,          /* j */
128 <  UMODE_SKILL,        /* k */
129 <  UMODE_LOCOPS,       /* l */
130 <  0,                  /* m */
131 <  UMODE_NCHANGE,      /* n */
132 <  UMODE_OPER,         /* o */
133 <  0,                  /* p */
134 <  0,                  /* q */
135 <  UMODE_REGISTERED,   /* r */
136 <  UMODE_SERVNOTICE,   /* s */
137 <  0,                  /* t */
138 <  UMODE_UNAUTH,       /* u */
139 <  0,                  /* v */
140 <  UMODE_WALLOP,       /* w */
141 <  0,                  /* x */
142 <  UMODE_SPY,          /* y */
143 <  UMODE_OPERWALL,     /* z      0x7A */
144 <  0,0,0,0,0,          /* 0x7B - 0x7F */
145 <
146 <  /* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
147 <  /* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
148 <  /* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
149 <  /* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
150 <  /* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
151 <  /* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
152 <  /* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
153 <  /* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
52 > #include "isupport.h"
53 > #include "tls.h"
54 > #include "patchlevel.h"
55 >
56 > static char umode_buffer[UMODE_MAX_STR];
57 >
58 > const struct user_modes *umode_map[256];
59 > const struct user_modes  umode_tab[] =
60 > {
61 >  { 'D', UMODE_DEAF         },
62 >  { 'F', UMODE_FARCONNECT   },
63 >  { 'G', UMODE_SOFTCALLERID },
64 >  { 'H', UMODE_HIDDEN       },
65 >  { 'R', UMODE_REGONLY      },
66 >  { 'S', UMODE_SSL          },
67 >  { 'W', UMODE_WEBIRC       },
68 >  { 'a', UMODE_ADMIN        },
69 >  { 'b', UMODE_BOTS         },
70 >  { 'c', UMODE_CCONN        },
71 >  { 'd', UMODE_DEBUG        },
72 >  { 'e', UMODE_EXTERNAL     },
73 >  { 'f', UMODE_FULL         },
74 >  { 'g', UMODE_CALLERID     },
75 >  { 'i', UMODE_INVISIBLE    },
76 >  { 'j', UMODE_REJ          },
77 >  { 'k', UMODE_SKILL        },
78 >  { 'l', UMODE_LOCOPS       },
79 >  { 'n', UMODE_NCHANGE      },
80 >  { 'o', UMODE_OPER         },
81 >  { 'p', UMODE_HIDECHANS    },
82 >  { 'q', UMODE_HIDEIDLE     },
83 >  { 'r', UMODE_REGISTERED   },
84 >  { 's', UMODE_SERVNOTICE   },
85 >  { 'u', UMODE_UNAUTH       },
86 >  { 'w', UMODE_WALLOP       },
87 >  { 'y', UMODE_SPY          },
88 >  { '\0', 0 }
89   };
90  
91   void
92 < assemble_umode_buffer(void)
92 > user_modes_init(void)
93   {
159  unsigned int idx = 0;
94    char *umode_buffer_ptr = umode_buffer;
95  
96 <  for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
97 <    if (user_modes[idx])
98 <      *umode_buffer_ptr++ = idx;
96 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
97 >  {
98 >    umode_map[tab->c] = tab;
99 >    *umode_buffer_ptr++ = tab->c;
100 >  }
101  
102    *umode_buffer_ptr = '\0';
103   }
# Line 173 | Line 109 | assemble_umode_buffer(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 <  const char *from, *to;
114 >  if (ConfigServerHide.hide_servers == 0 || 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(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(client_p, &me, RPL_LUSEROP, Count.oper);
123 >
124 >  if (dlink_list_length(&unknown_list))
125 >    sendto_one_numeric(client_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
126  
127 <  if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
127 >  if (dlink_list_length(channel_get_list()))
128 >    sendto_one_numeric(client_p, &me, RPL_LUSERCHANNELS, dlink_list_length(channel_get_list()));
129 >
130 >  if (ConfigServerHide.hide_servers == 0 || HasUMode(client_p, UMODE_OPER))
131    {
132 <    from = me.id;
133 <    to = source_p->id;
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 <    from = me.name;
140 <    to = source_p->name;
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    }
143 + }
144  
145 <  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
146 <    sendto_one(source_p, form_str(RPL_LUSERCLIENT),
147 <               from, to, (Count.total-Count.invisi),
148 <               Count.invisi, dlink_list_length(&global_serv_list));
149 <  else
150 <    sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
151 <               (Count.total-Count.invisi), Count.invisi, 1);
145 > /* report_and_set_user_flags()
146 > *
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 *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(client_p, &me, ":*** Spoofing your IP");
159  
160 <  if (Count.oper > 0)
161 <    sendto_one(source_p, form_str(RPL_LUSEROP),
162 <               from, to, Count.oper);
163 <
164 <  if (dlink_list_length(&unknown_list) > 0)
204 <    sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
205 <               from, to, dlink_list_length(&unknown_list));
206 <
207 <  if (dlink_list_length(&global_channel_list) > 0)
208 <    sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
209 <               from, to, dlink_list_length(&global_channel_list));
210 <
211 <  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
212 <  {
213 <    sendto_one(source_p, form_str(RPL_LUSERME),
214 <               from, to, Count.local, Count.myserver);
215 <    sendto_one(source_p, form_str(RPL_LOCALUSERS),
216 <               from, to, Count.local, Count.max_loc);
160 >  /* If this user is in the exception class, set it "E lined" */
161 >  if (IsConfExemptKline(conf))
162 >  {
163 >    AddFlag(client_p, FLAGS_EXEMPTKLINE);
164 >    sendto_one_notice(client_p, &me, ":*** You are exempt from K/D lines");
165    }
166 <  else
166 >
167 >  if (IsConfExemptXline(conf))
168 >  {
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 >    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 >    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 <    sendto_one(source_p, form_str(RPL_LUSERME),
189 <               from, to, Count.total, 0);
190 <    sendto_one(source_p, form_str(RPL_LOCALUSERS),
191 <               from, to, Count.total, Count.max_tot);
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       - 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 *client_p)
203 > {
204 >  dlink_node *node;
205 >  char buf[UMODE_MAX_STR] = "";
206 >
207 >  send_umode(client_p, MyConnect(client_p), 0, buf);
208 >  watch_check_hash(client_p, RPL_LOGON);
209 >
210 >  if (buf[0] == '\0')
211 >  {
212 >    buf[0] = '+';
213 >    buf[1] = '\0';
214    }
215  
216 <  sendto_one(source_p, form_str(RPL_GLOBALUSERS),
217 <             from, to, Count.total, Count.max_tot);
216 >  DLINK_FOREACH(node, local_server_list.head)
217 >  {
218 >    struct Client *server_p = node->data;
219  
220 <  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
221 <    sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
231 <               Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
220 >    if (server_p == client_p->from)
221 >      continue;
222  
223 <  if (Count.local > Count.max_loc_cli)
224 <    Count.max_loc_cli = Count.local;
223 >    /* TBR: compatibility mode */
224 >    if (IsCapable(server_p, CAPAB_RHOST))
225 >      sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s %s :%s",
226 >                 client_p->servptr->id,
227 >                 client_p->name, client_p->hopcount+1,
228 >                 client_p->tsinfo,
229 >                 buf, client_p->username, client_p->host, client_p->realhost,
230 >                 client_p->sockhost, client_p->id,
231 >                 client_p->account,
232 >                 client_p->info);
233 >    else
234 >      sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
235 >                 client_p->servptr->id,
236 >                 client_p->name, client_p->hopcount+1,
237 >                 client_p->tsinfo,
238 >                 buf, client_p->username, client_p->host,
239 >                 client_p->sockhost, client_p->id,
240 >                 client_p->account,
241 >                 client_p->info);
242  
243 <  if ((Count.local + Count.myserver) > Count.max_loc_con)
244 <    Count.max_loc_con = Count.local + Count.myserver;
243 >    if (!EmptyString(client_p->certfp))
244 >      sendto_one(server_p, ":%s CERTFP %s", client_p->id, client_p->certfp);
245 >  }
246   }
247  
248 < /* show_isupport()
248 > /* user_welcome()
249   *
250 < * inputs       - pointer to client
250 > * inputs       - client pointer to client to welcome
251   * output       - NONE
252 < * side effects - display to client what we support (for them)
252 > * side effects -
253   */
254 < void
255 < show_isupport(struct Client *source_p)
254 > static void
255 > user_welcome(struct Client *client_p)
256   {
257 <  send_message_file(source_p, isupportFile);
257 >  static const char built_date[] = __DATE__ " at " __TIME__;
258 >
259 >  if (HasFlag(client_p, FLAGS_SSL))
260 >  {
261 >    AddUMode(client_p, UMODE_SSL);
262 >    sendto_one_notice(client_p, &me, ":*** Connected securely via %s",
263 >                      tls_get_cipher(&client_p->connection->fd->ssl));
264 >  }
265 >
266 >  sendto_one_numeric(client_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
267 >                     client_p->name, client_p->username, client_p->realhost);
268 >  sendto_one_numeric(client_p, &me, RPL_YOURHOST,
269 >                     listener_get_name(client_p->connection->listener), PATCHLEVEL);
270 >  sendto_one_numeric(client_p, &me, RPL_CREATED, built_date);
271 >  sendto_one_numeric(client_p, &me, RPL_MYINFO, me.name, PATCHLEVEL, umode_buffer);
272 >
273 >  isupport_show(client_p);
274 >  show_lusers(client_p);
275 >  motd_signon(client_p);
276   }
277  
278 < /*
279 < ** register_local_user
280 < **      This function is called when both NICK and USER messages
281 < **      have been accepted for the client, in whatever order. Only
282 < **      after this, is the USER message propagated.
283 < **
284 < **      NICK's must be propagated at once when received, although
285 < **      it would be better to delay them too until full info is
286 < **      available. Doing it is not so simple though, would have
287 < **      to implement the following:
288 < **
289 < **      (actually it has been implemented already for a while) -orabidoo
290 < **
291 < **      1) user telnets in and gives only "NICK foobar" and waits
292 < **      2) another user far away logs in normally with the nick
293 < **         "foobar" (quite legal, as this server didn't propagate
294 < **         it).
295 < **      3) now this server gets nick "foobar" from outside, but
296 < **         has alread the same defined locally. Current server
297 < **         would just issue "KILL foobar" to clean out dups. But,
298 < **         this is not fair. It should actually request another
299 < **         nick from local user or kill him/her...
300 < */
278 > /* check_xline()
279 > *
280 > * inputs       - pointer to client to test
281 > * outupt       - 1 if exiting 0 if ok
282 > * side effects -
283 > */
284 > static bool
285 > check_xline(struct Client *client_p)
286 > {
287 >  const struct GecosItem *gecos = NULL;
288 >
289 >  if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
290 >    return false;
291 >
292 >  if ((gecos = gecos_find(client_p->info, match)))
293 >  {
294 >    sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
295 >                         "X-line Rejecting [%s] [%s], user %s [%s]",
296 >                         client_p->info, gecos->reason,
297 >                         client_get_name(client_p, HIDE_IP),
298 >                         client_p->sockhost);
299 >
300 >    ++ServerStats.is_ref;
301 >    exit_client(client_p, "Bad user info");
302 >    return true;
303 >  }
304 >
305 >  return false;
306 > }
307 >
308 > /*! \brief This function is called when both NICK and USER messages
309 > *      have been accepted for the client, in whatever order. Only
310 > *      after this, is the UID message propagated.
311 > * \param client_p Pointer to given client to introduce
312 > */
313   void
314 < register_local_user(struct Client *source_p)
314 > register_local_user(struct Client *client_p)
315   {
278  const char *id = NULL;
316    const struct MaskItem *conf = NULL;
317  
318 <  assert(source_p != NULL);
319 <  assert(source_p == source_p->from);
320 <  assert(MyConnect(source_p));
321 <  assert(!source_p->localClient->registration);
318 >  assert(client_p == client_p->from);
319 >  assert(client_p->connection->registration == 0);
320 >  assert(MyConnect(client_p));
321 >  assert(IsUnknown(client_p));
322  
323 <  ClearCap(source_p, CAP_TS6);
287 <
288 <  if (ConfigFileEntry.ping_cookie)
323 >  if (ConfigGeneral.ping_cookie)
324    {
325 <    if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
325 >    if (!HasFlag(client_p, FLAGS_PINGSENT) && client_p->connection->random_ping == 0)
326      {
327        do
328 <        source_p->localClient->random_ping = genrand_int32();
329 <      while (!source_p->localClient->random_ping);
328 >        client_p->connection->random_ping = genrand_int32();
329 >      while (client_p->connection->random_ping == 0);
330  
331 <      sendto_one(source_p, "PING :%u",
332 <                 source_p->localClient->random_ping);
298 <      SetPingSent(source_p);
331 >      sendto_one(client_p, "PING :%u", client_p->connection->random_ping);
332 >      AddFlag(client_p, FLAGS_PINGSENT);
333        return;
334      }
335  
336 <    if (!HasPingCookie(source_p))
336 >    if (!HasFlag(client_p, FLAGS_PING_COOKIE))
337        return;
338    }
339  
340 <  source_p->localClient->last_privmsg = CurrentTime;
307 <  /* Straight up the maximum rate of flooding... */
308 <  source_p->localClient->allow_read = MAX_FLOOD_BURST;
309 <
310 <  if (!check_client(source_p))
340 >  if (check_client(client_p) == 0)
341      return;
342  
343 <  if (valid_hostname(source_p->host) == 0)
314 <  {
315 <    sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
316 <               "character in your hostname", me.name, source_p->name);
317 <    strlcpy(source_p->host, source_p->sockhost,
318 <            sizeof(source_p->host));
319 <  }
320 <
321 <  conf = source_p->localClient->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];
326 <    const char *p = username;
347 >    char username[USERLEN + 1] = "";
348      unsigned int i = 0;
349  
350      if (IsNeedIdentd(conf))
351      {
352        ++ServerStats.is_ref;
353 <      sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
354 <                 "identd to use this server", me.name, source_p->name);
355 <      exit_client(source_p, &me, "Install identd");
353 >      sendto_one_notice(client_p, &me, ":*** Notice -- You need to install "
354 >                        "identd to use this server");
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 <      if (*p != '[')
345 <        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 */
370 >  /* Password check */
371    if (!EmptyString(conf->passwd))
372    {
373 <    const char *pass = source_p->localClient->passwd;
354 <
355 <    if (!match_conf_password(pass, conf))
373 >    if (match_conf_password(client_p->connection->password, conf) == false)
374      {
375        ++ServerStats.is_ref;
376 <      sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
377 <                 me.name, source_p->name);
378 <      exit_client(source_p, &me, "Bad Password");
376 >
377 >      sendto_one_numeric(client_p, &me, ERR_PASSWDMISMATCH);
378 >      exit_client(client_p, "Bad Password");
379        return;
380      }
381    }
382  
383 <  /* don't free source_p->localClient->passwd here - it can be required
384 <   * by masked /stats I if there are auth{} blocks with need_password = no;
383 >  /*
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 <  /* report if user has &^>= etc. and set flags as needed in source_p */
390 <  report_and_set_user_flags(source_p, conf);
389 >  /*
390 >   * Report if user has &^>= etc. and set flags as needed in client_p
391 >   */
392 >  report_and_set_user_flags(client_p, conf);
393  
394 <  if (IsDead(source_p))
394 >  if (IsDead(client_p))
395      return;
396  
397 <  /* Limit clients -
397 >  /*
398 >   * Limit clients -
399     * We want to be able to have servers and F-line clients
400     * connect, so save room for "buffer" connections.
401     * Smaller servers may want to decrease this, and it should
402     * probably be just a percentage of the MAXCLIENTS...
403     *   -Taner
404     */
405 <  /* Except "F:" clients */
406 <  if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385 <      (Count.local >= ServerInfo.max_clients && !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, &me, "Sorry, server is full - try later");
412 >    exit_client(client_p, "Sorry, server is full - try later");
413      return;
414    }
415  
416 <  /* valid user name check */
396 <  if (valid_username(source_p->username) == 0)
416 >  if (valid_username(client_p->username, true) == false)
417    {
418 <    char tmpstr2[IRCD_BUFSIZE];
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(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
425 <             source_p->username);
406 <    exit_client(source_p, &me, tmpstr2);
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 <  while (hash_find_id((id = uid_get())) != NULL)
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 <                       ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
443 <                       "255.255.255.255" : source_p->sockhost,
444 <                       get_client_class(&source_p->localClient->confs),
425 <                       source_p->info, source_p->id);
426 <
427 <  sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428 <                       "CLICONN %s %s %s %s %s %s %s 0 %s",
429 <                       source_p->name, source_p->username, source_p->host,
430 <                       ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431 <                       "255.255.255.255" : source_p->sockhost,
432 <                       get_client_class(&source_p->localClient->confs),
433 <                       ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434 <                           "<hidden>" : source_p->localClient->client_host,
435 <                       ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436 <                           "<hidden>" : source_p->localClient->client_server,
437 <                       source_p->info);
438 <
441 >                       client_p->name, client_p->username, client_p->realhost,
442 >                       client_p->sockhost,
443 >                       get_client_class(&client_p->connection->confs),
444 >                       client_p->info, client_p->id);
445  
446 <  if (ConfigFileEntry.invisible_on_connect)
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 >
454 >  SetClient(client_p);
455 >  client_p->connection->last_privmsg = CurrentTime;
456 >
457 >  dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
458 >  dlinkAdd(client_p, &client_p->node, &global_client_list);
459 >
460 >  assert(dlinkFind(&unknown_list, client_p));
461 >
462 >  dlink_move_node(&client_p->connection->lclient_node,
463 >                  &unknown_list, &local_client_list);
464 >
465 >  if (dlink_list_length(&local_client_list) > Count.max_loc)
466    {
467 <    Count.max_loc = Count.local;
467 >    Count.max_loc = dlink_list_length(&local_client_list);
468  
469      if (!(Count.max_loc % 10))
470 <      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
471 <                           "New Max Local Clients: %d",
470 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
471 >                           "New maximum local client connections: %u",
472                             Count.max_loc);
473    }
474  
475 <  /* Increment our total user count here */
476 <  if (++Count.total > Count.max_tot)
477 <    Count.max_tot = Count.total;
478 <  ++Count.totalrestartcount;
460 <
461 <  assert(source_p->servptr == &me);
462 <  SetClient(source_p);
463 <  dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
464 <
465 <  source_p->localClient->allow_read = MAX_FLOOD_BURST;
475 >  if ((dlink_list_length(&local_client_list) +
476 >       dlink_list_length(&local_server_list)) > Count.max_loc_con)
477 >    Count.max_loc_con = dlink_list_length(&local_client_list) +
478 >                        dlink_list_length(&local_server_list);
479  
480 <  assert(dlinkFind(&unknown_list, source_p));
481 <
482 <  dlink_move_node(&source_p->localClient->lclient_node,
470 <                  &unknown_list, &local_client_list);
480 >  if (dlink_list_length(&global_client_list) > Count.max_tot)
481 >    Count.max_tot = dlink_list_length(&global_client_list);
482 >  ++Count.totalrestartcount;
483  
484 <  user_welcome(source_p);
473 <  add_user_host(source_p->username, source_p->host, 0);
474 <  SetUserHost(source_p);
484 >  user_welcome(client_p);
485  
486 <  introduce_client(source_p);
486 >  introduce_client(client_p);
487   }
488  
489   /* register_remote_user()
490   *
491 < * inputs       - source_p remote or directly connected client
491 > * inputs       - client_p remote or directly connected client
492   *              - username to register as
493   *              - host name to register as
494   *              - server name
485 *              - realname (gecos)
495   * output       - NONE
496   * side effects - This function is called when a remote client
497   *                is introduced by a server.
498   */
499   void
500 < register_remote_user(struct Client *source_p,
492 <                     const char *username, const char *host, const char *server,
493 <                     const char *realname)
500 > register_remote_user(struct Client *client_p)
501   {
502 <  struct Client *target_p = NULL;
496 <
497 <  assert(source_p != NULL);
498 <  assert(source_p->username != username);
499 <
500 <  strlcpy(source_p->host, host, sizeof(source_p->host));
501 <  strlcpy(source_p->username, username, sizeof(source_p->username));
502 <
503 <  /*
504 <   * coming from another server, take the servers word for it
505 <   */
506 <  source_p->servptr = hash_find_server(server);
507 <
508 <  /*
509 <   * Super GhostDetect:
510 <   * If we can't find the server the user is supposed to be on,
511 <   * then simply blow the user away.        -Taner
512 <   */
513 <  if (source_p->servptr == NULL)
514 <  {
515 <    sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516 <                         "No server %s for user %s[%s@%s] from %s",
517 <                         server, source_p->name, source_p->username,
518 <                         source_p->host, source_p->from->name);
519 <    kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
520 <
521 <    AddFlag(source_p, FLAGS_KILLED);
522 <    exit_client(source_p, &me, "Ghosted Client");
523 <    return;
524 <  }
525 <
526 <  if ((target_p = source_p->servptr) && target_p->from != source_p->from)
527 <  {
528 <    sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
529 <                         "Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
530 <                         source_p->from->name, source_p->name, source_p->username,
531 <                         source_p->host, source_p->servptr->name,
532 <                         target_p->name, target_p->from->name);
533 <    kill_client(source_p->from, source_p,
534 <                "%s (NICK from wrong direction (%s != %s))",
535 <                me.name, source_p->servptr->name, target_p->from->name);
536 <    AddFlag(source_p, FLAGS_KILLED);
537 <    exit_client(source_p, &me, "USER server wrong direction");
538 <    return;
539 <  }
502 >  assert(client_p->servptr->from == client_p->from);
503  
504    /*
505     * If the nick has been introduced by a services server,
506     * make it a service as well.
507     */
508 <  if (HasFlag(source_p->servptr, FLAGS_SERVICE))
509 <    AddFlag(source_p, FLAGS_SERVICE);
547 <
548 <  /* Increment our total user count here */
549 <  if (++Count.total > Count.max_tot)
550 <    Count.max_tot = Count.total;
551 <
552 <  SetClient(source_p);
553 <  dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
554 <  add_user_host(source_p->username, source_p->host, 1);
555 <  SetUserHost(source_p);
556 <
557 <  introduce_client(source_p);
558 < }
559 <
560 < /* introduce_client()
561 < *
562 < * inputs       - source_p
563 < * output       - NONE
564 < * side effects - This common function introduces a client to the rest
565 < *                of the net, either from a local client connect or
566 < *                from a remote connect.
567 < */
568 < static void
569 < introduce_client(struct Client *source_p)
570 < {
571 <  dlink_node *server_node = NULL;
572 <  static char ubuf[12];
573 <
574 <  if (MyClient(source_p))
575 <    send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
576 <  else
577 <    send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
578 <
579 <  watch_check_hash(source_p, RPL_LOGON);
580 <
581 <  if (*ubuf == '\0')
582 <  {
583 <    ubuf[0] = '+';
584 <    ubuf[1] = '\0';
585 <  }
508 >  if (HasFlag(client_p->servptr, FLAGS_SERVICE))
509 >    AddFlag(client_p, FLAGS_SERVICE);
510  
511 <  DLINK_FOREACH(server_node, serv_list.head)
512 <  {
513 <    struct Client *server = server_node->data;
514 <
515 <    if (server == source_p->from)
516 <        continue;
511 >  SetClient(client_p);
512 >  dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
513 >  dlinkAdd(client_p, &client_p->node, &global_client_list);
514 >
515 >  if (dlink_list_length(&global_client_list) > Count.max_tot)
516 >    Count.max_tot = dlink_list_length(&global_client_list);
517 >
518 >  if (HasFlag(client_p->servptr, FLAGS_EOB))
519 >    sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
520 >                         "Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
521 >                         client_p->servptr->name,
522 >                         client_p->name, client_p->username, client_p->realhost,
523 >                         client_p->sockhost, client_p->info, client_p->id);
524  
525 <    if (IsCapable(server, CAP_SVS))
595 <    {
596 <      if (IsCapable(server, CAP_TS6) && HasID(source_p))
597 <        sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
598 <                   source_p->servptr->id,
599 <                   source_p->name, source_p->hopcount+1,
600 <                   (unsigned long)source_p->tsinfo,
601 <                   ubuf, source_p->username, source_p->host,
602 <                   (MyClient(source_p) && IsIPSpoof(source_p)) ?
603 <                   "0" : source_p->sockhost, source_p->id,
604 <                   source_p->svid,
605 <                   source_p->info);
606 <      else
607 <        sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
608 <                   source_p->name, source_p->hopcount+1,
609 <                   (unsigned long)source_p->tsinfo,
610 <                   ubuf, source_p->username, source_p->host,
611 <                   source_p->servptr->name, source_p->svid,
612 <                   source_p->info);
613 <
614 <    }
615 <    else
616 <    {
617 <      if (IsCapable(server, CAP_TS6) && HasID(source_p))
618 <        sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
619 <                   source_p->servptr->id,
620 <                   source_p->name, source_p->hopcount+1,
621 <                   (unsigned long)source_p->tsinfo,
622 <                   ubuf, source_p->username, source_p->host,
623 <                   (MyClient(source_p) && IsIPSpoof(source_p)) ?
624 <                   "0" : source_p->sockhost, source_p->id, source_p->info);
625 <      else
626 <        sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
627 <                   source_p->name, source_p->hopcount+1,
628 <                   (unsigned long)source_p->tsinfo,
629 <                   ubuf, source_p->username, source_p->host,
630 <                   source_p->servptr->name, source_p->info);
631 <    }
632 <  }
525 >  introduce_client(client_p);
526   }
527  
528   /* valid_hostname()
# Line 641 | Line 534 | introduce_client(struct Client *source_p
534   * NOTE: this doesn't allow a hostname to begin with a dot and
535   * will not allow more dots than chars.
536   */
537 < int
537 > bool
538   valid_hostname(const char *hostname)
539   {
540    const char *p = hostname;
541  
542 <  assert(p != NULL);
542 >  assert(p);
543  
544 <  if (*p == '.' || *p == ':')
545 <    return 0;
544 >  if (EmptyString(p) || *p == '.' || *p == ':')
545 >    return false;
546  
547    for (; *p; ++p)
548      if (!IsHostChar(*p))
549 <      return 0;
549 >      return false;
550  
551    return p - hostname <= HOSTLEN;
552   }
# Line 669 | Line 562 | valid_hostname(const char *hostname)
562   * Allow '.' in username to allow for "first.last"
563   * style of username
564   */
565 < int
566 < valid_username(const char *username)
565 > bool
566 > valid_username(const char *username, bool local)
567   {
675  int dots      = 0;
568    const char *p = username;
569  
570 <  assert(p != NULL);
570 >  assert(p);
571  
572    if (*p == '~')
573      ++p;
574  
575 <  /* reject usernames that don't start with an alphanum
575 >  /*
576 >   * Reject usernames that don't start with an alphanum
577     * i.e. reject jokers who have '-@somehost' or '.@somehost'
578     * or "-hi-@somehost", "h-----@somehost" would still be accepted.
579     */
580    if (!IsAlNum(*p))
581 <    return 0;
581 >    return false;
582  
583 <  while (*++p)
583 >  if (local)
584    {
585 <    if ((*p == '.') && ConfigFileEntry.dots_in_ident)
585 >    unsigned int dots = 0;
586 >
587 >    while (*++p)
588      {
589 <      if (++dots > ConfigFileEntry.dots_in_ident)
590 <        return 0;
591 <      if (!IsUserChar(*(p + 1)))
592 <        return 0;
589 >      if (*p == '.' && ConfigGeneral.dots_in_ident)
590 >      {
591 >        if (++dots > ConfigGeneral.dots_in_ident)
592 >          return false;
593 >        if (!IsUserChar(*(p + 1)))
594 >          return false;
595 >      }
596 >      else if (!IsUserChar(*p))
597 >        return false;
598      }
599 <    else if (!IsUserChar(*p))
600 <      return 0;
599 >  }
600 >  else
601 >  {
602 >    while (*++p)
603 >      if (!IsUserChar(*p))
604 >        return false;
605    }
606  
607 <  return 1;
607 >  return p - username <= USERLEN;
608   }
609  
610   /* clean_nick_name()
# Line 710 | Line 614 | valid_username(const char *username)
614   * output       - none
615   * side effects - walks through the nickname, returning 0 if erroneous
616   */
617 < int
618 < valid_nickname(const char *nickname, const int local)
617 > bool
618 > valid_nickname(const char *nickname, bool local)
619   {
620    const char *p = nickname;
717  assert(nickname && *nickname);
621  
622 <  /* nicks can't start with a digit or - or be 0 length */
623 <  /* This closer duplicates behaviour of hybrid-6 */
624 <  if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
625 <    return 0;
622 >  assert(p);
623 >
624 >  /*
625 >   * Nicks can't start with a digit or - or be 0 length.
626 >   */
627 >  if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
628 >    return false;
629  
630    for (; *p; ++p)
631      if (!IsNickChar(*p))
632 <      return 0;
632 >      return false;
633  
634    return p - nickname <= NICKLEN;
635   }
636  
637 < /* report_and_set_user_flags()
638 < *
639 < * inputs       - pointer to source_p
640 < *              - pointer to conf for this user
641 < * output       - NONE
736 < * side effects - Report to user any special flags
737 < *                they are getting, and set them.
738 < */
739 < static void
740 < report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
741 < {
742 <  /* If this user is being spoofed, tell them so */
743 <  if (IsConfDoSpoofIp(conf))
744 <  {
745 <    sendto_one(source_p,
746 <               ":%s NOTICE %s :*** Spoofing your IP. congrats.",
747 <               me.name, source_p->name);
748 <  }
749 <
750 <  /* If this user is in the exception class, Set it "E lined" */
751 <  if (IsConfExemptKline(conf))
752 <  {
753 <    SetExemptKline(source_p);
754 <    sendto_one(source_p,
755 <               ":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
756 <               me.name, source_p->name);
757 <  }
758 <
759 <  /* The else here is to make sure that G line exempt users
760 <   * do not get noticed twice.
761 <   */
762 <  else if (IsConfExemptGline(conf))
763 <  {
764 <    SetExemptGline(source_p);
765 <    sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
766 <               me.name, source_p->name);
767 <  }
768 <
769 <  if (IsConfExemptResv(conf))
770 <  {
771 <    SetExemptResv(source_p);
772 <    sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
773 <               me.name, source_p->name);
774 <  }
775 <
776 <  /* If this user is exempt from user limits set it "F lined" */
777 <  if (IsConfExemptLimits(conf))
778 <  {
779 <    SetExemptLimits(source_p);
780 <    sendto_one(source_p,
781 <               ":%s NOTICE %s :*** You are exempt from user limits. congrats.",
782 <               me.name,source_p->name);
783 <  }
784 <
785 <  if (IsConfCanFlood(conf))
786 <  {
787 <    SetCanFlood(source_p);
788 <    sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
789 <               "protection, aren't you fearsome.",
790 <               me.name, source_p->name);
791 <  }
792 < }
793 <
794 < /* change_simple_umode()
795 < *
796 < * this callback can be hooked to allow special handling of
797 < * certain usermodes
798 < */
799 < static void *
800 < change_simple_umode(va_list args)
801 < {
802 <  struct Client *client_p;
803 <  struct Client *source_p;
804 <  int what;
805 <  unsigned int flag;
806 <
807 <  client_p = va_arg(args, struct Client *);
808 <  source_p = va_arg(args, struct Client *);
809 <  what = va_arg(args, int);
810 <  flag = va_arg(args, unsigned int);
811 <
812 <  if (what == MODE_ADD)
813 <    AddUMode(source_p, flag);
814 <  else
815 <    DelUMode(source_p, flag);
816 <
817 <  return NULL;
818 < }
819 <
820 < /* set_user_mode()
821 < *
822 < * added 15/10/91 By Darren Reed.
823 < * parv[0] - sender
824 < * parv[1] - username to change mode for
825 < * parv[2] - modes to change
826 < */
827 < void
828 < set_user_mode(struct Client *client_p, struct Client *source_p,
829 <              const int parc, char *parv[])
830 < {
831 <  unsigned int flag, setflags;
832 <  char **p, *m, buf[IRCD_BUFSIZE];
833 <  struct Client *target_p;
834 <  int what = MODE_ADD, badflag = 0, i;
835 <
836 <  assert(!(parc < 2));
837 <
838 <  if ((target_p = find_person(client_p, parv[1])) == NULL)
839 <  {
840 <    if (MyConnect(source_p))
841 <      sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
842 <                 me.name, source_p->name, parv[1]);
843 <    return;
844 <  }
845 <
846 <  if (source_p != target_p)
847 <  {
848 <     sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
849 <                me.name, source_p->name);
850 <     return;
851 <  }
852 <
853 <  if (parc < 3)
854 <  {
855 <    m = buf;
856 <    *m++ = '+';
857 <
858 <    for (i = 0; i < 128; i++)
859 <      if (HasUMode(source_p, user_modes[i]))
860 <        *m++ = (char)i;
861 <    *m = '\0';
862 <
863 <    sendto_one(source_p, form_str(RPL_UMODEIS),
864 <               me.name, source_p->name, buf);
865 <    return;
866 <  }
867 <
868 <  execute_callback(entering_umode_cb, client_p, source_p);
869 <
870 <  /* find flags already set for user */
871 <  setflags = source_p->umodes;
872 <
873 <  /* parse mode change string(s) */
874 <  for (p = &parv[2]; p && *p; p++)
875 <  {
876 <    for (m = *p; *m; m++)
877 <    {
878 <      switch (*m)
879 <      {
880 <        case '+':
881 <          what = MODE_ADD;
882 <          break;
883 <        case '-':
884 <          what = MODE_DEL;
885 <          break;
886 <        case 'o':
887 <          if (what == MODE_ADD)
888 <          {
889 <            if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
890 <            {
891 <              ++Count.oper;
892 <              SetOper(source_p);
893 <            }
894 <          }
895 <          else
896 <          {
897 <            /* Only decrement the oper counts if an oper to begin with
898 <             * found by Pat Szuta, Perly , perly@xnet.com
899 <             */
900 <            if (!HasUMode(source_p, UMODE_OPER))
901 <              break;
902 <
903 <            ClearOper(source_p);
904 <            Count.oper--;
905 <
906 <            if (MyConnect(source_p))
907 <            {
908 <              dlink_node *dm;
909 <
910 <              detach_conf(source_p, CONF_OPER);
911 <              ClrOFlag(source_p);
912 <              DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
913 <
914 <              if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
915 <                free_dlink_node(dm);
916 <            }
917 <          }
918 <
919 <          break;
920 <
921 <        /* we may not get these,
922 <         * but they shouldnt be in default
923 <         */
924 <        case 'r':
925 <        case ' ' :
926 <        case '\n':
927 <        case '\r':
928 <        case '\t':
929 <          break;
930 <
931 <        default:
932 <          if ((flag = user_modes[(unsigned char)*m]))
933 <          {
934 <            if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
935 <                (ConfigFileEntry.oper_only_umodes & flag))
936 <            {
937 <              badflag = 1;
938 <            }
939 <            else
940 <              execute_callback(umode_cb, client_p, source_p, what, flag);
941 <          }
942 <          else
943 <          {
944 <            if (MyConnect(source_p))
945 <              badflag = 1;
946 <          }
947 <
948 <          break;
949 <      }
950 <    }
951 <  }
952 <
953 <  if (badflag)
954 <    sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
955 <               me.name, source_p->name);
956 <
957 <  if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
958 <  {
959 <    sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
960 <               me.name, source_p->name);
961 <    DelUMode(source_p, UMODE_NCHANGE);
962 <  }
963 <
964 <  if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
965 <      !HasOFlag(source_p, OPER_FLAG_ADMIN))
966 <  {
967 <    sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
968 <               me.name, source_p->name);
969 <    DelUMode(source_p, UMODE_ADMIN);
970 <  }
971 <
972 <  if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
973 <    ++Count.invisi;
974 <  if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
975 <    --Count.invisi;
976 <
977 <  /*
978 <   * compare new flags with old flags and send string which
979 <   * will cause servers to update correctly.
980 <   */
981 <  send_umode_out(client_p, source_p, setflags);
982 < }
983 <
984 < /* send_umode()
985 < * send the MODE string for user (user) to connection client_p
986 < * -avalon
987 < *
988 < * inputs       - client_p
989 < *              - source_p
990 < *              - int old
991 < *              - sendmask mask of modes to send
992 < *              - suplied umode_buf
993 < * output       - NONE
637 > /*! \brief Builds a mode change string to buffer pointed by \a buf
638 > * \param client_p  Pointer to client
639 > * \param dispatch  Whether to send a MODE message to client_p
640 > * \param old       Old user mode to compare against when building new mode buffer
641 > * \param buf       Pointer to buffer to build string in
642   */
643   void
644 < send_umode(struct Client *client_p, struct Client *source_p,
997 <           unsigned int old, unsigned int sendmask, char *umode_buf)
644 > send_umode(struct Client *client_p, bool dispatch, unsigned int old, char *buf)
645   {
646 <  char *m = umode_buf;
646 >  char *m = buf;
647    int what = 0;
1001  unsigned int i;
1002  unsigned int flag;
648  
649    /*
650 <   * build a string in umode_buf to represent the change in the user's
651 <   * mode between the new (source_p->umodes) and 'old'.
650 >   * Build a string in umode_buf to represent the change in the user's
651 >   * mode between the new (client_p->umodes) and 'old'.
652     */
653 <  for (i = 0; i < 128; i++)
653 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
654    {
655 <    flag = user_modes[i];
1011 <    if (!flag)
1012 <      continue;
1013 <
1014 <    if (MyClient(source_p) && !(flag & sendmask))
1015 <      continue;
1016 <
1017 <    if ((flag & old) && !HasUMode(source_p, flag))
655 >    if ((tab->flag & old) && !HasUMode(client_p, tab->flag))
656      {
657        if (what == MODE_DEL)
658 <        *m++ = (char)i;
658 >        *m++ = tab->c;
659        else
660        {
661          what = MODE_DEL;
662          *m++ = '-';
663 <        *m++ = (char)i;
663 >        *m++ = tab->c;
664        }
665      }
666 <    else if (!(flag & old) && HasUMode(source_p, flag))
666 >    else if (!(tab->flag & old) && HasUMode(client_p, tab->flag))
667      {
668        if (what == MODE_ADD)
669 <        *m++ = (char)i;
669 >        *m++ = tab->c;
670        else
671        {
672          what = MODE_ADD;
673          *m++ = '+';
674 <        *m++ = (char)i;
674 >        *m++ = tab->c;
675        }
676      }
677    }
678  
679    *m = '\0';
680  
681 <  if (*umode_buf && client_p)
681 >  if (dispatch == true && *buf)
682      sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
683 <               source_p->name, source_p->username,
684 <               source_p->host, source_p->name, umode_buf);
683 >               client_p->name, client_p->username,
684 >               client_p->host, client_p->name, buf);
685   }
686  
687   /* send_umode_out()
# Line 1053 | Line 691 | send_umode(struct Client *client_p, stru
691   * side effects - Only send ubuf out to servers that know about this client
692   */
693   void
694 < send_umode_out(struct Client *client_p, struct Client *source_p,
1057 <               unsigned int old)
694 > send_umode_out(struct Client *client_p, unsigned int old)
695   {
696 <  char buf[IRCD_BUFSIZE] = { '\0' };
1060 <  dlink_node *ptr = NULL;
696 >  char buf[UMODE_MAX_STR] = "";
697  
698 <  send_umode(NULL, source_p, old, SEND_UMODES, buf);
698 >  send_umode(client_p, MyConnect(client_p), old, buf);
699  
700    if (buf[0])
701 <  {
702 <    DLINK_FOREACH(ptr, serv_list.head)
1067 <    {
1068 <      struct Client *target_p = ptr->data;
1069 <
1070 <      if ((target_p != client_p) && (target_p != source_p))
1071 <        sendto_one(target_p, ":%s MODE %s :%s",
1072 <                   ID_or_name(source_p, target_p),
1073 <                   ID_or_name(source_p, target_p), buf);
1074 <    }
1075 <  }
1076 <
1077 <  if (client_p && MyClient(client_p))
1078 <    send_umode(client_p, source_p, old, 0xffffffff, buf);
701 >    sendto_server(client_p, 0, 0, ":%s MODE %s :%s",
702 >                  client_p->id, client_p->id, buf);
703   }
704  
705   void
706 < user_set_hostmask(struct Client *target_p, const char *hostname)
706 > user_set_hostmask(struct Client *client_p, const char *hostname)
707   {
708 <  if (!valid_hostname(hostname))
1085 <    return;
1086 <
1087 <  if (IsUserHostIp(target_p))
1088 <    delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1089 <
1090 <  strlcpy(target_p->host, hostname, sizeof(target_p->host));
1091 <  SetIPSpoof(target_p);
1092 <
1093 <  add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1094 <  SetUserHost(target_p);
1095 <
1096 <  if (MyClient(target_p))
1097 <    clear_ban_cache_client(target_p);
1098 < }
708 >  dlink_node *node;
709  
710 < /* user_welcome()
711 < *
1102 < * inputs       - client pointer to client to welcome
1103 < * output       - NONE
1104 < * side effects -
1105 < */
1106 < static void
1107 < user_welcome(struct Client *source_p)
1108 < {
1109 < #if defined(__TIME__) && defined(__DATE__)
1110 <  static const char built_date[] = __DATE__ " at " __TIME__;
1111 < #else
1112 <  static const char built_date[] = "unknown";
1113 < #endif
1114 <
1115 < #ifdef HAVE_LIBCRYPTO
1116 <  if (source_p->localClient->fd.ssl != NULL)
1117 <    sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1118 <               me.name, source_p->name,
1119 <               ssl_get_cipher(source_p->localClient->fd.ssl));
1120 < #endif
1121 <
1122 <  sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1123 <             ServerInfo.network_name, source_p->name,
1124 <             source_p->username, source_p->host);
1125 <  sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1126 <             get_listener_name(source_p->localClient->listener), ircd_version);
1127 <  sendto_one(source_p, form_str(RPL_CREATED),
1128 <             me.name, source_p->name, built_date);
1129 <  sendto_one(source_p, form_str(RPL_MYINFO),
1130 <             me.name, source_p->name, me.name, ircd_version, umode_buffer);
1131 <  show_isupport(source_p);
1132 <
1133 <  if (source_p->id[0] != '\0')
1134 <    sendto_one(source_p, form_str(RPL_YOURID), me.name,
1135 <               source_p->name, source_p->id);
1136 <
1137 <  show_lusers(source_p);
1138 <
1139 <  if (ConfigFileEntry.short_motd)
1140 <  {
1141 <    sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1142 <               me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1143 <    sendto_one(source_p,
1144 <               ":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1145 <               "read it", me.name, source_p->name);
1146 <    sendto_one(source_p, form_str(RPL_MOTDSTART),
1147 <               me.name, source_p->name, me.name);
1148 <    sendto_one(source_p, form_str(RPL_MOTD),
1149 <               me.name, source_p->name,
1150 <               "*** This is the short motd ***");
1151 <    sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1152 <               me.name, source_p->name);
1153 <  }
1154 <  else  
1155 <    send_message_file(source_p, &ConfigFileEntry.motd);
1156 < }
1157 <
1158 < /* check_xline()
1159 < *
1160 < * inputs       - pointer to client to test
1161 < * outupt       - 1 if exiting 0 if ok
1162 < * side effects -
1163 < */
1164 < static int
1165 < check_xline(struct Client *source_p)
1166 < {
1167 <  struct MaskItem *conf = NULL;
1168 <  const char *reason = NULL;
1169 <
1170 <  if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1171 <      (conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1172 <  {
1173 <    ++conf->count;
1174 <
1175 <    if (conf->reason != NULL)
1176 <      reason = conf->reason;
1177 <    else
1178 <      reason = "No Reason";
1179 <
1180 <    sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1181 <                         "X-line Rejecting [%s] [%s], user %s [%s]",
1182 <                         source_p->info, reason,
1183 <                         get_client_name(source_p, HIDE_IP),
1184 <                         source_p->sockhost);
1185 <
1186 <    ++ServerStats.is_ref;
1187 <    exit_client(source_p, &me, "Bad user info");
1188 <    return 1;
1189 <  }
1190 <
1191 <  return 0;
1192 < }
1193 <
1194 < /* oper_up()
1195 < *
1196 < * inputs       - pointer to given client to oper
1197 < * output       - NONE
1198 < * side effects - Blindly opers up given source_p, using conf info
1199 < *                all checks on passwords have already been done.
1200 < *                This could also be used by rsa oper routines.
1201 < */
1202 < void
1203 < oper_up(struct Client *source_p)
1204 < {
1205 <  const unsigned int old = source_p->umodes;
1206 <  const struct MaskItem *conf = source_p->localClient->confs.head->data;
1207 <
1208 <  assert(source_p->localClient->confs.head);
1209 <
1210 <  ++Count.oper;
1211 <  SetOper(source_p);
1212 <
1213 <  if (conf->modes)
1214 <    AddUMode(source_p, conf->modes);
1215 <  else if (ConfigFileEntry.oper_umodes)
1216 <    AddUMode(source_p, ConfigFileEntry.oper_umodes);
1217 <
1218 <  if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1219 <    ++Count.invisi;
1220 <  if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1221 <    --Count.invisi;
1222 <
1223 <  assert(dlinkFind(&oper_list, source_p) == NULL);
1224 <  dlinkAdd(source_p, make_dlink_node(), &oper_list);
1225 <
1226 <  AddOFlag(source_p, conf->port);
1227 <
1228 <  if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1229 <    AddUMode(source_p, UMODE_ADMIN);
1230 <  if (!HasOFlag(source_p, OPER_FLAG_N))
1231 <    DelUMode(source_p, UMODE_NCHANGE);
1232 <
1233 <  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1234 <                       get_oper_name(source_p));
1235 <  send_umode_out(source_p, source_p, old);
1236 <  sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1237 < }
1238 <
1239 < static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1240 <
1241 < int
1242 < valid_sid(const char *sid)
1243 < {
1244 <  if (strlen(sid) == IRC_MAXSID)
1245 <    if (IsDigit(*sid))
1246 <      if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1247 <        return 1;
1248 <
1249 <  return 0;
1250 < }
1251 <
1252 < /*
1253 < * init_uid()
1254 < *
1255 < * inputs       - NONE
1256 < * output       - NONE
1257 < * side effects - new_uid is filled in with server id portion (sid)
1258 < *                (first 3 bytes) or defaulted to 'A'.
1259 < *                Rest is filled in with 'A'
1260 < */
1261 < void
1262 < init_uid(void)
1263 < {
1264 <  unsigned int i;
1265 <
1266 <  memset(new_uid, 0, sizeof(new_uid));
1267 <
1268 <  if (!EmptyString(ServerInfo.sid))
1269 <    strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
710 >  if (strcmp(client_p->host, hostname) == 0)
711 >    return;
712  
713 <  for (i = 0; i < IRC_MAXSID; ++i)
714 <    if (new_uid[i] == '\0')
715 <      new_uid[i] = 'A';
713 >  if (ConfigGeneral.cycle_on_host_change)
714 >    sendto_common_channels_local(client_p, false, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
715 >                                 client_p->name, client_p->username, client_p->host);
716  
717 <  /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
718 <  /* Yes nenolod, I have known it was off by one ever since I wrote it
719 <   * But *JUST* for you, though, it really doesn't look as *pretty*
1278 <   * -Dianora
1279 <   */
1280 <  memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
717 >  sendto_common_channels_local(client_p, false, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
718 >                               client_p->name, client_p->username,
719 >                               client_p->host, client_p->username, hostname);
720  
721 <  entering_umode_cb = register_callback("entering_umode", NULL);
1283 <  umode_cb = register_callback("changing_umode", change_simple_umode);
1284 < }
721 >  strlcpy(client_p->host, hostname, sizeof(client_p->host));
722  
723 < /*
1287 < * add_one_to_uid
1288 < *
1289 < * inputs       - index number into new_uid
1290 < * output       - NONE
1291 < * side effects - new_uid is incremented by one
1292 < *                note this is a recursive function
1293 < */
1294 < static void
1295 < add_one_to_uid(int i)
1296 < {
1297 <  if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
723 >  if (MyConnect(client_p))
724    {
725 <    if (new_uid[i] == 'Z')
726 <      new_uid[i] = '0';
1301 <    else if (new_uid[i] == '9')
1302 <    {
1303 <      new_uid[i] = 'A';
1304 <      add_one_to_uid(i-1);
1305 <    }
1306 <    else
1307 <      ++new_uid[i];
725 >    sendto_one_numeric(client_p, &me, RPL_VISIBLEHOST, client_p->host);
726 >    clear_ban_cache_list(&client_p->channel);
727    }
1309  else
1310  {
1311    /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1312    if (new_uid[i] == 'Z')
1313      memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1314    else
1315      ++new_uid[i];
1316  }
1317 }
1318
1319 /*
1320 * uid_get
1321 *
1322 * inputs       - struct Client *
1323 * output       - new UID is returned to caller
1324 * side effects - new_uid is incremented by one.
1325 */
1326 static const char *
1327 uid_get(void)
1328 {
1329  add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1330  return new_uid;
1331 }
728  
729 < /*
730 < * init_isupport()
1335 < *
1336 < * input        - NONE
1337 < * output       - NONE
1338 < * side effects - Must be called before isupport is enabled
1339 < */
1340 < void
1341 < init_isupport(void)
1342 < {
1343 <  isupportFile = init_MessageLine();
1344 <
1345 <  add_isupport("CALLERID", NULL, -1);
1346 <  add_isupport("CASEMAPPING", CASEMAP, -1);
1347 <  add_isupport("DEAF", "D", -1);
1348 <  add_isupport("KICKLEN", NULL, KICKLEN);
1349 <  add_isupport("MODES", NULL, MAXMODEPARAMS);
1350 < #ifdef HALFOPS
1351 <  add_isupport("PREFIX", "(ohv)@%+", -1);
1352 <  add_isupport("STATUSMSG", "@%+", -1);
1353 < #else
1354 <  add_isupport("PREFIX", "(ov)@+", -1);
1355 <  add_isupport("STATUSMSG", "@+", -1);
1356 < #endif
1357 < }
1358 <
1359 < /*
1360 < * add_isupport()
1361 < *
1362 < * input        - name of supported function
1363 < *              - options if any
1364 < *              - number if any
1365 < * output       - NONE
1366 < * side effects - Each supported item must call this when activated
1367 < */
1368 < void
1369 < add_isupport(const char *name, const char *options, int n)
1370 < {
1371 <  dlink_node *ptr;
1372 <  struct Isupport *support;
1373 <
1374 <  DLINK_FOREACH(ptr, support_list.head)
1375 <  {
1376 <    support = ptr->data;
1377 <    if (irccmp(support->name, name) == 0)
1378 <    {
1379 <      MyFree(support->name);
1380 <      MyFree(support->options);
1381 <      break;
1382 <    }
1383 <  }
729 >  if (ConfigGeneral.cycle_on_host_change == 0)
730 >    return;
731  
732 <  if (ptr == NULL)
732 >  DLINK_FOREACH(node, client_p->channel.head)
733    {
734 <    support = MyMalloc(sizeof(*support));
735 <    dlinkAddTail(support, &support->node, &support_list);
736 <  }
737 <
738 <  support->name = xstrdup(name);
1392 <  if (options != NULL)
1393 <    support->options = xstrdup(options);
1394 <  support->number = n;
1395 <
1396 <  rebuild_isupport_message_line();
1397 < }
1398 <
1399 < /*
1400 < * delete_isupport()
1401 < *
1402 < * input        - name of supported function
1403 < * output       - NONE
1404 < * side effects - Each supported item must call this when deactivated
1405 < */
1406 < void
1407 < delete_isupport(const char *name)
1408 < {
1409 <  dlink_node *ptr;
1410 <  struct Isupport *support;
734 >    char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
735 >    char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
736 >    char *p = modebuf;
737 >    int len = 0;
738 >    const struct Membership *member = node->data;
739  
740 <  DLINK_FOREACH(ptr, support_list.head)
1413 <  {
1414 <    support = ptr->data;
1415 <    if (irccmp(support->name, name) == 0)
740 >    if (has_member_flags(member, CHFL_CHANOP))
741      {
742 <      dlinkDelete(ptr, &support_list);
743 <      MyFree(support->name);
1419 <      MyFree(support->options);
1420 <      MyFree(support);
1421 <      break;
742 >      *p++ = 'o';
743 >      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
744      }
1423  }
745  
746 <  rebuild_isupport_message_line();
1426 < }
1427 <
1428 < /*
1429 < * rebuild_isupport_message_line
1430 < *
1431 < * input        - NONE
1432 < * output       - NONE
1433 < * side effects - Destroy the isupport MessageFile lines, and rebuild.
1434 < */
1435 < void
1436 < rebuild_isupport_message_line(void)
1437 < {
1438 <  char isupportbuffer[IRCD_BUFSIZE];
1439 <  char *p = isupportbuffer;
1440 <  dlink_node *ptr = NULL;
1441 <  int n = 0;
1442 <  int tokens = 0;
1443 <  size_t len = 0;
1444 <  size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1445 <
1446 <  destroy_MessageLine(isupportFile);
1447 <
1448 <  DLINK_FOREACH(ptr, support_list.head)
1449 <  {
1450 <    struct Isupport *support = ptr->data;
1451 <
1452 <    p += (n = sprintf(p, "%s", support->name));
1453 <    len += n;
1454 <
1455 <    if (support->options != NULL)
746 >    if (has_member_flags(member, CHFL_HALFOP))
747      {
748 <      p += (n = sprintf(p, "=%s", support->options));
749 <      len += n;
748 >      *p++ = 'h';
749 >      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
750      }
751  
752 <    if (support->number > 0)
752 >    if (has_member_flags(member, CHFL_VOICE))
753      {
754 <      p += (n = sprintf(p, "=%d", support->number));
755 <      len += n;
754 >      *p++ = 'v';
755 >      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
756      }
757  
1467    *p++ = ' ';
1468    len++;
758      *p = '\0';
759  
760 <    if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
761 <    { /* arbritrary for now */
762 <      if (*--p == ' ')
763 <        *p = '\0';
764 <
765 <      addto_MessageLine(isupportFile, isupportbuffer);
766 <      p = isupportbuffer;
767 <      len = 0;
768 <      n = tokens = 0;
769 <    }
770 <  }
771 <
772 <  if (len != 0)
773 <  {
774 <    if (*--p == ' ')
775 <      *p = '\0';
776 <    addto_MessageLine(isupportFile, isupportbuffer);
777 <  }
760 >    sendto_channel_local(client_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
761 >                         client_p->name, client_p->username,
762 >                         client_p->host, member->chptr->name,
763 >                         client_p->account, client_p->info);
764 >    sendto_channel_local(client_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
765 >                         client_p->name, client_p->username,
766 >                         client_p->host, member->chptr->name);
767 >
768 >    if (nickbuf[0])
769 >      sendto_channel_local(client_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
770 >                           client_p->servptr->name, member->chptr->name,
771 >                           modebuf, nickbuf);
772 >  }
773 >
774 >  if (client_p->away[0])
775 >    sendto_common_channels_local(client_p, false, CAP_AWAY_NOTIFY, CAP_CHGHOST,
776 >                                 ":%s!%s@%s AWAY :%s",
777 >                                 client_p->name, client_p->username,
778 >                                 client_p->host, client_p->away);
779   }

Comparing:
ircd-hybrid/trunk/src/s_user.c (property svn:keywords), Revision 1899 by michael, Sat Apr 27 18:55:28 2013 UTC vs.
ircd-hybrid/branches/8.2.x/src/user.c (property svn:keywords), Revision 8751 by michael, Tue Jan 1 11:06:50 2019 UTC

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

Diff Legend

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