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 4709 by michael, Mon Oct 6 16:52:29 2014 UTC vs.
Revision 8496 by michael, Thu Apr 5 12:46:00 2018 UTC

# Line 1 | Line 1
1   /*
2   *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (c) 1997-2014 ircd-hybrid development team
4 > *  Copyright (c) 1997-2018 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 19 | Line 19
19   *  USA
20   */
21  
22 < /*! \file s_user.c
22 > /*! \file user.c
23   * \brief User related functions.
24   * \version $Id$
25   */
# Line 31 | Line 31
31   #include "channel_mode.h"
32   #include "client.h"
33   #include "hash.h"
34 + #include "id.h"
35   #include "irc_string.h"
36   #include "ircd.h"
37   #include "listener.h"
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 "server_capab.h" /* TBR: RHOST compatibility mode */
45   #include "send.h"
46   #include "memory.h"
47   #include "packet.h"
48   #include "rng_mt.h"
46 #include "userhost.h"
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);
55 > static char umode_buffer[UMODE_MAX_STR];
56  
57 < /* Used for building up the isupport string,
58 < * 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;
67 <
68 < /* memory is cheap. map 0-255 to equivalent mode */
69 < const unsigned int user_modes[256] =
57 > const struct user_modes *umode_map[256];
58 > const struct user_modes  umode_tab[] =
59   {
60 <  /* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
61 <  /* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
62 <  /* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
63 <  /* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
64 <  0,                  /* @ */
65 <  0,                  /* A */
66 <  0,                  /* B */
67 <  0,                  /* C */
68 <  UMODE_DEAF,         /* D */
69 <  0,                  /* E */
70 <  UMODE_FARCONNECT,   /* F */
71 <  UMODE_SOFTCALLERID, /* G */
72 <  UMODE_HIDDEN,       /* H */
73 <  0,                  /* I */
74 <  0,                  /* J */
75 <  0,                  /* K */
76 <  0,                  /* L */
77 <  0,                  /* M */
78 <  0,                  /* N */
79 <  0,                  /* O */
80 <  0,                  /* P */
81 <  0,                  /* Q */
82 <  UMODE_REGONLY,      /* R */
83 <  UMODE_SSL,          /* S */
84 <  0,                  /* T */
85 <  0,                  /* U */
86 <  0,                  /* V */
87 <  UMODE_WEBIRC,       /* W */
99 <  0,                  /* X */
100 <  0,                  /* Y */
101 <  0,                  /* Z 0x5A */
102 <  0, 0, 0, 0, 0,      /* 0x5F   */
103 <  0,                  /* 0x60   */
104 <  UMODE_ADMIN,        /* a */
105 <  UMODE_BOTS,         /* b */
106 <  UMODE_CCONN,        /* c */
107 <  UMODE_DEBUG,        /* d */
108 <  UMODE_EXTERNAL,     /* e */
109 <  UMODE_FULL,         /* f */
110 <  UMODE_CALLERID,     /* g */
111 <  0,                  /* h */
112 <  UMODE_INVISIBLE,    /* i */
113 <  UMODE_REJ,          /* j */
114 <  UMODE_SKILL,        /* k */
115 <  UMODE_LOCOPS,       /* l */
116 <  0,                  /* m */
117 <  UMODE_NCHANGE,      /* n */
118 <  UMODE_OPER,         /* o */
119 <  UMODE_HIDECHANS,    /* p */
120 <  UMODE_HIDEIDLE,     /* q */
121 <  UMODE_REGISTERED,   /* r */
122 <  UMODE_SERVNOTICE,   /* s */
123 <  0,                  /* t */
124 <  UMODE_UNAUTH,       /* u */
125 <  0,                  /* v */
126 <  UMODE_WALLOP,       /* w */
127 <  UMODE_HIDDENHOST,   /* x */
128 <  UMODE_SPY,          /* y */
129 <  0,                  /* z      0x7A */
130 <  0,0,0,0,0,          /* 0x7B - 0x7F */
131 <
132 <  /* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
133 <  /* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
134 <  /* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
135 <  /* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
136 <  /* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
137 <  /* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
138 <  /* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
139 <  /* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
60 >  { 'D', UMODE_DEAF         },
61 >  { 'F', UMODE_FARCONNECT   },
62 >  { 'G', UMODE_SOFTCALLERID },
63 >  { 'H', UMODE_HIDDEN       },
64 >  { 'R', UMODE_REGONLY      },
65 >  { 'S', UMODE_SSL          },
66 >  { 'W', UMODE_WEBIRC       },
67 >  { 'a', UMODE_ADMIN        },
68 >  { 'b', UMODE_BOTS         },
69 >  { 'c', UMODE_CCONN        },
70 >  { 'd', UMODE_DEBUG        },
71 >  { 'e', UMODE_EXTERNAL     },
72 >  { 'f', UMODE_FULL         },
73 >  { 'g', UMODE_CALLERID     },
74 >  { 'i', UMODE_INVISIBLE    },
75 >  { 'j', UMODE_REJ          },
76 >  { 'k', UMODE_SKILL        },
77 >  { 'l', UMODE_LOCOPS       },
78 >  { 'n', UMODE_NCHANGE      },
79 >  { 'o', UMODE_OPER         },
80 >  { 'p', UMODE_HIDECHANS    },
81 >  { 'q', UMODE_HIDEIDLE     },
82 >  { 'r', UMODE_REGISTERED   },
83 >  { 's', UMODE_SERVNOTICE   },
84 >  { 'u', UMODE_UNAUTH       },
85 >  { 'w', UMODE_WALLOP       },
86 >  { 'y', UMODE_SPY          },
87 >  { '\0', 0 }
88   };
89  
90   void
91 < assemble_umode_buffer(void)
91 > user_modes_init(void)
92   {
145  unsigned int idx = 0;
93    char *umode_buffer_ptr = umode_buffer;
94  
95 <  for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
96 <    if (user_modes[idx])
97 <      *umode_buffer_ptr++ = idx;
95 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
96 >  {
97 >    umode_map[tab->c] = tab;
98 >    *umode_buffer_ptr++ = tab->c;
99 >  }
100  
101    *umode_buffer_ptr = '\0';
102   }
# Line 159 | Line 108 | assemble_umode_buffer(void)
108   * side effects - display to client user counts etc.
109   */
110   void
111 < show_lusers(struct Client *source_p)
111 > show_lusers(struct Client *client_p)
112   {
113 <  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
114 <    sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
113 >  if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
114 >    sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (dlink_list_length(&global_client_list) - Count.invisi),
115                         Count.invisi, dlink_list_length(&global_server_list));
116    else
117 <    sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
118 <                       (Count.total - Count.invisi), Count.invisi, 1);
117 >    sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (dlink_list_length(&global_client_list) - Count.invisi),
118 >                       Count.invisi, 1);
119  
120    if (Count.oper)
121 <    sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
121 >    sendto_one_numeric(client_p, &me, RPL_LUSEROP, Count.oper);
122  
123    if (dlink_list_length(&unknown_list))
124 <    sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124 >    sendto_one_numeric(client_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
125  
126 <  if (dlink_list_length(&channel_list))
127 <    sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
126 >  if (dlink_list_length(channel_get_list()))
127 >    sendto_one_numeric(client_p, &me, RPL_LUSERCHANNELS, dlink_list_length(channel_get_list()));
128  
129 <  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129 >  if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
130    {
131 <    sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
132 <    sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
131 >    sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&local_client_list), dlink_list_length(&local_server_list));
132 >    sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&local_client_list), Count.max_loc);
133 >    sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
134 >    sendto_one_numeric(client_p, &me, RPL_STATSCONN, Count.max_loc_con, Count.max_loc, Count.totalrestartcount);
135    }
136    else
137    {
138 <    sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
139 <    sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
138 >    sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&global_client_list), 0);
139 >    sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
140 >    sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
141    }
190
191  sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
192
193  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
194    sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
195                       Count.max_loc_cli, Count.totalrestartcount);
196
197  if (Count.local > Count.max_loc_cli)
198    Count.max_loc_cli = Count.local;
199
200  if ((Count.local + Count.myserver) > Count.max_loc_con)
201    Count.max_loc_con = Count.local + Count.myserver;
142   }
143  
204 /* show_isupport()
205 *
206 * inputs       - pointer to client
207 * output       - NONE
208 * side effects - display to client what we support (for them)
209 */
210 void
211 show_isupport(struct Client *source_p)
212 {
213  const dlink_node *ptr = NULL;
214
215  DLINK_FOREACH(ptr, support_list_lines.head)
216    sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
217 }
218
219
144   /* report_and_set_user_flags()
145   *
146 < * inputs       - pointer to source_p
146 > * inputs       - pointer to client_p
147   *              - pointer to conf for this user
148   * output       - NONE
149   * side effects - Report to user any special flags
150   *                they are getting, and set them.
151   */
152   static void
153 < report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
153 > report_and_set_user_flags(struct Client *client_p, const struct MaskItem *conf)
154   {
155    /* If this user is being spoofed, tell them so */
156    if (IsConfDoSpoofIp(conf))
157 <    sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
157 >    sendto_one_notice(client_p, &me, ":*** Spoofing your IP");
158  
159 <  /* If this user is in the exception class, Set it "E lined" */
159 >  /* If this user is in the exception class, set it "E lined" */
160    if (IsConfExemptKline(conf))
161    {
162 <    SetExemptKline(source_p);
163 <    sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
162 >    AddFlag(client_p, FLAGS_EXEMPTKLINE);
163 >    sendto_one_notice(client_p, &me, ":*** You are exempt from K/D lines");
164    }
165  
166 <  /*
243 <   * The else here is to make sure that G line exempt users
244 <   * do not get noticed twice.
245 <   */
246 <  else if (IsConfExemptGline(conf))
166 >  if (IsConfExemptXline(conf))
167    {
168 <    SetExemptGline(source_p);
169 <    sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
168 >    AddFlag(client_p, FLAGS_EXEMPTXLINE);
169 >    sendto_one_notice(client_p, &me, ":*** You are exempt from X lines");
170    }
171  
172    if (IsConfExemptResv(conf))
173    {
174 <    SetExemptResv(source_p);
175 <    sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
174 >    AddFlag(client_p, FLAGS_EXEMPTRESV);
175 >    sendto_one_notice(client_p, &me, ":*** You are exempt from resvs");
176    }
177  
178    /* If this user is exempt from user limits set it "F lined" */
179    if (IsConfExemptLimits(conf))
180    {
181 <    SetExemptLimits(source_p);
182 <    sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
181 >    AddFlag(client_p, FLAGS_NOLIMIT);
182 >    sendto_one_notice(client_p, &me, ":*** You are exempt from user limits");
183    }
184  
185    if (IsConfCanFlood(conf))
186    {
187 <    SetCanFlood(source_p);
188 <    sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269 <                      "protection, aren't you fearsome.");
187 >    AddFlag(client_p, FLAGS_CANFLOOD);
188 >    sendto_one_notice(client_p, &me, ":*** You are exempt from flood protection");
189    }
190   }
191  
192   /* introduce_client()
193   *
194 < * inputs       - source_p
194 > * inputs       - client_p
195   * output       - NONE
196   * side effects - This common function introduces a client to the rest
197   *                of the net, either from a local client connect or
198   *                from a remote connect.
199   */
200   static void
201 < introduce_client(struct Client *source_p)
201 > introduce_client(struct Client *client_p)
202   {
203 <  dlink_node *ptr = NULL;
204 <  char ubuf[IRCD_BUFSIZE] = "";
203 >  dlink_node *node;
204 >  char buf[UMODE_MAX_STR] = "";
205  
206 <  if (MyClient(source_p))
207 <    send_umode(source_p, source_p, 0, ubuf);
289 <  else
290 <    send_umode(NULL, source_p, 0, ubuf);
291 <
292 <  watch_check_hash(source_p, RPL_LOGON);
206 >  send_umode(client_p, MyConnect(client_p), 0, buf);
207 >  watch_check_hash(client_p, RPL_LOGON);
208  
209 <  if (ubuf[0] == '\0')
209 >  if (buf[0] == '\0')
210    {
211 <    ubuf[0] = '+';
212 <    ubuf[1] = '\0';
211 >    buf[0] = '+';
212 >    buf[1] = '\0';
213    }
214  
215 <  DLINK_FOREACH(ptr, local_server_list.head)
215 >  DLINK_FOREACH(node, local_server_list.head)
216    {
217 <    struct Client *server = ptr->data;
217 >    struct Client *server_p = node->data;
218  
219 <    if (server == source_p->from)
219 >    if (server_p == client_p->from)
220        continue;
221  
222 <    if (IsCapable(server, CAP_SVS))
223 <      sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
224 <                 source_p->servptr->id,
225 <                 source_p->name, source_p->hopcount+1,
226 <                 (unsigned long)source_p->tsinfo,
227 <                 ubuf, source_p->username, source_p->host,
228 <                 (MyClient(source_p) && IsIPSpoof(source_p)) ?
229 <                 "0" : source_p->sockhost, source_p->id,
230 <                 source_p->svid,
231 <                 source_p->info);
222 >    /* TBR: compatibility mode */
223 >    if (IsCapable(server_p, CAPAB_RHOST))
224 >      sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s %s :%s",
225 >                 client_p->servptr->id,
226 >                 client_p->name, client_p->hopcount+1,
227 >                 client_p->tsinfo,
228 >                 buf, client_p->username, client_p->host, client_p->realhost,
229 >                 client_p->sockhost, client_p->id,
230 >                 client_p->account,
231 >                 client_p->info);
232      else
233 <      sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
234 <                 source_p->servptr->id,
235 <                 source_p->name, source_p->hopcount+1,
236 <                 (unsigned long)source_p->tsinfo,
237 <                 ubuf, source_p->username, source_p->host,
238 <                 (MyClient(source_p) && IsIPSpoof(source_p)) ?
239 <                 "0" : source_p->sockhost, source_p->id, source_p->info);
233 >      sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
234 >                 client_p->servptr->id,
235 >                 client_p->name, client_p->hopcount+1,
236 >                 client_p->tsinfo,
237 >                 buf, client_p->username, client_p->host,
238 >                 client_p->sockhost, client_p->id,
239 >                 client_p->account,
240 >                 client_p->info);
241  
242 <    if (!EmptyString(source_p->certfp))
243 <      sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
242 >    if (!EmptyString(client_p->certfp))
243 >      sendto_one(server_p, ":%s CERTFP %s", client_p->id, client_p->certfp);
244    }
245   }
246  
# Line 335 | Line 251 | introduce_client(struct Client *source_p
251   * side effects -
252   */
253   static void
254 < user_welcome(struct Client *source_p)
254 > user_welcome(struct Client *client_p)
255   {
340 #if defined(__TIME__) && defined(__DATE__)
256    static const char built_date[] = __DATE__ " at " __TIME__;
342 #else
343  static const char built_date[] = "unknown";
344 #endif
345
346 #ifdef HAVE_LIBCRYPTO
347  if (HasFlag(source_p, FLAGS_SSL))
348  {
349    AddUMode(source_p, UMODE_SSL);
350    sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
351                      ssl_get_cipher(source_p->connection->fd.ssl));
352  }
353 #endif
354
355  sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
356                     source_p->name);
357  sendto_one_numeric(source_p, &me, RPL_YOURHOST,
358                     get_listener_name(source_p->connection->listener), ircd_version);
359  sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
360  sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
361  show_isupport(source_p);
362  sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
257  
258 <  show_lusers(source_p);
259 <  motd_signon(source_p);
258 >  if (HasFlag(client_p, FLAGS_SSL))
259 >  {
260 >    AddUMode(client_p, UMODE_SSL);
261 >    sendto_one_notice(client_p, &me, ":*** Connected securely via %s",
262 >                      tls_get_cipher(&client_p->connection->fd->ssl));
263 >  }
264 >
265 >  sendto_one_numeric(client_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
266 >                     client_p->name, client_p->username, client_p->realhost);
267 >  sendto_one_numeric(client_p, &me, RPL_YOURHOST,
268 >                     listener_get_name(client_p->connection->listener), ircd_version);
269 >  sendto_one_numeric(client_p, &me, RPL_CREATED, built_date);
270 >  sendto_one_numeric(client_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
271 >
272 >  isupport_show(client_p);
273 >  show_lusers(client_p);
274 >  motd_signon(client_p);
275   }
276  
277   /* check_xline()
# Line 372 | Line 281 | user_welcome(struct Client *source_p)
281   * side effects -
282   */
283   static int
284 < check_xline(struct Client *source_p)
284 > check_xline(struct Client *client_p)
285   {
286 <  struct MaskItem *conf = NULL;
378 <  const char *reason = NULL;
286 >  const struct GecosItem *gecos = NULL;
287  
288 <  if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
289 <  {
382 <    ++conf->count;
383 <
384 <    if (conf->reason)
385 <      reason = conf->reason;
386 <    else
387 <      reason = CONF_NOREASON;
288 >  if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
289 >    return 0;
290  
291 +  if ((gecos = gecos_find(client_p->info, match)))
292 +  {
293      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
294                           "X-line Rejecting [%s] [%s], user %s [%s]",
295 <                         source_p->info, reason,
296 <                         get_client_name(source_p, HIDE_IP),
297 <                         source_p->sockhost);
295 >                         client_p->info, gecos->reason,
296 >                         client_get_name(client_p, HIDE_IP),
297 >                         client_p->sockhost);
298  
299      ++ServerStats.is_ref;
300 <    exit_client(source_p, "Bad user info");
300 >    exit_client(client_p, "Bad user info");
301      return 1;
302    }
303  
# Line 403 | Line 307 | check_xline(struct Client *source_p)
307   /*! \brief This function is called when both NICK and USER messages
308   *      have been accepted for the client, in whatever order. Only
309   *      after this, is the UID message propagated.
310 < * \param source_p Pointer to given client to introduce
310 > * \param client_p Pointer to given client to introduce
311   */
312   void
313 < register_local_user(struct Client *source_p)
313 > register_local_user(struct Client *client_p)
314   {
411  const char *id = NULL;
315    const struct MaskItem *conf = NULL;
316  
317 <  assert(source_p == source_p->from);
318 <  assert(MyConnect(source_p));
319 <  assert(!source_p->connection->registration);
320 <
418 <  ClearCap(source_p, CAP_TS6);
317 >  assert(client_p == client_p->from);
318 >  assert(MyConnect(client_p));
319 >  assert(IsUnknown(client_p));
320 >  assert(!client_p->connection->registration);
321  
322    if (ConfigGeneral.ping_cookie)
323    {
324 <    if (!IsPingSent(source_p) && !source_p->connection->random_ping)
324 >    if (!HasFlag(client_p, FLAGS_PINGSENT) && !client_p->connection->random_ping)
325      {
326        do
327 <        source_p->connection->random_ping = genrand_int32();
328 <      while (!source_p->connection->random_ping);
327 >        client_p->connection->random_ping = genrand_int32();
328 >      while (client_p->connection->random_ping == 0);
329  
330 <      sendto_one(source_p, "PING :%u",
331 <                 source_p->connection->random_ping);
430 <      SetPingSent(source_p);
330 >      sendto_one(client_p, "PING :%u", client_p->connection->random_ping);
331 >      AddFlag(client_p, FLAGS_PINGSENT);
332        return;
333      }
334  
335 <    if (!HasPingCookie(source_p))
335 >    if (!HasFlag(client_p, FLAGS_PING_COOKIE))
336        return;
337    }
338  
339 <  source_p->connection->last_privmsg = CurrentTime;
339 >  client_p->connection->last_privmsg = CurrentTime;
340    /* Straight up the maximum rate of flooding... */
341 <  source_p->connection->allow_read = MAX_FLOOD_BURST;
341 >  client_p->connection->allow_read = MAX_FLOOD_BURST;
342  
343 <  if (!check_client(source_p))
343 >  if (!check_client(client_p))
344      return;
345  
346 <  if (!valid_hostname(source_p->host))
446 <  {
447 <    sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
448 <                      "character in your hostname");
449 <    strlcpy(source_p->host, source_p->sockhost,
450 <            sizeof(source_p->host));
451 <  }
452 <
453 <  conf = source_p->connection->confs.head->data;
346 >  conf = client_p->connection->confs.head->data;
347  
348 <  if (!IsGotId(source_p))
348 >  if (!HasFlag(client_p, FLAGS_GOTID))
349    {
350      char username[USERLEN + 1] = "";
458    const char *p = username;
351      unsigned int i = 0;
352  
353      if (IsNeedIdentd(conf))
354      {
355        ++ServerStats.is_ref;
356 <      sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
356 >      sendto_one_notice(client_p, &me, ":*** Notice -- You need to install "
357                          "identd to use this server");
358 <      exit_client(source_p, "Install identd");
358 >      exit_client(client_p, "Install identd");
359        return;
360      }
361  
362 <    strlcpy(username, source_p->username, sizeof(username));
362 >    strlcpy(username, client_p->username, sizeof(username));
363  
364      if (!IsNoTilde(conf))
365 <      source_p->username[i++] = '~';
365 >      client_p->username[i++] = '~';
366  
367 <    for (; *p && i < USERLEN; ++p)
368 <      source_p->username[i++] = *p;
367 >    for (const char *p = username; *p && i < USERLEN; ++p)
368 >      client_p->username[i++] = *p;
369  
370 <    source_p->username[i] = '\0';
370 >    client_p->username[i] = '\0';
371    }
372  
373    /* Password check */
374    if (!EmptyString(conf->passwd))
375    {
376 <    if (!match_conf_password(source_p->connection->password, conf))
376 >    if (!match_conf_password(client_p->connection->password, conf))
377      {
378        ++ServerStats.is_ref;
379  
380 <      sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
381 <      exit_client(source_p, "Bad Password");
380 >      sendto_one_numeric(client_p, &me, ERR_PASSWDMISMATCH);
381 >      exit_client(client_p, "Bad Password");
382        return;
383      }
384    }
385  
386    /*
387 <   * Don't free source_p->connection->password here - it can be required
388 <   * by masked /stats I if there are auth{} blocks with need_password = no;
387 >   * Don't free client_p->connection->password here - it can be required
388 >   * by masked /stats I if there are auth {} blocks with need_password = no;
389     * --adx
390     */
391  
392    /*
393 <   * Report if user has &^>= etc. and set flags as needed in source_p
393 >   * Report if user has &^>= etc. and set flags as needed in client_p
394     */
395 <  report_and_set_user_flags(source_p, conf);
395 >  report_and_set_user_flags(client_p, conf);
396  
397 <  if (IsDead(source_p))
397 >  if (IsDead(client_p))
398      return;
399  
400    /*
# Line 513 | Line 405 | register_local_user(struct Client *sourc
405     * probably be just a percentage of the MAXCLIENTS...
406     *   -Taner
407     */
408 <  if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
409 <      (Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
408 >  if ((dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
409 >      (dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients && !HasFlag(client_p, FLAGS_NOLIMIT)))
410    {
411      sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
412                           "Too many clients, rejecting %s[%s].",
413 <                         source_p->name, source_p->host);
413 >                         client_p->name, client_p->host);
414      ++ServerStats.is_ref;
415 <    exit_client(source_p, "Sorry, server is full - try later");
415 >    exit_client(client_p, "Sorry, server is full - try later");
416      return;
417    }
418  
419 <  if (!valid_username(source_p->username, 1))
419 >  if (!valid_username(client_p->username, 1))
420    {
421      char buf[IRCD_BUFSIZE] = "";
422  
423      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
424                           "Invalid username: %s (%s@%s)",
425 <                         source_p->name, source_p->username, source_p->host);
425 >                         client_p->name, client_p->username, client_p->host);
426      ++ServerStats.is_ref;
427 <    snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
428 <    exit_client(source_p, buf);
427 >    snprintf(buf, sizeof(buf), "Invalid username [%s]", client_p->username);
428 >    exit_client(client_p, buf);
429      return;
430    }
431  
432 <  if (check_xline(source_p))
432 >  if (check_xline(client_p))
433      return;
434  
435 +  const char *id;
436    while (hash_find_id((id = uid_get())))
437      ;
438  
439 <  strlcpy(source_p->id, id, sizeof(source_p->id));
440 <  hash_add_id(source_p);
439 >  strlcpy(client_p->id, id, sizeof(client_p->id));
440 >  hash_add_id(client_p);
441  
442    sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
443                         "Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
444 <                       source_p->name, source_p->username, source_p->host,
445 <                       ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
446 <                       "255.255.255.255" : source_p->sockhost,
447 <                       get_client_class(&source_p->connection->confs),
555 <                       source_p->info, source_p->id);
444 >                       client_p->name, client_p->username, client_p->realhost,
445 >                       client_p->sockhost,
446 >                       get_client_class(&client_p->connection->confs),
447 >                       client_p->info, client_p->id);
448  
449    if (ConfigGeneral.invisible_on_connect)
450    {
451 <    AddUMode(source_p, UMODE_INVISIBLE);
451 >    AddUMode(client_p, UMODE_INVISIBLE);
452      ++Count.invisi;
453    }
454  
455 <  if (++Count.local > Count.max_loc)
455 >  assert(client_p->servptr == &me);
456 >  SetClient(client_p);
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,
470 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
471                             "New maximum local client connections: %u",
472                             Count.max_loc);
473    }
474  
475 <  if (++Count.total > Count.max_tot)
476 <    Count.max_tot = Count.total;
477 <  ++Count.totalrestartcount;
478 <
577 <  assert(source_p->servptr == &me);
578 <  SetClient(source_p);
579 <  dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
580 <  dlinkAdd(source_p, &source_p->node, &global_client_list);
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->connection->lclient_node,
585 <                  &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);
588 <  add_user_host(source_p->username, source_p->host, 0);
589 <  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
# Line 602 | Line 497 | register_local_user(struct Client *sourc
497   *                is introduced by a server.
498   */
499   void
500 < register_remote_user(struct Client *source_p)
500 > register_remote_user(struct Client *client_p)
501   {
502 <  const struct Client *target_p = NULL;
608 <
609 <  if ((target_p = source_p->servptr) && target_p->from != source_p->from)
610 <  {
611 <    sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
612 <                         "Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
613 <                         source_p->from->name, source_p->name, source_p->username,
614 <                         source_p->host, source_p->servptr->name,
615 <                         target_p->name, target_p->from->name);
616 <    sendto_one(source_p->from,
617 <               ":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
618 <               me.id, source_p->id, me.name, source_p->servptr->name,
619 <               target_p->from->name);
620 <
621 <    AddFlag(source_p, FLAGS_KILLED);
622 <    exit_client(source_p, "USER server wrong direction");
623 <    return;
624 <  }
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);
508 >  if (HasFlag(client_p->servptr, FLAGS_SERVICE))
509 >    AddFlag(client_p, FLAGS_SERVICE);
510  
511 <  if (++Count.total > Count.max_tot)
512 <    Count.max_tot = Count.total;
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 <  SetClient(source_p);
516 <  dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
638 <  dlinkAdd(source_p, &source_p->node, &global_client_list);
639 <  add_user_host(source_p->username, source_p->host, 1);
640 <  SetUserHost(source_p);
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(source_p->servptr, FLAGS_EOB))
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>",
521 <                         source_p->servptr->name,
522 <                         source_p->name, source_p->username, source_p->host,
523 <                         source_p->info, source_p->id);
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 <  introduce_client(source_p);
525 >  introduce_client(client_p);
526   }
527  
528   /* valid_hostname()
# Line 689 | Line 565 | valid_hostname(const char *hostname)
565   int
566   valid_username(const char *username, const int local)
567   {
692  unsigned int dots = 0;
568    const char *p = username;
569  
570    assert(p);
# Line 707 | Line 582 | valid_username(const char *username, con
582  
583    if (local)
584    {
585 +    unsigned int dots = 0;
586 +
587      while (*++p)
588      {
589        if (*p == '.' && ConfigGeneral.dots_in_ident)
# Line 742 | Line 619 | valid_nickname(const char *nickname, con
619   {
620    const char *p = nickname;
621  
622 <  assert(nickname && *nickname);
622 >  assert(p);
623  
624    /*
625     * Nicks can't start with a digit or - or be 0 length.
# Line 757 | Line 634 | valid_nickname(const char *nickname, con
634    return p - nickname <= NICKLEN;
635   }
636  
637 < /* send_umode()
638 < * send the MODE string for user (user) to connection client_p
639 < * -avalon
640 < *
641 < * inputs       - client_p
765 < *              - source_p
766 < *              - int old
767 < *              - sendmask mask of modes to send
768 < *              - suplied umode_buf
769 < * 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,
645 <           unsigned int old, char *umode_buf)
644 > send_umode(struct Client *client_p, unsigned int dispatch,
645 >           unsigned int old, char *buf)
646   {
647 <  char *m = umode_buf;
647 >  char *m = buf;
648    int what = 0;
649  
650    /*
651     * Build a string in umode_buf to represent the change in the user's
652 <   * mode between the new (source_p->umodes) and 'old'.
652 >   * mode between the new (client_p->umodes) and 'old'.
653     */
654 <  for (unsigned int i = 0; i < 128; ++i)
654 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
655    {
656 <    unsigned int flag = user_modes[i];
785 <
786 <    if (!flag)
787 <      continue;
788 <
789 <    if ((flag & old) && !HasUMode(source_p, flag))
656 >    if ((tab->flag & old) && !HasUMode(client_p, tab->flag))
657      {
658        if (what == MODE_DEL)
659 <        *m++ = (char)i;
659 >        *m++ = tab->c;
660        else
661        {
662          what = MODE_DEL;
663          *m++ = '-';
664 <        *m++ = (char)i;
664 >        *m++ = tab->c;
665        }
666      }
667 <    else if (!(flag & old) && HasUMode(source_p, flag))
667 >    else if (!(tab->flag & old) && HasUMode(client_p, tab->flag))
668      {
669        if (what == MODE_ADD)
670 <        *m++ = (char)i;
670 >        *m++ = tab->c;
671        else
672        {
673          what = MODE_ADD;
674          *m++ = '+';
675 <        *m++ = (char)i;
675 >        *m++ = tab->c;
676        }
677      }
678    }
679  
680    *m = '\0';
681  
682 <  if (*umode_buf && client_p)
682 >  if (dispatch && *buf)
683      sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
684                 client_p->name, client_p->username,
685 <               client_p->host, client_p->name, umode_buf);
685 >               client_p->host, client_p->name, buf);
686   }
687  
688   /* send_umode_out()
# Line 825 | Line 692 | send_umode(struct Client *client_p, stru
692   * side effects - Only send ubuf out to servers that know about this client
693   */
694   void
695 < send_umode_out(struct Client *source_p, unsigned int old)
695 > send_umode_out(struct Client *client_p, unsigned int old)
696   {
697 <  char buf[IRCD_BUFSIZE] = "";
697 >  char buf[UMODE_MAX_STR] = "";
698  
699 <  send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
699 >  send_umode(client_p, MyConnect(client_p), old, buf);
700  
701    if (buf[0])
702 <    sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
703 <                  source_p->id, source_p->id, buf);
702 >    sendto_server(client_p, 0, 0, ":%s MODE %s :%s",
703 >                  client_p->id, client_p->id, buf);
704   }
705  
706   void
707 < user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
707 > user_set_hostmask(struct Client *client_p, const char *hostname)
708   {
709 <  dlink_node *ptr = NULL;
709 >  dlink_node *node;
710  
711 <  if (!strcmp(target_p->host, hostname))
711 >  if (!strcmp(client_p->host, hostname))
712      return;
713  
847  switch (what)
848  {
849    case MODE_ADD:
850      AddUMode(target_p, UMODE_HIDDENHOST);
851      AddFlag(target_p, FLAGS_IP_SPOOFING);
852      break;
853    case MODE_DEL:
854      DelUMode(target_p, UMODE_HIDDENHOST);
855
856      if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
857        DelFlag(target_p, FLAGS_IP_SPOOFING);
858      break;
859    default: return;
860  }
861
714    if (ConfigGeneral.cycle_on_host_change)
715 <    sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
716 <                                 target_p->name, target_p->username, target_p->host);
865 <
866 <  if (IsUserHostIp(target_p))
867 <    delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
715 >    sendto_common_channels_local(client_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
716 >                                 client_p->name, client_p->username, client_p->host);
717  
718 <  strlcpy(target_p->host, hostname, sizeof(target_p->host));
718 >  sendto_common_channels_local(client_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
719 >                               client_p->name, client_p->username,
720 >                               client_p->host, client_p->username, hostname);
721  
722 <  add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
872 <  SetUserHost(target_p);
722 >  strlcpy(client_p->host, hostname, sizeof(client_p->host));
723  
724 <  if (MyClient(target_p))
724 >  if (MyConnect(client_p))
725    {
726 <    sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
727 <    clear_ban_cache_client(target_p);
726 >    sendto_one_numeric(client_p, &me, RPL_VISIBLEHOST, client_p->host);
727 >    clear_ban_cache_list(&client_p->channel);
728    }
729  
730    if (!ConfigGeneral.cycle_on_host_change)
731      return;
732  
733 <  DLINK_FOREACH(ptr, target_p->channel.head)
733 >  DLINK_FOREACH(node, client_p->channel.head)
734    {
735 <    char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
735 >    char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
736 >    char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
737      char *p = modebuf;
738      int len = 0;
739 <    const struct Membership *ms = ptr->data;
739 >    const struct Membership *member = node->data;
740  
741 <    if (has_member_flags(ms, CHFL_CHANOP))
741 >    if (has_member_flags(member, CHFL_CHANOP))
742      {
743        *p++ = 'o';
744 <      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
744 >      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
745      }
746  
747 <    if (has_member_flags(ms, CHFL_HALFOP))
747 >    if (has_member_flags(member, CHFL_HALFOP))
748      {
749        *p++ = 'h';
750 <      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
750 >      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
751      }
752  
753 <    if (has_member_flags(ms, CHFL_VOICE))
753 >    if (has_member_flags(member, CHFL_VOICE))
754      {
755        *p++ = 'v';
756 <      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
756 >      len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
757      }
758  
759      *p = '\0';
760  
761 <    sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
762 <                                target_p->name, target_p->username, target_p->host,
763 <                                ms->chptr->name);
764 <    if (nickbuf[0])
765 <      sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
766 <                                  target_p->servptr->name, ms->chptr->name,
767 <                                  modebuf, nickbuf);
761 >    sendto_channel_local(client_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
762 >                         client_p->name, client_p->username,
763 >                         client_p->host, member->chptr->name,
764 >                         client_p->account, client_p->info);
765 >    sendto_channel_local(client_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
766 >                         client_p->name, client_p->username,
767 >                         client_p->host, member->chptr->name);
768  
769 +    if (nickbuf[0])
770 +      sendto_channel_local(client_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
771 +                           client_p->servptr->name, member->chptr->name,
772 +                           modebuf, nickbuf);
773    }
774  
775 <  if (target_p->away[0])
776 <    sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
775 >  if (client_p->away[0])
776 >    sendto_common_channels_local(client_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
777                                   ":%s!%s@%s AWAY :%s",
778 <                                 target_p->name, target_p->username,
779 <                                 target_p->host, target_p->away);
925 < }
926 <
927 < /*! \brief Blindly opers up given source_p, using conf info.
928 < *         All checks on passwords have already been done.
929 < * \param source_p Pointer to given client to oper
930 < */
931 < void
932 < oper_up(struct Client *source_p)
933 < {
934 <  const unsigned int old = source_p->umodes;
935 <  const struct MaskItem *conf = source_p->connection->confs.head->data;
936 <
937 <  assert(source_p->connection->confs.head);
938 <
939 <  ++Count.oper;
940 <  SetOper(source_p);
941 <
942 <  if (conf->modes)
943 <    AddUMode(source_p, conf->modes);
944 <  else if (ConfigGeneral.oper_umodes)
945 <    AddUMode(source_p, ConfigGeneral.oper_umodes);
946 <
947 <  if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
948 <    ++Count.invisi;
949 <  if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
950 <    --Count.invisi;
951 <
952 <  assert(dlinkFind(&oper_list, source_p) == NULL);
953 <  dlinkAdd(source_p, make_dlink_node(), &oper_list);
954 <
955 <  AddOFlag(source_p, conf->port);
956 <
957 <  if (HasOFlag(source_p, OPER_FLAG_ADMIN))
958 <    AddUMode(source_p, UMODE_ADMIN);
959 <
960 <  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
961 <                       get_oper_name(source_p));
962 <  sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
963 <                me.id, get_oper_name(source_p));
964 <  send_umode_out(source_p, old);
965 <  sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
966 < }
967 <
968 < static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
969 <
970 < int
971 < valid_sid(const char *sid)
972 < {
973 <  if (strlen(sid) == IRC_MAXSID)
974 <    if (IsDigit(*sid))
975 <      if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
976 <        return 1;
977 <
978 <  return 0;
979 < }
980 <
981 < /*
982 < * init_uid()
983 < *
984 < * inputs       - NONE
985 < * output       - NONE
986 < * side effects - new_uid is filled in with server id portion (sid)
987 < *                (first 3 bytes) or defaulted to 'A'.
988 < *                Rest is filled in with 'A'
989 < */
990 < void
991 < init_uid(void)
992 < {
993 <  memset(new_uid, 0, sizeof(new_uid));
994 <
995 <  if (!EmptyString(ConfigServerInfo.sid))
996 <    strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
997 <
998 <  for (unsigned int i = 0; i < IRC_MAXSID; ++i)
999 <    if (new_uid[i] == '\0')
1000 <      new_uid[i] = 'A';
1001 <
1002 <  /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1003 <  memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1004 < }
1005 <
1006 < /*
1007 < * add_one_to_uid
1008 < *
1009 < * inputs       - index number into new_uid
1010 < * output       - NONE
1011 < * side effects - new_uid is incremented by one
1012 < *                note this is a recursive function
1013 < */
1014 < static void
1015 < add_one_to_uid(unsigned int i)
1016 < {
1017 <  if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1018 <  {
1019 <    if (new_uid[i] == 'Z')
1020 <      new_uid[i] = '0';
1021 <    else if (new_uid[i] == '9')
1022 <    {
1023 <      new_uid[i] = 'A';
1024 <      add_one_to_uid(i - 1);
1025 <    }
1026 <    else
1027 <      ++new_uid[i];
1028 <  }
1029 <  else
1030 <  {
1031 <    /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1032 <    if (new_uid[i] == 'Z')
1033 <      memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1034 <    else
1035 <      ++new_uid[i];
1036 <  }
1037 < }
1038 <
1039 < /*
1040 < * uid_get
1041 < *
1042 < * inputs       - struct Client *
1043 < * output       - new UID is returned to caller
1044 < * side effects - new_uid is incremented by one.
1045 < */
1046 < static const char *
1047 < uid_get(void)
1048 < {
1049 <  add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1050 <  return new_uid;
1051 < }
1052 <
1053 < /*
1054 < * init_isupport()
1055 < *
1056 < * input        - NONE
1057 < * output       - NONE
1058 < * side effects - Must be called before isupport is enabled
1059 < */
1060 < void
1061 < init_isupport(void)
1062 < {
1063 <  add_isupport("CALLERID", NULL, -1);
1064 <  add_isupport("CASEMAPPING", "rfc1459", -1);
1065 <  add_isupport("DEAF", "D", -1);
1066 <  add_isupport("KICKLEN", NULL, KICKLEN);
1067 <  add_isupport("MODES", NULL, MAXMODEPARAMS);
1068 <  add_isupport("PREFIX", "(ohv)@%+", -1);
1069 <  add_isupport("STATUSMSG", "@%+", -1);
1070 <  add_isupport("EXCEPTS", "e", -1);
1071 <  add_isupport("INVEX", "I", -1);
1072 < }
1073 <
1074 < /*
1075 < * add_isupport()
1076 < *
1077 < * input        - name of supported function
1078 < *              - options if any
1079 < *              - number if any
1080 < * output       - NONE
1081 < * side effects - Each supported item must call this when activated
1082 < */
1083 < void
1084 < add_isupport(const char *name, const char *options, int n)
1085 < {
1086 <  dlink_node *ptr;
1087 <  struct Isupport *support = NULL;
1088 <
1089 <  DLINK_FOREACH(ptr, support_list.head)
1090 <  {
1091 <    support = ptr->data;
1092 <    if (irccmp(support->name, name) == 0)
1093 <    {
1094 <      MyFree(support->name);
1095 <      MyFree(support->options);
1096 <      break;
1097 <    }
1098 <  }
1099 <
1100 <  if (ptr == NULL)
1101 <  {
1102 <    support = MyCalloc(sizeof(*support));
1103 <    dlinkAddTail(support, &support->node, &support_list);
1104 <  }
1105 <
1106 <  support->name = xstrdup(name);
1107 <  if (options)
1108 <    support->options = xstrdup(options);
1109 <  support->number = n;
1110 <
1111 <  rebuild_isupport_message_line();
1112 < }
1113 <
1114 < /*
1115 < * delete_isupport()
1116 < *
1117 < * input        - name of supported function
1118 < * output       - NONE
1119 < * side effects - Each supported item must call this when deactivated
1120 < */
1121 < void
1122 < delete_isupport(const char *name)
1123 < {
1124 <  dlink_node *ptr;
1125 <  struct Isupport *support;
1126 <
1127 <  DLINK_FOREACH(ptr, support_list.head)
1128 <  {
1129 <    support = ptr->data;
1130 <    if (irccmp(support->name, name) == 0)
1131 <    {
1132 <      dlinkDelete(ptr, &support_list);
1133 <      MyFree(support->name);
1134 <      MyFree(support->options);
1135 <      MyFree(support);
1136 <      break;
1137 <    }
1138 <  }
1139 <
1140 <  rebuild_isupport_message_line();
1141 < }
1142 <
1143 < /*
1144 < * rebuild_isupport_message_line
1145 < *
1146 < * input        - NONE
1147 < * output       - NONE
1148 < * side effects - Destroy the isupport MessageFile lines, and rebuild.
1149 < */
1150 < void
1151 < rebuild_isupport_message_line(void)
1152 < {
1153 <  char isupportbuffer[IRCD_BUFSIZE];
1154 <  char *p = isupportbuffer;
1155 <  dlink_node *ptr = NULL, *ptr_next = NULL;
1156 <  int n = 0;
1157 <  int tokens = 0;
1158 <  size_t len = 0;
1159 <  size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1160 <
1161 <  DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1162 <  {
1163 <    dlinkDelete(ptr, &support_list_lines);
1164 <    MyFree(ptr->data);
1165 <    free_dlink_node(ptr);
1166 <  }
1167 <
1168 <  DLINK_FOREACH(ptr, support_list.head)
1169 <  {
1170 <    struct Isupport *support = ptr->data;
1171 <
1172 <    p += (n = sprintf(p, "%s", support->name));
1173 <    len += n;
1174 <
1175 <    if (support->options)
1176 <    {
1177 <      p += (n = sprintf(p, "=%s", support->options));
1178 <      len += n;
1179 <    }
1180 <
1181 <    if (support->number > 0)
1182 <    {
1183 <      p += (n = sprintf(p, "=%d", support->number));
1184 <      len += n;
1185 <    }
1186 <
1187 <    *p++ = ' ';
1188 <    len++;
1189 <    *p = '\0';
1190 <
1191 <    if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1192 <    { /* arbritrary for now */
1193 <      if (*--p == ' ')
1194 <        *p = '\0';
1195 <
1196 <      dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1197 <      p = isupportbuffer;
1198 <      len = 0;
1199 <      n = tokens = 0;
1200 <    }
1201 <  }
1202 <
1203 <  if (len)
1204 <  {
1205 <    if (*--p == ' ')
1206 <      *p = '\0';
1207 <    dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1208 <  }
778 >                                 client_p->name, client_p->username,
779 >                                 client_p->host, client_p->away);
780   }

Comparing ircd-hybrid/trunk/src/user.c (property svn:keywords):
Revision 4709 by michael, Mon Oct 6 16:52:29 2014 UTC vs.
Revision 8496 by michael, Thu Apr 5 12:46:00 2018 UTC

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

Diff Legend

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