ViewVC Help

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

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

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

Diff Legend

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