ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/user.c

Comparing:
ircd-hybrid-7.3/src/s_user.c (file contents), Revision 1115 by michael, Tue Dec 21 14:42:54 2010 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 6185 by michael, Wed Jun 24 17:46:27 2015 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-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 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 "common.h"
33	–	#include "fdlist.h"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
37	–	#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40	<	#include "s_conf.h"
41	<	#include "s_log.h"
42	<	#include "s_serv.h"
40	>	#include "conf.h"
41	>	#include "log.h"
42	>	#include "server.h"
43		#include "send.h"
46	–	#include "supported.h"
47	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "hook.h"
49	<	#include "s_misc.h"
54	<	#include "msg.h"
48	>	#include "misc.h"
49	>	#include "parse.h"
50		#include "watch.h"
51	<
57	<	unsigned int MaxClientCount     = 1;
58	<	unsigned int MaxConnectionCount = 1;
59	<	struct Callback *entering_umode_cb = NULL;
60	<	struct Callback *umode_cb = NULL;
51	>	#include "isupport.h"
52
53		static char umode_buffer[IRCD_BUFSIZE];
54
55	<	static void user_welcome(struct Client *);
56	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
66	<	static int check_xline(struct Client *);
67	<	static void introduce_client(struct Client *);
68	<	static const char *uid_get(void);
69	<
70	<	/* Used for building up the isupport string,
71	<	* used with init_isupport, add_isupport, delete_isupport
72	<	*/
73	<
74	<	struct Isupport
55	>	const struct user_modes *umode_map[256];
56	>	const struct user_modes  umode_tab[] =
57		{
58	<	dlink_node node;
59	<	char *name;
60	<	char *options;
61	<	int number;
62	<	};
63	<
64	<	static dlink_list support_list = { NULL, NULL, 0 };
65	<	MessageFile *isupportFile;
66	<
67	<	/* memory is cheap. map 0-255 to equivalent mode */
68	<	unsigned int user_modes[256] =
69	<	{
70	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
71	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
72	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
73	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
74	<	0,                  /* @ */
75	<	0,                  /* A */
76	<	0,                  /* B */
77	<	UMODE_CCONN_FULL,   /* C */
78	<	UMODE_DEAF,         /* D */
79	<	0,                  /* E */
80	<	0,                  /* F */
81	<	UMODE_SOFTCALLERID, /* G */
82	<	0,                  /* H */
83	<	0,                  /* I */
84	<	0,                  /* J */
85	<	0,                  /* K */
86	<	0,                  /* L */
105	<	0,                  /* M */
106	<	0,                  /* N */
107	<	0,                  /* O */
108	<	0,                  /* P */
109	<	0,                  /* Q */
110	<	0,                  /* R */
111	<	0,                  /* S */
112	<	0,                  /* T */
113	<	0,                  /* U */
114	<	0,                  /* V */
115	<	0,                  /* W */
116	<	0,                  /* X */
117	<	0,                  /* Y */
118	<	0,                  /* Z 0x5A */
119	<	0, 0, 0, 0, 0,      /* 0x5F   */
120	<	0,                  /* 0x60   */
121	<	UMODE_ADMIN,        /* a */
122	<	UMODE_BOTS,         /* b */
123	<	UMODE_CCONN,        /* c */
124	<	UMODE_DEBUG,        /* d */
125	<	0,                  /* e */
126	<	UMODE_FULL,         /* f */
127	<	UMODE_CALLERID,     /* g */
128	<	0,                  /* h */
129	<	UMODE_INVISIBLE,    /* i */
130	<	0,                  /* j */
131	<	UMODE_SKILL,        /* k */
132	<	UMODE_LOCOPS,       /* l */
133	<	0,                  /* m */
134	<	UMODE_NCHANGE,      /* n */
135	<	UMODE_OPER,         /* o */
136	<	0,                  /* p */
137	<	0,                  /* q */
138	<	UMODE_REJ,          /* r */
139	<	UMODE_SERVNOTICE,   /* s */
140	<	0,                  /* t */
141	<	UMODE_UNAUTH,       /* u */
142	<	0,                  /* v */
143	<	UMODE_WALLOP,       /* w */
144	<	UMODE_EXTERNAL,     /* x */
145	<	UMODE_SPY,          /* y */
146	<	UMODE_OPERWALL,     /* z      0x7A */
147	<	0,0,0,0,0,          /* 0x7B - 0x7F */
148	<
149	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
150	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
151	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
152	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
153	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
154	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
155	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
156	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
58	>	{ 'D', UMODE_DEAF         },
59	>	{ 'F', UMODE_FARCONNECT   },
60	>	{ 'G', UMODE_SOFTCALLERID },
61	>	{ 'H', UMODE_HIDDEN       },
62	>	{ 'R', UMODE_REGONLY      },
63	>	{ 'S', UMODE_SSL          },
64	>	{ 'W', UMODE_WEBIRC       },
65	>	{ 'a', UMODE_ADMIN        },
66	>	{ 'b', UMODE_BOTS         },
67	>	{ 'c', UMODE_CCONN        },
68	>	{ 'd', UMODE_DEBUG        },
69	>	{ 'e', UMODE_EXTERNAL     },
70	>	{ 'f', UMODE_FULL         },
71	>	{ 'g', UMODE_CALLERID     },
72	>	{ 'i', UMODE_INVISIBLE    },
73	>	{ 'j', UMODE_REJ          },
74	>	{ 'k', UMODE_SKILL        },
75	>	{ 'l', UMODE_LOCOPS       },
76	>	{ 'n', UMODE_NCHANGE      },
77	>	{ 'o', UMODE_OPER         },
78	>	{ 'p', UMODE_HIDECHANS    },
79	>	{ 'q', UMODE_HIDEIDLE     },
80	>	{ 'r', UMODE_REGISTERED   },
81	>	{ 's', UMODE_SERVNOTICE   },
82	>	{ 'u', UMODE_UNAUTH       },
83	>	{ 'w', UMODE_WALLOP       },
84	>	{ 'x', UMODE_HIDDENHOST   },
85	>	{ 'y', UMODE_SPY          },
86	>	{ '\0', 0 }
87		};
88
89		void
90	<	assemble_umode_buffer(void)
90	>	user_usermodes_init(void)
91		{
162	–	unsigned int idx = 0;
92		char *umode_buffer_ptr = umode_buffer;
93
94	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
95	<	if (user_modes[idx])
96	<	*umode_buffer_ptr++ = idx;
94	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
95	>	{
96	>	umode_map[tab->c] = tab;
97	>	*umode_buffer_ptr++ = tab->c;
98	>	}
99
100		*umode_buffer_ptr = '\0';
101		}
#	Line 176 | Line 107 | assemble_umode_buffer(void)
107		* side effects - display to client user counts etc.
108		*/
109		void
110	<	show_lusers(struct Client *source_p)
110	>	show_lusers(struct Client *source_p)
111		{
112	<	const char *from, *to;
112	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	Count.invisi, dlink_list_length(&global_server_list));
115	>	else
116	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117	>	Count.invisi, 1);
118	>
119	>	if (Count.oper)
120	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
121
122	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
122	>	if (dlink_list_length(&unknown_list))
123	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124	>
125	>	if (dlink_list_length(&channel_list))
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
127	>
128	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129		{
130	<	from = me.id;
131	<	to = source_p->id;
130	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
131	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
132		}
133		else
134		{
135	<	from = me.name;
136	<	to = source_p->name;
135	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
136	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
137		}
138
139	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
140	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
141	<	from, to, (Count.total-Count.invisi),
142	<	Count.invisi, dlink_list_length(&global_serv_list));
143	<	else
144	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
145	<	(Count.total-Count.invisi), Count.invisi, 1);
139	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
140	>
141	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
142	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
143	>	Count.max_loc_cli, Count.totalrestartcount);
144	>
145	>	if (Count.local > Count.max_loc_cli)
146	>	Count.max_loc_cli = Count.local;
147	>
148	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
149	>	Count.max_loc_con = Count.local + Count.myserver;
150	>	}
151	>
152	>	/* report_and_set_user_flags()
153	>	*
154	>	* inputs       - pointer to source_p
155	>	*              - pointer to conf for this user
156	>	* output       - NONE
157	>	* side effects - Report to user any special flags
158	>	*                they are getting, and set them.
159	>	*/
160	>	static void
161	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
162	>	{
163	>	/* If this user is being spoofed, tell them so */
164	>	if (IsConfDoSpoofIp(conf))
165	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
166
167	<	if (Count.oper > 0)
168	<	sendto_one(source_p, form_str(RPL_LUSEROP),
169	<	from, to, Count.oper);
170	<
171	<	if (dlink_list_length(&unknown_list) > 0)
207	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
208	<	from, to, dlink_list_length(&unknown_list));
209	<
210	<	if (dlink_list_length(&global_channel_list) > 0)
211	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
212	<	from, to, dlink_list_length(&global_channel_list));
213	<
214	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
215	<	{
216	<	sendto_one(source_p, form_str(RPL_LUSERME),
217	<	from, to, Count.local, Count.myserver);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.local, Count.max_loc,
220	<	Count.local, Count.max_loc);
167	>	/* If this user is in the exception class, set it "E lined" */
168	>	if (IsConfExemptKline(conf))
169	>	{
170	>	SetExemptKline(source_p);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
172		}
173	+
174	+	if (IsConfExemptXline(conf))
175	+	{
176	+	SetExemptXline(source_p);
177	+	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
178	+	}
179	+
180	+	if (IsConfExemptResv(conf))
181	+	{
182	+	SetExemptResv(source_p);
183	+	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
184	+	}
185	+
186	+	/* If this user is exempt from user limits set it "F lined" */
187	+	if (IsConfExemptLimits(conf))
188	+	{
189	+	SetExemptLimits(source_p);
190	+	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
191	+	}
192	+
193	+	if (IsConfCanFlood(conf))
194	+	{
195	+	SetCanFlood(source_p);
196	+	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
197	+	"protection, aren't you fearsome.");
198	+	}
199	+	}
200	+
201	+	/* introduce_client()
202	+	*
203	+	* inputs       - source_p
204	+	* output       - NONE
205	+	* side effects - This common function introduces a client to the rest
206	+	*                of the net, either from a local client connect or
207	+	*                from a remote connect.
208	+	*/
209	+	static void
210	+	introduce_client(struct Client *source_p)
211	+	{
212	+	dlink_node *node = NULL;
213	+	char ubuf[IRCD_BUFSIZE] = "";
214	+
215	+	if (MyClient(source_p))
216	+	send_umode(source_p, source_p, 0, ubuf);
217		else
218	+	send_umode(NULL, source_p, 0, ubuf);
219	+
220	+	watch_check_hash(source_p, RPL_LOGON);
221	+
222	+	if (ubuf[0] == '\0')
223		{
224	<	sendto_one(source_p, form_str(RPL_LUSERME),
225	<	from, to, Count.total, 0);
226	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
227	<	from, to, Count.total, Count.max_tot,
228	<	Count.total, Count.max_tot);
229	<	}
230	<
231	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
232	<	from, to, Count.total, Count.max_tot,
233	<	Count.total, Count.max_tot);
234	<
235	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
236	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
237	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
224	>	ubuf[0] = '+';
225	>	ubuf[1] = '\0';
226	>	}
227
228	<	if (Count.local > MaxClientCount)
229	<	MaxClientCount = Count.local;
228	>	DLINK_FOREACH(node, local_server_list.head)
229	>	{
230	>	struct Client *server = node->data;
231	>
232	>	if (server == source_p->from)
233	>	continue;
234
235	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
236	<	MaxConnectionCount = Count.local + Count.myserver;
235	>	if (IsCapable(server, CAP_SVS))
236	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
237	>	source_p->servptr->id,
238	>	source_p->name, source_p->hopcount+1,
239	>	(unsigned long)source_p->tsinfo,
240	>	ubuf, source_p->username, source_p->host,
241	>	source_p->sockhost, source_p->id,
242	>	source_p->account,
243	>	source_p->info);
244	>	else
245	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
246	>	source_p->servptr->id,
247	>	source_p->name, source_p->hopcount+1,
248	>	(unsigned long)source_p->tsinfo,
249	>	ubuf, source_p->username, source_p->host,
250	>	source_p->sockhost, source_p->id, source_p->info);
251	>
252	>	if (!EmptyString(source_p->certfp))
253	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
254	>	}
255		}
256
257	<	/* show_isupport()
257	>	/* user_welcome()
258		*
259	<	* inputs       - pointer to client
259	>	* inputs       - client pointer to client to welcome
260		* output       - NONE
261	<	* side effects - display to client what we support (for them)
261	>	* side effects -
262		*/
263	<	void
264	<	show_isupport(struct Client *source_p)
263	>	static void
264	>	user_welcome(struct Client *source_p)
265		{
266	<	send_message_file(source_p, isupportFile);
266	>	#if defined(__TIME__) && defined(__DATE__)
267	>	static const char built_date[] = __DATE__ " at " __TIME__;
268	>	#else
269	>	static const char built_date[] = "unknown";
270	>	#endif
271	>
272	>	#ifdef HAVE_LIBCRYPTO
273	>	if (HasFlag(source_p, FLAGS_SSL))
274	>	{
275	>	AddUMode(source_p, UMODE_SSL);
276	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
277	>	ssl_get_cipher(source_p->connection->fd.ssl));
278	>	}
279	>	#endif
280	>
281	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
282	>	source_p->name);
283	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
284	>	get_listener_name(source_p->connection->listener), ircd_version);
285	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
286	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
287	>	isupport_show(source_p);
288	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
289	>
290	>	show_lusers(source_p);
291	>	motd_signon(source_p);
292		}
293
294	<	/*
295	<	** register_local_user
296	<	**      This function is called when both NICK and USER messages
297	<	**      have been accepted for the client, in whatever order. Only
298	<	**      after this, is the USER message propagated.
299	<	**
300	<	**      NICK's must be propagated at once when received, although
301	<	**      it would be better to delay them too until full info is
302	<	**      available. Doing it is not so simple though, would have
303	<	**      to implement the following:
304	<	**
305	<	**      (actually it has been implemented already for a while) -orabidoo
306	<	**
307	<	**      1) user telnets in and gives only "NICK foobar" and waits
308	<	**      2) another user far away logs in normally with the nick
309	<	**         "foobar" (quite legal, as this server didn't propagate
310	<	**         it).
311	<	**      3) now this server gets nick "foobar" from outside, but
312	<	**         has alread the same defined locally. Current server
313	<	**         would just issue "KILL foobar" to clean out dups. But,
314	<	**         this is not fair. It should actually request another
315	<	**         nick from local user or kill him/her...
316	<	*/
294	>	/* check_xline()
295	>	*
296	>	* inputs       - pointer to client to test
297	>	* outupt       - 1 if exiting 0 if ok
298	>	* side effects -
299	>	*/
300	>	static int
301	>	check_xline(struct Client *source_p)
302	>	{
303	>	struct MaskItem *conf = NULL;
304	>
305	>	if (IsExemptXline(source_p))
306	>	return 0;
307	>
308	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
309	>	{
310	>	++conf->count;
311	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
312	>	"X-line Rejecting [%s] [%s], user %s [%s]",
313	>	source_p->info, conf->reason,
314	>	get_client_name(source_p, HIDE_IP),
315	>	source_p->sockhost);
316	>
317	>	++ServerStats.is_ref;
318	>	exit_client(source_p, "Bad user info");
319	>	return 1;
320	>	}
321	>
322	>	return 0;
323	>	}
324	>
325	>	/*! \brief This function is called when both NICK and USER messages
326	>	*      have been accepted for the client, in whatever order. Only
327	>	*      after this, is the UID message propagated.
328	>	* \param source_p Pointer to given client to introduce
329	>	*/
330		void
331		register_local_user(struct Client *source_p)
332		{
333		const char *id = NULL;
334	<	const struct AccessItem *aconf = NULL;
286	<	dlink_node *ptr = NULL;
287	<	dlink_node *m = NULL;
334	>	const struct MaskItem *conf = NULL;
335
289	–	assert(source_p != NULL);
336		assert(source_p == source_p->from);
337		assert(MyConnect(source_p));
338	<	assert(!source_p->localClient->registration);
339	<
294	<	ClearCap(source_p, CAP_TS6);
338	>	assert(IsUnknown(source_p));
339	>	assert(!source_p->connection->registration);
340
341	<	if (ConfigFileEntry.ping_cookie)
341	>	if (ConfigGeneral.ping_cookie)
342		{
343	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
343	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
344		{
345		do
346	<	source_p->localClient->random_ping = genrand_int32();
347	<	while (!source_p->localClient->random_ping);
346	>	source_p->connection->random_ping = genrand_int32();
347	>	while (!source_p->connection->random_ping);
348
349	<	sendto_one(source_p, "PING :%u",
305	<	source_p->localClient->random_ping);
349	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
350		SetPingSent(source_p);
351		return;
352		}
#	Line 311 | Line 355 | register_local_user(struct Client *sourc
355		return;
356		}
357
358	<	source_p->localClient->last = CurrentTime;
358	>	source_p->connection->last_privmsg = CurrentTime;
359		/* Straight up the maximum rate of flooding... */
360	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
360	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
361
362	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
362	>	if (!check_client(source_p))
363		return;
364
365	<	if (valid_hostname(source_p->host) == 0)
365	>	if (!valid_hostname(source_p->host))
366		{
367	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
368	<	"character in your hostname", me.name, source_p->name);
369	<	strlcpy(source_p->host, source_p->sockhost,
326	<	sizeof(source_p->host));
367	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
368	>	"character in your hostname");
369	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
370		}
371
372	<	ptr   = source_p->localClient->confs.head;
330	<	aconf = map_to_conf(ptr->data);
372	>	conf = source_p->connection->confs.head->data;
373
374		if (!IsGotId(source_p))
375		{
376	<	char username[USERLEN + 1];
376	>	char username[USERLEN + 1] = "";
377		const char *p = username;
378		unsigned int i = 0;
379
380	<	if (IsNeedIdentd(aconf))
380	>	if (IsNeedIdentd(conf))
381		{
382		++ServerStats.is_ref;
383	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
384	<	"identd to use this server", me.name, source_p->name);
385	<	exit_client(source_p, &me, "Install identd");
383	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
384	>	"identd to use this server");
385	>	exit_client(source_p, "Install identd");
386		return;
387		}
388
389		strlcpy(username, source_p->username, sizeof(username));
390
391	<	if (!IsNoTilde(aconf))
391	>	if (!IsNoTilde(conf))
392		source_p->username[i++] = '~';
393
394		for (; *p && i < USERLEN; ++p)
395	<	if (*p != '[')
354	<	source_p->username[i++] = *p;
395	>	source_p->username[i++] = *p;
396
397		source_p->username[i] = '\0';
398		}
399
400	<	/* password check */
401	<	if (!EmptyString(aconf->passwd))
400	>	/* Password check */
401	>	if (!EmptyString(conf->passwd))
402		{
403	<	const char *pass = source_p->localClient->passwd;
363	<
364	<	if (!match_conf_password(pass, aconf))
403	>	if (!match_conf_password(source_p->connection->password, conf))
404		{
405		++ServerStats.is_ref;
406	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
407	<	me.name, source_p->name);
408	<	exit_client(source_p, &me, "Bad Password");
406	>
407	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
408	>	exit_client(source_p, "Bad Password");
409		return;
410		}
411		}
412
413	<	/* don't free source_p->localClient->passwd here - it can be required
414	<	* by masked /stats I if there are auth{} blocks with need_password = no;
413	>	/*
414	>	* Don't free source_p->connection->password here - it can be required
415	>	* by masked /stats I if there are auth {} blocks with need_password = no;
416		* --adx
417		*/
418
419	<	/* report if user has &^>= etc. and set flags as needed in source_p */
420	<	report_and_set_user_flags(source_p, aconf);
419	>	/*
420	>	* Report if user has &^>= etc. and set flags as needed in source_p
421	>	*/
422	>	report_and_set_user_flags(source_p, conf);
423
424		if (IsDead(source_p))
425		return;
426
427	<	/* Limit clients -
427	>	/*
428	>	* Limit clients -
429		* We want to be able to have servers and F-line clients
430		* connect, so save room for "buffer" connections.
431		* Smaller servers may want to decrease this, and it should
432		* probably be just a percentage of the MAXCLIENTS...
433		*   -Taner
434		*/
435	<	/* Except "F:" clients */
436	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
394	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
435	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
436	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
437		{
438	<	sendto_realops_flags(UMODE_FULL, L_ALL,
438	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
439		"Too many clients, rejecting %s[%s].",
440		source_p->name, source_p->host);
441		++ServerStats.is_ref;
442	<	exit_client(source_p, &me, "Sorry, server is full - try later");
442	>	exit_client(source_p, "Sorry, server is full - try later");
443		return;
444		}
445
446	<	/* valid user name check */
405	<	if (valid_username(source_p->username) == 0)
446	>	if (!valid_username(source_p->username, 1))
447		{
448	<	char tmpstr2[IRCD_BUFSIZE];
448	>	char buf[IRCD_BUFSIZE] = "";
449
450	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
450	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
451	>	"Invalid username: %s (%s@%s)",
452		source_p->name, source_p->username, source_p->host);
453		++ServerStats.is_ref;
454	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
455	<	exit_client(source_p, &me, tmpstr2);
454	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
455	>	exit_client(source_p, buf);
456		return;
457		}
458
459		if (check_xline(source_p))
460		return;
461
462	<	while (hash_find_id((id = uid_get())) != NULL)
462	>	while (hash_find_id((id = uid_get())))
463		;
464
465		strlcpy(source_p->id, id, sizeof(source_p->id));
466		hash_add_id(source_p);
467
468	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
469	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
428	<	source_p->name, source_p->username, source_p->host,
429	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
430	<	"255.255.255.255" : source_p->sockhost,
431	<	get_client_class(source_p),
432	<	source_p->info);
433	<
434	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
435	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
468	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
469	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
470		source_p->name, source_p->username, source_p->host,
471	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
472	<	"255.255.255.255" : source_p->sockhost,
473	<	get_client_class(source_p),
440	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
441	<	"<hidden>" : source_p->localClient->client_host,
442	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
443	<	"<hidden>" : source_p->localClient->client_server,
444	<	source_p->info);
445	<
471	>	source_p->sockhost,
472	>	get_client_class(&source_p->connection->confs),
473	>	source_p->info, source_p->id);
474
475	<	if (ConfigFileEntry.invisible_on_connect)
475	>	if (ConfigGeneral.invisible_on_connect)
476		{
477	<	source_p->umodes |= UMODE_INVISIBLE;
477	>	AddUMode(source_p, UMODE_INVISIBLE);
478		++Count.invisi;
479		}
480
481	<	if ((++Count.local) > Count.max_loc)
481	>	if (++Count.local > Count.max_loc)
482		{
483		Count.max_loc = Count.local;
484
485		if (!(Count.max_loc % 10))
486	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
486	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
487	>	"New maximum local client connections: %u",
488		Count.max_loc);
489		}
490
462	–	/* Increment our total user count here */
491		if (++Count.total > Count.max_tot)
492		Count.max_tot = Count.total;
493		++Count.totalrestartcount;
#	Line 467 | Line 495 | register_local_user(struct Client *sourc
495		assert(source_p->servptr == &me);
496		SetClient(source_p);
497		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
498	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
499
500	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
500	>	assert(dlinkFind(&unknown_list, source_p));
501
502	<	assert(dlinkFindDelete(&unknown_list, source_p));
503	<
475	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
476	<	{
477	<	free_dlink_node(m);
478	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
479	<	}
502	>	dlink_move_node(&source_p->connection->lclient_node,
503	>	&unknown_list, &local_client_list);
504
505		user_welcome(source_p);
506		add_user_host(source_p->username, source_p->host, 0);
#	Line 491 | Line 515 | register_local_user(struct Client *sourc
515		*              - username to register as
516		*              - host name to register as
517		*              - server name
494	–	*              - realname (gecos)
518		* output       - NONE
519		* side effects - This function is called when a remote client
520		*                is introduced by a server.
521		*/
522		void
523	<	register_remote_user(struct Client *source_p,
501	<	const char *username, const char *host, const char *server,
502	<	const char *realname)
523	>	register_remote_user(struct Client *source_p)
524		{
525	<	struct Client *target_p = NULL;
505	<
506	<	assert(source_p != NULL);
507	<	assert(source_p->username != username);
508	<
509	<	strlcpy(source_p->host, host, sizeof(source_p->host));
510	<	strlcpy(source_p->username, username, sizeof(source_p->username));
511	<
512	<	/*
513	<	* coming from another server, take the servers word for it
514	<	*/
515	<	source_p->servptr = find_server(server);
516	<
517	<	/* Super GhostDetect:
518	<	* If we can't find the server the user is supposed to be on,
519	<	* then simply blow the user away.        -Taner
520	<	*/
521	<	if (source_p->servptr == NULL)
522	<	{
523	<	sendto_realops_flags(UMODE_ALL, L_ALL,
524	<	"No server %s for user %s[%s@%s] from %s",
525	<	server, source_p->name, source_p->username,
526	<	source_p->host, source_p->from->name);
527	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
528	<
529	<	SetKilled(source_p);
530	<	exit_client(source_p, &me, "Ghosted Client");
531	<	return;
532	<	}
525	>	const struct Client *target_p = NULL;
526
527		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
528		{
529	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
529	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
530		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
531		source_p->from->name, source_p->name, source_p->username,
532		source_p->host, source_p->servptr->name,
533		target_p->name, target_p->from->name);
534	<	kill_client(source_p->from, source_p,
535	<	"%s (NICK from wrong direction (%s != %s))",
536	<	me.name, source_p->servptr->name, target_p->from->name);
537	<	SetKilled(source_p);
538	<	exit_client(source_p, &me, "USER server wrong direction");
534	>	sendto_one(source_p->from,
535	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
536	>	me.id, source_p->id, me.name, source_p->servptr->name,
537	>	target_p->from->name);
538	>
539	>	AddFlag(source_p, FLAGS_KILLED);
540	>	exit_client(source_p, "UID server wrong direction");
541		return;
542		}
543
544	<	/* Increment our total user count here */
544	>	/*
545	>	* If the nick has been introduced by a services server,
546	>	* make it a service as well.
547	>	*/
548	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
549	>	AddFlag(source_p, FLAGS_SERVICE);
550	>
551		if (++Count.total > Count.max_tot)
552		Count.max_tot = Count.total;
553
554		SetClient(source_p);
555		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
556	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
557		add_user_host(source_p->username, source_p->host, 1);
558		SetUserHost(source_p);
559
560	<	introduce_client(source_p);
561	<	}
562	<
563	<	/* introduce_client()
564	<	*
565	<	* inputs       - source_p
564	<	* output       - NONE
565	<	* side effects - This common function introduces a client to the rest
566	<	*                of the net, either from a local client connect or
567	<	*                from a remote connect.
568	<	*/
569	<	static void
570	<	introduce_client(struct Client *source_p)
571	<	{
572	<	dlink_node *server_node = NULL;
573	<	static char ubuf[12];
574	<
575	<	if (MyClient(source_p))
576	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
577	<	else
578	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
579	<
580	<	watch_check_hash(source_p, RPL_LOGON);
560	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
561	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
562	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
563	>	source_p->servptr->name,
564	>	source_p->name, source_p->username, source_p->host,
565	>	source_p->sockhost, source_p->info, source_p->id);
566
567	<	if (*ubuf == '\0')
583	<	{
584	<	ubuf[0] = '+';
585	<	ubuf[1] = '\0';
586	<	}
587	<
588	<	DLINK_FOREACH(server_node, serv_list.head)
589	<	{
590	<	struct Client *server = server_node->data;
591	<
592	<	if (server == source_p->from)
593	<	continue;
594	<
595	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
596	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
597	<	source_p->servptr->id,
598	<	source_p->name, source_p->hopcount+1,
599	<	(unsigned long)source_p->tsinfo,
600	<	ubuf, source_p->username, source_p->host,
601	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
602	<	"0" : source_p->sockhost, source_p->id, source_p->info);
603	<	else
604	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
605	<	source_p->name, source_p->hopcount+1,
606	<	(unsigned long)source_p->tsinfo,
607	<	ubuf, source_p->username, source_p->host,
608	<	source_p->servptr->name, source_p->info);
609	<	}
567	>	introduce_client(source_p);
568		}
569
570		/* valid_hostname()
#	Line 623 | Line 581 | valid_hostname(const char *hostname)
581		{
582		const char *p = hostname;
583
584	<	assert(p != NULL);
584	>	assert(p);
585
586	<	if (*p == '.' || *p == ':')
586	>	if (EmptyString(p) || *p == '.' || *p == ':')
587		return 0;
588
589		for (; *p; ++p)
590		if (!IsHostChar(*p))
591		return 0;
592
593	<	return 1;
593	>	return p - hostname <= HOSTLEN;
594		}
595
596		/* valid_username()
#	Line 647 | Line 605 | valid_hostname(const char *hostname)
605		* style of username
606		*/
607		int
608	<	valid_username(const char *username)
608	>	valid_username(const char *username, const int local)
609		{
610	<	int dots      = 0;
610	>	unsigned int dots = 0;
611		const char *p = username;
612
613	<	assert(p != NULL);
613	>	assert(p);
614
615		if (*p == '~')
616		++p;
617
618	<	/* reject usernames that don't start with an alphanum
618	>	/*
619	>	* Reject usernames that don't start with an alphanum
620		* i.e. reject jokers who have '-@somehost' or '.@somehost'
621		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
622		*/
623		if (!IsAlNum(*p))
624		return 0;
625
626	<	while (*++p)
626	>	if (local)
627		{
628	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
628	>	while (*++p)
629		{
630	<	if (++dots > ConfigFileEntry.dots_in_ident)
631	<	return 0;
632	<	if (!IsUserChar(*(p + 1)))
630	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
631	>	{
632	>	if (++dots > ConfigGeneral.dots_in_ident)
633	>	return 0;
634	>	if (!IsUserChar(*(p + 1)))
635	>	return 0;
636	>	}
637	>	else if (!IsUserChar(*p))
638		return 0;
639		}
676	–	else if (!IsUserChar(*p))
677	–	return 0;
640		}
641	<
680	<	return 1;
681	<	}
682	<
683	<	/* report_and_set_user_flags()
684	<	*
685	<	* inputs       - pointer to source_p
686	<	*              - pointer to aconf for this user
687	<	* output       - NONE
688	<	* side effects - Report to user any special flags
689	<	*                they are getting, and set them.
690	<	*/
691	<	static void
692	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
693	<	{
694	<	/* If this user is being spoofed, tell them so */
695	<	if (IsConfDoSpoofIp(aconf))
696	<	{
697	<	sendto_one(source_p,
698	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
699	<	me.name, source_p->name);
700	<	}
701	<
702	<	/* If this user is in the exception class, Set it "E lined" */
703	<	if (IsConfExemptKline(aconf))
704	<	{
705	<	SetExemptKline(source_p);
706	<	sendto_one(source_p,
707	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
708	<	me.name, source_p->name);
709	<	}
710	<
711	<	/* The else here is to make sure that G line exempt users
712	<	* do not get noticed twice.
713	<	*/
714	<	else if (IsConfExemptGline(aconf))
715	<	{
716	<	SetExemptGline(source_p);
717	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
718	<	me.name, source_p->name);
719	<	}
720	<
721	<	if (IsConfExemptResv(aconf))
722	<	{
723	<	SetExemptResv(source_p);
724	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
725	<	me.name, source_p->name);
726	<	}
727	<
728	<	/* If this user is exempt from user limits set it "F lined" */
729	<	if (IsConfExemptLimits(aconf))
730	<	{
731	<	SetExemptLimits(source_p);
732	<	sendto_one(source_p,
733	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
734	<	me.name,source_p->name);
735	<	}
736	<
737	<	/* If this user is exempt from idle time outs */
738	<	if (IsConfIdlelined(aconf))
641	>	else
642		{
643	<	SetIdlelined(source_p);
644	<	sendto_one(source_p,
645	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
743	<	me.name, source_p->name);
643	>	while (*++p)
644	>	if (!IsUserChar(*p))
645	>	return 0;
646		}
647
648	<	if (IsConfCanFlood(aconf))
747	<	{
748	<	SetCanFlood(source_p);
749	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
750	<	"protection, aren't you fearsome.",
751	<	me.name, source_p->name);
752	<	}
648	>	return p - username <= USERLEN;
649		}
650
651	<	/* change_simple_umode()
651	>	/* clean_nick_name()
652		*
653	<	* this callback can be hooked to allow special handling of
654	<	* certain usermodes
653	>	* input        - nickname
654	>	*              - whether it's a local nick (1) or remote (0)
655	>	* output       - none
656	>	* side effects - walks through the nickname, returning 0 if erroneous
657		*/
658	<	static void *
659	<	change_simple_umode(va_list args)
762	<	{
763	<	struct Client *client_p;
764	<	struct Client *source_p;
765	<	int what;
766	<	unsigned int flag;
767	<
768	<	client_p = va_arg(args, struct Client *);
769	<	source_p = va_arg(args, struct Client *);
770	<	what = va_arg(args, int);
771	<	flag = va_arg(args, unsigned int);
772	<
773	<	if (what == MODE_ADD)
774	<	source_p->umodes |= flag;
775	<	else
776	<	source_p->umodes &= ~flag;
777	<
778	<	return NULL;
779	<	}
780	<
781	<	/* set_user_mode()
782	<	*
783	<	* added 15/10/91 By Darren Reed.
784	<	* parv[0] - sender
785	<	* parv[1] - username to change mode for
786	<	* parv[2] - modes to change
787	<	*/
788	<	void
789	<	set_user_mode(struct Client *client_p, struct Client *source_p,
790	<	int parc, char *parv[])
658	>	int
659	>	valid_nickname(const char *nickname, const int local)
660		{
661	<	unsigned int flag, setflags;
793	<	char **p, *m, buf[IRCD_BUFSIZE];
794	<	struct Client *target_p;
795	<	int what = MODE_ADD, badflag = 0, i;
796	<
797	<	assert(!(parc < 2));
798	<
799	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
800	<	{
801	<	if (MyConnect(source_p))
802	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
803	<	me.name, source_p->name, parv[1]);
804	<	return;
805	<	}
806	<
807	<	if (IsServer(source_p))
808	<	{
809	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
810	<	parv[1], source_p->name);
811	<	return;
812	<	}
813	<
814	<	if (source_p != target_p)
815	<	{
816	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
817	<	me.name, source_p->name);
818	<	return;
819	<	}
820	<
821	<	if (parc < 3)
822	<	{
823	<	m = buf;
824	<	*m++ = '+';
825	<
826	<	for (i = 0; i < 128; i++)
827	<	if (source_p->umodes & user_modes[i])
828	<	*m++ = (char)i;
829	<	*m = '\0';
830	<
831	<	sendto_one(source_p, form_str(RPL_UMODEIS),
832	<	me.name, source_p->name, buf);
833	<	return;
834	<	}
661	>	const char *p = nickname;
662
663	<	execute_callback(entering_umode_cb, client_p, source_p);
837	<
838	<	/* find flags already set for user */
839	<	setflags = source_p->umodes;
840	<
841	<	/* parse mode change string(s) */
842	<	for (p = &parv[2]; p && *p; p++)
843	<	{
844	<	for (m = *p; *m; m++)
845	<	{
846	<	switch (*m)
847	<	{
848	<	case '+':
849	<	what = MODE_ADD;
850	<	break;
851	<	case '-':
852	<	what = MODE_DEL;
853	<	break;
854	<	case 'o':
855	<	if (what == MODE_ADD)
856	<	{
857	<	if (IsServer(client_p) && !IsOper(source_p))
858	<	{
859	<	++Count.oper;
860	<	SetOper(source_p);
861	<	}
862	<	}
863	<	else
864	<	{
865	<	/* Only decrement the oper counts if an oper to begin with
866	<	* found by Pat Szuta, Perly , perly@xnet.com
867	<	*/
868	<	if (!IsOper(source_p))
869	<	break;
870	<
871	<	ClearOper(source_p);
872	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
873	<	Count.oper--;
874	<
875	<	if (MyConnect(source_p))
876	<	{
877	<	dlink_node *dm;
878	<
879	<	detach_conf(source_p, OPER_TYPE);
880	<	ClearOperFlags(source_p);
881	<
882	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
883	<	free_dlink_node(dm);
884	<	}
885	<	}
886	<
887	<	break;
888	<
889	<	/* we may not get these,
890	<	* but they shouldnt be in default
891	<	*/
892	<	case ' ' :
893	<	case '\n':
894	<	case '\r':
895	<	case '\t':
896	<	break;
897	<
898	<	default:
899	<	if ((flag = user_modes[(unsigned char)*m]))
900	<	{
901	<	if (MyConnect(source_p) && !IsOper(source_p) &&
902	<	(ConfigFileEntry.oper_only_umodes & flag))
903	<	{
904	<	badflag = 1;
905	<	}
906	<	else
907	<	execute_callback(umode_cb, client_p, source_p, what, flag);
908	<	}
909	<	else
910	<	{
911	<	if (MyConnect(source_p))
912	<	badflag = 1;
913	<	}
914	<
915	<	break;
916	<	}
917	<	}
918	<	}
919	<
920	<	if (badflag)
921	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
922	<	me.name, source_p->name);
923	<
924	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
925	<	{
926	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
927	<	me.name, source_p->name);
928	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
929	<	}
930	<
931	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
932	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
933	<	{
934	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
935	<	me.name, source_p->name);
936	<	source_p->umodes &= ~UMODE_ADMIN;
937	<	}
938	<
939	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
940	<	++Count.invisi;
941	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
942	<	--Count.invisi;
663	>	assert(p);
664
665		/*
666	<	* compare new flags with old flags and send string which
946	<	* will cause servers to update correctly.
666	>	* Nicks can't start with a digit or - or be 0 length.
667		*/
668	<	send_umode_out(client_p, source_p, setflags);
668	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
669	>	return 0;
670	>
671	>	for (; *p; ++p)
672	>	if (!IsNickChar(*p))
673	>	return 0;
674	>
675	>	return p - nickname <= NICKLEN;
676		}
677
678		/* send_umode()
#	Line 961 | Line 688 | set_user_mode(struct Client *client_p, s
688		*/
689		void
690		send_umode(struct Client *client_p, struct Client *source_p,
691	<	unsigned int old, unsigned int sendmask, char *umode_buf)
691	>	unsigned int old, char *umode_buf)
692		{
693		char *m = umode_buf;
694		int what = 0;
968	–	unsigned int i;
969	–	unsigned int flag;
695
696		/*
697	<	* build a string in umode_buf to represent the change in the user's
697	>	* Build a string in umode_buf to represent the change in the user's
698		* mode between the new (source_p->umodes) and 'old'.
699		*/
700	<	for (i = 0; i < 128; i++)
700	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
701		{
702	<	flag = user_modes[i];
978	<	if (!flag)
979	<	continue;
980	<
981	<	if (MyClient(source_p) && !(flag & sendmask))
982	<	continue;
983	<
984	<	if ((flag & old) && !(source_p->umodes & flag))
702	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
703		{
704		if (what == MODE_DEL)
705	<	*m++ = (char)i;
705	>	*m++ = tab->c;
706		else
707		{
708		what = MODE_DEL;
709		*m++ = '-';
710	<	*m++ = (char)i;
710	>	*m++ = tab->c;
711		}
712		}
713	<	else if (!(flag & old) && (source_p->umodes & flag))
713	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
714		{
715		if (what == MODE_ADD)
716	<	*m++ = (char)i;
716	>	*m++ = tab->c;
717		else
718		{
719		what = MODE_ADD;
720		*m++ = '+';
721	<	*m++ = (char)i;
721	>	*m++ = tab->c;
722		}
723		}
724		}
#	Line 1009 | Line 727 | send_umode(struct Client *client_p, stru
727
728		if (*umode_buf && client_p)
729		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
730	<	source_p->name, source_p->username,
731	<	source_p->host, source_p->name, umode_buf);
730	>	client_p->name, client_p->username,
731	>	client_p->host, client_p->name, umode_buf);
732		}
733
734		/* send_umode_out()
#	Line 1020 | Line 738 | send_umode(struct Client *client_p, stru
738		* side effects - Only send ubuf out to servers that know about this client
739		*/
740		void
741	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1024	<	unsigned int old)
741	>	send_umode_out(struct Client *source_p, unsigned int old)
742		{
743	<	char buf[IRCD_BUFSIZE] = { '\0' };
1027	<	dlink_node *ptr = NULL;
743	>	char buf[IRCD_BUFSIZE] = "";
744
745	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1030	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
745	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
746
747		if (buf[0])
748	<	{
749	<	DLINK_FOREACH(ptr, serv_list.head)
1035	<	{
1036	<	struct Client *target_p = ptr->data;
1037	<
1038	<	if ((target_p != client_p) && (target_p != source_p))
1039	<	sendto_one(target_p, ":%s MODE %s :%s",
1040	<	ID_or_name(source_p, target_p),
1041	<	ID_or_name(source_p, target_p), buf);
1042	<	}
1043	<	}
1044	<
1045	<	if (client_p && MyClient(client_p))
1046	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
748	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
749	>	source_p->id, source_p->id, buf);
750		}
751
752	<	/* user_welcome()
753	<	*
1051	<	* inputs       - client pointer to client to welcome
1052	<	* output       - NONE
1053	<	* side effects -
1054	<	*/
1055	<	static void
1056	<	user_welcome(struct Client *source_p)
752	>	void
753	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
754		{
755	<	#if defined(__TIME__) && defined(__DATE__)
1059	<	static const char built_date[] = __DATE__ " at " __TIME__;
1060	<	#else
1061	<	static const char built_date[] = "unknown";
1062	<	#endif
755	>	dlink_node *node = NULL;
756
757	<	#ifdef HAVE_LIBCRYPTO
758	<	if (source_p->localClient->fd.ssl != NULL)
1066	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1067	<	me.name, source_p->name,
1068	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1069	<	#endif
1070	<
1071	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1072	<	ServerInfo.network_name, source_p->name);
1073	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1074	<	get_listener_name(source_p->localClient->listener), ircd_version);
1075	<	sendto_one(source_p, form_str(RPL_CREATED),
1076	<	me.name, source_p->name, built_date);
1077	<	sendto_one(source_p, form_str(RPL_MYINFO),
1078	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1079	<	show_isupport(source_p);
1080	<
1081	<	if (source_p->id[0] != '\0')
1082	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1083	<	source_p->name, source_p->id);
1084	<
1085	<	show_lusers(source_p);
757	>	if (!strcmp(target_p->host, hostname))
758	>	return;
759
760	<	if (ConfigFileEntry.short_motd)
760	>	switch (what)
761		{
762	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
763	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
764	<	sendto_one(source_p,
765	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
766	<	"read it", me.name, source_p->name);
767	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
768	<	me.name, source_p->name, me.name);
1096	<	sendto_one(source_p, form_str(RPL_MOTD),
1097	<	me.name, source_p->name,
1098	<	"*** This is the short motd ***");
1099	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1100	<	me.name, source_p->name);
762	>	case MODE_ADD:
763	>	AddUMode(target_p, UMODE_HIDDENHOST);
764	>	break;
765	>	case MODE_DEL:
766	>	DelUMode(target_p, UMODE_HIDDENHOST);
767	>	break;
768	>	default: return;
769		}
1102	–	else
1103	–	send_message_file(source_p, &ConfigFileEntry.motd);
1104	–	}
770
771	<	/* check_xline()
772	<	*
773	<	* inputs       - pointer to client to test
1109	<	* outupt       - 1 if exiting 0 if ok
1110	<	* side effects -
1111	<	*/
1112	<	static int
1113	<	check_xline(struct Client *source_p)
1114	<	{
1115	<	struct ConfItem *conf = NULL;
1116	<	const char *reason = NULL;
1117	<
1118	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1119	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1120	<	{
1121	<	struct MatchItem *reg = map_to_conf(conf);
771	>	if (ConfigGeneral.cycle_on_host_change)
772	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
773	>	target_p->name, target_p->username, target_p->host);
774
775	<	++reg->count;
775	>	if (IsUserHostIp(target_p))
776	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
777
778	<	if (reg->reason != NULL)
1126	<	reason = reg->reason;
1127	<	else
1128	<	reason = "No Reason";
778	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
779
780	<	sendto_realops_flags(UMODE_REJ, L_ALL,
781	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1132	<	source_p->info, reason,
1133	<	get_client_name(source_p, HIDE_IP),
1134	<	source_p->sockhost);
780	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
781	>	SetUserHost(target_p);
782
783	<	++ServerStats.is_ref;
784	<	if (REJECT_HOLD_TIME > 0)
785	<	{
786	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1140	<	me.name, source_p->name);
1141	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1142	<	SetCaptured(source_p);
1143	<	}
1144	<	else
1145	<	exit_client(source_p, &me, "Bad user info");
1146	<	return 1;
783	>	if (MyClient(target_p))
784	>	{
785	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
786	>	clear_ban_cache_client(target_p);
787		}
788
789	<	return 0;
790	<	}
1151	<
1152	<	/* oper_up()
1153	<	*
1154	<	* inputs       - pointer to given client to oper
1155	<	* output       - NONE
1156	<	* side effects - Blindly opers up given source_p, using aconf info
1157	<	*                all checks on passwords have already been done.
1158	<	*                This could also be used by rsa oper routines.
1159	<	*/
1160	<	void
1161	<	oper_up(struct Client *source_p)
1162	<	{
1163	<	unsigned int old = source_p->umodes;
1164	<	const char *operprivs = "";
1165	<	const struct AccessItem *oconf = NULL;
1166	<
1167	<	assert(source_p->localClient->confs.head);
1168	<	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1169	<
1170	<	++Count.oper;
1171	<	SetOper(source_p);
1172	<
1173	<	if (oconf->modes)
1174	<	source_p->umodes |= oconf->modes;
1175	<	else if (ConfigFileEntry.oper_umodes)
1176	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1177	<	else
1178	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1179	<	UMODE_WALLOP|UMODE_LOCOPS);
1180	<
1181	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1182	<	++Count.invisi;
1183	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1184	<	--Count.invisi;
1185	<
1186	<	assert(dlinkFind(&oper_list, source_p) == NULL);
1187	<	dlinkAdd(source_p, make_dlink_node(), &oper_list);
1188	<
1189	<	operprivs = oper_privs_as_string(oconf->port);
1190	<
1191	<	SetOFlag(source_p, oconf->port);
1192	<
1193	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1194	<	source_p->umodes |= UMODE_ADMIN;
1195	<	if (!IsOperN(source_p))
1196	<	source_p->umodes &= ~UMODE_NCHANGE;
1197	<
1198	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1199	<	source_p->name, source_p->username, source_p->host);
1200	<	send_umode_out(source_p, source_p, old);
1201	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1202	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1203	<	me.name, source_p->name, operprivs);
1204	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1205	<	}
1206	<
1207	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1208	<
1209	<	int
1210	<	valid_sid(const char *sid)
1211	<	{
1212	<	if (strlen(sid) == IRC_MAXSID)
1213	<	if (IsDigit(*sid))
1214	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1215	<	return 1;
1216	<
1217	<	return 0;
1218	<	}
1219	<
1220	<	/*
1221	<	* init_uid()
1222	<	*
1223	<	* inputs       - NONE
1224	<	* output       - NONE
1225	<	* side effects - new_uid is filled in with server id portion (sid)
1226	<	*                (first 3 bytes) or defaulted to 'A'.
1227	<	*                Rest is filled in with 'A'
1228	<	*/
1229	<	void
1230	<	init_uid(void)
1231	<	{
1232	<	int i;
1233	<
1234	<	memset(new_uid, 0, sizeof(new_uid));
1235	<
1236	<	if (!EmptyString(ServerInfo.sid))
1237	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1238	<
1239	<	for (i = 0; i < IRC_MAXSID; ++i)
1240	<	if (new_uid[i] == '\0')
1241	<	new_uid[i] = 'A';
1242	<
1243	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1244	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1245	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1246	<	* -Dianora
1247	<	*/
1248	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1249	<
1250	<	entering_umode_cb = register_callback("entering_umode", NULL);
1251	<	umode_cb = register_callback("changing_umode", change_simple_umode);
1252	<	}
789	>	if (!ConfigGeneral.cycle_on_host_change)
790	>	return;
791
792	<	/*
1255	<	* add_one_to_uid
1256	<	*
1257	<	* inputs       - index number into new_uid
1258	<	* output       - NONE
1259	<	* side effects - new_uid is incremented by one
1260	<	*                note this is a recursive function
1261	<	*/
1262	<	static void
1263	<	add_one_to_uid(int i)
1264	<	{
1265	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
792	>	DLINK_FOREACH(node, target_p->channel.head)
793		{
794	<	if (new_uid[i] == 'Z')
795	<	new_uid[i] = '0';
796	<	else if (new_uid[i] == '9')
794	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
795	>	char *p = modebuf;
796	>	int len = 0;
797	>	const struct Membership *member = node->data;
798	>
799	>	if (has_member_flags(member, CHFL_CHANOP))
800		{
801	<	new_uid[i] = 'A';
802	<	add_one_to_uid(i-1);
801	>	*p++ = 'o';
802	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
803		}
1274	–	else
1275	–	++new_uid[i];
1276	–	}
1277	–	else
1278	–	{
1279	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1280	–	if (new_uid[i] == 'Z')
1281	–	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1282	–	else
1283	–	++new_uid[i];
1284	–	}
1285	–	}
1286	–
1287	–	/*
1288	–	* uid_get
1289	–	*
1290	–	* inputs       - struct Client *
1291	–	* output       - new UID is returned to caller
1292	–	* side effects - new_uid is incremented by one.
1293	–	*/
1294	–	static const char *
1295	–	uid_get(void)
1296	–	{
1297	–	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1298	–	return new_uid;
1299	–	}
1300	–
1301	–	/*
1302	–	* init_isupport()
1303	–	*
1304	–	* input        - NONE
1305	–	* output       - NONE
1306	–	* side effects - Must be called before isupport is enabled
1307	–	*/
1308	–	void
1309	–	init_isupport(void)
1310	–	{
1311	–	isupportFile = init_MessageLine();
804
805	<	add_isupport("CALLERID", NULL, -1);
806	<	add_isupport("CASEMAPPING", CASEMAP, -1);
807	<	add_isupport("DEAF", "D", -1);
808	<	add_isupport("KICKLEN", NULL, KICKLEN);
809	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1318	<	add_isupport("NICKLEN", NULL, NICKLEN-1);
1319	<	#ifdef HALFOPS
1320	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1321	<	add_isupport("STATUSMSG", "@%+", -1);
1322	<	#else
1323	<	add_isupport("PREFIX", "(ov)@+", -1);
1324	<	add_isupport("STATUSMSG", "@+", -1);
1325	<	#endif
1326	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1327	<	}
1328	<
1329	<	/*
1330	<	* add_isupport()
1331	<	*
1332	<	* input        - name of supported function
1333	<	*              - options if any
1334	<	*              - number if any
1335	<	* output       - NONE
1336	<	* side effects - Each supported item must call this when activated
1337	<	*/
1338	<	void
1339	<	add_isupport(const char *name, const char *options, int n)
1340	<	{
1341	<	dlink_node *ptr;
1342	<	struct Isupport *support;
805	>	if (has_member_flags(member, CHFL_HALFOP))
806	>	{
807	>	*p++ = 'h';
808	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
809	>	}
810
811	<	DLINK_FOREACH(ptr, support_list.head)
1345	<	{
1346	<	support = ptr->data;
1347	<	if (irccmp(support->name, name) == 0)
811	>	if (has_member_flags(member, CHFL_VOICE))
812		{
813	<	MyFree(support->name);
814	<	MyFree(support->options);
1351	<	break;
813	>	*p++ = 'v';
814	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
815		}
1353	–	}
816
817	<	if (ptr == NULL)
1356	<	{
1357	<	support = MyMalloc(sizeof(*support));
1358	<	dlinkAddTail(support, &support->node, &support_list);
1359	<	}
817	>	*p = '\0';
818
1361	–	DupString(support->name, name);
1362	–	if (options != NULL)
1363	–	DupString(support->options, options);
1364	–	support->number = n;
819
820	<	rebuild_isupport_message_line();
821	<	}
820	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
821	>	target_p->name, target_p->username,
822	>	target_p->host, member->chptr->name,
823	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
824	>	target_p->info);
825	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
826	>	target_p->name, target_p->username,
827	>	target_p->host, member->chptr->name);
828	>
829	>	if (nickbuf[0])
830	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
831	>	target_p->servptr->name, member->chptr->name,
832	>	modebuf, nickbuf);
833
1369	–	/*
1370	–	* delete_isupport()
1371	–	*
1372	–	* input        - name of supported function
1373	–	* output       - NONE
1374	–	* side effects - Each supported item must call this when deactivated
1375	–	*/
1376	–	void
1377	–	delete_isupport(const char *name)
1378	–	{
1379	–	dlink_node *ptr;
1380	–	struct Isupport *support;
1381	–
1382	–	DLINK_FOREACH(ptr, support_list.head)
1383	–	{
1384	–	support = ptr->data;
1385	–	if (irccmp(support->name, name) == 0)
1386	–	{
1387	–	dlinkDelete(ptr, &support_list);
1388	–	MyFree(support->name);
1389	–	MyFree(support->options);
1390	–	MyFree(support);
1391	–	break;
1392	–	}
834		}
835
836	<	rebuild_isupport_message_line();
837	<	}
838	<
839	<	/*
840	<	* rebuild_isupport_message_line
841	<	*
842	<	* input        - NONE
843	<	* output       - NONE
844	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
836	>	if (target_p->away[0])
837	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
838	>	":%s!%s@%s AWAY :%s",
839	>	target_p->name, target_p->username,
840	>	target_p->host, target_p->away);
841	>	}
842	>
843	>	/*! \brief Blindly opers up given source_p, using conf info.
844	>	*         All checks on passwords have already been done.
845	>	* \param source_p Pointer to given client to oper
846		*/
847		void
848	<	rebuild_isupport_message_line(void)
848	>	oper_up(struct Client *source_p)
849		{
850	<	char isupportbuffer[IRCD_BUFSIZE];
851	<	char *p = isupportbuffer;
1410	<	dlink_node *ptr = NULL;
1411	<	int n = 0;
1412	<	int tokens = 0;
1413	<	size_t len = 0;
1414	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
850	>	const unsigned int old = source_p->umodes;
851	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
852
853	<	destroy_MessageLine(isupportFile);
853	>	assert(source_p->connection->confs.head);
854
855	<	DLINK_FOREACH(ptr, support_list.head)
856	<	{
1420	<	struct Isupport *support = ptr->data;
855	>	++Count.oper;
856	>	SetOper(source_p);
857
858	<	p += (n = ircsprintf(p, "%s", support->name));
859	<	len += n;
858	>	if (conf->modes)
859	>	AddUMode(source_p, conf->modes);
860	>	else if (ConfigGeneral.oper_umodes)
861	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
862
863	<	if (support->options != NULL)
864	<	{
865	<	p += (n = ircsprintf(p, "=%s", support->options));
866	<	len += n;
1429	<	}
863	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
864	>	++Count.invisi;
865	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
866	>	--Count.invisi;
867
868	<	if (support->number > 0)
869	<	{
1433	<	p += (n = ircsprintf(p, "=%d", support->number));
1434	<	len += n;
1435	<	}
868	>	assert(dlinkFind(&oper_list, source_p) == NULL);
869	>	dlinkAdd(source_p, make_dlink_node(), &oper_list);
870
871	<	*p++ = ' ';
1438	<	len++;
1439	<	*p = '\0';
871	>	AddOFlag(source_p, conf->port);
872
873	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
874	<	{ /* arbritrary for now */
1443	<	if (*--p == ' ')
1444	<	*p = '\0';
1445	<
1446	<	addto_MessageLine(isupportFile, isupportbuffer);
1447	<	p = isupportbuffer;
1448	<	len = 0;
1449	<	n = tokens = 0;
1450	<	}
1451	<	}
873	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
874	>	AddUMode(source_p, UMODE_ADMIN);
875
876	<	if (len != 0)
876	>	if (!EmptyString(conf->whois))
877		{
878	<	if (*--p == ' ')
879	<	*p = '\0';
880	<	addto_MessageLine(isupportFile, isupportbuffer);
878	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
879	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
880	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
881	>	RPL_WHOISOPERATOR, conf->whois);
882		}
883	+
884	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
885	+	get_oper_name(source_p));
886	+	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
887	+	me.id, get_oper_name(source_p));
888	+	send_umode_out(source_p, old);
889	+	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
890		}

Diff Legend

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