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 1309 by michael, Sun Mar 25 11:24:18 2012 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 5562 by michael, Sat Feb 14 20:03:35 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 s_user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "sprintf_irc.h"
36	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
45	–	#include "supported.h"
46	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
52	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
56	–
57	–	struct Callback *entering_umode_cb = NULL;
58	–	struct Callback *umode_cb = NULL;
59	–
51		static char umode_buffer[IRCD_BUFSIZE];
61	–
62	–	static void user_welcome(struct Client *);
63	–	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
64	–	static int check_xline(struct Client *);
65	–	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	<
72	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 77 | 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	<	UMODE_HIDDEN,       /* 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 */
115	<	0,                  /* Y */
116	<	0,                  /* Z 0x5A */
117	<	0, 0, 0, 0, 0,      /* 0x5F   */
118	<	0,                  /* 0x60   */
119	<	UMODE_ADMIN,        /* a */
120	<	UMODE_BOTS,         /* b */
121	<	UMODE_CCONN,        /* c */
122	<	UMODE_DEBUG,        /* d */
123	<	0,                  /* e */
124	<	UMODE_FULL,         /* f */
125	<	UMODE_CALLERID,     /* g */
126	<	0,                  /* h */
127	<	UMODE_INVISIBLE,    /* i */
128	<	UMODE_REJ,          /* j */
129	<	UMODE_SKILL,        /* k */
130	<	UMODE_LOCOPS,       /* l */
131	<	0,                  /* m */
132	<	UMODE_NCHANGE,      /* n */
133	<	UMODE_OPER,         /* o */
134	<	0,                  /* p */
135	<	0,                  /* q */
136	<	UMODE_REGISTERED,   /* r */
137	<	UMODE_SERVNOTICE,   /* s */
138	<	0,                  /* t */
139	<	UMODE_UNAUTH,       /* u */
140	<	0,                  /* v */
141	<	UMODE_WALLOP,       /* w */
142	<	UMODE_EXTERNAL,     /* x */
143	<	UMODE_SPY,          /* y */
144	<	UMODE_OPERWALL,     /* z      0x7A */
145	<	0,0,0,0,0,          /* 0x7B - 0x7F */
146	<
147	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
148	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
149	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
150	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
151	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
152	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
153	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
154	<	/* 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		{
160	–	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 174 | 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		{
179	–	const char *from, *to;
180	–
181	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
182	–	{
183	–	from = me.id;
184	–	to = source_p->id;
185	–	}
186	–	else
187	–	{
188	–	from = me.name;
189	–	to = source_p->name;
190	–	}
191	–
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),
195	<	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),
202	<	from, to, Count.oper);
203	<
204	<	if (dlink_list_length(&unknown_list) > 0)
205	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
206	<	from, to, dlink_list_length(&unknown_list));
207	<
208	<	if (dlink_list_length(&global_channel_list) > 0)
209	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
210	<	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);
216	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
217	<	from, to, Count.local, Count.max_loc,
218	<	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);
224	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
225	<	from, to, Count.total, Count.max_tot,
226	<	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),
230	<	from, to, Count.total, Count.max_tot,
231	<	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 248 | 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;
284	<	dlink_node *ptr = NULL;
364	>	const struct MaskItem *conf = NULL;
365
286	–	assert(source_p != NULL);
366		assert(source_p == source_p->from);
367		assert(MyConnect(source_p));
368	<	assert(!source_p->localClient->registration);
368	>	assert(!source_p->connection->registration);
369
370	<	ClearCap(source_p, CAP_TS6);
292	<
293	<	if (ConfigFileEntry.ping_cookie)
370	>	if (ConfigGeneral.ping_cookie)
371		{
372	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
372	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
373		{
374		do
375	<	source_p->localClient->random_ping = genrand_int32();
376	<	while (!source_p->localClient->random_ping);
375	>	source_p->connection->random_ping = genrand_int32();
376	>	while (!source_p->connection->random_ping);
377
378	<	sendto_one(source_p, "PING :%u",
302	<	source_p->localClient->random_ping);
378	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
379		SetPingSent(source_p);
380		return;
381		}
#	Line 308 | Line 384 | register_local_user(struct Client *sourc
384		return;
385		}
386
387	<	source_p->localClient->last_privmsg = CurrentTime;
387	>	source_p->connection->last_privmsg = CurrentTime;
388		/* Straight up the maximum rate of flooding... */
389	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
389	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
390
391	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
391	>	if (!check_client(source_p))
392		return;
393
394	<	if (valid_hostname(source_p->host) == 0)
394	>	if (!valid_hostname(source_p->host))
395		{
396	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
397	<	"character in your hostname", me.name, source_p->name);
398	<	strlcpy(source_p->host, source_p->sockhost,
323	<	sizeof(source_p->host));
396	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
397	>	"character in your hostname");
398	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
399		}
400
401	<	ptr   = source_p->localClient->confs.head;
327	<	aconf = map_to_conf(ptr->data);
401	>	conf = source_p->connection->confs.head->data;
402
403		if (!IsGotId(source_p))
404		{
405	<	char username[USERLEN + 1];
405	>	char username[USERLEN + 1] = "";
406		const char *p = username;
407		unsigned int i = 0;
408
409	<	if (IsNeedIdentd(aconf))
409	>	if (IsNeedIdentd(conf))
410		{
411		++ServerStats.is_ref;
412	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
413	<	"identd to use this server", me.name, source_p->name);
414	<	exit_client(source_p, &me, "Install identd");
412	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
413	>	"identd to use this server");
414	>	exit_client(source_p, "Install identd");
415		return;
416		}
417
418		strlcpy(username, source_p->username, sizeof(username));
419
420	<	if (!IsNoTilde(aconf))
420	>	if (!IsNoTilde(conf))
421		source_p->username[i++] = '~';
422
423		for (; *p && i < USERLEN; ++p)
424	<	if (*p != '[')
351	<	source_p->username[i++] = *p;
424	>	source_p->username[i++] = *p;
425
426		source_p->username[i] = '\0';
427		}
428
429	<	/* password check */
430	<	if (!EmptyString(aconf->passwd))
429	>	/* Password check */
430	>	if (!EmptyString(conf->passwd))
431		{
432	<	const char *pass = source_p->localClient->passwd;
360	<
361	<	if (!match_conf_password(pass, aconf))
432	>	if (!match_conf_password(source_p->connection->password, conf))
433		{
434		++ServerStats.is_ref;
435	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
436	<	me.name, source_p->name);
437	<	exit_client(source_p, &me, "Bad Password");
435	>
436	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
437	>	exit_client(source_p, "Bad Password");
438		return;
439		}
440		}
441
442	<	/* don't free source_p->localClient->passwd here - it can be required
443	<	* by masked /stats I if there are auth{} blocks with need_password = no;
442	>	/*
443	>	* Don't free source_p->connection->password here - it can be required
444	>	* by masked /stats I if there are auth {} blocks with need_password = no;
445		* --adx
446		*/
447
448	<	/* report if user has &^>= etc. and set flags as needed in source_p */
449	<	report_and_set_user_flags(source_p, aconf);
448	>	/*
449	>	* Report if user has &^>= etc. and set flags as needed in source_p
450	>	*/
451	>	report_and_set_user_flags(source_p, conf);
452
453		if (IsDead(source_p))
454		return;
455
456	<	/* Limit clients -
456	>	/*
457	>	* Limit clients -
458		* We want to be able to have servers and F-line clients
459		* connect, so save room for "buffer" connections.
460		* Smaller servers may want to decrease this, and it should
461		* probably be just a percentage of the MAXCLIENTS...
462		*   -Taner
463		*/
464	<	/* Except "F:" clients */
465	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
391	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
464	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
465	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
466		{
467	<	sendto_realops_flags(UMODE_FULL, L_ALL,
467	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
468		"Too many clients, rejecting %s[%s].",
469		source_p->name, source_p->host);
470		++ServerStats.is_ref;
471	<	exit_client(source_p, &me, "Sorry, server is full - try later");
471	>	exit_client(source_p, "Sorry, server is full - try later");
472		return;
473		}
474
475	<	/* valid user name check */
402	<	if (valid_username(source_p->username) == 0)
475	>	if (!valid_username(source_p->username, 1))
476		{
477	<	char tmpstr2[IRCD_BUFSIZE];
477	>	char buf[IRCD_BUFSIZE] = "";
478
479	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
479	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
480	>	"Invalid username: %s (%s@%s)",
481		source_p->name, source_p->username, source_p->host);
482		++ServerStats.is_ref;
483	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
484	<	source_p->username);
411	<	exit_client(source_p, &me, tmpstr2);
483	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
484	>	exit_client(source_p, buf);
485		return;
486		}
487
488		if (check_xline(source_p))
489		return;
490
491	<	while (hash_find_id((id = uid_get())) != NULL)
491	>	while (hash_find_id((id = uid_get())))
492		;
493
494		strlcpy(source_p->id, id, sizeof(source_p->id));
495		hash_add_id(source_p);
496
497	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
497	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
498		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
499		source_p->name, source_p->username, source_p->host,
500	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
501	<	"255.255.255.255" : source_p->sockhost,
429	<	get_client_class(source_p),
500	>	source_p->sockhost,
501	>	get_client_class(&source_p->connection->confs),
502		source_p->info, source_p->id);
503
504	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
433	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
434	<	source_p->name, source_p->username, source_p->host,
435	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	<	"255.255.255.255" : source_p->sockhost,
437	<	get_client_class(source_p),
438	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
439	<	"<hidden>" : source_p->localClient->client_host,
440	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
441	<	"<hidden>" : source_p->localClient->client_server,
442	<	source_p->info);
443	<
444	<
445	<	if (ConfigFileEntry.invisible_on_connect)
504	>	if (ConfigGeneral.invisible_on_connect)
505		{
506		AddUMode(source_p, UMODE_INVISIBLE);
507		++Count.invisi;
508		}
509
510	<	if ((++Count.local) > Count.max_loc)
510	>	if (++Count.local > Count.max_loc)
511		{
512		Count.max_loc = Count.local;
513
514		if (!(Count.max_loc % 10))
515	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
515	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516	>	"New maximum local client connections: %u",
517		Count.max_loc);
518		}
519
460	–	/* Increment our total user count here */
520		if (++Count.total > Count.max_tot)
521		Count.max_tot = Count.total;
522		++Count.totalrestartcount;
#	Line 465 | Line 524 | register_local_user(struct Client *sourc
524		assert(source_p->servptr == &me);
525		SetClient(source_p);
526		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
527	<
469	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
527	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
528
529		assert(dlinkFind(&unknown_list, source_p));
530
531	<	dlink_move_node(&source_p->localClient->lclient_node,
531	>	dlink_move_node(&source_p->connection->lclient_node,
532		&unknown_list, &local_client_list);
533
534		user_welcome(source_p);
#	Line 486 | Line 544 | register_local_user(struct Client *sourc
544		*              - username to register as
545		*              - host name to register as
546		*              - server name
489	–	*              - realname (gecos)
547		* output       - NONE
548		* side effects - This function is called when a remote client
549		*                is introduced by a server.
550		*/
551		void
552	<	register_remote_user(struct Client *source_p,
496	<	const char *username, const char *host, const char *server,
497	<	const char *realname)
552	>	register_remote_user(struct Client *source_p)
553		{
554	<	struct Client *target_p = NULL;
500	<
501	<	assert(source_p != NULL);
502	<	assert(source_p->username != username);
503	<
504	<	strlcpy(source_p->host, host, sizeof(source_p->host));
505	<	strlcpy(source_p->username, username, sizeof(source_p->username));
506	<
507	<	/*
508	<	* coming from another server, take the servers word for it
509	<	*/
510	<	source_p->servptr = hash_find_server(server);
511	<
512	<	/* Super GhostDetect:
513	<	* If we can't find the server the user is supposed to be on,
514	<	* then simply blow the user away.        -Taner
515	<	*/
516	<	if (source_p->servptr == NULL)
517	<	{
518	<	sendto_realops_flags(UMODE_ALL, L_ALL,
519	<	"No server %s for user %s[%s@%s] from %s",
520	<	server, source_p->name, source_p->username,
521	<	source_p->host, source_p->from->name);
522	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
523	<
524	<	AddFlag(source_p, FLAGS_KILLED);
525	<	exit_client(source_p, &me, "Ghosted Client");
526	<	return;
527	<	}
554	>	const struct Client *target_p = NULL;
555
556		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
557		{
558	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
558	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
559		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
560		source_p->from->name, source_p->name, source_p->username,
561		source_p->host, source_p->servptr->name,
562		target_p->name, target_p->from->name);
563	<	kill_client(source_p->from, source_p,
564	<	"%s (NICK from wrong direction (%s != %s))",
565	<	me.name, source_p->servptr->name, target_p->from->name);
563	>	sendto_one(source_p->from,
564	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
565	>	me.id, source_p->id, me.name, source_p->servptr->name,
566	>	target_p->from->name);
567	>
568		AddFlag(source_p, FLAGS_KILLED);
569	<	exit_client(source_p, &me, "USER server wrong direction");
569	>	exit_client(source_p, "UID server wrong direction");
570		return;
571		}
572
#	Line 548 | Line 577 | register_remote_user(struct Client *sour
577		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
578		AddFlag(source_p, FLAGS_SERVICE);
579
551	–	/* Increment our total user count here */
580		if (++Count.total > Count.max_tot)
581		Count.max_tot = Count.total;
582
583		SetClient(source_p);
584		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
585	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
586		add_user_host(source_p->username, source_p->host, 1);
587		SetUserHost(source_p);
588
589	<	introduce_client(source_p);
561	<	}
562	<
563	<	/* introduce_client()
564	<	*
565	<	* inputs       - source_p
566	<	* output       - NONE
567	<	* side effects - This common function introduces a client to the rest
568	<	*                of the net, either from a local client connect or
569	<	*                from a remote connect.
570	<	*/
571	<	static void
572	<	introduce_client(struct Client *source_p)
573	<	{
574	<	dlink_node *server_node = NULL;
575	<	static char ubuf[12];
576	<
577	<	if (MyClient(source_p))
578	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
579	<	else
580	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
581	<
582	<	watch_check_hash(source_p, RPL_LOGON);
583	<
584	<	if (*ubuf == '\0')
589	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
590		{
591	<	ubuf[0] = '+';
592	<	ubuf[1] = '\0';
593	<	}
594	<
595	<	DLINK_FOREACH(server_node, serv_list.head)
596	<	{
592	<	struct Client *server = server_node->data;
593	<
594	<	if (server == source_p->from)
595	<	continue;
596	<
597	<	if (IsCapable(server, CAP_SVS))
598	<	{
599	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
600	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
601	<	source_p->servptr->id,
602	<	source_p->name, source_p->hopcount+1,
603	<	(unsigned long)source_p->tsinfo,
604	<	ubuf, source_p->username, source_p->host,
605	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
606	<	"0" : source_p->sockhost, source_p->id,
607	<	(unsigned long)source_p->servicestamp,
608	<	source_p->info);
609	<	else
610	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %lu :%s",
611	<	source_p->name, source_p->hopcount+1,
612	<	(unsigned long)source_p->tsinfo,
613	<	ubuf, source_p->username, source_p->host,
614	<	source_p->servptr->name, (unsigned long)source_p->servicestamp,
615	<	source_p->info);
616	<
617	<	}
591	>	if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
592	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
593	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
594	>	source_p->servptr->name,
595	>	source_p->name, source_p->username, source_p->host,
596	>	source_p->sockhost, source_p->info, source_p->id);
597		else
598	<	{
599	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
600	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
601	<	source_p->servptr->id,
602	<	source_p->name, source_p->hopcount+1,
624	<	(unsigned long)source_p->tsinfo,
625	<	ubuf, source_p->username, source_p->host,
626	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
627	<	"0" : source_p->sockhost, source_p->id, source_p->info);
628	<	else
629	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
630	<	source_p->name, source_p->hopcount+1,
631	<	(unsigned long)source_p->tsinfo,
632	<	ubuf, source_p->username, source_p->host,
633	<	source_p->servptr->name, source_p->info);
634	<	}
598	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
599	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
600	>	source_p->servptr->name,
601	>	source_p->name, source_p->username, source_p->host,
602	>	source_p->info, source_p->id);
603		}
604	+
605	+	introduce_client(source_p);
606		}
607
608		/* valid_hostname()
#	Line 649 | Line 619 | valid_hostname(const char *hostname)
619		{
620		const char *p = hostname;
621
622	<	assert(p != NULL);
622	>	assert(p);
623
624	<	if (*p == '.' || *p == ':')
624	>	if (EmptyString(p) || *p == '.' || *p == ':')
625		return 0;
626
627		for (; *p; ++p)
628		if (!IsHostChar(*p))
629		return 0;
630
631	<	return 1;
631	>	return p - hostname <= HOSTLEN;
632		}
633
634		/* valid_username()
#	Line 673 | Line 643 | valid_hostname(const char *hostname)
643		* style of username
644		*/
645		int
646	<	valid_username(const char *username)
646	>	valid_username(const char *username, const int local)
647		{
648	<	int dots      = 0;
648	>	unsigned int dots = 0;
649		const char *p = username;
650
651	<	assert(p != NULL);
651	>	assert(p);
652
653		if (*p == '~')
654		++p;
655
656	<	/* reject usernames that don't start with an alphanum
656	>	/*
657	>	* Reject usernames that don't start with an alphanum
658		* i.e. reject jokers who have '-@somehost' or '.@somehost'
659		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
660		*/
661		if (!IsAlNum(*p))
662		return 0;
663
664	<	while (*++p)
664	>	if (local)
665		{
666	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
666	>	while (*++p)
667		{
668	<	if (++dots > ConfigFileEntry.dots_in_ident)
669	<	return 0;
670	<	if (!IsUserChar(*(p + 1)))
668	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
669	>	{
670	>	if (++dots > ConfigGeneral.dots_in_ident)
671	>	return 0;
672	>	if (!IsUserChar(*(p + 1)))
673	>	return 0;
674	>	}
675	>	else if (!IsUserChar(*p))
676		return 0;
677		}
678	<	else if (!IsUserChar(*p))
679	<	return 0;
678	>	}
679	>	else
680	>	{
681	>	while (*++p)
682	>	if (!IsUserChar(*p))
683	>	return 0;
684		}
685
686	<	return 1;
686	>	return p - username <= USERLEN;
687		}
688
689		/* clean_nick_name()
#	Line 717 | Line 697 | int
697		valid_nickname(const char *nickname, const int local)
698		{
699		const char *p = nickname;
720	–	assert(nickname && *nickname);
700
701	<	/* nicks can't start with a digit or - or be 0 length */
702	<	/* This closer duplicates behaviour of hybrid-6 */
703	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
701	>	assert(p);
702	>
703	>	/*
704	>	* Nicks can't start with a digit or - or be 0 length.
705	>	*/
706	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
707		return 0;
708
709		for (; *p; ++p)
710		if (!IsNickChar(*p))
711		return 0;
712
713	<	return p - nickname <= (NICKLEN - 1);
732	<	}
733	<
734	<	/* report_and_set_user_flags()
735	<	*
736	<	* inputs       - pointer to source_p
737	<	*              - pointer to aconf for this user
738	<	* output       - NONE
739	<	* side effects - Report to user any special flags
740	<	*                they are getting, and set them.
741	<	*/
742	<	static void
743	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
744	<	{
745	<	/* If this user is being spoofed, tell them so */
746	<	if (IsConfDoSpoofIp(aconf))
747	<	{
748	<	sendto_one(source_p,
749	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
750	<	me.name, source_p->name);
751	<	}
752	<
753	<	/* If this user is in the exception class, Set it "E lined" */
754	<	if (IsConfExemptKline(aconf))
755	<	{
756	<	SetExemptKline(source_p);
757	<	sendto_one(source_p,
758	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
759	<	me.name, source_p->name);
760	<	}
761	<
762	<	/* The else here is to make sure that G line exempt users
763	<	* do not get noticed twice.
764	<	*/
765	<	else if (IsConfExemptGline(aconf))
766	<	{
767	<	SetExemptGline(source_p);
768	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
769	<	me.name, source_p->name);
770	<	}
771	<
772	<	if (IsConfExemptResv(aconf))
773	<	{
774	<	SetExemptResv(source_p);
775	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
776	<	me.name, source_p->name);
777	<	}
778	<
779	<	/* If this user is exempt from user limits set it "F lined" */
780	<	if (IsConfExemptLimits(aconf))
781	<	{
782	<	SetExemptLimits(source_p);
783	<	sendto_one(source_p,
784	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
785	<	me.name,source_p->name);
786	<	}
787	<
788	<	if (IsConfCanFlood(aconf))
789	<	{
790	<	SetCanFlood(source_p);
791	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
792	<	"protection, aren't you fearsome.",
793	<	me.name, source_p->name);
794	<	}
795	<	}
796	<
797	<	/* change_simple_umode()
798	<	*
799	<	* this callback can be hooked to allow special handling of
800	<	* certain usermodes
801	<	*/
802	<	static void *
803	<	change_simple_umode(va_list args)
804	<	{
805	<	struct Client *client_p;
806	<	struct Client *source_p;
807	<	int what;
808	<	unsigned int flag;
809	<
810	<	client_p = va_arg(args, struct Client *);
811	<	source_p = va_arg(args, struct Client *);
812	<	what = va_arg(args, int);
813	<	flag = va_arg(args, unsigned int);
814	<
815	<	if (what == MODE_ADD)
816	<	AddUMode(source_p, flag);
817	<	else
818	<	DelUMode(source_p, flag);
819	<
820	<	return NULL;
821	<	}
822	<
823	<	/* set_user_mode()
824	<	*
825	<	* added 15/10/91 By Darren Reed.
826	<	* parv[0] - sender
827	<	* parv[1] - username to change mode for
828	<	* parv[2] - modes to change
829	<	*/
830	<	void
831	<	set_user_mode(struct Client *client_p, struct Client *source_p,
832	<	int parc, char *parv[])
833	<	{
834	<	unsigned int flag, setflags;
835	<	char **p, *m, buf[IRCD_BUFSIZE];
836	<	struct Client *target_p;
837	<	int what = MODE_ADD, badflag = 0, i;
838	<
839	<	assert(!(parc < 2));
840	<
841	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
842	<	{
843	<	if (MyConnect(source_p))
844	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
845	<	me.name, source_p->name, parv[1]);
846	<	return;
847	<	}
848	<
849	<	if (IsServer(source_p))
850	<	{
851	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
852	<	parv[1], source_p->name);
853	<	return;
854	<	}
855	<
856	<	if (source_p != target_p)
857	<	{
858	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
859	<	me.name, source_p->name);
860	<	return;
861	<	}
862	<
863	<	if (parc < 3)
864	<	{
865	<	m = buf;
866	<	*m++ = '+';
867	<
868	<	for (i = 0; i < 128; i++)
869	<	if (HasUMode(source_p, user_modes[i]))
870	<	*m++ = (char)i;
871	<	*m = '\0';
872	<
873	<	sendto_one(source_p, form_str(RPL_UMODEIS),
874	<	me.name, source_p->name, buf);
875	<	return;
876	<	}
877	<
878	<	execute_callback(entering_umode_cb, client_p, source_p);
879	<
880	<	/* find flags already set for user */
881	<	setflags = source_p->umodes;
882	<
883	<	/* parse mode change string(s) */
884	<	for (p = &parv[2]; p && *p; p++)
885	<	{
886	<	for (m = *p; *m; m++)
887	<	{
888	<	switch (*m)
889	<	{
890	<	case '+':
891	<	what = MODE_ADD;
892	<	break;
893	<	case '-':
894	<	what = MODE_DEL;
895	<	break;
896	<	case 'o':
897	<	if (what == MODE_ADD)
898	<	{
899	<	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
900	<	{
901	<	++Count.oper;
902	<	SetOper(source_p);
903	<	}
904	<	}
905	<	else
906	<	{
907	<	/* Only decrement the oper counts if an oper to begin with
908	<	* found by Pat Szuta, Perly , perly@xnet.com
909	<	*/
910	<	if (!HasUMode(source_p, UMODE_OPER))
911	<	break;
912	<
913	<	ClearOper(source_p);
914	<	Count.oper--;
915	<
916	<	if (MyConnect(source_p))
917	<	{
918	<	dlink_node *dm;
919	<
920	<	detach_conf(source_p, OPER_TYPE);
921	<	ClrOFlag(source_p);
922	<	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
923	<
924	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
925	<	free_dlink_node(dm);
926	<	}
927	<	}
928	<
929	<	break;
930	<
931	<	/* we may not get these,
932	<	* but they shouldnt be in default
933	<	*/
934	<	case 'r':
935	<	case ' ' :
936	<	case '\n':
937	<	case '\r':
938	<	case '\t':
939	<	break;
940	<
941	<	default:
942	<	if ((flag = user_modes[(unsigned char)*m]))
943	<	{
944	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
945	<	(ConfigFileEntry.oper_only_umodes & flag))
946	<	{
947	<	badflag = 1;
948	<	}
949	<	else
950	<	execute_callback(umode_cb, client_p, source_p, what, flag);
951	<	}
952	<	else
953	<	{
954	<	if (MyConnect(source_p))
955	<	badflag = 1;
956	<	}
957	<
958	<	break;
959	<	}
960	<	}
961	<	}
962	<
963	<	if (badflag)
964	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
965	<	me.name, source_p->name);
966	<
967	<	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
968	<	{
969	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
970	<	me.name, source_p->name);
971	<	DelUMode(source_p, UMODE_NCHANGE);
972	<	}
973	<
974	<	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
975	<	!HasOFlag(source_p, OPER_FLAG_ADMIN))
976	<	{
977	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
978	<	me.name, source_p->name);
979	<	DelUMode(source_p, UMODE_ADMIN);
980	<	}
981	<
982	<	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
983	<	++Count.invisi;
984	<	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
985	<	--Count.invisi;
986	<
987	<	/*
988	<	* compare new flags with old flags and send string which
989	<	* will cause servers to update correctly.
990	<	*/
991	<	send_umode_out(client_p, source_p, setflags);
713	>	return p - nickname <= NICKLEN;
714		}
715
716		/* send_umode()
#	Line 1004 | Line 726 | set_user_mode(struct Client *client_p, s
726		*/
727		void
728		send_umode(struct Client *client_p, struct Client *source_p,
729	<	unsigned int old, unsigned int sendmask, char *umode_buf)
729	>	unsigned int old, char *umode_buf)
730		{
731		char *m = umode_buf;
732		int what = 0;
1011	–	unsigned int i;
1012	–	unsigned int flag;
733
734		/*
735	<	* build a string in umode_buf to represent the change in the user's
735	>	* Build a string in umode_buf to represent the change in the user's
736		* mode between the new (source_p->umodes) and 'old'.
737		*/
738	<	for (i = 0; i < 128; i++)
738	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
739		{
740	<	flag = user_modes[i];
1021	<	if (!flag)
1022	<	continue;
1023	<
1024	<	if (MyClient(source_p) && !(flag & sendmask))
1025	<	continue;
1026	<
1027	<	if ((flag & old) && !HasUMode(source_p, flag))
740	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
741		{
742		if (what == MODE_DEL)
743	<	*m++ = (char)i;
743	>	*m++ = tab->c;
744		else
745		{
746		what = MODE_DEL;
747		*m++ = '-';
748	<	*m++ = (char)i;
748	>	*m++ = tab->c;
749		}
750		}
751	<	else if (!(flag & old) && HasUMode(source_p, flag))
751	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
752		{
753		if (what == MODE_ADD)
754	<	*m++ = (char)i;
754	>	*m++ = tab->c;
755		else
756		{
757		what = MODE_ADD;
758		*m++ = '+';
759	<	*m++ = (char)i;
759	>	*m++ = tab->c;
760		}
761		}
762		}
#	Line 1052 | Line 765 | send_umode(struct Client *client_p, stru
765
766		if (*umode_buf && client_p)
767		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
768	<	source_p->name, source_p->username,
769	<	source_p->host, source_p->name, umode_buf);
768	>	client_p->name, client_p->username,
769	>	client_p->host, client_p->name, umode_buf);
770		}
771
772		/* send_umode_out()
#	Line 1063 | Line 776 | send_umode(struct Client *client_p, stru
776		* side effects - Only send ubuf out to servers that know about this client
777		*/
778		void
779	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1067	<	unsigned int old)
779	>	send_umode_out(struct Client *source_p, unsigned int old)
780		{
781	<	char buf[IRCD_BUFSIZE] = { '\0' };
1070	<	dlink_node *ptr = NULL;
781	>	char buf[IRCD_BUFSIZE] = "";
782
783	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
783	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
784
785		if (buf[0])
786	<	{
787	<	DLINK_FOREACH(ptr, serv_list.head)
1077	<	{
1078	<	struct Client *target_p = ptr->data;
1079	<
1080	<	if ((target_p != client_p) && (target_p != source_p))
1081	<	sendto_one(target_p, ":%s MODE %s :%s",
1082	<	ID_or_name(source_p, target_p),
1083	<	ID_or_name(source_p, target_p), buf);
1084	<	}
1085	<	}
1086	<
1087	<	if (client_p && MyClient(client_p))
1088	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
786	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
787	>	source_p->id, source_p->id, buf);
788		}
789
790	<	/* user_welcome()
791	<	*
1093	<	* inputs       - client pointer to client to welcome
1094	<	* output       - NONE
1095	<	* side effects -
1096	<	*/
1097	<	static void
1098	<	user_welcome(struct Client *source_p)
790	>	void
791	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
792		{
793	<	#if defined(__TIME__) && defined(__DATE__)
1101	<	static const char built_date[] = __DATE__ " at " __TIME__;
1102	<	#else
1103	<	static const char built_date[] = "unknown";
1104	<	#endif
793	>	dlink_node *node = NULL;
794
795	<	#ifdef HAVE_LIBCRYPTO
796	<	if (source_p->localClient->fd.ssl != NULL)
1108	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1109	<	me.name, source_p->name,
1110	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1111	<	#endif
795	>	if (!strcmp(target_p->host, hostname))
796	>	return;
797
798	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
799	<	ServerInfo.network_name, source_p->name);
800	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
801	<	get_listener_name(source_p->localClient->listener), ircd_version);
802	<	sendto_one(source_p, form_str(RPL_CREATED),
803	<	me.name, source_p->name, built_date);
804	<	sendto_one(source_p, form_str(RPL_MYINFO),
805	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
806	<	show_isupport(source_p);
798	>	switch (what)
799	>	{
800	>	case MODE_ADD:
801	>	AddUMode(target_p, UMODE_HIDDENHOST);
802	>	break;
803	>	case MODE_DEL:
804	>	DelUMode(target_p, UMODE_HIDDENHOST);
805	>	break;
806	>	default: return;
807	>	}
808
809	<	if (source_p->id[0] != '\0')
810	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
811	<	source_p->name, source_p->id);
809	>	if (ConfigGeneral.cycle_on_host_change)
810	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
811	>	target_p->name, target_p->username, target_p->host);
812
813	<	show_lusers(source_p);
813	>	if (IsUserHostIp(target_p))
814	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
815	>
816	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
817	>
818	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
819	>	SetUserHost(target_p);
820
821	<	if (ConfigFileEntry.short_motd)
821	>	if (MyClient(target_p))
822		{
823	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
824	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1133	<	sendto_one(source_p,
1134	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1135	<	"read it", me.name, source_p->name);
1136	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1137	<	me.name, source_p->name, me.name);
1138	<	sendto_one(source_p, form_str(RPL_MOTD),
1139	<	me.name, source_p->name,
1140	<	"*** This is the short motd ***");
1141	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1142	<	me.name, source_p->name);
823	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
824	>	clear_ban_cache_client(target_p);
825		}
1144	–	else
1145	–	send_message_file(source_p, &ConfigFileEntry.motd);
1146	–	}
826
827	<	/* check_xline()
828	<	*
1150	<	* inputs       - pointer to client to test
1151	<	* outupt       - 1 if exiting 0 if ok
1152	<	* side effects -
1153	<	*/
1154	<	static int
1155	<	check_xline(struct Client *source_p)
1156	<	{
1157	<	struct ConfItem *conf = NULL;
1158	<	const char *reason = NULL;
827	>	if (!ConfigGeneral.cycle_on_host_change)
828	>	return;
829
830	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1161	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
830	>	DLINK_FOREACH(node, target_p->channel.head)
831		{
832	<	struct MatchItem *reg = map_to_conf(conf);
833	<
834	<	++reg->count;
832	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
833	>	char *p = modebuf;
834	>	int len = 0;
835	>	const struct Membership *member = node->data;
836
837	<	if (reg->reason != NULL)
838	<	reason = reg->reason;
839	<	else
840	<	reason = "No Reason";
837	>	if (has_member_flags(member, CHFL_CHANOP))
838	>	{
839	>	*p++ = 'o';
840	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
841	>	}
842
843	<	sendto_realops_flags(UMODE_REJ, L_ALL,
844	<	"X-line Rejecting [%s] [%s], user %s [%s]",
845	<	source_p->info, reason,
846	<	get_client_name(source_p, HIDE_IP),
847	<	source_p->sockhost);
843	>	if (has_member_flags(member, CHFL_HALFOP))
844	>	{
845	>	*p++ = 'h';
846	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
847	>	}
848
849	<	++ServerStats.is_ref;
1179	<	if (REJECT_HOLD_TIME > 0)
849	>	if (has_member_flags(member, CHFL_VOICE))
850		{
851	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
852	<	me.name, source_p->name);
1183	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1184	<	SetCaptured(source_p);
851	>	*p++ = 'v';
852	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
853		}
1186	–	else
1187	–	exit_client(source_p, &me, "Bad user info");
1188	–	return 1;
1189	–	}
854
855	<	return 0;
1192	<	}
855	>	*p = '\0';
856
857	<	/* oper_up()
858	<	*
859	<	* inputs       - pointer to given client to oper
860	<	* output       - NONE
861	<	* side effects - Blindly opers up given source_p, using aconf info
862	<	*                all checks on passwords have already been done.
863	<	*                This could also be used by rsa oper routines.
857	>
858	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
859	>	target_p->name, target_p->username,
860	>	target_p->host, member->chptr->name,
861	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
862	>	target_p->info);
863	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
864	>	target_p->name, target_p->username,
865	>	target_p->host, member->chptr->name);
866	>
867	>	if (nickbuf[0])
868	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
869	>	target_p->servptr->name, member->chptr->name,
870	>	modebuf, nickbuf);
871	>
872	>	}
873	>
874	>	if (target_p->away[0])
875	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
876	>	":%s!%s@%s AWAY :%s",
877	>	target_p->name, target_p->username,
878	>	target_p->host, target_p->away);
879	>	}
880	>
881	>	/*! \brief Blindly opers up given source_p, using conf info.
882	>	*         All checks on passwords have already been done.
883	>	* \param source_p Pointer to given client to oper
884		*/
885		void
886		oper_up(struct Client *source_p)
887		{
888	<	unsigned int old = source_p->umodes;
889	<	const char *operprivs = "";
1207	<	const struct AccessItem *oconf = NULL;
888	>	const unsigned int old = source_p->umodes;
889	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
890
891	<	assert(source_p->localClient->confs.head);
1210	<	oconf = map_to_conf((source_p->localClient->confs.head)->data);
891	>	assert(source_p->connection->confs.head);
892
893		++Count.oper;
894		SetOper(source_p);
895
896	<	if (oconf->modes)
897	<	AddUMode(source_p, oconf->modes);
898	<	else if (ConfigFileEntry.oper_umodes)
899	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
896	>	if (conf->modes)
897	>	AddUMode(source_p, conf->modes);
898	>	else if (ConfigGeneral.oper_umodes)
899	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
900
901		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
902		++Count.invisi;
#	Line 1225 | Line 906 | oper_up(struct Client *source_p)
906		assert(dlinkFind(&oper_list, source_p) == NULL);
907		dlinkAdd(source_p, make_dlink_node(), &oper_list);
908
909	<	operprivs = oper_privs_as_string(oconf->port);
1229	<
1230	<	AddOFlag(source_p, oconf->port);
909	>	AddOFlag(source_p, conf->port);
910
911		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
912		AddUMode(source_p, UMODE_ADMIN);
1234	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1235	–	DelUMode(source_p, UMODE_NCHANGE);
913
914	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
915	<	source_p->name, source_p->username, source_p->host);
916	<	send_umode_out(source_p, source_p, old);
917	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
918	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
919	<	me.name, source_p->name, operprivs);
920	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
914	>	if (!EmptyString(conf->whois))
915	>	{
916	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
917	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
918	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
919	>	RPL_WHOISOPERATOR, conf->whois);
920	>	}
921	>
922	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
923	>	get_oper_name(source_p));
924	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
925	>	me.id, get_oper_name(source_p));
926	>	send_umode_out(source_p, old);
927	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
928		}
929
930	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
930	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
931
932		int
933		valid_sid(const char *sid)
#	Line 1258 | Line 942 | valid_sid(const char *sid)
942
943		/*
944		* init_uid()
945	<	*
945	>	*
946		* inputs       - NONE
947		* output       - NONE
948		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1268 | Line 952 | valid_sid(const char *sid)
952		void
953		init_uid(void)
954		{
1271	–	int i;
1272	–
955		memset(new_uid, 0, sizeof(new_uid));
956
957	<	if (!EmptyString(ServerInfo.sid))
958	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
957	>	if (!EmptyString(ConfigServerInfo.sid))
958	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
959
960	<	for (i = 0; i < IRC_MAXSID; ++i)
961	<	if (new_uid[i] == '\0')
960	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
961	>	if (new_uid[i] == '\0')
962		new_uid[i] = 'A';
963
964		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1283	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1284	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1285	–	* -Dianora
1286	–	*/
965		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1288	–
1289	–	entering_umode_cb = register_callback("entering_umode", NULL);
1290	–	umode_cb = register_callback("changing_umode", change_simple_umode);
966		}
967
968		/*
#	Line 1299 | Line 974 | init_uid(void)
974		*                note this is a recursive function
975		*/
976		static void
977	<	add_one_to_uid(int i)
977	>	add_one_to_uid(unsigned int i)
978		{
979	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
979	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
980		{
981		if (new_uid[i] == 'Z')
982		new_uid[i] = '0';
983		else if (new_uid[i] == '9')
984		{
985		new_uid[i] = 'A';
986	<	add_one_to_uid(i-1);
986	>	add_one_to_uid(i - 1);
987		}
988		else
989		++new_uid[i];
#	Line 1333 | Line 1008 | add_one_to_uid(int i)
1008		static const char *
1009		uid_get(void)
1010		{
1011	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1011	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1012		return new_uid;
1013		}
1014
#	Line 1347 | Line 1022 | uid_get(void)
1022		void
1023		init_isupport(void)
1024		{
1350	–	isupportFile = init_MessageLine();
1351	–
1025		add_isupport("CALLERID", NULL, -1);
1026	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1026	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1027		add_isupport("DEAF", "D", -1);
1028		add_isupport("KICKLEN", NULL, KICKLEN);
1029		add_isupport("MODES", NULL, MAXMODEPARAMS);
1357	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1358	–	#ifdef HALFOPS
1030		add_isupport("PREFIX", "(ohv)@%+", -1);
1031		add_isupport("STATUSMSG", "@%+", -1);
1032	<	#else
1033	<	add_isupport("PREFIX", "(ov)@+", -1);
1363	<	add_isupport("STATUSMSG", "@+", -1);
1364	<	#endif
1365	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1032	>	add_isupport("EXCEPTS", NULL, -1);
1033	>	add_isupport("INVEX", NULL, -1);
1034		}
1035
1036		/*
#	Line 1377 | Line 1045 | init_isupport(void)
1045		void
1046		add_isupport(const char *name, const char *options, int n)
1047		{
1048	<	dlink_node *ptr;
1049	<	struct Isupport *support;
1048	>	dlink_node *node = NULL;
1049	>	struct Isupport *support = NULL;
1050
1051	<	DLINK_FOREACH(ptr, support_list.head)
1051	>	DLINK_FOREACH(node, support_list.head)
1052		{
1053	<	support = ptr->data;
1053	>	support = node->data;
1054		if (irccmp(support->name, name) == 0)
1055		{
1056		MyFree(support->name);
#	Line 1391 | Line 1059 | add_isupport(const char *name, const cha
1059		}
1060		}
1061
1062	<	if (ptr == NULL)
1062	>	if (node == NULL)
1063		{
1064	<	support = MyMalloc(sizeof(*support));
1064	>	support = MyCalloc(sizeof(*support));
1065		dlinkAddTail(support, &support->node, &support_list);
1066		}
1067
1068	<	DupString(support->name, name);
1069	<	if (options != NULL)
1070	<	DupString(support->options, options);
1068	>	support->name = xstrdup(name);
1069	>	if (options)
1070	>	support->options = xstrdup(options);
1071		support->number = n;
1072
1073		rebuild_isupport_message_line();
#	Line 1415 | Line 1083 | add_isupport(const char *name, const cha
1083		void
1084		delete_isupport(const char *name)
1085		{
1086	<	dlink_node *ptr;
1419	<	struct Isupport *support;
1086	>	dlink_node *node = NULL;
1087
1088	<	DLINK_FOREACH(ptr, support_list.head)
1088	>	DLINK_FOREACH(node, support_list.head)
1089		{
1090	<	support = ptr->data;
1090	>	struct Isupport *support = node->data;
1091	>
1092		if (irccmp(support->name, name) == 0)
1093		{
1094	<	dlinkDelete(ptr, &support_list);
1094	>	dlinkDelete(node, &support_list);
1095		MyFree(support->name);
1096		MyFree(support->options);
1097		MyFree(support);
#	Line 1446 | Line 1114 | rebuild_isupport_message_line(void)
1114		{
1115		char isupportbuffer[IRCD_BUFSIZE];
1116		char *p = isupportbuffer;
1117	<	dlink_node *ptr = NULL;
1117	>	dlink_node *node = NULL, *node_next = NULL;
1118		int n = 0;
1119		int tokens = 0;
1120		size_t len = 0;
1121	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1121	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1122
1123	<	destroy_MessageLine(isupportFile);
1123	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1124	>	{
1125	>	dlinkDelete(node, &support_list_lines);
1126	>	MyFree(node->data);
1127	>	free_dlink_node(node);
1128	>	}
1129
1130	<	DLINK_FOREACH(ptr, support_list.head)
1130	>	DLINK_FOREACH(node, support_list.head)
1131		{
1132	<	struct Isupport *support = ptr->data;
1132	>	struct Isupport *support = node->data;
1133
1134	<	p += (n = ircsprintf(p, "%s", support->name));
1134	>	p += (n = sprintf(p, "%s", support->name));
1135		len += n;
1136
1137	<	if (support->options != NULL)
1137	>	if (support->options)
1138		{
1139	<	p += (n = ircsprintf(p, "=%s", support->options));
1139	>	p += (n = sprintf(p, "=%s", support->options));
1140		len += n;
1141		}
1142
1143		if (support->number > 0)
1144		{
1145	<	p += (n = ircsprintf(p, "=%d", support->number));
1145	>	p += (n = sprintf(p, "=%d", support->number));
1146		len += n;
1147		}
1148
#	Line 1482 | Line 1155 | rebuild_isupport_message_line(void)
1155		if (*--p == ' ')
1156		*p = '\0';
1157
1158	<	addto_MessageLine(isupportFile, isupportbuffer);
1158	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1159		p = isupportbuffer;
1160		len = 0;
1161		n = tokens = 0;
1162		}
1163		}
1164
1165	<	if (len != 0)
1165	>	if (len)
1166		{
1167		if (*--p == ' ')
1168		*p = '\0';
1169	<	addto_MessageLine(isupportFile, isupportbuffer);
1169	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1170		}
1171		}

Diff Legend

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