ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/user.c (file contents):
Revision 3528 by michael, Wed May 14 15:44:52 2014 UTC vs.
Revision 8752 by michael, Tue Jan 1 11:07:01 2019 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2019 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 15 | 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
22	<	/*! \file s_user.c
22	>	/*! \file user.c
23		* \brief User related functions.
24		* \version $Id$
25		*/
#	Line 31 | Line 31
31		#include "channel_mode.h"
32		#include "client.h"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40		#include "conf.h"
41	+	#include "conf_gecos.h"
42		#include "log.h"
43		#include "server.h"
44	+	#include "server_capab.h" /* TBR: RHOST compatibility mode */
45		#include "send.h"
43	–	#include "supported.h"
46		#include "memory.h"
47		#include "packet.h"
48		#include "rng_mt.h"
47	–	#include "userhost.h"
49		#include "misc.h"
50		#include "parse.h"
51		#include "watch.h"
52	<
53	<	static char umode_buffer[IRCD_BUFSIZE];
54	<	static const char *uid_get(void);
55	<
56	<	/* Used for building up the isupport string,
57	<	* used with init_isupport, add_isupport, delete_isupport
58	<	*/
59	<	struct Isupport
60	<	{
61	<	dlink_node node;
62	<	char *name;
63	<	char *options;
64	<	int number;
65	<	};
66	<
67	<	static dlink_list support_list;
68	<	static dlink_list support_list_lines;
69	<
70	<	/* memory is cheap. map 0-255 to equivalent mode */
71	<	const unsigned int user_modes[256] =
72	<	{
73	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
74	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
75	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
76	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
77	<	0,                  /* @ */
78	<	0,                  /* A */
79	<	0,                  /* B */
80	<	0,                  /* C */
81	<	UMODE_DEAF,         /* D */
82	<	0,                  /* E */
83	<	UMODE_FARCONNECT,   /* F */
84	<	UMODE_SOFTCALLERID, /* G */
85	<	UMODE_HIDDEN,       /* H */
86	<	0,                  /* I */
87	<	0,                  /* J */
88	<	0,                  /* K */
88	<	0,                  /* L */
89	<	0,                  /* M */
90	<	0,                  /* N */
91	<	0,                  /* O */
92	<	0,                  /* P */
93	<	0,                  /* Q */
94	<	UMODE_REGONLY,      /* R */
95	<	UMODE_SSL,          /* S */
96	<	0,                  /* T */
97	<	0,                  /* U */
98	<	0,                  /* V */
99	<	UMODE_WEBIRC,       /* W */
100	<	0,                  /* X */
101	<	0,                  /* Y */
102	<	0,                  /* Z 0x5A */
103	<	0, 0, 0, 0, 0,      /* 0x5F   */
104	<	0,                  /* 0x60   */
105	<	UMODE_ADMIN,        /* a */
106	<	UMODE_BOTS,         /* b */
107	<	UMODE_CCONN,        /* c */
108	<	UMODE_DEBUG,        /* d */
109	<	UMODE_EXTERNAL,     /* e */
110	<	UMODE_FULL,         /* f */
111	<	UMODE_CALLERID,     /* g */
112	<	0,                  /* h */
113	<	UMODE_INVISIBLE,    /* i */
114	<	UMODE_REJ,          /* j */
115	<	UMODE_SKILL,        /* k */
116	<	UMODE_LOCOPS,       /* l */
117	<	0,                  /* m */
118	<	UMODE_NCHANGE,      /* n */
119	<	UMODE_OPER,         /* o */
120	<	UMODE_HIDECHANS,    /* p */
121	<	UMODE_HIDEIDLE,     /* q */
122	<	UMODE_REGISTERED,   /* r */
123	<	UMODE_SERVNOTICE,   /* s */
124	<	0,                  /* t */
125	<	UMODE_UNAUTH,       /* u */
126	<	0,                  /* v */
127	<	UMODE_WALLOP,       /* w */
128	<	UMODE_HIDDENHOST,   /* x */
129	<	UMODE_SPY,          /* y */
130	<	UMODE_OPERWALL,     /* z      0x7A */
131	<	0,0,0,0,0,          /* 0x7B - 0x7F */
132	<
133	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
134	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
135	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
136	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
137	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
138	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
139	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
140	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
52	>	#include "isupport.h"
53	>	#include "tls.h"
54	>	#include "patchlevel.h"
55	>
56	>	static char umode_buffer[UMODE_MAX_STR];
57	>
58	>	const struct user_modes *umode_map[256];
59	>	const struct user_modes  umode_tab[] =
60	>	{
61	>	{ 'D', UMODE_DEAF         },
62	>	{ 'F', UMODE_FARCONNECT   },
63	>	{ 'G', UMODE_SOFTCALLERID },
64	>	{ 'H', UMODE_HIDDEN       },
65	>	{ 'R', UMODE_REGONLY      },
66	>	{ 'S', UMODE_SSL          },
67	>	{ 'W', UMODE_WEBIRC       },
68	>	{ 'a', UMODE_ADMIN        },
69	>	{ 'b', UMODE_BOTS         },
70	>	{ 'c', UMODE_CCONN        },
71	>	{ 'd', UMODE_DEBUG        },
72	>	{ 'e', UMODE_EXTERNAL     },
73	>	{ 'f', UMODE_FULL         },
74	>	{ 'g', UMODE_CALLERID     },
75	>	{ 'i', UMODE_INVISIBLE    },
76	>	{ 'j', UMODE_REJ          },
77	>	{ 'k', UMODE_SKILL        },
78	>	{ 'l', UMODE_LOCOPS       },
79	>	{ 'n', UMODE_NCHANGE      },
80	>	{ 'o', UMODE_OPER         },
81	>	{ 'p', UMODE_HIDECHANS    },
82	>	{ 'q', UMODE_HIDEIDLE     },
83	>	{ 'r', UMODE_REGISTERED   },
84	>	{ 's', UMODE_SERVNOTICE   },
85	>	{ 'u', UMODE_UNAUTH       },
86	>	{ 'w', UMODE_WALLOP       },
87	>	{ 'y', UMODE_SPY          },
88	>	{ '\0', 0 }
89		};
90
91		void
92	<	assemble_umode_buffer(void)
92	>	user_modes_init(void)
93		{
146	–	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 160 | 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	<	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_serv_list));
114	>	if (ConfigServerHide.hide_servers == 0 || 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(source_p, &me, RPL_LUSERCLIENT,
119	<	(Count.total - Count.invisi), Count.invisi, 1);
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(source_p, &me, RPL_LUSEROP, Count.oper);
122	>	sendto_one_numeric(client_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));
125	>	sendto_one_numeric(client_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
126
127	<	if (dlink_list_length(&global_channel_list))
128	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
127	>	if (dlink_list_length(channel_get_list()))
128	>	sendto_one_numeric(client_p, &me, RPL_LUSERCHANNELS, dlink_list_length(channel_get_list()));
129
130	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
130	>	if (ConfigServerHide.hide_servers == 0 || HasUMode(client_p, UMODE_OPER))
131		{
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);
132	>	sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&local_client_list), dlink_list_length(&local_server_list));
133	>	sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&local_client_list), Count.max_loc);
134	>	sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
135	>	sendto_one_numeric(client_p, &me, RPL_STATSCONN, Count.max_loc_con, Count.max_loc, Count.totalrestartcount);
136		}
137		else
138		{
139	<	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
140	<	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
139	>	sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&global_client_list), 0);
140	>	sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
141	>	sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
142		}
191	–
192	–	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
193	–
194	–	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
195	–	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
196	–	Count.max_loc_cli, Count.totalrestartcount);
197	–
198	–	if (Count.local > Count.max_loc_cli)
199	–	Count.max_loc_cli = Count.local;
200	–
201	–	if ((Count.local + Count.myserver) > Count.max_loc_con)
202	–	Count.max_loc_con = Count.local + Count.myserver;
143		}
144
205	–	/* show_isupport()
206	–	*
207	–	* inputs       - pointer to client
208	–	* output       - NONE
209	–	* side effects - display to client what we support (for them)
210	–	*/
211	–	void
212	–	show_isupport(struct Client *source_p)
213	–	{
214	–	const dlink_node *ptr = NULL;
215	–
216	–	DLINK_FOREACH(ptr, support_list_lines.head)
217	–	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
218	–	}
219	–
220	–
145		/* report_and_set_user_flags()
146		*
147	<	* inputs       - pointer to source_p
147	>	* inputs       - pointer to client_p
148		*              - pointer to conf for this user
149		* output       - NONE
150		* side effects - Report to user any special flags
151		*                they are getting, and set them.
152		*/
153		static void
154	<	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
154	>	report_and_set_user_flags(struct Client *client_p, const struct MaskItem *conf)
155		{
156		/* If this user is being spoofed, tell them so */
157		if (IsConfDoSpoofIp(conf))
158	<	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
158	>	sendto_one_notice(client_p, &me, ":*** Spoofing your IP");
159
160	<	/* If this user is in the exception class, Set it "E lined" */
160	>	/* If this user is in the exception class, set it "E lined" */
161		if (IsConfExemptKline(conf))
162		{
163	<	SetExemptKline(source_p);
164	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
163	>	AddFlag(client_p, FLAGS_EXEMPTKLINE);
164	>	sendto_one_notice(client_p, &me, ":*** You are exempt from K/D lines");
165		}
166
167	<	/*
244	<	* The else here is to make sure that G line exempt users
245	<	* do not get noticed twice.
246	<	*/
247	<	else if (IsConfExemptGline(conf))
167	>	if (IsConfExemptXline(conf))
168		{
169	<	SetExemptGline(source_p);
170	<	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
169	>	AddFlag(client_p, FLAGS_EXEMPTXLINE);
170	>	sendto_one_notice(client_p, &me, ":*** You are exempt from X lines");
171		}
172
173		if (IsConfExemptResv(conf))
174		{
175	<	SetExemptResv(source_p);
176	<	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
175	>	AddFlag(client_p, FLAGS_EXEMPTRESV);
176	>	sendto_one_notice(client_p, &me, ":*** You are exempt from resvs");
177		}
178
179		/* If this user is exempt from user limits set it "F lined" */
180		if (IsConfExemptLimits(conf))
181		{
182	<	SetExemptLimits(source_p);
183	<	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
182	>	AddFlag(client_p, FLAGS_NOLIMIT);
183	>	sendto_one_notice(client_p, &me, ":*** You are exempt from user limits");
184		}
185
186		if (IsConfCanFlood(conf))
187		{
188	<	SetCanFlood(source_p);
189	<	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
270	<	"protection, aren't you fearsome.");
188	>	AddFlag(client_p, FLAGS_CANFLOOD);
189	>	sendto_one_notice(client_p, &me, ":*** You are exempt from flood protection");
190		}
191		}
192
193		/* introduce_client()
194		*
195	<	* inputs       - source_p
195	>	* inputs       - client_p
196		* output       - NONE
197		* side effects - This common function introduces a client to the rest
198		*                of the net, either from a local client connect or
199		*                from a remote connect.
200		*/
201		static void
202	<	introduce_client(struct Client *source_p)
202	>	introduce_client(struct Client *client_p)
203		{
204	<	dlink_node *ptr = NULL;
205	<	char ubuf[IRCD_BUFSIZE] = "";
204	>	dlink_node *node;
205	>	char buf[UMODE_MAX_STR] = "";
206
207	<	if (MyClient(source_p))
208	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
290	<	else
291	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
292	<
293	<	watch_check_hash(source_p, RPL_LOGON);
207	>	send_umode(client_p, MyConnect(client_p), 0, buf);
208	>	watch_check_hash(client_p, RPL_LOGON);
209
210	<	if (ubuf[0] == '\0')
210	>	if (buf[0] == '\0')
211		{
212	<	ubuf[0] = '+';
213	<	ubuf[1] = '\0';
212	>	buf[0] = '+';
213	>	buf[1] = '\0';
214		}
215
216	<	DLINK_FOREACH(ptr, serv_list.head)
216	>	DLINK_FOREACH(node, local_server_list.head)
217		{
218	<	struct Client *server = ptr->data;
218	>	struct Client *server_p = node->data;
219
220	<	if (server == source_p->from)
220	>	if (server_p == client_p->from)
221		continue;
222
223	<	if (IsCapable(server, CAP_SVS))
224	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
225	<	source_p->servptr->id,
226	<	source_p->name, source_p->hopcount+1,
227	<	(unsigned long)source_p->tsinfo,
228	<	ubuf, source_p->username, source_p->host,
229	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
230	<	"0" : source_p->sockhost, source_p->id,
231	<	source_p->svid,
232	<	source_p->info);
223	>	/* TBR: compatibility mode */
224	>	if (IsCapable(server_p, CAPAB_RHOST))
225	>	sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s %s :%s",
226	>	client_p->servptr->id,
227	>	client_p->name, client_p->hopcount+1,
228	>	client_p->tsinfo,
229	>	buf, client_p->username, client_p->host, client_p->realhost,
230	>	client_p->sockhost, client_p->id,
231	>	client_p->account,
232	>	client_p->info);
233		else
234	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
235	<	source_p->servptr->id,
236	<	source_p->name, source_p->hopcount+1,
237	<	(unsigned long)source_p->tsinfo,
238	<	ubuf, source_p->username, source_p->host,
239	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
240	<	"0" : source_p->sockhost, source_p->id, source_p->info);
234	>	sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
235	>	client_p->servptr->id,
236	>	client_p->name, client_p->hopcount+1,
237	>	client_p->tsinfo,
238	>	buf, client_p->username, client_p->host,
239	>	client_p->sockhost, client_p->id,
240	>	client_p->account,
241	>	client_p->info);
242
243	<	if (!EmptyString(source_p->certfp))
244	<	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
243	>	if (!EmptyString(client_p->certfp))
244	>	sendto_one(server_p, ":%s CERTFP %s", client_p->id, client_p->certfp);
245		}
246		}
247
#	Line 336 | Line 252 | introduce_client(struct Client *source_p
252		* side effects -
253		*/
254		static void
255	<	user_welcome(struct Client *source_p)
255	>	user_welcome(struct Client *client_p)
256		{
341	–	#if defined(__TIME__) && defined(__DATE__)
257		static const char built_date[] = __DATE__ " at " __TIME__;
343	–	#else
344	–	static const char built_date[] = "unknown";
345	–	#endif
346	–
347	–	#ifdef HAVE_LIBCRYPTO
348	–	if (HasFlag(source_p, FLAGS_SSL))
349	–	{
350	–	AddUMode(source_p, UMODE_SSL);
351	–	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
352	–	ssl_get_cipher(source_p->localClient->fd.ssl));
353	–	}
354	–	#endif
355	–
356	–	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
357	–	source_p->name);
358	–	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
359	–	get_listener_name(source_p->localClient->listener), ircd_version);
360	–	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
361	–	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
362	–	show_isupport(source_p);
258
259	<	if (source_p->id[0])
260	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
261	<
262	<	show_lusers(source_p);
263	<	motd_signon(source_p);
259	>	if (HasFlag(client_p, FLAGS_SSL))
260	>	{
261	>	AddUMode(client_p, UMODE_SSL);
262	>	sendto_one_notice(client_p, &me, ":*** Connected securely via %s",
263	>	tls_get_cipher(&client_p->connection->fd->ssl));
264	>	}
265	>
266	>	sendto_one_numeric(client_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
267	>	client_p->name, client_p->username, client_p->realhost);
268	>	sendto_one_numeric(client_p, &me, RPL_YOURHOST,
269	>	listener_get_name(client_p->connection->listener), PATCHLEVEL);
270	>	sendto_one_numeric(client_p, &me, RPL_CREATED, built_date);
271	>	sendto_one_numeric(client_p, &me, RPL_MYINFO, me.name, PATCHLEVEL, umode_buffer);
272	>
273	>	isupport_show(client_p);
274	>	show_lusers(client_p);
275	>	motd_signon(client_p);
276		}
277
278		/* check_xline()
#	Line 374 | Line 281 | user_welcome(struct Client *source_p)
281		* outupt       - 1 if exiting 0 if ok
282		* side effects -
283		*/
284	<	static int
285	<	check_xline(struct Client *source_p)
284	>	static bool
285	>	check_xline(struct Client *client_p)
286		{
287	<	struct MaskItem *conf = NULL;
381	<	const char *reason = NULL;
287	>	const struct GecosItem *gecos = NULL;
288
289	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
290	<	{
385	<	++conf->count;
386	<
387	<	if (conf->reason)
388	<	reason = conf->reason;
389	<	else
390	<	reason = CONF_NOREASON;
289	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
290	>	return false;
291
292	+	if ((gecos = gecos_find(client_p->info, match)))
293	+	{
294		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
295		"X-line Rejecting [%s] [%s], user %s [%s]",
296	<	source_p->info, reason,
297	<	get_client_name(source_p, HIDE_IP),
298	<	source_p->sockhost);
296	>	client_p->info, gecos->reason,
297	>	client_get_name(client_p, HIDE_IP),
298	>	client_p->sockhost);
299
300		++ServerStats.is_ref;
301	<	exit_client(source_p, "Bad user info");
302	<	return 1;
301	>	exit_client(client_p, "Bad user info");
302	>	return true;
303		}
304
305	<	return 0;
305	>	return false;
306		}
307
308		/*! \brief This function is called when both NICK and USER messages
309		*      have been accepted for the client, in whatever order. Only
310		*      after this, is the UID message propagated.
311	<	* \param source_p Pointer to given client to introduce
311	>	* \param client_p Pointer to given client to introduce
312		*/
313		void
314	<	register_local_user(struct Client *source_p)
314	>	register_local_user(struct Client *client_p)
315		{
414	–	const char *id = NULL;
316		const struct MaskItem *conf = NULL;
317
318	<	assert(source_p == source_p->from);
319	<	assert(MyConnect(source_p));
320	<	assert(!source_p->localClient->registration);
321	<
421	<	ClearCap(source_p, CAP_TS6);
318	>	assert(client_p == client_p->from);
319	>	assert(client_p->connection->registration == 0);
320	>	assert(MyConnect(client_p));
321	>	assert(IsUnknown(client_p));
322
323	<	if (ConfigFileEntry.ping_cookie)
323	>	if (ConfigGeneral.ping_cookie)
324		{
325	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
325	>	if (!HasFlag(client_p, FLAGS_PINGSENT) && client_p->connection->random_ping == 0)
326		{
327		do
328	<	source_p->localClient->random_ping = genrand_int32();
329	<	while (!source_p->localClient->random_ping);
328	>	client_p->connection->random_ping = genrand_int32();
329	>	while (client_p->connection->random_ping == 0);
330
331	<	sendto_one(source_p, "PING :%u",
332	<	source_p->localClient->random_ping);
433	<	SetPingSent(source_p);
331	>	sendto_one(client_p, "PING :%u", client_p->connection->random_ping);
332	>	AddFlag(client_p, FLAGS_PINGSENT);
333		return;
334		}
335
336	<	if (!HasPingCookie(source_p))
336	>	if (!HasFlag(client_p, FLAGS_PING_COOKIE))
337		return;
338		}
339
340	<	source_p->localClient->last_privmsg = CurrentTime;
442	<	/* Straight up the maximum rate of flooding... */
443	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
444	<
445	<	if (!check_client(source_p))
340	>	if (check_client(client_p) == 0)
341		return;
342
343	<	if (!valid_hostname(source_p->host))
449	<	{
450	<	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
451	<	"character in your hostname");
452	<	strlcpy(source_p->host, source_p->sockhost,
453	<	sizeof(source_p->host));
454	<	}
455	<
456	<	conf = source_p->localClient->confs.head->data;
343	>	conf = client_p->connection->confs.head->data;
344
345	<	if (!IsGotId(source_p))
345	>	if (!HasFlag(client_p, FLAGS_GOTID))
346		{
347		char username[USERLEN + 1] = "";
461	–	const char *p = username;
348		unsigned int i = 0;
349
350		if (IsNeedIdentd(conf))
351		{
352		++ServerStats.is_ref;
353	<	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
353	>	sendto_one_notice(client_p, &me, ":*** Notice -- You need to install "
354		"identd to use this server");
355	<	exit_client(source_p, "Install identd");
355	>	exit_client(client_p, "Install identd");
356		return;
357		}
358
359	<	strlcpy(username, source_p->username, sizeof(username));
359	>	strlcpy(username, client_p->username, sizeof(username));
360
361		if (!IsNoTilde(conf))
362	<	source_p->username[i++] = '~';
362	>	client_p->username[i++] = '~';
363
364	<	for (; *p && i < USERLEN; ++p)
365	<	if (*p != '[')
480	<	source_p->username[i++] = *p;
364	>	for (const char *p = username; *p && i < USERLEN; ++p)
365	>	client_p->username[i++] = *p;
366
367	<	source_p->username[i] = '\0';
367	>	client_p->username[i] = '\0';
368		}
369
370		/* Password check */
371		if (!EmptyString(conf->passwd))
372		{
373	<	if (!match_conf_password(source_p->localClient->passwd, conf))
373	>	if (match_conf_password(client_p->connection->password, conf) == false)
374		{
375		++ServerStats.is_ref;
376
377	<	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
378	<	exit_client(source_p, "Bad Password");
377	>	sendto_one_numeric(client_p, &me, ERR_PASSWDMISMATCH);
378	>	exit_client(client_p, "Bad Password");
379		return;
380		}
381		}
382
383		/*
384	<	* Don't free source_p->localClient->passwd here - it can be required
385	<	* by masked /stats I if there are auth{} blocks with need_password = no;
384	>	* Don't free client_p->connection->password here - it can be required
385	>	* by masked /stats I if there are auth {} blocks with need_password = no;
386		* --adx
387		*/
388
389		/*
390	<	* Report if user has &^>= etc. and set flags as needed in source_p
390	>	* Report if user has &^>= etc. and set flags as needed in client_p
391		*/
392	<	report_and_set_user_flags(source_p, conf);
392	>	report_and_set_user_flags(client_p, conf);
393
394	<	if (IsDead(source_p))
394	>	if (IsDead(client_p))
395		return;
396
397		/*
#	Line 517 | Line 402 | register_local_user(struct Client *sourc
402		* probably be just a percentage of the MAXCLIENTS...
403		*   -Taner
404		*/
405	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
406	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
405	>	if ((dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
406	>	(dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients && !HasFlag(client_p, FLAGS_NOLIMIT)))
407		{
408		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
409		"Too many clients, rejecting %s[%s].",
410	<	source_p->name, source_p->host);
410	>	client_p->name, client_p->host);
411		++ServerStats.is_ref;
412	<	exit_client(source_p, "Sorry, server is full - try later");
412	>	exit_client(client_p, "Sorry, server is full - try later");
413		return;
414		}
415
416	<	if (!valid_username(source_p->username, 1))
416	>	if (valid_username(client_p->username, true) == false)
417		{
418		char buf[IRCD_BUFSIZE] = "";
419
420		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
421		"Invalid username: %s (%s@%s)",
422	<	source_p->name, source_p->username, source_p->host);
422	>	client_p->name, client_p->username, client_p->host);
423		++ServerStats.is_ref;
424	<	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
425	<	exit_client(source_p, buf);
424	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", client_p->username);
425	>	exit_client(client_p, buf);
426		return;
427		}
428
429	<	if (check_xline(source_p))
429	>	if (check_xline(client_p))
430		return;
431
432	+	const char *id;
433		while (hash_find_id((id = uid_get())))
434		;
435
436	<	strlcpy(source_p->id, id, sizeof(source_p->id));
437	<	hash_add_id(source_p);
436	>	strlcpy(client_p->id, id, sizeof(client_p->id));
437	>	hash_add_id(client_p);
438
439		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
440		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
441	<	source_p->name, source_p->username, source_p->host,
442	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
443	<	"255.255.255.255" : source_p->sockhost,
444	<	get_client_class(&source_p->localClient->confs),
559	<	source_p->info, source_p->id);
441	>	client_p->name, client_p->username, client_p->realhost,
442	>	client_p->sockhost,
443	>	get_client_class(&client_p->connection->confs),
444	>	client_p->info, client_p->id);
445
446	<	if (ConfigFileEntry.invisible_on_connect)
446	>	if (ConfigGeneral.invisible_on_connect)
447		{
448	<	AddUMode(source_p, UMODE_INVISIBLE);
448	>	AddUMode(client_p, UMODE_INVISIBLE);
449		++Count.invisi;
450		}
451
452	<	if (++Count.local > Count.max_loc)
452	>	assert(client_p->servptr == &me);
453	>
454	>	SetClient(client_p);
455	>	client_p->connection->last_privmsg = CurrentTime;
456	>
457	>	dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
458	>	dlinkAdd(client_p, &client_p->node, &global_client_list);
459	>
460	>	assert(dlinkFind(&unknown_list, client_p));
461	>
462	>	dlink_move_node(&client_p->connection->lclient_node,
463	>	&unknown_list, &local_client_list);
464	>
465	>	if (dlink_list_length(&local_client_list) > Count.max_loc)
466		{
467	<	Count.max_loc = Count.local;
467	>	Count.max_loc = dlink_list_length(&local_client_list);
468
469		if (!(Count.max_loc % 10))
470	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
471	<	"New Max Local Clients: %d",
470	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
471	>	"New maximum local client connections: %u",
472		Count.max_loc);
473		}
474
475	<	if (++Count.total > Count.max_tot)
476	<	Count.max_tot = Count.total;
477	<	++Count.totalrestartcount;
475	>	if ((dlink_list_length(&local_client_list) +
476	>	dlink_list_length(&local_server_list)) > Count.max_loc_con)
477	>	Count.max_loc_con = dlink_list_length(&local_client_list) +
478	>	dlink_list_length(&local_server_list);
479
480	<	assert(source_p->servptr == &me);
481	<	SetClient(source_p);
482	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
584	<
585	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
586	<
587	<	assert(dlinkFind(&unknown_list, source_p));
588	<
589	<	dlink_move_node(&source_p->localClient->lclient_node,
590	<	&unknown_list, &local_client_list);
480	>	if (dlink_list_length(&global_client_list) > Count.max_tot)
481	>	Count.max_tot = dlink_list_length(&global_client_list);
482	>	++Count.totalrestartcount;
483
484	<	user_welcome(source_p);
593	<	add_user_host(source_p->username, source_p->host, 0);
594	<	SetUserHost(source_p);
484	>	user_welcome(client_p);
485
486	<	introduce_client(source_p);
486	>	introduce_client(client_p);
487		}
488
489		/* register_remote_user()
490		*
491	<	* inputs       - source_p remote or directly connected client
491	>	* inputs       - client_p remote or directly connected client
492		*              - username to register as
493		*              - host name to register as
494		*              - server name
#	Line 607 | Line 497 | register_local_user(struct Client *sourc
497		*                is introduced by a server.
498		*/
499		void
500	<	register_remote_user(struct Client *source_p, const char *username,
611	<	const char *host, const char *server)
500	>	register_remote_user(struct Client *client_p)
501		{
502	<	struct Client *target_p = NULL;
614	<
615	<	assert(source_p->username != username);
616	<
617	<	strlcpy(source_p->host, host, sizeof(source_p->host));
618	<	strlcpy(source_p->username, username, sizeof(source_p->username));
619	<
620	<	/*
621	<	* Coming from another server, take the servers word for it
622	<	*/
623	<	source_p->servptr = hash_find_server(server);
624	<
625	<	/*
626	<	* Super GhostDetect:
627	<	* If we can't find the server the user is supposed to be on,
628	<	* then simply blow the user away.        -Taner
629	<	*/
630	<	if (source_p->servptr == NULL)
631	<	{
632	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
633	<	"No server %s for user %s[%s@%s] from %s",
634	<	server, source_p->name, source_p->username,
635	<	source_p->host, source_p->from->name);
636	<	sendto_one(source_p->from,
637	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
638	<	me.id, source_p->id, me.name, server);
639	<
640	<	AddFlag(source_p, FLAGS_KILLED);
641	<	exit_client(source_p, "Ghosted Client");
642	<	return;
643	<	}
644	<
645	<	if ((target_p = source_p->servptr) && target_p->from != source_p->from)
646	<	{
647	<	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
648	<	"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
649	<	source_p->from->name, source_p->name, source_p->username,
650	<	source_p->host, source_p->servptr->name,
651	<	target_p->name, target_p->from->name);
652	<	sendto_one(source_p->from,
653	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
654	<	me.id, source_p->id, me.name, source_p->servptr->name,
655	<	target_p->from->name);
656	<
657	<	AddFlag(source_p, FLAGS_KILLED);
658	<	exit_client(source_p, "USER server wrong direction");
659	<	return;
660	<	}
502	>	assert(client_p->servptr->from == client_p->from);
503
504		/*
505		* If the nick has been introduced by a services server,
506		* make it a service as well.
507		*/
508	<	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
509	<	AddFlag(source_p, FLAGS_SERVICE);
508	>	if (HasFlag(client_p->servptr, FLAGS_SERVICE))
509	>	AddFlag(client_p, FLAGS_SERVICE);
510
511	<	if (++Count.total > Count.max_tot)
512	<	Count.max_tot = Count.total;
511	>	SetClient(client_p);
512	>	dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
513	>	dlinkAdd(client_p, &client_p->node, &global_client_list);
514
515	<	SetClient(source_p);
516	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
674	<	add_user_host(source_p->username, source_p->host, 1);
675	<	SetUserHost(source_p);
515	>	if (dlink_list_length(&global_client_list) > Count.max_tot)
516	>	Count.max_tot = dlink_list_length(&global_client_list);
517
518	<	if (HasFlag(source_p->servptr, FLAGS_EOB))
518	>	if (HasFlag(client_p->servptr, FLAGS_EOB))
519		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
520	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
521	<	source_p->servptr->name,
522	<	source_p->name, source_p->username, source_p->host,
523	<	source_p->info, source_p->id);
520	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
521	>	client_p->servptr->name,
522	>	client_p->name, client_p->username, client_p->realhost,
523	>	client_p->sockhost, client_p->info, client_p->id);
524
525	<	introduce_client(source_p);
525	>	introduce_client(client_p);
526		}
527
528		/* valid_hostname()
#	Line 693 | Line 534 | register_remote_user(struct Client *sour
534		* NOTE: this doesn't allow a hostname to begin with a dot and
535		* will not allow more dots than chars.
536		*/
537	<	int
537	>	bool
538		valid_hostname(const char *hostname)
539		{
540		const char *p = hostname;
#	Line 701 | Line 542 | valid_hostname(const char *hostname)
542		assert(p);
543
544		if (EmptyString(p) || *p == '.' || *p == ':')
545	<	return 0;
545	>	return false;
546
547		for (; *p; ++p)
548		if (!IsHostChar(*p))
549	<	return 0;
549	>	return false;
550
551		return p - hostname <= HOSTLEN;
552		}
#	Line 721 | Line 562 | valid_hostname(const char *hostname)
562		* Allow '.' in username to allow for "first.last"
563		* style of username
564		*/
565	<	int
566	<	valid_username(const char *username, const int local)
565	>	bool
566	>	valid_username(const char *username, bool local)
567		{
727	–	int dots      = 0;
568		const char *p = username;
569
570		assert(p);
#	Line 738 | Line 578 | valid_username(const char *username, con
578		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
579		*/
580		if (!IsAlNum(*p))
581	<	return 0;
581	>	return false;
582
583		if (local)
584		{
585	+	unsigned int dots = 0;
586	+
587		while (*++p)
588		{
589	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
589	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
590		{
591	<	if (++dots > ConfigFileEntry.dots_in_ident)
592	<	return 0;
591	>	if (++dots > ConfigGeneral.dots_in_ident)
592	>	return false;
593		if (!IsUserChar(*(p + 1)))
594	<	return 0;
594	>	return false;
595		}
596		else if (!IsUserChar(*p))
597	<	return 0;
597	>	return false;
598		}
599		}
600		else
601		{
602		while (*++p)
603		if (!IsUserChar(*p))
604	<	return 0;
604	>	return false;
605		}
606
607	<	return  p - username <= USERLEN;;
607	>	return p - username <= USERLEN;
608		}
609
610		/* clean_nick_name()
#	Line 772 | Line 614 | valid_username(const char *username, con
614		* output       - none
615		* side effects - walks through the nickname, returning 0 if erroneous
616		*/
617	<	int
618	<	valid_nickname(const char *nickname, const int local)
617	>	bool
618	>	valid_nickname(const char *nickname, bool local)
619		{
620		const char *p = nickname;
621
622	<	assert(nickname && *nickname);
622	>	assert(p);
623
624		/*
625		* Nicks can't start with a digit or - or be 0 length.
626		*/
627	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
628	<	return 0;
627	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
628	>	return false;
629
630		for (; *p; ++p)
631		if (!IsNickChar(*p))
632	<	return 0;
632	>	return false;
633
634		return p - nickname <= NICKLEN;
635		}
636
637	<	/* send_umode()
638	<	* send the MODE string for user (user) to connection client_p
639	<	* -avalon
640	<	*
641	<	* inputs       - client_p
800	<	*              - source_p
801	<	*              - int old
802	<	*              - sendmask mask of modes to send
803	<	*              - suplied umode_buf
804	<	* output       - NONE
637	>	/*! \brief Builds a mode change string to buffer pointed by \a buf
638	>	* \param client_p  Pointer to client
639	>	* \param dispatch  Whether to send a MODE message to client_p
640	>	* \param old       Old user mode to compare against when building new mode buffer
641	>	* \param buf       Pointer to buffer to build string in
642		*/
643		void
644	<	send_umode(struct Client *client_p, struct Client *source_p,
808	<	unsigned int old, unsigned int sendmask, char *umode_buf)
644	>	send_umode(struct Client *client_p, bool dispatch, unsigned int old, char *buf)
645		{
646	<	char *m = umode_buf;
646	>	char *m = buf;
647		int what = 0;
648
649		/*
650		* Build a string in umode_buf to represent the change in the user's
651	<	* mode between the new (source_p->umodes) and 'old'.
651	>	* mode between the new (client_p->umodes) and 'old'.
652		*/
653	<	for (unsigned int i = 0; i < 128; ++i)
653	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
654		{
655	<	unsigned int flag = user_modes[i];
820	<
821	<	if (!flag)
822	<	continue;
823	<
824	<	if (MyClient(source_p) && !(flag & sendmask))
825	<	continue;
826	<
827	<	if ((flag & old) && !HasUMode(source_p, flag))
655	>	if ((tab->flag & old) && !HasUMode(client_p, tab->flag))
656		{
657		if (what == MODE_DEL)
658	<	*m++ = (char)i;
658	>	*m++ = tab->c;
659		else
660		{
661		what = MODE_DEL;
662		*m++ = '-';
663	<	*m++ = (char)i;
663	>	*m++ = tab->c;
664		}
665		}
666	<	else if (!(flag & old) && HasUMode(source_p, flag))
666	>	else if (!(tab->flag & old) && HasUMode(client_p, tab->flag))
667		{
668		if (what == MODE_ADD)
669	<	*m++ = (char)i;
669	>	*m++ = tab->c;
670		else
671		{
672		what = MODE_ADD;
673		*m++ = '+';
674	<	*m++ = (char)i;
674	>	*m++ = tab->c;
675		}
676		}
677		}
678
679		*m = '\0';
680
681	<	if (*umode_buf && client_p)
681	>	if (dispatch == true && *buf)
682		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
683	<	source_p->name, source_p->username,
684	<	source_p->host, source_p->name, umode_buf);
683	>	client_p->name, client_p->username,
684	>	client_p->host, client_p->name, buf);
685		}
686
687		/* send_umode_out()
#	Line 863 | Line 691 | send_umode(struct Client *client_p, stru
691		* side effects - Only send ubuf out to servers that know about this client
692		*/
693		void
694	<	send_umode_out(struct Client *client_p, struct Client *source_p,
867	<	unsigned int old)
694	>	send_umode_out(struct Client *client_p, unsigned int old)
695		{
696	<	char buf[IRCD_BUFSIZE] = "";
696	>	char buf[UMODE_MAX_STR] = "";
697
698	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
698	>	send_umode(client_p, MyConnect(client_p), old, buf);
699
700		if (buf[0])
701	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
702	<	source_p->id, source_p->id, buf);
876	<
877	<	if (client_p && MyClient(client_p))
878	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
701	>	sendto_server(client_p, 0, 0, ":%s MODE %s :%s",
702	>	client_p->id, client_p->id, buf);
703		}
704
705		void
706	<	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
706	>	user_set_hostmask(struct Client *client_p, const char *hostname)
707		{
708	<	dlink_node *ptr = NULL;
708	>	dlink_node *node;
709
710	<	if (!strcmp(target_p->host, hostname))
710	>	if (strcmp(client_p->host, hostname) == 0)
711		return;
712
713	<	switch (what)
714	<	{
715	<	case MODE_ADD:
892	<	AddUMode(target_p, UMODE_HIDDENHOST);
893	<	AddFlag(target_p, FLAGS_IP_SPOOFING);
894	<	break;
895	<	case MODE_DEL:
896	<	DelUMode(target_p, UMODE_HIDDENHOST);
897	<
898	<	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
899	<	DelFlag(target_p, FLAGS_IP_SPOOFING);
900	<	break;
901	<	default: return;
902	<	}
903	<
904	<	if (ConfigFileEntry.cycle_on_host_change)
905	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
906	<	target_p->name, target_p->username, target_p->host);
713	>	if (ConfigGeneral.cycle_on_host_change)
714	>	sendto_common_channels_local(client_p, false, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
715	>	client_p->name, client_p->username, client_p->host);
716
717	<	if (IsUserHostIp(target_p))
718	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
717	>	sendto_common_channels_local(client_p, false, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
718	>	client_p->name, client_p->username,
719	>	client_p->host, client_p->username, hostname);
720
721	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
721	>	strlcpy(client_p->host, hostname, sizeof(client_p->host));
722
723	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
914	<	SetUserHost(target_p);
915	<
916	<	if (MyClient(target_p))
723	>	if (MyConnect(client_p))
724		{
725	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
726	<	clear_ban_cache_client(target_p);
725	>	sendto_one_numeric(client_p, &me, RPL_VISIBLEHOST, client_p->host);
726	>	clear_ban_cache_list(&client_p->channel);
727		}
728
729	<	if (!ConfigFileEntry.cycle_on_host_change)
729	>	if (ConfigGeneral.cycle_on_host_change == 0)
730		return;
731
732	<	DLINK_FOREACH(ptr, target_p->channel.head)
732	>	DLINK_FOREACH(node, client_p->channel.head)
733		{
734	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
734	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
735	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
736		char *p = modebuf;
737		int len = 0;
738	<	const struct Membership *ms = ptr->data;
738	>	const struct Membership *member = node->data;
739
740	<	if (has_member_flags(ms, CHFL_CHANOP))
740	>	if (has_member_flags(member, CHFL_CHANOP))
741		{
742		*p++ = 'o';
743	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
743	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
744		}
745
746	<	if (has_member_flags(ms, CHFL_HALFOP))
746	>	if (has_member_flags(member, CHFL_HALFOP))
747		{
748		*p++ = 'h';
749	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
749	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
750		}
751
752	<	if (has_member_flags(ms, CHFL_VOICE))
752	>	if (has_member_flags(member, CHFL_VOICE))
753		{
754		*p++ = 'v';
755	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
755	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
756		}
757
758		*p = '\0';
759
760	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
761	<	target_p->name, target_p->username, target_p->host,
762	<	ms->chptr->chname);
763	<	if (nickbuf[0])
764	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
765	<	target_p->servptr->name, ms->chptr->chname,
766	<	modebuf, nickbuf);
760	>	sendto_channel_local(client_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
761	>	client_p->name, client_p->username,
762	>	client_p->host, member->chptr->name,
763	>	client_p->account, client_p->info);
764	>	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
765	>	client_p->name, client_p->username,
766	>	client_p->host, member->chptr->name);
767
768	+	if (nickbuf[0])
769	+	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
770	+	client_p->servptr->name, member->chptr->name,
771	+	modebuf, nickbuf);
772		}
773
774	<	if (target_p->away[0])
775	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
774	>	if (client_p->away[0])
775	>	sendto_common_channels_local(client_p, false, CAP_AWAY_NOTIFY, CAP_CHGHOST,
776		":%s!%s@%s AWAY :%s",
777	<	target_p->name, target_p->username,
778	<	target_p->host, target_p->away);
967	<	}
968	<
969	<	/*! \brief Blindly opers up given source_p, using conf info.
970	<	*         All checks on passwords have already been done.
971	<	* \param source_p Pointer to given client to oper
972	<	*/
973	<	void
974	<	oper_up(struct Client *source_p)
975	<	{
976	<	const unsigned int old = source_p->umodes;
977	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
978	<
979	<	assert(source_p->localClient->confs.head);
980	<
981	<	++Count.oper;
982	<	SetOper(source_p);
983	<
984	<	if (conf->modes)
985	<	AddUMode(source_p, conf->modes);
986	<	else if (ConfigFileEntry.oper_umodes)
987	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
988	<
989	<	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
990	<	++Count.invisi;
991	<	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
992	<	--Count.invisi;
993	<
994	<	assert(dlinkFind(&oper_list, source_p) == NULL);
995	<	dlinkAdd(source_p, make_dlink_node(), &oper_list);
996	<
997	<	AddOFlag(source_p, conf->port);
998	<
999	<	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1000	<	AddUMode(source_p, UMODE_ADMIN);
1001	<
1002	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1003	<	get_oper_name(source_p));
1004	<	send_umode_out(source_p, source_p, old);
1005	<	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1006	<	}
1007	<
1008	<	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1009	<
1010	<	int
1011	<	valid_sid(const char *sid)
1012	<	{
1013	<	if (strlen(sid) == IRC_MAXSID)
1014	<	if (IsDigit(*sid))
1015	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1016	<	return 1;
1017	<
1018	<	return 0;
1019	<	}
1020	<
1021	<	/*
1022	<	* init_uid()
1023	<	*
1024	<	* inputs       - NONE
1025	<	* output       - NONE
1026	<	* side effects - new_uid is filled in with server id portion (sid)
1027	<	*                (first 3 bytes) or defaulted to 'A'.
1028	<	*                Rest is filled in with 'A'
1029	<	*/
1030	<	void
1031	<	init_uid(void)
1032	<	{
1033	<	memset(new_uid, 0, sizeof(new_uid));
1034	<
1035	<	if (!EmptyString(ServerInfo.sid))
1036	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1037	<
1038	<	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1039	<	if (new_uid[i] == '\0')
1040	<	new_uid[i] = 'A';
1041	<
1042	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1043	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1044	<	}
1045	<
1046	<	/*
1047	<	* add_one_to_uid
1048	<	*
1049	<	* inputs       - index number into new_uid
1050	<	* output       - NONE
1051	<	* side effects - new_uid is incremented by one
1052	<	*                note this is a recursive function
1053	<	*/
1054	<	static void
1055	<	add_one_to_uid(int i)
1056	<	{
1057	<	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1058	<	{
1059	<	if (new_uid[i] == 'Z')
1060	<	new_uid[i] = '0';
1061	<	else if (new_uid[i] == '9')
1062	<	{
1063	<	new_uid[i] = 'A';
1064	<	add_one_to_uid(i-1);
1065	<	}
1066	<	else
1067	<	++new_uid[i];
1068	<	}
1069	<	else
1070	<	{
1071	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1072	<	if (new_uid[i] == 'Z')
1073	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1074	<	else
1075	<	++new_uid[i];
1076	<	}
1077	<	}
1078	<
1079	<	/*
1080	<	* uid_get
1081	<	*
1082	<	* inputs       - struct Client *
1083	<	* output       - new UID is returned to caller
1084	<	* side effects - new_uid is incremented by one.
1085	<	*/
1086	<	static const char *
1087	<	uid_get(void)
1088	<	{
1089	<	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1090	<	return new_uid;
1091	<	}
1092	<
1093	<	/*
1094	<	* init_isupport()
1095	<	*
1096	<	* input        - NONE
1097	<	* output       - NONE
1098	<	* side effects - Must be called before isupport is enabled
1099	<	*/
1100	<	void
1101	<	init_isupport(void)
1102	<	{
1103	<	add_isupport("CALLERID", NULL, -1);
1104	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1105	<	add_isupport("DEAF", "D", -1);
1106	<	add_isupport("KICKLEN", NULL, KICKLEN);
1107	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1108	<	#ifdef HALFOPS
1109	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1110	<	add_isupport("STATUSMSG", "@%+", -1);
1111	<	#else
1112	<	add_isupport("PREFIX", "(ov)@+", -1);
1113	<	add_isupport("STATUSMSG", "@+", -1);
1114	<	#endif
1115	<	add_isupport("EXCEPTS", "e", -1);
1116	<	add_isupport("INVEX", "I", -1);
1117	<	}
1118	<
1119	<	/*
1120	<	* add_isupport()
1121	<	*
1122	<	* input        - name of supported function
1123	<	*              - options if any
1124	<	*              - number if any
1125	<	* output       - NONE
1126	<	* side effects - Each supported item must call this when activated
1127	<	*/
1128	<	void
1129	<	add_isupport(const char *name, const char *options, int n)
1130	<	{
1131	<	dlink_node *ptr;
1132	<	struct Isupport *support;
1133	<
1134	<	DLINK_FOREACH(ptr, support_list.head)
1135	<	{
1136	<	support = ptr->data;
1137	<	if (irccmp(support->name, name) == 0)
1138	<	{
1139	<	MyFree(support->name);
1140	<	MyFree(support->options);
1141	<	break;
1142	<	}
1143	<	}
1144	<
1145	<	if (ptr == NULL)
1146	<	{
1147	<	support = MyCalloc(sizeof(*support));
1148	<	dlinkAddTail(support, &support->node, &support_list);
1149	<	}
1150	<
1151	<	support->name = xstrdup(name);
1152	<	if (options)
1153	<	support->options = xstrdup(options);
1154	<	support->number = n;
1155	<
1156	<	rebuild_isupport_message_line();
1157	<	}
1158	<
1159	<	/*
1160	<	* delete_isupport()
1161	<	*
1162	<	* input        - name of supported function
1163	<	* output       - NONE
1164	<	* side effects - Each supported item must call this when deactivated
1165	<	*/
1166	<	void
1167	<	delete_isupport(const char *name)
1168	<	{
1169	<	dlink_node *ptr;
1170	<	struct Isupport *support;
1171	<
1172	<	DLINK_FOREACH(ptr, support_list.head)
1173	<	{
1174	<	support = ptr->data;
1175	<	if (irccmp(support->name, name) == 0)
1176	<	{
1177	<	dlinkDelete(ptr, &support_list);
1178	<	MyFree(support->name);
1179	<	MyFree(support->options);
1180	<	MyFree(support);
1181	<	break;
1182	<	}
1183	<	}
1184	<
1185	<	rebuild_isupport_message_line();
1186	<	}
1187	<
1188	<	/*
1189	<	* rebuild_isupport_message_line
1190	<	*
1191	<	* input        - NONE
1192	<	* output       - NONE
1193	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1194	<	*/
1195	<	void
1196	<	rebuild_isupport_message_line(void)
1197	<	{
1198	<	char isupportbuffer[IRCD_BUFSIZE];
1199	<	char *p = isupportbuffer;
1200	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1201	<	int n = 0;
1202	<	int tokens = 0;
1203	<	size_t len = 0;
1204	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1205	<
1206	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1207	<	{
1208	<	dlinkDelete(ptr, &support_list_lines);
1209	<	MyFree(ptr->data);
1210	<	free_dlink_node(ptr);
1211	<	}
1212	<
1213	<	DLINK_FOREACH(ptr, support_list.head)
1214	<	{
1215	<	struct Isupport *support = ptr->data;
1216	<
1217	<	p += (n = sprintf(p, "%s", support->name));
1218	<	len += n;
1219	<
1220	<	if (support->options)
1221	<	{
1222	<	p += (n = sprintf(p, "=%s", support->options));
1223	<	len += n;
1224	<	}
1225	<
1226	<	if (support->number > 0)
1227	<	{
1228	<	p += (n = sprintf(p, "=%d", support->number));
1229	<	len += n;
1230	<	}
1231	<
1232	<	*p++ = ' ';
1233	<	len++;
1234	<	*p = '\0';
1235	<
1236	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1237	<	{ /* arbritrary for now */
1238	<	if (*--p == ' ')
1239	<	*p = '\0';
1240	<
1241	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1242	<	p = isupportbuffer;
1243	<	len = 0;
1244	<	n = tokens = 0;
1245	<	}
1246	<	}
1247	<
1248	<	if (len)
1249	<	{
1250	<	if (*--p == ' ')
1251	<	*p = '\0';
1252	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1253	<	}
777	>	client_p->name, client_p->username,
778	>	client_p->host, client_p->away);
779		}

Comparing ircd-hybrid/trunk/src/user.c (property svn:keywords):
Revision 3528 by michael, Wed May 14 15:44:52 2014 UTC vs.
Revision 8752 by michael, Tue Jan 1 11:07:01 2019 UTC

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

Diff Legend

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