ViewVC Help

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

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

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

Comparing:
ircd-hybrid-7.3/src/s_user.c (property svn:keywords), Revision 1115 by michael, Tue Dec 21 14:42:54 2010 UTC vs.
ircd-hybrid/trunk/src/user.c (property svn:keywords), Revision 7967 by michael, Mon Mar 13 19:10:19 2017 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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