ViewVC Help

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

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

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

Diff Legend

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