ViewVC Help

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

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

Comparing:
ircd-hybrid/src/s_user.c (file contents), Revision 32 by knight, Sun Oct 2 20:41:23 2005 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 5784 by michael, Sun Apr 5 15:17:11 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28	<	#include "tools.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
28	>	#include "list.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "common.h"
33	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
37	–	#include "s_bsd.h"
38	–	#include "irc_getnameinfo.h"
35		#include "ircd.h"
40	–	#include "list.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39	<	#include "s_conf.h"
40	<	#include "s_log.h"
41	<	#include "s_serv.h"
47	<	#include "s_stats.h"
39	>	#include "conf.h"
40	>	#include "log.h"
41	>	#include "server.h"
42		#include "send.h"
49	–	#include "supported.h"
50	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45	+	#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
48	<	#include "s_misc.h"
49	<	#include "msg.h"
57	<	#include "pcre.h"
58	<
59	<	int MaxClientCount     = 1;
60	<	int MaxConnectionCount = 1;
61	<	struct Callback *entering_umode_cb = NULL;
62	<	struct Callback *umode_cb = NULL;
63	<	struct Callback *uid_get_cb = NULL;
47	>	#include "misc.h"
48	>	#include "parse.h"
49	>	#include "watch.h"
50
51		static char umode_buffer[IRCD_BUFSIZE];
52	<
67	<	static void user_welcome(struct Client *);
68	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
69	<	static int check_xline(struct Client *);
70	<	static int check_regexp_xline(struct Client *);
71	<	static void introduce_client(struct Client *, struct Client *);
72	<	static void *uid_get(va_list);
52	>	static const char *uid_get(void);
53
54		/* Used for building up the isupport string,
55		* used with init_isupport, add_isupport, delete_isupport
56		*/
57	<
78	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 83 | Line 62 | struct Isupport
62		int number;
63		};
64
65	<	static dlink_list support_list = { NULL, NULL, 0 };
66	<	MessageFile *isupportFile;
65	>	static dlink_list support_list;
66	>	static dlink_list support_list_lines;
67
68	<	/* memory is cheap. map 0-255 to equivalent mode */
69	<	unsigned int user_modes[256] =
68	>	const struct user_modes *umode_map[256];
69	>	const struct user_modes  umode_tab[] =
70		{
71	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
73	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
74	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
75	<	0,                  /* @ */
76	<	0,                  /* A */
77	<	0,                  /* B */
78	<	0,                  /* C */
79	<	UMODE_DEAF,         /* D */
80	<	0,                  /* E */
81	<	0,                  /* F */
82	<	UMODE_SOFTCALLERID, /* G */
83	<	0,                  /* H */
84	<	0,                  /* I */
85	<	0,                  /* J */
86	<	0,                  /* K */
87	<	0,                  /* L */
88	<	0,                  /* M */
89	<	0,                  /* N */
90	<	0,                  /* O */
91	<	0,                  /* P */
92	<	0,                  /* Q */
93	<	0,                  /* R */
94	<	0,                  /* S */
95	<	0,                  /* T */
96	<	0,                  /* U */
97	<	0,                  /* V */
98	<	0,                  /* W */
99	<	0,                  /* X */
121	<	0,                  /* Y */
122	<	0,                  /* Z 0x5A */
123	<	0, 0, 0, 0, 0,      /* 0x5F   */
124	<	0,                  /* 0x60   */
125	<	UMODE_ADMIN,        /* a */
126	<	UMODE_BOTS,         /* b */
127	<	UMODE_CCONN,        /* c */
128	<	UMODE_DEBUG,        /* d */
129	<	0,                  /* e */
130	<	UMODE_FULL,         /* f */
131	<	UMODE_CALLERID,     /* g */
132	<	0,                  /* h */
133	<	UMODE_INVISIBLE,    /* i */
134	<	0,                  /* j */
135	<	UMODE_SKILL,        /* k */
136	<	UMODE_LOCOPS,       /* l */
137	<	0,                  /* m */
138	<	UMODE_NCHANGE,      /* n */
139	<	UMODE_OPER,         /* o */
140	<	0,                  /* p */
141	<	0,                  /* q */
142	<	UMODE_REJ,          /* r */
143	<	UMODE_SERVNOTICE,   /* s */
144	<	0,                  /* t */
145	<	UMODE_UNAUTH,       /* u */
146	<	0,                  /* v */
147	<	UMODE_WALLOP,       /* w */
148	<	UMODE_EXTERNAL,     /* x */
149	<	UMODE_SPY,          /* y */
150	<	UMODE_OPERWALL,     /* z      0x7A */
151	<	0,0,0,0,0,          /* 0x7B - 0x7F */
152	<
153	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
154	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
155	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
156	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
157	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
158	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
159	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
160	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
71	>	{ 'D', UMODE_DEAF         },
72	>	{ 'F', UMODE_FARCONNECT   },
73	>	{ 'G', UMODE_SOFTCALLERID },
74	>	{ 'H', UMODE_HIDDEN       },
75	>	{ 'R', UMODE_REGONLY      },
76	>	{ 'S', UMODE_SSL          },
77	>	{ 'W', UMODE_WEBIRC       },
78	>	{ 'a', UMODE_ADMIN        },
79	>	{ 'b', UMODE_BOTS         },
80	>	{ 'c', UMODE_CCONN        },
81	>	{ 'd', UMODE_DEBUG        },
82	>	{ 'e', UMODE_EXTERNAL     },
83	>	{ 'f', UMODE_FULL         },
84	>	{ 'g', UMODE_CALLERID     },
85	>	{ 'i', UMODE_INVISIBLE    },
86	>	{ 'j', UMODE_REJ          },
87	>	{ 'k', UMODE_SKILL        },
88	>	{ 'l', UMODE_LOCOPS       },
89	>	{ 'n', UMODE_NCHANGE      },
90	>	{ 'o', UMODE_OPER         },
91	>	{ 'p', UMODE_HIDECHANS    },
92	>	{ 'q', UMODE_HIDEIDLE     },
93	>	{ 'r', UMODE_REGISTERED   },
94	>	{ 's', UMODE_SERVNOTICE   },
95	>	{ 'u', UMODE_UNAUTH       },
96	>	{ 'w', UMODE_WALLOP       },
97	>	{ 'x', UMODE_HIDDENHOST   },
98	>	{ 'y', UMODE_SPY          },
99	>	{ '\0', 0 }
100		};
101
102		void
103	<	assemble_umode_buffer(void)
103	>	user_usermodes_init(void)
104		{
166	–	unsigned int idx = 0;
105		char *umode_buffer_ptr = umode_buffer;
106
107	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
108	<	if (user_modes[idx])
109	<	*umode_buffer_ptr++ = idx;
107	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
108	>	{
109	>	umode_map[tab->c] = tab;
110	>	*umode_buffer_ptr++ = tab->c;
111	>	}
112
113		*umode_buffer_ptr = '\0';
114		}
#	Line 180 | Line 120 | assemble_umode_buffer(void)
120		* side effects - display to client user counts etc.
121		*/
122		void
123	<	show_lusers(struct Client *source_p)
123	>	show_lusers(struct Client *source_p)
124		{
125	<	const char *from, *to;
125	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
127	>	Count.invisi, dlink_list_length(&global_server_list));
128	>	else
129	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
130	>	Count.invisi, 1);
131	>
132	>	if (Count.oper)
133	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
134	>
135	>	if (dlink_list_length(&unknown_list))
136	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
137
138	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
138	>	if (dlink_list_length(&channel_list))
139	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
140	>
141	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
142		{
143	<	from = me.id;
144	<	to = source_p->id;
143	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
144	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
145		}
146		else
147		{
148	<	from = me.name;
149	<	to = source_p->name;
148	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
149	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
150		}
151
152	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
199	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
200	<	from, to, (Count.total-Count.invisi),
201	<	Count.invisi, dlink_list_length(&global_serv_list));
202	<	else
203	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
204	<	(Count.total-Count.invisi), Count.invisi, 1);
152	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
153
154	<	if (Count.oper > 0)
155	<	sendto_one(source_p, form_str(RPL_LUSEROP),
156	<	from, to, Count.oper);
209	<
210	<	if (dlink_list_length(&unknown_list) > 0)
211	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
212	<	from, to, dlink_list_length(&unknown_list));
213	<
214	<	if (dlink_list_length(&global_channel_list) > 0)
215	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
216	<	from, to,
217	<	dlink_list_length(&global_channel_list));
218	<
219	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
220	<	{
221	<	sendto_one(source_p, form_str(RPL_LUSERME),
222	<	from, to,
223	<	Count.local, Count.myserver);
224	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
225	<	from, to, Count.local, Count.max_loc,
226	<	Count.local, Count.max_loc);
227	<	}
228	<	else
229	<	{
230	<	sendto_one(source_p, form_str(RPL_LUSERME),
231	<	from, to, Count.total, 0);
232	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
233	<	from, to, Count.total, Count.max_tot,
234	<	Count.total, Count.max_tot);
235	<	}
236	<
237	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
238	<	from, to, Count.total, Count.max_tot,
239	<	Count.total, Count.max_tot);
240	<
241	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
242	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
243	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
154	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
155	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
156	>	Count.max_loc_cli, Count.totalrestartcount);
157
158	<	if (Count.local > MaxClientCount)
159	<	MaxClientCount = Count.local;
158	>	if (Count.local > Count.max_loc_cli)
159	>	Count.max_loc_cli = Count.local;
160
161	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
162	<	MaxConnectionCount = Count.local + Count.myserver;
161	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
162	>	Count.max_loc_con = Count.local + Count.myserver;
163		}
164
165		/* show_isupport()
#	Line 256 | Line 169 | show_lusers(struct Client *source_p)
169		* side effects - display to client what we support (for them)
170		*/
171		void
172	<	show_isupport(struct Client *source_p)
172	>	show_isupport(struct Client *source_p)
173		{
174	<	send_message_file(source_p, isupportFile);
174	>	const dlink_node *node = NULL;
175	>
176	>	DLINK_FOREACH(node, support_list_lines.head)
177	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
178		}
179
180	<	/*
181	<	** register_local_user
182	<	**      This function is called when both NICK and USER messages
183	<	**      have been accepted for the client, in whatever order. Only
184	<	**      after this, is the USER message propagated.
185	<	**
186	<	**      NICK's must be propagated at once when received, although
187	<	**      it would be better to delay them too until full info is
188	<	**      available. Doing it is not so simple though, would have
189	<	**      to implement the following:
190	<	**
191	<	**      (actually it has been implemented already for a while) -orabidoo
192	<	**
193	<	**      1) user telnets in and gives only "NICK foobar" and waits
194	<	**      2) another user far away logs in normally with the nick
195	<	**         "foobar" (quite legal, as this server didn't propagate
196	<	**         it).
197	<	**      3) now this server gets nick "foobar" from outside, but
198	<	**         has alread the same defined locally. Current server
199	<	**         would just issue "KILL foobar" to clean out dups. But,
200	<	**         this is not fair. It should actually request another
201	<	**         nick from local user or kill him/her...
202	<	*/
180	>
181	>	/* report_and_set_user_flags()
182	>	*
183	>	* inputs       - pointer to source_p
184	>	*              - pointer to conf for this user
185	>	* output       - NONE
186	>	* side effects - Report to user any special flags
187	>	*                they are getting, and set them.
188	>	*/
189	>	static void
190	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
191	>	{
192	>	/* If this user is being spoofed, tell them so */
193	>	if (IsConfDoSpoofIp(conf))
194	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
195	>
196	>	/* If this user is in the exception class, set it "E lined" */
197	>	if (IsConfExemptKline(conf))
198	>	{
199	>	SetExemptKline(source_p);
200	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
201	>	}
202	>
203	>	/*
204	>	* The else here is to make sure that G line exempt users
205	>	* do not get noticed twice.
206	>	*/
207	>	else if (IsConfExemptGline(conf))
208	>	{
209	>	SetExemptGline(source_p);
210	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
211	>	}
212	>
213	>	if (IsConfExemptResv(conf))
214	>	{
215	>	SetExemptResv(source_p);
216	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
217	>	}
218	>
219	>	/* If this user is exempt from user limits set it "F lined" */
220	>	if (IsConfExemptLimits(conf))
221	>	{
222	>	SetExemptLimits(source_p);
223	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
224	>	}
225	>
226	>	if (IsConfCanFlood(conf))
227	>	{
228	>	SetCanFlood(source_p);
229	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
230	>	"protection, aren't you fearsome.");
231	>	}
232	>	}
233	>
234	>	/* introduce_client()
235	>	*
236	>	* inputs       - source_p
237	>	* output       - NONE
238	>	* side effects - This common function introduces a client to the rest
239	>	*                of the net, either from a local client connect or
240	>	*                from a remote connect.
241	>	*/
242	>	static void
243	>	introduce_client(struct Client *source_p)
244	>	{
245	>	dlink_node *node = NULL;
246	>	char ubuf[IRCD_BUFSIZE] = "";
247	>
248	>	if (MyClient(source_p))
249	>	send_umode(source_p, source_p, 0, ubuf);
250	>	else
251	>	send_umode(NULL, source_p, 0, ubuf);
252	>
253	>	watch_check_hash(source_p, RPL_LOGON);
254	>
255	>	if (ubuf[0] == '\0')
256	>	{
257	>	ubuf[0] = '+';
258	>	ubuf[1] = '\0';
259	>	}
260	>
261	>	DLINK_FOREACH(node, local_server_list.head)
262	>	{
263	>	struct Client *server = node->data;
264	>
265	>	if (server == source_p->from)
266	>	continue;
267	>
268	>	if (IsCapable(server, CAP_SVS))
269	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
270	>	source_p->servptr->id,
271	>	source_p->name, source_p->hopcount+1,
272	>	(unsigned long)source_p->tsinfo,
273	>	ubuf, source_p->username, source_p->host,
274	>	source_p->sockhost, source_p->id,
275	>	source_p->account,
276	>	source_p->info);
277	>	else
278	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
279	>	source_p->servptr->id,
280	>	source_p->name, source_p->hopcount+1,
281	>	(unsigned long)source_p->tsinfo,
282	>	ubuf, source_p->username, source_p->host,
283	>	source_p->sockhost, source_p->id, source_p->info);
284	>
285	>	if (!EmptyString(source_p->certfp))
286	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
287	>	}
288	>	}
289	>
290	>	/* user_welcome()
291	>	*
292	>	* inputs       - client pointer to client to welcome
293	>	* output       - NONE
294	>	* side effects -
295	>	*/
296	>	static void
297	>	user_welcome(struct Client *source_p)
298	>	{
299	>	#if defined(__TIME__) && defined(__DATE__)
300	>	static const char built_date[] = __DATE__ " at " __TIME__;
301	>	#else
302	>	static const char built_date[] = "unknown";
303	>	#endif
304	>
305	>	#ifdef HAVE_LIBCRYPTO
306	>	if (HasFlag(source_p, FLAGS_SSL))
307	>	{
308	>	AddUMode(source_p, UMODE_SSL);
309	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
310	>	ssl_get_cipher(source_p->connection->fd.ssl));
311	>	}
312	>	#endif
313	>
314	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
315	>	source_p->name);
316	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
317	>	get_listener_name(source_p->connection->listener), ircd_version);
318	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
319	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
320	>	show_isupport(source_p);
321	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
322	>
323	>	show_lusers(source_p);
324	>	motd_signon(source_p);
325	>	}
326	>
327	>	/* check_xline()
328	>	*
329	>	* inputs       - pointer to client to test
330	>	* outupt       - 1 if exiting 0 if ok
331	>	* side effects -
332	>	*/
333	>	static int
334	>	check_xline(struct Client *source_p)
335	>	{
336	>	struct MaskItem *conf = NULL;
337	>
338	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
339	>	{
340	>	++conf->count;
341	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
342	>	"X-line Rejecting [%s] [%s], user %s [%s]",
343	>	source_p->info, conf->reason,
344	>	get_client_name(source_p, HIDE_IP),
345	>	source_p->sockhost);
346	>
347	>	++ServerStats.is_ref;
348	>	exit_client(source_p, "Bad user info");
349	>	return 1;
350	>	}
351	>
352	>	return 0;
353	>	}
354	>
355	>	/*! \brief This function is called when both NICK and USER messages
356	>	*      have been accepted for the client, in whatever order. Only
357	>	*      after this, is the UID message propagated.
358	>	* \param source_p Pointer to given client to introduce
359	>	*/
360		void
361	<	register_local_user(struct Client *client_p, struct Client *source_p,
289	<	const char *nick, const char *username)
361	>	register_local_user(struct Client *source_p)
362		{
363	<	const struct AccessItem *aconf = NULL;
364	<	char ipaddr[HOSTIPLEN];
293	<	dlink_node *ptr;
294	<	dlink_node *m;
363	>	const char *id = NULL;
364	>	const struct MaskItem *conf = NULL;
365
366	<	assert(source_p != NULL);
366	>	assert(source_p == source_p->from);
367		assert(MyConnect(source_p));
368	<	assert(source_p->username != username);
368	>	assert(IsUnknown(source_p));
369	>	assert(!source_p->connection->registration);
370
371	<	if (ConfigFileEntry.ping_cookie)
371	>	if (ConfigGeneral.ping_cookie)
372		{
373	<	if (!IsPingSent(source_p) &&
303	<	source_p->localClient->random_ping == 0)
373	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
374		{
375	<	source_p->localClient->random_ping = (unsigned long)rand();
376	<	sendto_one(source_p, "PING :%lu",
377	<	source_p->localClient->random_ping);
375	>	do
376	>	source_p->connection->random_ping = genrand_int32();
377	>	while (!source_p->connection->random_ping);
378	>
379	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
380		SetPingSent(source_p);
381		return;
382		}
#	Line 313 | Line 385 | register_local_user(struct Client *clien
385		return;
386		}
387
388	<	source_p->localClient->last = CurrentTime;
388	>	source_p->connection->last_privmsg = CurrentTime;
389		/* Straight up the maximum rate of flooding... */
390	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
390	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
391
392	<	if (!execute_callback(client_check_cb, source_p, username))
392	>	if (!check_client(source_p))
393		return;
394
395	<	if (valid_hostname(source_p->host) == 0)
395	>	if (!valid_hostname(source_p->host))
396		{
397	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
398	<	"character in your hostname", me.name, source_p->name);
399	<	strlcpy(source_p->host, source_p->sockhost,
328	<	sizeof(source_p->host));
397	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
398	>	"character in your hostname");
399	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
400		}
401
402	<	ptr   = source_p->localClient->confs.head;
332	<	aconf = map_to_conf(ptr->data);
402	>	conf = source_p->connection->confs.head->data;
403
404		if (!IsGotId(source_p))
405		{
406	<	const char *p = NULL;
406	>	char username[USERLEN + 1] = "";
407	>	const char *p = username;
408		unsigned int i = 0;
409
410	<	if (IsNeedIdentd(aconf))
410	>	if (IsNeedIdentd(conf))
411		{
412	<	ServerStats->is_ref++;
413	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
414	<	"identd to use this server", me.name, source_p->name);
415	<	exit_client(source_p, &me, "Install identd");
412	>	++ServerStats.is_ref;
413	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
414	>	"identd to use this server");
415	>	exit_client(source_p, "Install identd");
416		return;
417		}
418
419	<	p = username;
419	>	strlcpy(username, source_p->username, sizeof(username));
420
421	<	if (!IsNoTilde(aconf))
421	>	if (!IsNoTilde(conf))
422		source_p->username[i++] = '~';
423
424	<	while (*p && i < USERLEN)
425	<	{
355	<	if (*p != '[')
356	<	source_p->username[i++] = *p;
357	<	p++;
358	<	}
424	>	for (; *p && i < USERLEN; ++p)
425	>	source_p->username[i++] = *p;
426
427		source_p->username[i] = '\0';
428		}
429
430	<	/* password check */
431	<	if (!EmptyString(aconf->passwd))
430	>	/* Password check */
431	>	if (!EmptyString(conf->passwd))
432		{
433	<	const char *pass = source_p->localClient->passwd;
367	<
368	<	if (!match_conf_password(pass, aconf))
433	>	if (!match_conf_password(source_p->connection->password, conf))
434		{
435	<	ServerStats->is_ref++;
436	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
437	<	me.name, source_p->name);
438	<	exit_client(source_p, &me, "Bad Password");
435	>	++ServerStats.is_ref;
436	>
437	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
438	>	exit_client(source_p, "Bad Password");
439		return;
440		}
441		}
442
443	<	/* don't free source_p->localClient->passwd here - it can be required
444	<	* by masked /stats I if there are auth{} blocks with need_password = no;
443	>	/*
444	>	* Don't free source_p->connection->password here - it can be required
445	>	* by masked /stats I if there are auth {} blocks with need_password = no;
446		* --adx
447		*/
448
449	<	/* report if user has &^>= etc. and set flags as needed in source_p */
450	<	report_and_set_user_flags(source_p, aconf);
449	>	/*
450	>	* Report if user has &^>= etc. and set flags as needed in source_p
451	>	*/
452	>	report_and_set_user_flags(source_p, conf);
453
454	<	/* Limit clients -
454	>	if (IsDead(source_p))
455	>	return;
456	>
457	>	/*
458	>	* Limit clients -
459		* We want to be able to have servers and F-line clients
460		* connect, so save room for "buffer" connections.
461		* Smaller servers may want to decrease this, and it should
462		* probably be just a percentage of the MAXCLIENTS...
463		*   -Taner
464		*/
465	<	/* Except "F:" clients */
466	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
395	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
465	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
466	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
467		{
468	<	sendto_realops_flags(UMODE_FULL, L_ALL,
468	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
469		"Too many clients, rejecting %s[%s].",
470	<	nick, source_p->host);
471	<	ServerStats->is_ref++;
472	<	exit_client(source_p, &me, "Sorry, server is full - try later");
470	>	source_p->name, source_p->host);
471	>	++ServerStats.is_ref;
472	>	exit_client(source_p, "Sorry, server is full - try later");
473		return;
474		}
475
476	<	/* valid user name check */
406	<	if (valid_username(source_p->username) == 0)
476	>	if (!valid_username(source_p->username, 1))
477		{
478	<	char tmpstr2[IRCD_BUFSIZE];
478	>	char buf[IRCD_BUFSIZE] = "";
479
480	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
481	<	nick, source_p->username, source_p->host);
482	<	ServerStats->is_ref++;
483	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
484	<	exit_client(source_p, &me, tmpstr2);
480	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
481	>	"Invalid username: %s (%s@%s)",
482	>	source_p->name, source_p->username, source_p->host);
483	>	++ServerStats.is_ref;
484	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
485	>	exit_client(source_p, buf);
486		return;
487		}
488
489	<	assert(source_p == client_p);
419	<
420	<	/* end of valid user name check */
421	<	if (check_xline(source_p) || check_regexp_xline(source_p))
489	>	if (check_xline(source_p))
490		return;
491
492	<	if (IsDead(client_p))
493	<	return;
426	<
427	<	if (source_p->id[0] == '\0' && me.id[0])
428	<	{
429	<	char *id = (char *) execute_callback(uid_get_cb, source_p);
430	<	while (hash_find_id(id) != NULL)
431	<	id = uid_get(NULL);
432	<
433	<	strlcpy(source_p->id, id, sizeof(source_p->id));
434	<	hash_add_id(source_p);
435	<	}
436	<
437	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
438	<	source_p->localClient->ip.ss_len, ipaddr,
439	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
492	>	while (hash_find_id((id = uid_get())))
493	>	;
494
495	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
496	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
443	<	nick, source_p->username, source_p->host,
444	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
445	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
446	<	source_p->info);
495	>	strlcpy(source_p->id, id, sizeof(source_p->id));
496	>	hash_add_id(source_p);
497
498	<	/* If they have died in send_* don't do anything. */
499	<	if (IsDead(source_p))
500	<	return;
498	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
499	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
500	>	source_p->name, source_p->username, source_p->host,
501	>	source_p->sockhost,
502	>	get_client_class(&source_p->connection->confs),
503	>	source_p->info, source_p->id);
504
505	<	if (ConfigFileEntry.invisible_on_connect)
506	<	source_p->umodes |= UMODE_INVISIBLE;
507	<	Count.invisi++;
505	>	if (ConfigGeneral.invisible_on_connect)
506	>	{
507	>	AddUMode(source_p, UMODE_INVISIBLE);
508	>	++Count.invisi;
509	>	}
510
511	<	if ((++Count.local) > Count.max_loc)
511	>	if (++Count.local > Count.max_loc)
512		{
513		Count.max_loc = Count.local;
514
515		if (!(Count.max_loc % 10))
516	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
516	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
517	>	"New maximum local client connections: %u",
518		Count.max_loc);
519		}
520
465	–	SetClient(source_p);
466	–
467	–	source_p->servptr = &me;
468	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
469	–
470	–	/* Increment our total user count here */
521		if (++Count.total > Count.max_tot)
522		Count.max_tot = Count.total;
523	<	Count.totalrestartcount++;
523	>	++Count.totalrestartcount;
524
525	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
525	>	assert(source_p->servptr == &me);
526	>	SetClient(source_p);
527	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
528	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
529
530	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
531	<	{
532	<	free_dlink_node(m);
533	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
481	<	}
482	<	else assert(0);
530	>	assert(dlinkFind(&unknown_list, source_p));
531	>
532	>	dlink_move_node(&source_p->connection->lclient_node,
533	>	&unknown_list, &local_client_list);
534
535		user_welcome(source_p);
536		add_user_host(source_p->username, source_p->host, 0);
537		SetUserHost(source_p);
538
539	<	introduce_client(client_p, source_p);
539	>	introduce_client(source_p);
540		}
541
542		/* register_remote_user()
543		*
544	<	* inputs       - client_p directly connected client
494	<	*              - source_p remote or directly connected client
544	>	* inputs       - source_p remote or directly connected client
545		*              - username to register as
546		*              - host name to register as
547		*              - server name
498	–	*              - realname (gecos)
548		* output       - NONE
549		* side effects - This function is called when a remote client
550		*                is introduced by a server.
551		*/
552		void
553	<	register_remote_user(struct Client *client_p, struct Client *source_p,
505	<	const char *username, const char *host, const char *server,
506	<	const char *realname)
553	>	register_remote_user(struct Client *source_p)
554		{
555	<	struct Client *target_p;
509	<
510	<	assert(source_p != NULL);
511	<	assert(source_p->username != username);
512	<
513	<	strlcpy(source_p->host, host, sizeof(source_p->host));
514	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
515	<	strlcpy(source_p->username, username, sizeof(source_p->username));
516	<
517	<	/* Increment our total user count here */
518	<	if (++Count.total > Count.max_tot)
519	<	Count.max_tot = Count.total;
520	<
521	<	source_p->from->serv->dep_users++;
522	<
523	<	/*
524	<	* coming from another server, take the servers word for it
525	<	*/
526	<	source_p->servptr = find_server(server);
527	<
528	<	/* Super GhostDetect:
529	<	* If we can't find the server the user is supposed to be on,
530	<	* then simply blow the user away.        -Taner
531	<	*/
532	<	if (source_p->servptr == NULL)
533	<	{
534	<	sendto_realops_flags(UMODE_ALL, L_ALL,
535	<	"No server %s for user %s[%s@%s] from %s",
536	<	server, source_p->name, source_p->username,
537	<	source_p->host, source_p->from->name);
538	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
539	<
540	<	/* XXX */
541	<	SetKilled(source_p);
542	<	exit_client(source_p, &me, "Ghosted Client");
543	<	return;
544	<	}
555	>	const struct Client *target_p = NULL;
556
557		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
558		{
559	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
559	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
560		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
561	<	client_p->name, source_p->name, source_p->username,
561	>	source_p->from->name, source_p->name, source_p->username,
562		source_p->host, source_p->servptr->name,
563		target_p->name, target_p->from->name);
564	<	kill_client(client_p, source_p,
565	<	"%s (NICK from wrong direction (%s != %s))",
566	<	me.name, source_p->servptr->name, target_p->from->name);
567	<	SetKilled(source_p);
557	<	exit_client(source_p, &me, "USER server wrong direction");
558	<	return;
559	<	}
560	<
561	<	SetClient(source_p);
562	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
563	<	add_user_host(source_p->username, source_p->host, 1);
564	<	SetUserHost(source_p);
565	<
566	<	introduce_client(client_p, source_p);
567	<	}
568	<
569	<	/* introduce_client()
570	<	*
571	<	* inputs       - client_p
572	<	*              - source_p
573	<	* output       - NONE
574	<	* side effects - This common function introduces a client to the rest
575	<	*                of the net, either from a local client connect or
576	<	*                from a remote connect.
577	<	*/
578	<	static void
579	<	introduce_client(struct Client *client_p, struct Client *source_p)
580	<	{
581	<	dlink_node *server_node;
582	<	static char ubuf[12];
583	<
584	<	if (MyClient(source_p))
585	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
586	<	else
587	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
564	>	sendto_one(source_p->from,
565	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
566	>	me.id, source_p->id, me.name, source_p->servptr->name,
567	>	target_p->from->name);
568
569	<	if (*ubuf == '\0')
570	<	{
571	<	ubuf[0] = '+';
592	<	ubuf[1] = '\0';
569	>	AddFlag(source_p, FLAGS_KILLED);
570	>	exit_client(source_p, "UID server wrong direction");
571	>	return;
572		}
573
574	<	/* arghhh one could try not introducing new nicks to ll leafs
575	<	* but then you have to introduce them "on the fly" in SJOIN
576	<	* not fun.
598	<	* Its not going to cost much more bandwidth to simply let new
599	<	* nicks just ride on through.
574	>	/*
575	>	* If the nick has been introduced by a services server,
576	>	* make it a service as well.
577		*/
578	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
579	+	AddFlag(source_p, FLAGS_SERVICE);
580
581	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
582	<	* you _need_ to if you aren't going to burst everyone initially.
604	<	*
605	<	* Only send to non CAP_LL servers, unless we're a lazylink leaf,
606	<	* in that case just send it to the uplink.
607	<	* -davidt
608	<	* rewritten to cope with SIDs .. eww eww eww --is
609	<	*/
581	>	if (++Count.total > Count.max_tot)
582	>	Count.max_tot = Count.total;
583
584	<	/* XXX THESE NEED A PREFIX!?!?!? */
585	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
586	<	client_p != uplink)
587	<	{
588	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
616	<	{
617	<	sendto_one(uplink, ":%s UID %s %d %lu %s %s %s %s %s :%s",
618	<	source_p->servptr->id,
619	<	source_p->name, source_p->hopcount+1,
620	<	(unsigned long)source_p->tsinfo,
621	<	ubuf, source_p->username, source_p->host,
622	<	((MyClient(source_p) && !IsIPSpoof(source_p)) ?
623	<	source_p->sockhost : "0"),
624	<	source_p->id, source_p->info);
625	<	}
626	<	else
627	<	{
628	<	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
629	<	source_p->name, source_p->hopcount+1,
630	<	(unsigned long)source_p->tsinfo,
631	<	ubuf, source_p->username, source_p->host,
632	<	source_p->servptr->name,
633	<	source_p->info);
634	<	}
635	<	}
636	<	else
637	<	{
638	<	DLINK_FOREACH(server_node, serv_list.head)
639	<	{
640	<	struct Client *server = server_node->data;
584	>	SetClient(source_p);
585	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
586	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
587	>	add_user_host(source_p->username, source_p->host, 1);
588	>	SetUserHost(source_p);
589
590	<	if (IsCapable(server, CAP_LL) || server == client_p)
591	<	continue;
590	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
591	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
592	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
593	>	source_p->servptr->name,
594	>	source_p->name, source_p->username, source_p->host,
595	>	source_p->sockhost, source_p->info, source_p->id);
596
597	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
646	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
647	<	source_p->servptr->id,
648	<	source_p->name, source_p->hopcount+1,
649	<	(unsigned long)source_p->tsinfo,
650	<	ubuf, source_p->username, source_p->host,
651	<	((MyClient(source_p)&&!IsIPSpoof(source_p))?source_p->sockhost:"0"),
652	<	source_p->id, source_p->info);
653	<	else
654	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
655	<	source_p->name, source_p->hopcount+1,
656	<	(unsigned long)source_p->tsinfo,
657	<	ubuf, source_p->username, source_p->host,
658	<	source_p->servptr->name,
659	<	source_p->info);
660	<	}
661	<	}
597	>	introduce_client(source_p);
598		}
599
600		/* valid_hostname()
#	Line 675 | Line 611 | valid_hostname(const char *hostname)
611		{
612		const char *p = hostname;
613
614	<	assert(p != NULL);
614	>	assert(p);
615
616	<	if (('.' == *p) || (':' == *p))
617	<	return (0);
616	>	if (EmptyString(p) || *p == '.' || *p == ':')
617	>	return 0;
618
619	<	while (*p)
684	<	{
619	>	for (; *p; ++p)
620		if (!IsHostChar(*p))
621	<	return (0);
687	<	p++;
688	<	}
621	>	return 0;
622
623	<	return (1);
623	>	return p - hostname <= HOSTLEN;
624		}
625
626		/* valid_username()
#	Line 702 | Line 635 | valid_hostname(const char *hostname)
635		* style of username
636		*/
637		int
638	<	valid_username(const char *username)
638	>	valid_username(const char *username, const int local)
639		{
640	<	int dots      = 0;
640	>	unsigned int dots = 0;
641		const char *p = username;
642
643	<	assert(p != NULL);
643	>	assert(p);
644
645	<	if ('~' == *p)
645	>	if (*p == '~')
646		++p;
647
648	<	/* reject usernames that don't start with an alphanum
648	>	/*
649	>	* Reject usernames that don't start with an alphanum
650		* i.e. reject jokers who have '-@somehost' or '.@somehost'
651		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
652		*/
653		if (!IsAlNum(*p))
654	<	return (0);
654	>	return 0;
655
656	<	while (*++p)
656	>	if (local)
657		{
658	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
658	>	while (*++p)
659		{
660	<	dots++;
661	<
662	<	if (dots > ConfigFileEntry.dots_in_ident)
663	<	return (0);
664	<	if (!IsUserChar(p[1]))
665	<	return (0);
660	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
661	>	{
662	>	if (++dots > ConfigGeneral.dots_in_ident)
663	>	return 0;
664	>	if (!IsUserChar(*(p + 1)))
665	>	return 0;
666	>	}
667	>	else if (!IsUserChar(*p))
668	>	return 0;
669		}
733	–	else if (!IsUserChar(*p))
734	–	return (0);
670		}
671	<
737	<	return (1);
738	<	}
739	<
740	<	/* report_and_set_user_flags()
741	<	*
742	<	* inputs       - pointer to source_p
743	<	*              - pointer to aconf for this user
744	<	* output       - NONE
745	<	* side effects - Report to user any special flags
746	<	*                they are getting, and set them.
747	<	*/
748	<	static void
749	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
750	<	{
751	<	/* If this user is being spoofed, tell them so */
752	<	if (IsConfDoSpoofIp(aconf))
753	<	{
754	<	sendto_one(source_p,
755	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
756	<	me.name, source_p->name);
757	<	}
758	<
759	<	/* If this user is in the exception class, Set it "E lined" */
760	<	if (IsConfExemptKline(aconf))
761	<	{
762	<	SetExemptKline(source_p);
763	<	sendto_one(source_p,
764	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
765	<	me.name, source_p->name);
766	<	}
767	<
768	<	/* The else here is to make sure that G line exempt users
769	<	* do not get noticed twice.
770	<	*/
771	<	else if (IsConfExemptGline(aconf))
772	<	{
773	<	SetExemptGline(source_p);
774	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
775	<	me.name, source_p->name);
776	<	}
777	<
778	<	if (IsConfExemptResv(aconf))
779	<	{
780	<	SetExemptResv(source_p);
781	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
782	<	me.name, source_p->name);
783	<	}
784	<
785	<	/* If this user is exempt from user limits set it "F lined" */
786	<	if (IsConfExemptLimits(aconf))
787	<	{
788	<	SetExemptLimits(source_p);
789	<	sendto_one(source_p,
790	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
791	<	me.name,source_p->name);
792	<	}
793	<
794	<	/* If this user is exempt from idle time outs */
795	<	if (IsConfIdlelined(aconf))
671	>	else
672		{
673	<	SetIdlelined(source_p);
674	<	sendto_one(source_p,
675	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
800	<	me.name, source_p->name);
673	>	while (*++p)
674	>	if (!IsUserChar(*p))
675	>	return 0;
676		}
677
678	<	if (IsConfCanFlood(aconf))
804	<	{
805	<	SetCanFlood(source_p);
806	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
807	<	"protection, aren't you fearsome.",
808	<	me.name, source_p->name);
809	<	}
678	>	return p - username <= USERLEN;
679		}
680
681	<	/* do_local_user()
681	>	/* clean_nick_name()
682		*
683	<	* inputs       -
684	<	* output       - NONE
685	<	* side effects -
683	>	* input        - nickname
684	>	*              - whether it's a local nick (1) or remote (0)
685	>	* output       - none
686	>	* side effects - walks through the nickname, returning 0 if erroneous
687		*/
688	<	void
689	<	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
820	<	const char *username, const char *host, const char *server,
821	<	const char *realname)
688	>	int
689	>	valid_nickname(const char *nickname, const int local)
690		{
691	<	assert(source_p != NULL);
824	<	assert(source_p->username != username);
825	<
826	<	if (source_p == NULL)
827	<	return;
828	<
829	<	if (!IsUnknown(source_p))
830	<	{
831	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
832	<	me.name, nick);
833	<	return;
834	<	}
691	>	const char *p = nickname;
692
693	<	source_p->flags |= FLAGS_GOTUSER;
693	>	assert(p);
694
695		/*
696	<	* don't take the clients word for it, ever
840	<	*/
841	<	source_p->servptr = &me;
842	<
843	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
844	<
845	<	if (!IsGotId(source_p))
846	<	{
847	<	/* save the username in the client
848	<	* If you move this you'll break ping cookies..you've been warned
849	<	*/
850	<	strlcpy(source_p->username, username, sizeof(source_p->username));
851	<	}
852	<
853	<	if (source_p->name[0])
854	<	{
855	<	/* NICK already received, now I have USER... */
856	<	register_local_user(client_p, source_p, source_p->name, username);
857	<	}
858	<	}
859	<
860	<	/* change_simple_umode()
861	<	*
862	<	* this callback can be hooked to allow special handling of
863	<	* certain usermodes
864	<	*/
865	<	static void *
866	<	change_simple_umode(va_list args)
867	<	{
868	<	struct Client *source_p;
869	<	int what;
870	<	unsigned int flag;
871	<
872	<	va_arg(args, struct Client *);
873	<	source_p = va_arg(args, struct Client *);
874	<	what = va_arg(args, int);
875	<	flag = va_arg(args, unsigned int);
876	<
877	<	if (what == MODE_ADD)
878	<	source_p->umodes |= flag;
879	<	else
880	<	source_p->umodes &= ~flag;
881	<
882	<	return NULL;
883	<	}
884	<
885	<	/* set_user_mode()
886	<	*
887	<	* added 15/10/91 By Darren Reed.
888	<	* parv[0] - sender
889	<	* parv[1] - username to change mode for
890	<	* parv[2] - modes to change
891	<	*/
892	<	void
893	<	set_user_mode(struct Client *client_p, struct Client *source_p,
894	<	int parc, char *parv[])
895	<	{
896	<	unsigned int flag, setflags;
897	<	char **p, *m, buf[IRCD_BUFSIZE];
898	<	struct Client *target_p;
899	<	int what = MODE_ADD, badflag = 0, i;
900	<	#if 0
901	<	/* already covered by m_mode */
902	<	if (parc < 2)
903	<	{
904	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
905	<	me.name, source_p->name, "MODE");
906	<	return;
907	<	}
908	<	#endif
909	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
910	<	{
911	<	if (MyConnect(source_p))
912	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
913	<	me.name, source_p->name, parv[1]);
914	<	return;
915	<	}
916	<
917	<	/* Dont know why these were commented out..
918	<	* put them back using new sendto() funcs
696	>	* Nicks can't start with a digit or - or be 0 length.
697		*/
698	<	if (IsServer(source_p))
699	<	{
922	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
923	<	parv[1], source_p->name);
924	<	return;
925	<	}
926	<
927	<	if (source_p != target_p || target_p->from != source_p->from)
928	<	{
929	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
930	<	me.name, source_p->name);
931	<	return;
932	<	}
933	<
934	<	if (parc < 3)
935	<	{
936	<	m = buf;
937	<	*m++ = '+';
938	<
939	<	for (i = 0; i < 128; i++)
940	<	if (source_p->umodes & user_modes[i])
941	<	*m++ = (char)i;
942	<	*m = '\0';
943	<
944	<	sendto_one(source_p, form_str(RPL_UMODEIS),
945	<	me.name, source_p->name, buf);
946	<	return;
947	<	}
948	<
949	<	execute_callback(entering_umode_cb, client_p, source_p);
950	<
951	<	/* find flags already set for user */
952	<	setflags = source_p->umodes;
953	<
954	<	/* parse mode change string(s) */
955	<	for (p = &parv[2]; p && *p; p++)
956	<	{
957	<	for (m = *p; *m; m++)
958	<	{
959	<	switch (*m)
960	<	{
961	<	case '+':
962	<	what = MODE_ADD;
963	<	break;
964	<	case '-':
965	<	what = MODE_DEL;
966	<	break;
967	<	case 'o':
968	<	if (what == MODE_ADD)
969	<	{
970	<	if (IsServer(client_p) && !IsOper(source_p))
971	<	{
972	<	++Count.oper;
973	<	SetOper(source_p);
974	<	}
975	<	}
976	<	else
977	<	{
978	<	/* Only decrement the oper counts if an oper to begin with
979	<	* found by Pat Szuta, Perly , perly@xnet.com
980	<	*/
981	<	if (!IsOper(source_p))
982	<	break;
983	<
984	<	ClearOper(source_p);
985	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
986	<	Count.oper--;
987	<
988	<	if (MyConnect(source_p))
989	<	{
990	<	dlink_node *dm;
991	<
992	<	detach_conf(source_p, OPER_TYPE);
993	<	ClearOperFlags(source_p);
994	<
995	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
996	<	free_dlink_node(dm);
997	<	}
998	<	}
999	<
1000	<	break;
1001	<
1002	<	/* we may not get these,
1003	<	* but they shouldnt be in default
1004	<	*/
1005	<	case ' ' :
1006	<	case '\n':
1007	<	case '\r':
1008	<	case '\t':
1009	<	break;
1010	<
1011	<	default:
1012	<	if ((flag = user_modes[(unsigned char)*m]))
1013	<	{
1014	<	if (MyConnect(source_p) && !IsOper(source_p) &&
1015	<	(ConfigFileEntry.oper_only_umodes & flag))
1016	<	{
1017	<	badflag = 1;
1018	<	}
1019	<	else
1020	<	execute_callback(umode_cb, client_p, source_p, what, flag);
1021	<	}
1022	<	else
1023	<	{
1024	<	if (MyConnect(source_p))
1025	<	badflag = 1;
1026	<	}
1027	<
1028	<	break;
1029	<	}
1030	<	}
1031	<	}
1032	<
1033	<	if (badflag)
1034	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
1035	<	me.name, source_p->name);
698	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
699	>	return 0;
700
701	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
702	<	{
703	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1040	<	me.name, source_p->name);
1041	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1042	<	}
1043	<
1044	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1045	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
1046	<	{
1047	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1048	<	me.name, source_p->name);
1049	<	source_p->umodes &= ~UMODE_ADMIN;
1050	<	}
1051	<
1052	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
1053	<	++Count.invisi;
1054	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
1055	<	--Count.invisi;
701	>	for (; *p; ++p)
702	>	if (!IsNickChar(*p))
703	>	return 0;
704
705	<	/* compare new flags with old flags and send string which
1058	<	* will cause servers to update correctly.
1059	<	*/
1060	<	send_umode_out(client_p, source_p, setflags);
705	>	return p - nickname <= NICKLEN;
706		}
707
708		/* send_umode()
709		* send the MODE string for user (user) to connection client_p
710		* -avalon
711	+	*
712	+	* inputs       - client_p
713	+	*              - source_p
714	+	*              - int old
715	+	*              - sendmask mask of modes to send
716	+	*              - suplied umode_buf
717	+	* output       - NONE
718		*/
719		void
720		send_umode(struct Client *client_p, struct Client *source_p,
721	<	unsigned int old, unsigned int sendmask, char *umode_buf)
721	>	unsigned int old, char *umode_buf)
722		{
1071	–	int what = 0;
1072	–	unsigned int i;
1073	–	unsigned int flag;
723		char *m = umode_buf;
724	+	int what = 0;
725
726	<	/* build a string in umode_buf to represent the change in the user's
726	>	/*
727	>	* Build a string in umode_buf to represent the change in the user's
728		* mode between the new (source_p->umodes) and 'old'.
729		*/
730	<	for (i = 0; i < 128; i++)
730	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
731		{
732	<	flag = user_modes[i];
1082	<	if (!flag)
1083	<	continue;
1084	<
1085	<	if (MyClient(source_p) && !(flag & sendmask))
1086	<	continue;
1087	<
1088	<	if ((flag & old) && !(source_p->umodes & flag))
732	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
733		{
734		if (what == MODE_DEL)
735	<	*m++ = (char)i;
735	>	*m++ = tab->c;
736		else
737		{
738		what = MODE_DEL;
739		*m++ = '-';
740	<	*m++ = (char)i;
740	>	*m++ = tab->c;
741		}
742		}
743	<	else if (!(flag & old) && (source_p->umodes & flag))
743	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
744		{
745		if (what == MODE_ADD)
746	<	*m++ = (char)i;
746	>	*m++ = tab->c;
747		else
748		{
749		what = MODE_ADD;
750		*m++ = '+';
751	<	*m++ = (char)i;
751	>	*m++ = tab->c;
752		}
753		}
754		}
#	Line 1112 | Line 756 | send_umode(struct Client *client_p, stru
756		*m = '\0';
757
758		if (*umode_buf && client_p)
759	<	sendto_one(client_p, ":%s MODE %s :%s",
760	<	source_p->name, source_p->name, umode_buf);
759	>	sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
760	>	client_p->name, client_p->username,
761	>	client_p->host, client_p->name, umode_buf);
762		}
763
764		/* send_umode_out()
#	Line 1123 | Line 768 | send_umode(struct Client *client_p, stru
768		* side effects - Only send ubuf out to servers that know about this client
769		*/
770		void
771	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1127	<	unsigned int old)
771	>	send_umode_out(struct Client *source_p, unsigned int old)
772		{
773	<	char buf[IRCD_BUFSIZE];
1130	<	dlink_node *ptr = NULL;
773	>	char buf[IRCD_BUFSIZE] = "";
774
775	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1133	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1134	<
1135	<	if (*buf)
1136	<	{
1137	<	DLINK_FOREACH(ptr, serv_list.head)
1138	<	{
1139	<	struct Client *target_p = ptr->data;
775	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
776
777	<	if ((target_p != client_p) && (target_p != source_p))
778	<	{
779	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1144	<	(target_p->localClient->serverMask &
1145	<	source_p->lazyLinkClientExists))
1146	<	sendto_one(target_p, ":%s MODE %s :%s",
1147	<	ID_or_name(source_p, target_p),
1148	<	ID_or_name(source_p, target_p), buf);
1149	<	}
1150	<	}
1151	<	}
1152	<
1153	<	if (client_p && MyClient(client_p))
1154	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
777	>	if (buf[0])
778	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
779	>	source_p->id, source_p->id, buf);
780		}
781
782	<	/* user_welcome()
783	<	*
1159	<	* inputs       - client pointer to client to welcome
1160	<	* output       - NONE
1161	<	* side effects -
1162	<	*/
1163	<	static void
1164	<	user_welcome(struct Client *source_p)
782	>	void
783	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
784		{
785	<	#if defined(__TIME__) && defined(__DATE__)
1167	<	static const char built_date[] = __DATE__ " at " __TIME__;
1168	<	#else
1169	<	static const char built_date[] = "unknown";
1170	<	#endif
785	>	dlink_node *node = NULL;
786
787	<	#ifdef HAVE_LIBCRYPTO
788	<	if (source_p->localClient->fd.ssl != NULL)
1174	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1175	<	me.name, source_p->name,
1176	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1177	<	#endif
787	>	if (!strcmp(target_p->host, hostname))
788	>	return;
789
790	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
791	<	ServerInfo.network_name, source_p->name);
792	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
793	<	get_listener_name(source_p->localClient->listener), ircd_version);
794	<	sendto_one(source_p, form_str(RPL_CREATED),
795	<	me.name, source_p->name, built_date);
796	<	sendto_one(source_p, form_str(RPL_MYINFO),
797	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
798	<	show_isupport(source_p);
790	>	switch (what)
791	>	{
792	>	case MODE_ADD:
793	>	AddUMode(target_p, UMODE_HIDDENHOST);
794	>	break;
795	>	case MODE_DEL:
796	>	DelUMode(target_p, UMODE_HIDDENHOST);
797	>	break;
798	>	default: return;
799	>	}
800
801	<	if (source_p->id[0] != '\0')
802	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
803	<	source_p->name, source_p->id);
801	>	if (ConfigGeneral.cycle_on_host_change)
802	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
803	>	target_p->name, target_p->username, target_p->host);
804
805	<	show_lusers(source_p);
805	>	if (IsUserHostIp(target_p))
806	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
807
808	<	if (ConfigFileEntry.short_motd)
1196	<	{
1197	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1198	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1199	<	sendto_one(source_p,
1200	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1201	<	"read it", source_p->name);
1202	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1203	<	me.name, source_p->name, me.name);
1204	<	sendto_one(source_p, form_str(RPL_MOTD),
1205	<	me.name, source_p->name,
1206	<	"*** This is the short motd ***");
1207	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1208	<	me.name, source_p->name);
1209	<	}
1210	<	else
1211	<	send_message_file(source_p, &ConfigFileEntry.motd);
1212	<	}
808	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
809
810	<	/* check_xline()
811	<	*
1216	<	* inputs       - pointer to client to test
1217	<	* outupt       - 1 if exiting 0 if ok
1218	<	* side effects -
1219	<	*/
1220	<	static int
1221	<	check_xline(struct Client *source_p)
1222	<	{
1223	<	struct ConfItem *conf;
1224	<	struct MatchItem *xconf;
1225	<	const char *reason;
810	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
811	>	SetUserHost(target_p);
812
813	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info,
1228	<	NULL, NULL, 0)) != NULL)
813	>	if (MyClient(target_p))
814		{
815	<	xconf = map_to_conf(conf);
816	<	xconf->count++;
815	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
816	>	clear_ban_cache_client(target_p);
817	>	}
818
819	<	if (xconf->reason != NULL)
820	<	reason = xconf->reason;
1235	<	else
1236	<	reason = "No Reason";
819	>	if (!ConfigGeneral.cycle_on_host_change)
820	>	return;
821
822	<	sendto_realops_flags(UMODE_REJ, L_ALL,
823	<	"X-line Rejecting [%s] [%s], user %s [%s]",
824	<	source_p->info, reason,
825	<	get_client_name(source_p, HIDE_IP),
826	<	source_p->sockhost);
822	>	DLINK_FOREACH(node, target_p->channel.head)
823	>	{
824	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
825	>	char *p = modebuf;
826	>	int len = 0;
827	>	const struct Membership *member = node->data;
828
829	<	ServerStats->is_ref++;
1245	<	if(REJECT_HOLD_TIME > 0)
829	>	if (has_member_flags(member, CHFL_CHANOP))
830		{
831	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
832	<	me.name, source_p->name);
1249	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1250	<	SetCaptured(source_p);
831	>	*p++ = 'o';
832	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
833		}
1252	–	else
1253	–	exit_client(source_p, &me, "Bad user info");
1254	–	return 1;
1255	–	}
834
835	<	return 0;
836	<	}
837	<
838	<	static int
839	<	check_regexp_xline(struct Client *source_p)
1262	<	{
1263	<	struct ConfItem *conf = NULL;
1264	<	const char *reason = NULL;
835	>	if (has_member_flags(member, CHFL_HALFOP))
836	>	{
837	>	*p++ = 'h';
838	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
839	>	}
840
841	<	if ((conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
842	<	{
843	<	struct MatchItem *reg = map_to_conf(conf);
841	>	if (has_member_flags(member, CHFL_VOICE))
842	>	{
843	>	*p++ = 'v';
844	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
845	>	}
846
847	<	++reg->count;
847	>	*p = '\0';
848
1272	–	if (reg->reason != NULL)
1273	–	reason = reg->reason;
1274	–	else
1275	–	reason = "No Reason";
849
850	<	sendto_realops_flags(UMODE_REJ, L_ALL,
851	<	"X-line (REGEX) Rejecting [%s] [%s], user %s [%s]",
852	<	source_p->info, reason,
853	<	get_client_name(source_p, HIDE_IP),
854	<	source_p->sockhost);
850	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
851	>	target_p->name, target_p->username,
852	>	target_p->host, member->chptr->name,
853	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
854	>	target_p->info);
855	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
856	>	target_p->name, target_p->username,
857	>	target_p->host, member->chptr->name);
858	>
859	>	if (nickbuf[0])
860	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
861	>	target_p->servptr->name, member->chptr->name,
862	>	modebuf, nickbuf);
863
1283	–	ServerStats->is_ref++;
1284	–	exit_client(source_p, &me, "Bad user info");
1285	–	return 1;
864		}
865
866	<	return 0;
867	<	}
868	<
869	<	/* oper_up()
870	<	*
871	<	* inputs       - pointer to given client to oper
872	<	* output       - NONE
873	<	* side effects - Blindly opers up given source_p, using aconf info
874	<	*                all checks on passwords have already been done.
875	<	*                This could also be used by rsa oper routines.
866	>	if (target_p->away[0])
867	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
868	>	":%s!%s@%s AWAY :%s",
869	>	target_p->name, target_p->username,
870	>	target_p->host, target_p->away);
871	>	}
872	>
873	>	/*! \brief Blindly opers up given source_p, using conf info.
874	>	*         All checks on passwords have already been done.
875	>	* \param source_p Pointer to given client to oper
876		*/
877		void
878		oper_up(struct Client *source_p)
879		{
880	<	unsigned int old = source_p->umodes;
881	<	const char *operprivs = "";
882	<	struct AccessItem *oconf;
880	>	const unsigned int old = source_p->umodes;
881	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
882	>
883	>	assert(source_p->connection->confs.head);
884
885	+	++Count.oper;
886		SetOper(source_p);
887
888	<	if (ConfigFileEntry.oper_umodes)
889	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
890	<	else
891	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1312	<	UMODE_WALLOP|UMODE_LOCOPS);
888	>	if (conf->modes)
889	>	AddUMode(source_p, conf->modes);
890	>	else if (ConfigGeneral.oper_umodes)
891	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
892
893	<	Count.oper++;
893	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
894	>	++Count.invisi;
895	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
896	>	--Count.invisi;
897
898		assert(dlinkFind(&oper_list, source_p) == NULL);
899		dlinkAdd(source_p, make_dlink_node(), &oper_list);
900
901	<	assert(source_p->localClient->confs.head);
1320	<	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1321	<	operprivs = oper_privs_as_string(oconf->port);
1322	<
1323	<	SetOFlag(source_p, oconf->port);
1324	<
1325	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1326	<	source_p->umodes |= UMODE_ADMIN;
1327	<	if (!IsOperN(source_p))
1328	<	source_p->umodes &= ~UMODE_NCHANGE;
1329	<
1330	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1331	<	source_p->name, source_p->username, source_p->host);
1332	<	send_umode_out(source_p, source_p, old);
1333	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1334	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1335	<	me.name, source_p->name, operprivs);
1336	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1337	<	}
1338	<
1339	<	/*
1340	<	* Quick and dirty UID code for new proposed SID on EFnet
1341	<	*
1342	<	*/
1343	<
1344	<	static char new_uid[TOTALSIDUID+1];     /* allow for \0 */
1345	<	static void add_one_to_uid(int i);
901	>	AddOFlag(source_p, conf->port);
902
903	<	/*
904	<	* init_uid()
1349	<	*
1350	<	* inputs       - NONE
1351	<	* output       - NONE
1352	<	* side effects - new_uid is filled in with server id portion (sid)
1353	<	*                (first 3 bytes) or defaulted to 'A'.
1354	<	*                Rest is filled in with 'A'
1355	<	*/
1356	<	void
1357	<	init_uid(void)
1358	<	{
1359	<	int i;
1360	<
1361	<	memset(new_uid, 0, sizeof(new_uid));
903	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
904	>	AddUMode(source_p, UMODE_ADMIN);
905
906	<	if (ServerInfo.sid != NULL)
906	>	if (!EmptyString(conf->whois))
907		{
908	<	memcpy(new_uid, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
909	<	IRC_MAXSID));
910	<	memcpy(&me.id, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
911	<	IRC_MAXSID));
1369	<	hash_add_id(&me);
908	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
909	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
910	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
911	>	RPL_WHOISOPERATOR, conf->whois);
912		}
913
914	<	for (i = 0; i < IRC_MAXSID; i++)
915	<	if (new_uid[i] == '\0')
916	<	new_uid[i] = 'A';
914	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
915	>	get_oper_name(source_p));
916	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
917	>	me.id, get_oper_name(source_p));
918	>	send_umode_out(source_p, old);
919	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
920	>	}
921
922	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
923	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
924	<	* But *JUST* for you, though, it really doesn't look as *pretty*
925	<	* -Dianora
926	<	*/
927	<	memcpy(new_uid+IRC_MAXSID, "AAAAA@", IRC_MAXUID);
922	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
923	>
924	>	int
925	>	valid_sid(const char *sid)
926	>	{
927	>	if (strlen(sid) == IRC_MAXSID)
928	>	if (IsDigit(*sid))
929	>	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
930	>	return 1;
931
932	<	entering_umode_cb = register_callback("entering_umode", NULL);
1384	<	umode_cb = register_callback("changing_umode", change_simple_umode);
1385	<	uid_get_cb = register_callback("uid_get", uid_get);
932	>	return 0;
933		}
934
935		/*
936	<	* uid_get
936	>	* init_uid()
937	>	*
938	>	* inputs       - NONE
939	>	* output       - NONE
940	>	* side effects - new_uid is filled in with server id portion (sid)
941	>	*                (first 3 bytes). Rest is filled in with '9'.
942		*
943	<	* inputs       - struct Client *
1392	<	* output       - new UID is returned to caller
1393	<	* side effects - new_uid is incremented by one.
943	>	* NOTE: this function assumes that 'ConfigServerInfo.sid' has been set to a proper value
944		*/
945	<	static void *
946	<	uid_get(va_list args)
945	>	void
946	>	init_uid(void)
947		{
948	<	add_one_to_uid(TOTALSIDUID-1);        /* index from 0 */
1399	<	return ((void *) new_uid);
948	>	snprintf(new_uid, sizeof(new_uid), "%s999999", ConfigServerInfo.sid);
949		}
950
951		/*
#	Line 1408 | Line 957 | uid_get(va_list args)
957		*                note this is a recursive function
958		*/
959		static void
960	<	add_one_to_uid(int i)
960	>	add_one_to_uid(unsigned int i)
961		{
962	<	if (i != IRC_MAXSID)          /* Not reached server SID portion yet? */
962	>	if (i < IRC_MAXSID)
963	>	return;
964	>
965	>	if (new_uid[i] == 'Z')
966	>	new_uid[i] = '0';
967	>	else if (new_uid[i] == '9')
968		{
969	<	if (new_uid[i] == 'Z')
970	<	new_uid[i] = '0';
1417	<	else if (new_uid[i] == '9')
1418	<	{
1419	<	new_uid[i] = 'A';
1420	<	add_one_to_uid(i-1);
1421	<	}
1422	<	else new_uid[i] = new_uid[i] + 1;
969	>	new_uid[i] = 'A';
970	>	add_one_to_uid(i - 1);
971		}
972		else
973	<	{
974	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
975	<	if (new_uid[i] == 'Z')
976	<	memcpy(new_uid+IRC_MAXSID, "AAAAAA", IRC_MAXUID);
977	<	else
978	<	new_uid[i] = new_uid[i] + 1;
979	<	}
973	>	++new_uid[i];
974	>	}
975	>
976	>	/*
977	>	* uid_get
978	>	*
979	>	* inputs       - struct Client *
980	>	* output       - new UID is returned to caller
981	>	* side effects - new_uid is incremented by one.
982	>	*/
983	>	static const char *
984	>	uid_get(void)
985	>	{
986	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
987	>	return new_uid;
988		}
989
990		/*
#	Line 1441 | Line 997 | add_one_to_uid(int i)
997		void
998		init_isupport(void)
999		{
1444	–	isupportFile = init_MessageLine();
1445	–
1000		add_isupport("CALLERID", NULL, -1);
1001	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1001	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1002	>	add_isupport("DEAF", "D", -1);
1003		add_isupport("KICKLEN", NULL, KICKLEN);
1004		add_isupport("MODES", NULL, MAXMODEPARAMS);
1450	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1451	–	#ifdef HALFOPS
1005		add_isupport("PREFIX", "(ohv)@%+", -1);
1006		add_isupport("STATUSMSG", "@%+", -1);
1007	<	#else
1008	<	add_isupport("PREFIX", "(ov)@+", -1);
1456	<	add_isupport("STATUSMSG", "@+", -1);
1457	<	#endif
1458	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1007	>	add_isupport("EXCEPTS", NULL, -1);
1008	>	add_isupport("INVEX", NULL, -1);
1009		}
1010
1011		/*
#	Line 1470 | Line 1020 | init_isupport(void)
1020		void
1021		add_isupport(const char *name, const char *options, int n)
1022		{
1023	<	dlink_node *ptr;
1024	<	struct Isupport *support;
1023	>	dlink_node *node = NULL;
1024	>	struct Isupport *support = NULL;
1025
1026	<	DLINK_FOREACH(ptr, support_list.head)
1026	>	DLINK_FOREACH(node, support_list.head)
1027		{
1028	<	support = ptr->data;
1028	>	support = node->data;
1029		if (irccmp(support->name, name) == 0)
1030		{
1031		MyFree(support->name);
#	Line 1484 | Line 1034 | add_isupport(const char *name, const cha
1034		}
1035		}
1036
1037	<	if (ptr == NULL)
1037	>	if (node == NULL)
1038		{
1039	<	support = MyMalloc(sizeof(*support));
1039	>	support = MyCalloc(sizeof(*support));
1040		dlinkAddTail(support, &support->node, &support_list);
1041		}
1042
1043	<	DupString(support->name, name);
1044	<	if (options != NULL)
1045	<	DupString(support->options, options);
1043	>	support->name = xstrdup(name);
1044	>	if (options)
1045	>	support->options = xstrdup(options);
1046		support->number = n;
1047
1048		rebuild_isupport_message_line();
#	Line 1508 | Line 1058 | add_isupport(const char *name, const cha
1058		void
1059		delete_isupport(const char *name)
1060		{
1061	<	dlink_node *ptr;
1512	<	struct Isupport *support;
1061	>	dlink_node *node = NULL;
1062
1063	<	DLINK_FOREACH(ptr, support_list.head)
1063	>	DLINK_FOREACH(node, support_list.head)
1064		{
1065	<	support = ptr->data;
1065	>	struct Isupport *support = node->data;
1066	>
1067		if (irccmp(support->name, name) == 0)
1068		{
1069	<	dlinkDelete(ptr, &support_list);
1069	>	dlinkDelete(node, &support_list);
1070		MyFree(support->name);
1071		MyFree(support->options);
1072		MyFree(support);
#	Line 1539 | Line 1089 | rebuild_isupport_message_line(void)
1089		{
1090		char isupportbuffer[IRCD_BUFSIZE];
1091		char *p = isupportbuffer;
1092	<	dlink_node *ptr = NULL;
1092	>	dlink_node *node = NULL, *node_next = NULL;
1093		int n = 0;
1094		int tokens = 0;
1095		size_t len = 0;
1096	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1096	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1097
1098	<	destroy_MessageLine(isupportFile);
1098	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1099	>	{
1100	>	dlinkDelete(node, &support_list_lines);
1101	>	MyFree(node->data);
1102	>	free_dlink_node(node);
1103	>	}
1104
1105	<	DLINK_FOREACH(ptr, support_list.head)
1105	>	DLINK_FOREACH(node, support_list.head)
1106		{
1107	<	struct Isupport *support = ptr->data;
1107	>	struct Isupport *support = node->data;
1108
1109	<	p += (n = ircsprintf(p, "%s", support->name));
1109	>	p += (n = sprintf(p, "%s", support->name));
1110		len += n;
1111
1112	<	if (support->options != NULL)
1112	>	if (support->options)
1113		{
1114	<	p += (n = ircsprintf(p, "=%s", support->options));
1114	>	p += (n = sprintf(p, "=%s", support->options));
1115		len += n;
1116		}
1117
1118		if (support->number > 0)
1119		{
1120	<	p += (n = ircsprintf(p, "=%d", support->number));
1120	>	p += (n = sprintf(p, "=%d", support->number));
1121		len += n;
1122		}
1123
#	Line 1573 | Line 1128 | rebuild_isupport_message_line(void)
1128		if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1129		{ /* arbritrary for now */
1130		if (*--p == ' ')
1131	<	*p = '\0';
1131	>	*p = '\0';
1132
1133	<	addto_MessageLine(isupportFile, isupportbuffer);
1133	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1134		p = isupportbuffer;
1135		len = 0;
1136		n = tokens = 0;
1137		}
1138		}
1139
1140	<	if (len != 0)
1140	>	if (len)
1141		{
1142		if (*--p == ' ')
1143		*p = '\0';
1144	<	addto_MessageLine(isupportFile, isupportbuffer);
1144	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1145		}
1146		}

Comparing:
ircd-hybrid/src/s_user.c (property svn:keywords), Revision 32 by knight, Sun Oct 2 20:41:23 2005 UTC vs.
ircd-hybrid/trunk/src/user.c (property svn:keywords), Revision 5784 by michael, Sun Apr 5 15:17:11 2015 UTC

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

Diff Legend

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