ViewVC Help

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

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

Comparing:
ircd-hybrid/src/s_user.c (file contents), Revision 1155 by michael, Tue Aug 9 20:27:45 2011 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 6161 by michael, Thu Jun 18 10:55:29 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "common.h"
33	–	#include "fdlist.h"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
37	–	#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40	<	#include "s_conf.h"
41	<	#include "s_log.h"
42	<	#include "s_serv.h"
40	>	#include "conf.h"
41	>	#include "log.h"
42	>	#include "server.h"
43		#include "send.h"
46	–	#include "supported.h"
47	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "hook.h"
49	<	#include "s_misc.h"
54	<	#include "msg.h"
48	>	#include "misc.h"
49	>	#include "parse.h"
50		#include "watch.h"
51
57	–
58	–	struct Callback *entering_umode_cb = NULL;
59	–	struct Callback *umode_cb = NULL;
60	–
52		static char umode_buffer[IRCD_BUFSIZE];
53
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 *);
67	–	static const char *uid_get(void);
68	–
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	<	0,                  /* 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	<	0,                  /* 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_REJ,          /* 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		{
125	<	const char *from, *to;
126	<
127	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
183	<	{
184	<	from = me.id;
185	<	to = source_p->id;
186	<	}
125	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
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	<	{
130	<	from = me.name;
190	<	to = source_p->name;
191	<	}
129	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
130	>	Count.invisi, 1);
131
132	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
133	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
134	<	from, to, (Count.total-Count.invisi),
135	<	Count.invisi, dlink_list_length(&global_serv_list));
136	<	else
137	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
138	<	(Count.total-Count.invisi), Count.invisi, 1);
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 (dlink_list_length(&channel_list))
139	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
140
141	<	if (Count.oper > 0)
142	<	sendto_one(source_p, form_str(RPL_LUSEROP),
143	<	from, to, Count.oper);
144	<
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));
212	<
213	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
214	<	{
215	<	sendto_one(source_p, form_str(RPL_LUSERME),
216	<	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);
141	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
142	>	{
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),
153	<	from, to, Count.total, Count.max_tot,
154	<	Count.total, Count.max_tot);
155	<
156	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
235	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
236	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
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_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 lines. Congrats.");
201	>	}
202	>
203	>	if (IsConfExemptXline(conf))
204	>	{
205	>	SetExemptXline(source_p);
206	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
207	>	}
208	>
209	>	if (IsConfExemptResv(conf))
210	>	{
211	>	SetExemptResv(source_p);
212	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
213	>	}
214	>
215	>	/* If this user is exempt from user limits set it "F lined" */
216	>	if (IsConfExemptLimits(conf))
217	>	{
218	>	SetExemptLimits(source_p);
219	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
220	>	}
221	>
222	>	if (IsConfCanFlood(conf))
223	>	{
224	>	SetCanFlood(source_p);
225	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
226	>	"protection, aren't you fearsome.");
227	>	}
228	>	}
229	>
230	>	/* introduce_client()
231	>	*
232	>	* inputs       - source_p
233	>	* output       - NONE
234	>	* side effects - This common function introduces a client to the rest
235	>	*                of the net, either from a local client connect or
236	>	*                from a remote connect.
237	>	*/
238	>	static void
239	>	introduce_client(struct Client *source_p)
240	>	{
241	>	dlink_node *node = NULL;
242	>	char ubuf[IRCD_BUFSIZE] = "";
243	>
244	>	if (MyClient(source_p))
245	>	send_umode(source_p, source_p, 0, ubuf);
246	>	else
247	>	send_umode(NULL, source_p, 0, ubuf);
248	>
249	>	watch_check_hash(source_p, RPL_LOGON);
250	>
251	>	if (ubuf[0] == '\0')
252	>	{
253	>	ubuf[0] = '+';
254	>	ubuf[1] = '\0';
255	>	}
256	>
257	>	DLINK_FOREACH(node, local_server_list.head)
258	>	{
259	>	struct Client *server = node->data;
260	>
261	>	if (server == source_p->from)
262	>	continue;
263	>
264	>	if (IsCapable(server, CAP_SVS))
265	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
266	>	source_p->servptr->id,
267	>	source_p->name, source_p->hopcount+1,
268	>	(unsigned long)source_p->tsinfo,
269	>	ubuf, source_p->username, source_p->host,
270	>	source_p->sockhost, source_p->id,
271	>	source_p->account,
272	>	source_p->info);
273	>	else
274	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
275	>	source_p->servptr->id,
276	>	source_p->name, source_p->hopcount+1,
277	>	(unsigned long)source_p->tsinfo,
278	>	ubuf, source_p->username, source_p->host,
279	>	source_p->sockhost, source_p->id, source_p->info);
280	>
281	>	if (!EmptyString(source_p->certfp))
282	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
283	>	}
284	>	}
285	>
286	>	/* user_welcome()
287	>	*
288	>	* inputs       - client pointer to client to welcome
289	>	* output       - NONE
290	>	* side effects -
291	>	*/
292	>	static void
293	>	user_welcome(struct Client *source_p)
294	>	{
295	>	#if defined(__TIME__) && defined(__DATE__)
296	>	static const char built_date[] = __DATE__ " at " __TIME__;
297	>	#else
298	>	static const char built_date[] = "unknown";
299	>	#endif
300	>
301	>	#ifdef HAVE_LIBCRYPTO
302	>	if (HasFlag(source_p, FLAGS_SSL))
303	>	{
304	>	AddUMode(source_p, UMODE_SSL);
305	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
306	>	ssl_get_cipher(source_p->connection->fd.ssl));
307	>	}
308	>	#endif
309	>
310	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
311	>	source_p->name);
312	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
313	>	get_listener_name(source_p->connection->listener), ircd_version);
314	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
315	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
316	>	show_isupport(source_p);
317	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
318	>
319	>	show_lusers(source_p);
320	>	motd_signon(source_p);
321	>	}
322	>
323	>	/* check_xline()
324	>	*
325	>	* inputs       - pointer to client to test
326	>	* outupt       - 1 if exiting 0 if ok
327	>	* side effects -
328	>	*/
329	>	static int
330	>	check_xline(struct Client *source_p)
331	>	{
332	>	struct MaskItem *conf = NULL;
333	>
334	>	if (IsExemptXline(source_p))
335	>	return 0;
336	>
337	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
338	>	{
339	>	++conf->count;
340	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
341	>	"X-line Rejecting [%s] [%s], user %s [%s]",
342	>	source_p->info, conf->reason,
343	>	get_client_name(source_p, HIDE_IP),
344	>	source_p->sockhost);
345	>
346	>	++ServerStats.is_ref;
347	>	exit_client(source_p, "Bad user info");
348	>	return 1;
349	>	}
350	>
351	>	return 0;
352	>	}
353	>
354	>	/*! \brief This function is called when both NICK and USER messages
355	>	*      have been accepted for the client, in whatever order. Only
356	>	*      after this, is the UID message propagated.
357	>	* \param source_p Pointer to given client to introduce
358	>	*/
359		void
360		register_local_user(struct Client *source_p)
361		{
362		const char *id = NULL;
363	<	const struct AccessItem *aconf = NULL;
285	<	dlink_node *ptr = NULL;
363	>	const struct MaskItem *conf = NULL;
364
287	–	assert(source_p != NULL);
365		assert(source_p == source_p->from);
366		assert(MyConnect(source_p));
367	<	assert(!source_p->localClient->registration);
368	<
292	<	ClearCap(source_p, CAP_TS6);
367	>	assert(IsUnknown(source_p));
368	>	assert(!source_p->connection->registration);
369
370	<	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",
303	<	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 309 | Line 384 | register_local_user(struct Client *sourc
384		return;
385		}
386
387	<	source_p->localClient->last = 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,
324	<	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;
328	<	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 != '[')
352	<	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;
361	<
362	<	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) ||
392	<	(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 */
403	<	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);
412	<	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,
430	<	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,
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)
504	>	if (ConfigGeneral.invisible_on_connect)
505		{
506	<	source_p->umodes |= UMODE_INVISIBLE;
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
461	–	/* Increment our total user count here */
520		if (++Count.total > Count.max_tot)
521		Count.max_tot = Count.total;
522		++Count.totalrestartcount;
#	Line 466 | 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	<
470	<	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 487 | Line 544 | register_local_user(struct Client *sourc
544		*              - username to register as
545		*              - host name to register as
546		*              - server name
490	–	*              - 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,
497	<	const char *username, const char *host, const char *server,
498	<	const char *realname)
552	>	register_remote_user(struct Client *source_p)
553		{
554	<	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 = 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	<	SetKilled(source_p);
526	<	exit_client(source_p, &me, "Ghosted Client");
527	<	return;
528	<	}
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);
566	<	SetKilled(source_p);
567	<	exit_client(source_p, &me, "USER server wrong direction");
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, "UID server wrong direction");
570		return;
571		}
572
573	<	/* Increment our total user count here */
573	>	/*
574	>	* If the nick has been introduced by a services server,
575	>	* make it a service as well.
576	>	*/
577	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
578	>	AddFlag(source_p, FLAGS_SERVICE);
579	>
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);
590	<	}
589	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
590	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
591	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
592	>	source_p->servptr->name,
593	>	source_p->name, source_p->username, source_p->host,
594	>	source_p->sockhost, source_p->info, source_p->id);
595
596	<	/* introduce_client()
558	<	*
559	<	* inputs       - source_p
560	<	* output       - NONE
561	<	* side effects - This common function introduces a client to the rest
562	<	*                of the net, either from a local client connect or
563	<	*                from a remote connect.
564	<	*/
565	<	static void
566	<	introduce_client(struct Client *source_p)
567	<	{
568	<	dlink_node *server_node = NULL;
569	<	static char ubuf[12];
570	<
571	<	if (MyClient(source_p))
572	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
573	<	else
574	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
575	<
576	<	watch_check_hash(source_p, RPL_LOGON);
577	<
578	<	if (*ubuf == '\0')
579	<	{
580	<	ubuf[0] = '+';
581	<	ubuf[1] = '\0';
582	<	}
583	<
584	<	DLINK_FOREACH(server_node, serv_list.head)
585	<	{
586	<	struct Client *server = server_node->data;
587	<
588	<	if (server == source_p->from)
589	<	continue;
590	<
591	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
592	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
593	<	source_p->servptr->id,
594	<	source_p->name, source_p->hopcount+1,
595	<	(unsigned long)source_p->tsinfo,
596	<	ubuf, source_p->username, source_p->host,
597	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
598	<	"0" : source_p->sockhost, source_p->id, source_p->info);
599	<	else
600	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
601	<	source_p->name, source_p->hopcount+1,
602	<	(unsigned long)source_p->tsinfo,
603	<	ubuf, source_p->username, source_p->host,
604	<	source_p->servptr->name, source_p->info);
605	<	}
596	>	introduce_client(source_p);
597		}
598
599		/* valid_hostname()
#	Line 619 | Line 610 | valid_hostname(const char *hostname)
610		{
611		const char *p = hostname;
612
613	<	assert(p != NULL);
613	>	assert(p);
614
615	<	if (*p == '.' || *p == ':')
615	>	if (EmptyString(p) || *p == '.' || *p == ':')
616		return 0;
617
618		for (; *p; ++p)
619		if (!IsHostChar(*p))
620		return 0;
621
622	<	return 1;
622	>	return p - hostname <= HOSTLEN;
623		}
624
625		/* valid_username()
#	Line 643 | Line 634 | valid_hostname(const char *hostname)
634		* style of username
635		*/
636		int
637	<	valid_username(const char *username)
637	>	valid_username(const char *username, const int local)
638		{
639	<	int dots      = 0;
639	>	unsigned int dots = 0;
640		const char *p = username;
641
642	<	assert(p != NULL);
642	>	assert(p);
643
644		if (*p == '~')
645		++p;
646
647	<	/* reject usernames that don't start with an alphanum
647	>	/*
648	>	* Reject usernames that don't start with an alphanum
649		* i.e. reject jokers who have '-@somehost' or '.@somehost'
650		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
651		*/
652		if (!IsAlNum(*p))
653		return 0;
654
655	<	while (*++p)
655	>	if (local)
656		{
657	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
657	>	while (*++p)
658		{
659	<	if (++dots > ConfigFileEntry.dots_in_ident)
660	<	return 0;
661	<	if (!IsUserChar(*(p + 1)))
659	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
660	>	{
661	>	if (++dots > ConfigGeneral.dots_in_ident)
662	>	return 0;
663	>	if (!IsUserChar(*(p + 1)))
664	>	return 0;
665	>	}
666	>	else if (!IsUserChar(*p))
667		return 0;
668		}
672	–	else if (!IsUserChar(*p))
673	–	return 0;
674	–	}
675	–
676	–	return 1;
677	–	}
678	–
679	–	/* report_and_set_user_flags()
680	–	*
681	–	* inputs       - pointer to source_p
682	–	*              - pointer to aconf for this user
683	–	* output       - NONE
684	–	* side effects - Report to user any special flags
685	–	*                they are getting, and set them.
686	–	*/
687	–	static void
688	–	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
689	–	{
690	–	/* If this user is being spoofed, tell them so */
691	–	if (IsConfDoSpoofIp(aconf))
692	–	{
693	–	sendto_one(source_p,
694	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
695	–	me.name, source_p->name);
669		}
670	<
698	<	/* If this user is in the exception class, Set it "E lined" */
699	<	if (IsConfExemptKline(aconf))
700	<	{
701	<	SetExemptKline(source_p);
702	<	sendto_one(source_p,
703	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
704	<	me.name, source_p->name);
705	<	}
706	<
707	<	/* The else here is to make sure that G line exempt users
708	<	* do not get noticed twice.
709	<	*/
710	<	else if (IsConfExemptGline(aconf))
711	<	{
712	<	SetExemptGline(source_p);
713	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
714	<	me.name, source_p->name);
715	<	}
716	<
717	<	if (IsConfExemptResv(aconf))
718	<	{
719	<	SetExemptResv(source_p);
720	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
721	<	me.name, source_p->name);
722	<	}
723	<
724	<	/* If this user is exempt from user limits set it "F lined" */
725	<	if (IsConfExemptLimits(aconf))
726	<	{
727	<	SetExemptLimits(source_p);
728	<	sendto_one(source_p,
729	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
730	<	me.name,source_p->name);
731	<	}
732	<
733	<	/* If this user is exempt from idle time outs */
734	<	if (IsConfIdlelined(aconf))
735	<	{
736	<	SetIdlelined(source_p);
737	<	sendto_one(source_p,
738	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
739	<	me.name, source_p->name);
740	<	}
741	<
742	<	if (IsConfCanFlood(aconf))
670	>	else
671		{
672	<	SetCanFlood(source_p);
673	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
674	<	"protection, aren't you fearsome.",
747	<	me.name, source_p->name);
672	>	while (*++p)
673	>	if (!IsUserChar(*p))
674	>	return 0;
675		}
749	–	}
750	–
751	–	/* change_simple_umode()
752	–	*
753	–	* this callback can be hooked to allow special handling of
754	–	* certain usermodes
755	–	*/
756	–	static void *
757	–	change_simple_umode(va_list args)
758	–	{
759	–	struct Client *client_p;
760	–	struct Client *source_p;
761	–	int what;
762	–	unsigned int flag;
763	–
764	–	client_p = va_arg(args, struct Client *);
765	–	source_p = va_arg(args, struct Client *);
766	–	what = va_arg(args, int);
767	–	flag = va_arg(args, unsigned int);
768	–
769	–	if (what == MODE_ADD)
770	–	source_p->umodes |= flag;
771	–	else
772	–	source_p->umodes &= ~flag;
676
677	<	return NULL;
677	>	return p - username <= USERLEN;
678		}
679
680	<	/* set_user_mode()
680	>	/* clean_nick_name()
681		*
682	<	* added 15/10/91 By Darren Reed.
683	<	* parv[0] - sender
684	<	* parv[1] - username to change mode for
685	<	* parv[2] - modes to change
682	>	* input        - nickname
683	>	*              - whether it's a local nick (1) or remote (0)
684	>	* output       - none
685	>	* side effects - walks through the nickname, returning 0 if erroneous
686		*/
687	<	void
688	<	set_user_mode(struct Client *client_p, struct Client *source_p,
786	<	int parc, char *parv[])
687	>	int
688	>	valid_nickname(const char *nickname, const int local)
689		{
690	<	unsigned int flag, setflags;
789	<	char **p, *m, buf[IRCD_BUFSIZE];
790	<	struct Client *target_p;
791	<	int what = MODE_ADD, badflag = 0, i;
792	<
793	<	assert(!(parc < 2));
690	>	const char *p = nickname;
691
692	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
796	<	{
797	<	if (MyConnect(source_p))
798	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
799	<	me.name, source_p->name, parv[1]);
800	<	return;
801	<	}
802	<
803	<	if (IsServer(source_p))
804	<	{
805	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
806	<	parv[1], source_p->name);
807	<	return;
808	<	}
809	<
810	<	if (source_p != target_p)
811	<	{
812	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
813	<	me.name, source_p->name);
814	<	return;
815	<	}
816	<
817	<	if (parc < 3)
818	<	{
819	<	m = buf;
820	<	*m++ = '+';
821	<
822	<	for (i = 0; i < 128; i++)
823	<	if (source_p->umodes & user_modes[i])
824	<	*m++ = (char)i;
825	<	*m = '\0';
826	<
827	<	sendto_one(source_p, form_str(RPL_UMODEIS),
828	<	me.name, source_p->name, buf);
829	<	return;
830	<	}
831	<
832	<	execute_callback(entering_umode_cb, client_p, source_p);
833	<
834	<	/* find flags already set for user */
835	<	setflags = source_p->umodes;
836	<
837	<	/* parse mode change string(s) */
838	<	for (p = &parv[2]; p && *p; p++)
839	<	{
840	<	for (m = *p; *m; m++)
841	<	{
842	<	switch (*m)
843	<	{
844	<	case '+':
845	<	what = MODE_ADD;
846	<	break;
847	<	case '-':
848	<	what = MODE_DEL;
849	<	break;
850	<	case 'o':
851	<	if (what == MODE_ADD)
852	<	{
853	<	if (IsServer(client_p) && !IsOper(source_p))
854	<	{
855	<	++Count.oper;
856	<	SetOper(source_p);
857	<	}
858	<	}
859	<	else
860	<	{
861	<	/* Only decrement the oper counts if an oper to begin with
862	<	* found by Pat Szuta, Perly , perly@xnet.com
863	<	*/
864	<	if (!IsOper(source_p))
865	<	break;
866	<
867	<	ClearOper(source_p);
868	<	Count.oper--;
869	<
870	<	if (MyConnect(source_p))
871	<	{
872	<	dlink_node *dm;
873	<
874	<	detach_conf(source_p, OPER_TYPE);
875	<	ClearOperFlags(source_p);
876	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
877	<
878	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
879	<	free_dlink_node(dm);
880	<	}
881	<	}
882	<
883	<	break;
884	<
885	<	/* we may not get these,
886	<	* but they shouldnt be in default
887	<	*/
888	<	case ' ' :
889	<	case '\n':
890	<	case '\r':
891	<	case '\t':
892	<	break;
893	<
894	<	default:
895	<	if ((flag = user_modes[(unsigned char)*m]))
896	<	{
897	<	if (MyConnect(source_p) && !IsOper(source_p) &&
898	<	(ConfigFileEntry.oper_only_umodes & flag))
899	<	{
900	<	badflag = 1;
901	<	}
902	<	else
903	<	execute_callback(umode_cb, client_p, source_p, what, flag);
904	<	}
905	<	else
906	<	{
907	<	if (MyConnect(source_p))
908	<	badflag = 1;
909	<	}
910	<
911	<	break;
912	<	}
913	<	}
914	<	}
915	<
916	<	if (badflag)
917	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
918	<	me.name, source_p->name);
919	<
920	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
921	<	{
922	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
923	<	me.name, source_p->name);
924	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
925	<	}
926	<
927	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
928	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
929	<	{
930	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
931	<	me.name, source_p->name);
932	<	source_p->umodes &= ~UMODE_ADMIN;
933	<	}
934	<
935	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
936	<	++Count.invisi;
937	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
938	<	--Count.invisi;
692	>	assert(p);
693
694		/*
695	<	* compare new flags with old flags and send string which
942	<	* will cause servers to update correctly.
695	>	* Nicks can't start with a digit or - or be 0 length.
696		*/
697	<	send_umode_out(client_p, source_p, setflags);
697	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
698	>	return 0;
699	>
700	>	for (; *p; ++p)
701	>	if (!IsNickChar(*p))
702	>	return 0;
703	>
704	>	return p - nickname <= NICKLEN;
705		}
706
707		/* send_umode()
#	Line 957 | Line 717 | set_user_mode(struct Client *client_p, s
717		*/
718		void
719		send_umode(struct Client *client_p, struct Client *source_p,
720	<	unsigned int old, unsigned int sendmask, char *umode_buf)
720	>	unsigned int old, char *umode_buf)
721		{
722		char *m = umode_buf;
723		int what = 0;
964	–	unsigned int i;
965	–	unsigned int flag;
724
725		/*
726	<	* build a string in umode_buf to represent the change in the user's
726	>	* Build a string in umode_buf to represent the change in the user's
727		* mode between the new (source_p->umodes) and 'old'.
728		*/
729	<	for (i = 0; i < 128; i++)
729	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
730		{
731	<	flag = user_modes[i];
974	<	if (!flag)
975	<	continue;
976	<
977	<	if (MyClient(source_p) && !(flag & sendmask))
978	<	continue;
979	<
980	<	if ((flag & old) && !(source_p->umodes & flag))
731	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
732		{
733		if (what == MODE_DEL)
734	<	*m++ = (char)i;
734	>	*m++ = tab->c;
735		else
736		{
737		what = MODE_DEL;
738		*m++ = '-';
739	<	*m++ = (char)i;
739	>	*m++ = tab->c;
740		}
741		}
742	<	else if (!(flag & old) && (source_p->umodes & flag))
742	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
743		{
744		if (what == MODE_ADD)
745	<	*m++ = (char)i;
745	>	*m++ = tab->c;
746		else
747		{
748		what = MODE_ADD;
749		*m++ = '+';
750	<	*m++ = (char)i;
750	>	*m++ = tab->c;
751		}
752		}
753		}
#	Line 1005 | Line 756 | send_umode(struct Client *client_p, stru
756
757		if (*umode_buf && client_p)
758		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
759	<	source_p->name, source_p->username,
760	<	source_p->host, source_p->name, umode_buf);
759	>	client_p->name, client_p->username,
760	>	client_p->host, client_p->name, umode_buf);
761		}
762
763		/* send_umode_out()
#	Line 1016 | Line 767 | send_umode(struct Client *client_p, stru
767		* side effects - Only send ubuf out to servers that know about this client
768		*/
769		void
770	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1020	<	unsigned int old)
770	>	send_umode_out(struct Client *source_p, unsigned int old)
771		{
772	<	char buf[IRCD_BUFSIZE] = { '\0' };
1023	<	dlink_node *ptr = NULL;
772	>	char buf[IRCD_BUFSIZE] = "";
773
774	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1026	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
774	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
775
776		if (buf[0])
777	<	{
778	<	DLINK_FOREACH(ptr, serv_list.head)
1031	<	{
1032	<	struct Client *target_p = ptr->data;
1033	<
1034	<	if ((target_p != client_p) && (target_p != source_p))
1035	<	sendto_one(target_p, ":%s MODE %s :%s",
1036	<	ID_or_name(source_p, target_p),
1037	<	ID_or_name(source_p, target_p), buf);
1038	<	}
1039	<	}
1040	<
1041	<	if (client_p && MyClient(client_p))
1042	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
777	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
778	>	source_p->id, source_p->id, buf);
779		}
780
781	<	/* user_welcome()
782	<	*
1047	<	* inputs       - client pointer to client to welcome
1048	<	* output       - NONE
1049	<	* side effects -
1050	<	*/
1051	<	static void
1052	<	user_welcome(struct Client *source_p)
781	>	void
782	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
783		{
784	<	#if defined(__TIME__) && defined(__DATE__)
1055	<	static const char built_date[] = __DATE__ " at " __TIME__;
1056	<	#else
1057	<	static const char built_date[] = "unknown";
1058	<	#endif
784	>	dlink_node *node = NULL;
785
786	<	#ifdef HAVE_LIBCRYPTO
787	<	if (source_p->localClient->fd.ssl != NULL)
1062	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1063	<	me.name, source_p->name,
1064	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1065	<	#endif
786	>	if (!strcmp(target_p->host, hostname))
787	>	return;
788
789	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
790	<	ServerInfo.network_name, source_p->name);
791	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
792	<	get_listener_name(source_p->localClient->listener), ircd_version);
793	<	sendto_one(source_p, form_str(RPL_CREATED),
794	<	me.name, source_p->name, built_date);
795	<	sendto_one(source_p, form_str(RPL_MYINFO),
796	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
797	<	show_isupport(source_p);
789	>	switch (what)
790	>	{
791	>	case MODE_ADD:
792	>	AddUMode(target_p, UMODE_HIDDENHOST);
793	>	break;
794	>	case MODE_DEL:
795	>	DelUMode(target_p, UMODE_HIDDENHOST);
796	>	break;
797	>	default: return;
798	>	}
799
800	<	if (source_p->id[0] != '\0')
801	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
802	<	source_p->name, source_p->id);
800	>	if (ConfigGeneral.cycle_on_host_change)
801	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
802	>	target_p->name, target_p->username, target_p->host);
803
804	<	show_lusers(source_p);
804	>	if (IsUserHostIp(target_p))
805	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
806
807	<	if (ConfigFileEntry.short_motd)
807	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
808	>
809	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
810	>	SetUserHost(target_p);
811	>
812	>	if (MyClient(target_p))
813		{
814	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
815	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1087	<	sendto_one(source_p,
1088	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1089	<	"read it", me.name, source_p->name);
1090	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1091	<	me.name, source_p->name, me.name);
1092	<	sendto_one(source_p, form_str(RPL_MOTD),
1093	<	me.name, source_p->name,
1094	<	"*** This is the short motd ***");
1095	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1096	<	me.name, source_p->name);
814	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
815	>	clear_ban_cache_client(target_p);
816		}
1098	–	else
1099	–	send_message_file(source_p, &ConfigFileEntry.motd);
1100	–	}
817
818	<	/* check_xline()
819	<	*
1104	<	* inputs       - pointer to client to test
1105	<	* outupt       - 1 if exiting 0 if ok
1106	<	* side effects -
1107	<	*/
1108	<	static int
1109	<	check_xline(struct Client *source_p)
1110	<	{
1111	<	struct ConfItem *conf = NULL;
1112	<	const char *reason = NULL;
818	>	if (!ConfigGeneral.cycle_on_host_change)
819	>	return;
820
821	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1115	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
821	>	DLINK_FOREACH(node, target_p->channel.head)
822		{
823	<	struct MatchItem *reg = map_to_conf(conf);
823	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
824	>	char *p = modebuf;
825	>	int len = 0;
826	>	const struct Membership *member = node->data;
827
828	<	++reg->count;
829	<
830	<	if (reg->reason != NULL)
831	<	reason = reg->reason;
832	<	else
1124	<	reason = "No Reason";
828	>	if (has_member_flags(member, CHFL_CHANOP))
829	>	{
830	>	*p++ = 'o';
831	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
832	>	}
833
834	<	sendto_realops_flags(UMODE_REJ, L_ALL,
835	<	"X-line Rejecting [%s] [%s], user %s [%s]",
836	<	source_p->info, reason,
837	<	get_client_name(source_p, HIDE_IP),
838	<	source_p->sockhost);
834	>	if (has_member_flags(member, CHFL_HALFOP))
835	>	{
836	>	*p++ = 'h';
837	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
838	>	}
839
840	<	++ServerStats.is_ref;
1133	<	if (REJECT_HOLD_TIME > 0)
840	>	if (has_member_flags(member, CHFL_VOICE))
841		{
842	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
843	<	me.name, source_p->name);
1137	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1138	<	SetCaptured(source_p);
842	>	*p++ = 'v';
843	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
844		}
1140	–	else
1141	–	exit_client(source_p, &me, "Bad user info");
1142	–	return 1;
1143	–	}
845
846	<	return 0;
1146	<	}
846	>	*p = '\0';
847
848	<	/* oper_up()
849	<	*
850	<	* inputs       - pointer to given client to oper
851	<	* output       - NONE
852	<	* side effects - Blindly opers up given source_p, using aconf info
853	<	*                all checks on passwords have already been done.
854	<	*                This could also be used by rsa oper routines.
848	>
849	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
850	>	target_p->name, target_p->username,
851	>	target_p->host, member->chptr->name,
852	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
853	>	target_p->info);
854	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
855	>	target_p->name, target_p->username,
856	>	target_p->host, member->chptr->name);
857	>
858	>	if (nickbuf[0])
859	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
860	>	target_p->servptr->name, member->chptr->name,
861	>	modebuf, nickbuf);
862	>
863	>	}
864	>
865	>	if (target_p->away[0])
866	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
867	>	":%s!%s@%s AWAY :%s",
868	>	target_p->name, target_p->username,
869	>	target_p->host, target_p->away);
870	>	}
871	>
872	>	/*! \brief Blindly opers up given source_p, using conf info.
873	>	*         All checks on passwords have already been done.
874	>	* \param source_p Pointer to given client to oper
875		*/
876		void
877		oper_up(struct Client *source_p)
878		{
879	<	unsigned int old = source_p->umodes;
880	<	const char *operprivs = "";
1161	<	const struct AccessItem *oconf = NULL;
879	>	const unsigned int old = source_p->umodes;
880	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
881
882	<	assert(source_p->localClient->confs.head);
1164	<	oconf = map_to_conf((source_p->localClient->confs.head)->data);
882	>	assert(source_p->connection->confs.head);
883
884		++Count.oper;
885		SetOper(source_p);
886
887	<	if (oconf->modes)
888	<	source_p->umodes |= oconf->modes;
889	<	else if (ConfigFileEntry.oper_umodes)
890	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1173	<	else
1174	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1175	<	UMODE_WALLOP|UMODE_LOCOPS);
887	>	if (conf->modes)
888	>	AddUMode(source_p, conf->modes);
889	>	else if (ConfigGeneral.oper_umodes)
890	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
891
892	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
892	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
893		++Count.invisi;
894	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
894	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
895		--Count.invisi;
896
897		assert(dlinkFind(&oper_list, source_p) == NULL);
898		dlinkAdd(source_p, make_dlink_node(), &oper_list);
899
900	<	operprivs = oper_privs_as_string(oconf->port);
1186	<
1187	<	SetOFlag(source_p, oconf->port);
1188	<
1189	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1190	<	source_p->umodes |= UMODE_ADMIN;
1191	<	if (!IsOperN(source_p))
1192	<	source_p->umodes &= ~UMODE_NCHANGE;
1193	<
1194	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1195	<	source_p->name, source_p->username, source_p->host);
1196	<	send_umode_out(source_p, source_p, old);
1197	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1198	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1199	<	me.name, source_p->name, operprivs);
1200	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1201	<	}
1202	<
1203	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1204	<
1205	<	int
1206	<	valid_sid(const char *sid)
1207	<	{
1208	<	if (strlen(sid) == IRC_MAXSID)
1209	<	if (IsDigit(*sid))
1210	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1211	<	return 1;
1212	<
1213	<	return 0;
1214	<	}
900	>	AddOFlag(source_p, conf->port);
901
902	<	/*
903	<	* init_uid()
1218	<	*
1219	<	* inputs       - NONE
1220	<	* output       - NONE
1221	<	* side effects - new_uid is filled in with server id portion (sid)
1222	<	*                (first 3 bytes) or defaulted to 'A'.
1223	<	*                Rest is filled in with 'A'
1224	<	*/
1225	<	void
1226	<	init_uid(void)
1227	<	{
1228	<	int i;
902	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
903	>	AddUMode(source_p, UMODE_ADMIN);
904
905	<	memset(new_uid, 0, sizeof(new_uid));
1231	<
1232	<	if (!EmptyString(ServerInfo.sid))
1233	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1234	<
1235	<	for (i = 0; i < IRC_MAXSID; ++i)
1236	<	if (new_uid[i] == '\0')
1237	<	new_uid[i] = 'A';
1238	<
1239	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1240	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1241	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1242	<	* -Dianora
1243	<	*/
1244	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1245	<
1246	<	entering_umode_cb = register_callback("entering_umode", NULL);
1247	<	umode_cb = register_callback("changing_umode", change_simple_umode);
1248	<	}
1249	<
1250	<	/*
1251	<	* add_one_to_uid
1252	<	*
1253	<	* inputs       - index number into new_uid
1254	<	* output       - NONE
1255	<	* side effects - new_uid is incremented by one
1256	<	*                note this is a recursive function
1257	<	*/
1258	<	static void
1259	<	add_one_to_uid(int i)
1260	<	{
1261	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
905	>	if (!EmptyString(conf->whois))
906		{
907	<	if (new_uid[i] == 'Z')
908	<	new_uid[i] = '0';
909	<	else if (new_uid[i] == '9')
910	<	{
1267	<	new_uid[i] = 'A';
1268	<	add_one_to_uid(i-1);
1269	<	}
1270	<	else
1271	<	++new_uid[i];
907	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
908	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
909	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
910	>	RPL_WHOISOPERATOR, conf->whois);
911		}
1273	–	else
1274	–	{
1275	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1276	–	if (new_uid[i] == 'Z')
1277	–	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1278	–	else
1279	–	++new_uid[i];
1280	–	}
1281	–	}
912
913	<	/*
914	<	* uid_get
915	<	*
916	<	* inputs       - struct Client *
917	<	* output       - new UID is returned to caller
918	<	* side effects - new_uid is incremented by one.
1289	<	*/
1290	<	static const char *
1291	<	uid_get(void)
1292	<	{
1293	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1294	<	return new_uid;
913	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
914	>	get_oper_name(source_p));
915	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
916	>	me.id, get_oper_name(source_p));
917	>	send_umode_out(source_p, old);
918	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
919		}
920
921		/*
#	Line 1304 | Line 928 | uid_get(void)
928		void
929		init_isupport(void)
930		{
1307	–	isupportFile = init_MessageLine();
1308	–
931		add_isupport("CALLERID", NULL, -1);
932	<	add_isupport("CASEMAPPING", CASEMAP, -1);
932	>	add_isupport("CASEMAPPING", "rfc1459", -1);
933		add_isupport("DEAF", "D", -1);
934		add_isupport("KICKLEN", NULL, KICKLEN);
935		add_isupport("MODES", NULL, MAXMODEPARAMS);
1314	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1315	–	#ifdef HALFOPS
936		add_isupport("PREFIX", "(ohv)@%+", -1);
937		add_isupport("STATUSMSG", "@%+", -1);
938	<	#else
939	<	add_isupport("PREFIX", "(ov)@+", -1);
1320	<	add_isupport("STATUSMSG", "@+", -1);
1321	<	#endif
1322	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
938	>	add_isupport("EXCEPTS", NULL, -1);
939	>	add_isupport("INVEX", NULL, -1);
940		}
941
942		/*
#	Line 1334 | Line 951 | init_isupport(void)
951		void
952		add_isupport(const char *name, const char *options, int n)
953		{
954	<	dlink_node *ptr;
955	<	struct Isupport *support;
954	>	dlink_node *node = NULL;
955	>	struct Isupport *support = NULL;
956
957	<	DLINK_FOREACH(ptr, support_list.head)
957	>	DLINK_FOREACH(node, support_list.head)
958		{
959	<	support = ptr->data;
959	>	support = node->data;
960		if (irccmp(support->name, name) == 0)
961		{
962		MyFree(support->name);
#	Line 1348 | Line 965 | add_isupport(const char *name, const cha
965		}
966		}
967
968	<	if (ptr == NULL)
968	>	if (node == NULL)
969		{
970	<	support = MyMalloc(sizeof(*support));
970	>	support = MyCalloc(sizeof(*support));
971		dlinkAddTail(support, &support->node, &support_list);
972		}
973
974	<	DupString(support->name, name);
975	<	if (options != NULL)
976	<	DupString(support->options, options);
974	>	support->name = xstrdup(name);
975	>	if (options)
976	>	support->options = xstrdup(options);
977		support->number = n;
978
979		rebuild_isupport_message_line();
#	Line 1372 | Line 989 | add_isupport(const char *name, const cha
989		void
990		delete_isupport(const char *name)
991		{
992	<	dlink_node *ptr;
1376	<	struct Isupport *support;
992	>	dlink_node *node = NULL;
993
994	<	DLINK_FOREACH(ptr, support_list.head)
994	>	DLINK_FOREACH(node, support_list.head)
995		{
996	<	support = ptr->data;
996	>	struct Isupport *support = node->data;
997	>
998		if (irccmp(support->name, name) == 0)
999		{
1000	<	dlinkDelete(ptr, &support_list);
1000	>	dlinkDelete(node, &support_list);
1001		MyFree(support->name);
1002		MyFree(support->options);
1003		MyFree(support);
#	Line 1403 | Line 1020 | rebuild_isupport_message_line(void)
1020		{
1021		char isupportbuffer[IRCD_BUFSIZE];
1022		char *p = isupportbuffer;
1023	<	dlink_node *ptr = NULL;
1023	>	dlink_node *node = NULL, *node_next = NULL;
1024		int n = 0;
1025		int tokens = 0;
1026		size_t len = 0;
1027	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1027	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1028
1029	<	destroy_MessageLine(isupportFile);
1029	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1030	>	{
1031	>	dlinkDelete(node, &support_list_lines);
1032	>	MyFree(node->data);
1033	>	free_dlink_node(node);
1034	>	}
1035
1036	<	DLINK_FOREACH(ptr, support_list.head)
1036	>	DLINK_FOREACH(node, support_list.head)
1037		{
1038	<	struct Isupport *support = ptr->data;
1038	>	struct Isupport *support = node->data;
1039
1040	<	p += (n = ircsprintf(p, "%s", support->name));
1040	>	p += (n = sprintf(p, "%s", support->name));
1041		len += n;
1042
1043	<	if (support->options != NULL)
1043	>	if (support->options)
1044		{
1045	<	p += (n = ircsprintf(p, "=%s", support->options));
1045	>	p += (n = sprintf(p, "=%s", support->options));
1046		len += n;
1047		}
1048
1049		if (support->number > 0)
1050		{
1051	<	p += (n = ircsprintf(p, "=%d", support->number));
1051	>	p += (n = sprintf(p, "=%d", support->number));
1052		len += n;
1053		}
1054
#	Line 1439 | Line 1061 | rebuild_isupport_message_line(void)
1061		if (*--p == ' ')
1062		*p = '\0';
1063
1064	<	addto_MessageLine(isupportFile, isupportbuffer);
1064	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1065		p = isupportbuffer;
1066		len = 0;
1067		n = tokens = 0;
1068		}
1069		}
1070
1071	<	if (len != 0)
1071	>	if (len)
1072		{
1073		if (*--p == ' ')
1074		*p = '\0';
1075	<	addto_MessageLine(isupportFile, isupportbuffer);
1075	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1076		}
1077		}

Diff Legend

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