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

Comparing ircd-hybrid/trunk/src/user.c (property svn:keywords):
Revision 3896 by michael, Fri Jun 6 19:08:47 2014 UTC vs.
Revision 8496 by michael, Thu Apr 5 12:46:00 2018 UTC

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

Diff Legend

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