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 4440 by michael, Sat Aug 9 18:50:49 2014 UTC vs.
Revision 5347 by michael, Sun Jan 11 12:42:20 2015 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-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 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
#	Line 162 | Line 162 | void
162		show_lusers(struct Client *source_p)
163		{
164		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
166		Count.invisi, dlink_list_length(&global_server_list));
167		else
168	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
169	<	(Count.total - Count.invisi), Count.invisi, 1);
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
169	>	Count.invisi, 1);
170
171		if (Count.oper)
172		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
#	Line 210 | Line 210 | show_lusers(struct Client *source_p)
210		void
211		show_isupport(struct Client *source_p)
212		{
213	<	const dlink_node *ptr = NULL;
213	>	const dlink_node *node = NULL;
214
215	<	DLINK_FOREACH(ptr, support_list_lines.head)
216	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
215	>	DLINK_FOREACH(node, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
217		}
218
219
#	Line 232 | Line 232 | report_and_set_user_flags(struct Client
232		if (IsConfDoSpoofIp(conf))
233		sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234
235	<	/* If this user is in the exception class, Set it "E lined" */
235	>	/* If this user is in the exception class, set it "E lined" */
236		if (IsConfExemptKline(conf))
237		{
238		SetExemptKline(source_p);
#	Line 281 | Line 281 | report_and_set_user_flags(struct Client
281		static void
282		introduce_client(struct Client *source_p)
283		{
284	<	dlink_node *ptr = NULL;
284	>	dlink_node *node = NULL;
285		char ubuf[IRCD_BUFSIZE] = "";
286
287		if (MyClient(source_p))
#	Line 297 | Line 297 | introduce_client(struct Client *source_p
297		ubuf[1] = '\0';
298		}
299
300	<	DLINK_FOREACH(ptr, local_server_list.head)
300	>	DLINK_FOREACH(node, local_server_list.head)
301		{
302	<	struct Client *server = ptr->data;
302	>	struct Client *server = node->data;
303
304		if (server == source_p->from)
305		continue;
#	Line 310 | Line 310 | introduce_client(struct Client *source_p
310		source_p->name, source_p->hopcount+1,
311		(unsigned long)source_p->tsinfo,
312		ubuf, source_p->username, source_p->host,
313	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	<	"0" : source_p->sockhost, source_p->id,
315	<	source_p->svid,
313	>	source_p->sockhost, source_p->id,
314	>	source_p->account,
315		source_p->info);
316		else
317		sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
#	Line 320 | Line 319 | introduce_client(struct Client *source_p
319		source_p->name, source_p->hopcount+1,
320		(unsigned long)source_p->tsinfo,
321		ubuf, source_p->username, source_p->host,
322	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
324	<	"0" : source_p->sockhost, source_p->id, source_p->info);
322	>	source_p->sockhost, source_p->id, source_p->info);
323
324		if (!EmptyString(source_p->certfp))
325		sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
#	Line 348 | Line 346 | user_welcome(struct Client *source_p)
346		{
347		AddUMode(source_p, UMODE_SSL);
348		sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
349	<	ssl_get_cipher(source_p->localClient->fd.ssl));
349	>	ssl_get_cipher(source_p->connection->fd.ssl));
350		}
351		#endif
352
353		sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
354		source_p->name);
355		sendto_one_numeric(source_p, &me, RPL_YOURHOST,
356	<	get_listener_name(source_p->localClient->listener), ircd_version);
356	>	get_listener_name(source_p->connection->listener), ircd_version);
357		sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
358		sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
359		show_isupport(source_p);
#	Line 375 | Line 373 | static int
373		check_xline(struct Client *source_p)
374		{
375		struct MaskItem *conf = NULL;
378	–	const char *reason = NULL;
376
377		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
378		{
379		++conf->count;
383	–
384	–	if (conf->reason)
385	–	reason = conf->reason;
386	–	else
387	–	reason = CONF_NOREASON;
388	–
380		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
381		"X-line Rejecting [%s] [%s], user %s [%s]",
382	<	source_p->info, reason,
382	>	source_p->info, conf->reason,
383		get_client_name(source_p, HIDE_IP),
384		source_p->sockhost);
385
#	Line 413 | Line 404 | register_local_user(struct Client *sourc
404
405		assert(source_p == source_p->from);
406		assert(MyConnect(source_p));
407	<	assert(!source_p->localClient->registration);
407	>	assert(!source_p->connection->registration);
408
409		ClearCap(source_p, CAP_TS6);
410
411		if (ConfigGeneral.ping_cookie)
412		{
413	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
413	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
414		{
415		do
416	<	source_p->localClient->random_ping = genrand_int32();
417	<	while (!source_p->localClient->random_ping);
416	>	source_p->connection->random_ping = genrand_int32();
417	>	while (!source_p->connection->random_ping);
418
419	<	sendto_one(source_p, "PING :%u",
429	<	source_p->localClient->random_ping);
419	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
420		SetPingSent(source_p);
421		return;
422		}
#	Line 435 | Line 425 | register_local_user(struct Client *sourc
425		return;
426		}
427
428	<	source_p->localClient->last_privmsg = CurrentTime;
428	>	source_p->connection->last_privmsg = CurrentTime;
429		/* Straight up the maximum rate of flooding... */
430	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
430	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
431
432		if (!check_client(source_p))
433		return;
#	Line 446 | Line 436 | register_local_user(struct Client *sourc
436		{
437		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
438		"character in your hostname");
439	<	strlcpy(source_p->host, source_p->sockhost,
450	<	sizeof(source_p->host));
439	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
440		}
441
442	<	conf = source_p->localClient->confs.head->data;
442	>	conf = source_p->connection->confs.head->data;
443
444		if (!IsGotId(source_p))
445		{
#	Line 481 | Line 470 | register_local_user(struct Client *sourc
470		/* Password check */
471		if (!EmptyString(conf->passwd))
472		{
473	<	if (!match_conf_password(source_p->localClient->password, conf))
473	>	if (!match_conf_password(source_p->connection->password, conf))
474		{
475		++ServerStats.is_ref;
476
#	Line 492 | Line 481 | register_local_user(struct Client *sourc
481		}
482
483		/*
484	<	* Don't free source_p->localClient->password here - it can be required
485	<	* by masked /stats I if there are auth{} blocks with need_password = no;
484	>	* Don't free source_p->connection->password here - it can be required
485	>	* by masked /stats I if there are auth {} blocks with need_password = no;
486		* --adx
487		*/
488
#	Line 549 | Line 538 | register_local_user(struct Client *sourc
538		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
539		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
540		source_p->name, source_p->username, source_p->host,
541	<	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
542	<	"255.255.255.255" : source_p->sockhost,
554	<	get_client_class(&source_p->localClient->confs),
541	>	source_p->sockhost,
542	>	get_client_class(&source_p->connection->confs),
543		source_p->info, source_p->id);
544
545		if (ConfigGeneral.invisible_on_connect)
#	Line 566 | Line 554 | register_local_user(struct Client *sourc
554
555		if (!(Count.max_loc % 10))
556		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
557	<	"New Max Local Clients: %d",
557	>	"New maximum local client connections: %u",
558		Count.max_loc);
559		}
560
#	Line 581 | Line 569 | register_local_user(struct Client *sourc
569
570		assert(dlinkFind(&unknown_list, source_p));
571
572	<	dlink_move_node(&source_p->localClient->lclient_node,
572	>	dlink_move_node(&source_p->connection->lclient_node,
573		&unknown_list, &local_client_list);
574
575		user_welcome(source_p);
#	Line 614 | Line 602 | register_remote_user(struct Client *sour
602		source_p->host, source_p->servptr->name,
603		target_p->name, target_p->from->name);
604		sendto_one(source_p->from,
605	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
605	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
606		me.id, source_p->id, me.name, source_p->servptr->name,
607		target_p->from->name);
608
609		AddFlag(source_p, FLAGS_KILLED);
610	<	exit_client(source_p, "USER server wrong direction");
610	>	exit_client(source_p, "UID server wrong direction");
611		return;
612		}
613
#	Line 640 | Line 628 | register_remote_user(struct Client *sour
628		SetUserHost(source_p);
629
630		if (HasFlag(source_p->servptr, FLAGS_EOB))
631	<	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
632	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
633	<	source_p->servptr->name,
634	<	source_p->name, source_p->username, source_p->host,
635	<	source_p->info, source_p->id);
631	>	if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
632	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
633	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
634	>	source_p->servptr->name,
635	>	source_p->name, source_p->username, source_p->host,
636	>	source_p->sockhost, source_p->info, source_p->id);
637	>	else
638	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
639	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
640	>	source_p->servptr->name,
641	>	source_p->name, source_p->username, source_p->host,
642	>	source_p->info, source_p->id);
643
644		introduce_client(source_p);
645		}
#	Line 742 | Line 737 | valid_nickname(const char *nickname, con
737		{
738		const char *p = nickname;
739
740	<	assert(nickname && *nickname);
740	>	assert(p);
741
742		/*
743		* Nicks can't start with a digit or - or be 0 length.
744		*/
745	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
745	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
746		return 0;
747
748		for (; *p; ++p)
#	Line 814 | Line 809 | send_umode(struct Client *client_p, stru
809
810		if (*umode_buf && client_p)
811		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
812	<	source_p->name, source_p->username,
813	<	source_p->host, source_p->name, umode_buf);
812	>	client_p->name, client_p->username,
813	>	client_p->host, client_p->name, umode_buf);
814		}
815
816		/* send_umode_out()
#	Line 825 | Line 820 | send_umode(struct Client *client_p, stru
820		* side effects - Only send ubuf out to servers that know about this client
821		*/
822		void
823	<	send_umode_out(struct Client *client_p, struct Client *source_p,
829	<	unsigned int old)
823	>	send_umode_out(struct Client *source_p, unsigned int old)
824		{
825		char buf[IRCD_BUFSIZE] = "";
826
827	<	send_umode(NULL, source_p, old, buf);
827	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
828
829		if (buf[0])
830	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
830	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
831		source_p->id, source_p->id, buf);
838	–
839	–	if (client_p && MyClient(client_p))
840	–	send_umode(client_p, source_p, old, buf);
832		}
833
834		void
835		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
836		{
837	<	dlink_node *ptr = NULL;
837	>	dlink_node *node = NULL;
838
839		if (!strcmp(target_p->host, hostname))
840		return;
#	Line 852 | Line 843 | user_set_hostmask(struct Client *target_
843		{
844		case MODE_ADD:
845		AddUMode(target_p, UMODE_HIDDENHOST);
855	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
846		break;
847		case MODE_DEL:
848		DelUMode(target_p, UMODE_HIDDENHOST);
859	–
860	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
861	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
849		break;
850		default: return;
851		}
#	Line 877 | Line 864 | user_set_hostmask(struct Client *target_
864
865		if (MyClient(target_p))
866		{
867	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
867	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
868		clear_ban_cache_client(target_p);
869		}
870
871		if (!ConfigGeneral.cycle_on_host_change)
872		return;
873
874	<	DLINK_FOREACH(ptr, target_p->channel.head)
874	>	DLINK_FOREACH(node, target_p->channel.head)
875		{
876		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
877		char *p = modebuf;
878		int len = 0;
879	<	const struct Membership *ms = ptr->data;
879	>	const struct Membership *member = node->data;
880
881	<	if (has_member_flags(ms, CHFL_CHANOP))
881	>	if (has_member_flags(member, CHFL_CHANOP))
882		{
883		*p++ = 'o';
884		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
885		}
886
887	<	if (has_member_flags(ms, CHFL_HALFOP))
887	>	if (has_member_flags(member, CHFL_HALFOP))
888		{
889		*p++ = 'h';
890		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
891		}
892
893	<	if (has_member_flags(ms, CHFL_VOICE))
893	>	if (has_member_flags(member, CHFL_VOICE))
894		{
895		*p++ = 'v';
896		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 911 | Line 898 | user_set_hostmask(struct Client *target_
898
899		*p = '\0';
900
901	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
902	<	target_p->name, target_p->username, target_p->host,
903	<	ms->chptr->chname);
901	>
902	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
903	>	target_p->name, target_p->username,
904	>	target_p->host, member->chptr->name,
905	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
906	>	target_p->info);
907	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
908	>	target_p->name, target_p->username,
909	>	target_p->host, member->chptr->name);
910	>
911		if (nickbuf[0])
912	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
913	<	target_p->servptr->name, ms->chptr->chname,
912	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
913	>	target_p->servptr->name, member->chptr->name,
914		modebuf, nickbuf);
915
916		}
#	Line 936 | Line 930 | void
930		oper_up(struct Client *source_p)
931		{
932		const unsigned int old = source_p->umodes;
933	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
933	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
934
935	<	assert(source_p->localClient->confs.head);
935	>	assert(source_p->connection->confs.head);
936
937		++Count.oper;
938		SetOper(source_p);
#	Line 963 | Line 957 | oper_up(struct Client *source_p)
957
958		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
959		get_oper_name(source_p));
960	<	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
960	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
961		me.id, get_oper_name(source_p));
962	<	send_umode_out(source_p, source_p, old);
962	>	send_umode_out(source_p, old);
963		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
964		}
965
#	Line 1071 | Line 1065 | init_isupport(void)
1065		add_isupport("MODES", NULL, MAXMODEPARAMS);
1066		add_isupport("PREFIX", "(ohv)@%+", -1);
1067		add_isupport("STATUSMSG", "@%+", -1);
1068	<	add_isupport("EXCEPTS", "e", -1);
1069	<	add_isupport("INVEX", "I", -1);
1068	>	add_isupport("EXCEPTS", NULL, -1);
1069	>	add_isupport("INVEX", NULL, -1);
1070		}
1071
1072		/*
#	Line 1087 | Line 1081 | init_isupport(void)
1081		void
1082		add_isupport(const char *name, const char *options, int n)
1083		{
1084	<	dlink_node *ptr;
1084	>	dlink_node *node = NULL;
1085		struct Isupport *support = NULL;
1086
1087	<	DLINK_FOREACH(ptr, support_list.head)
1087	>	DLINK_FOREACH(node, support_list.head)
1088		{
1089	<	support = ptr->data;
1089	>	support = node->data;
1090		if (irccmp(support->name, name) == 0)
1091		{
1092		MyFree(support->name);
#	Line 1101 | Line 1095 | add_isupport(const char *name, const cha
1095		}
1096		}
1097
1098	<	if (ptr == NULL)
1098	>	if (node == NULL)
1099		{
1100		support = MyCalloc(sizeof(*support));
1101		dlinkAddTail(support, &support->node, &support_list);
#	Line 1125 | Line 1119 | add_isupport(const char *name, const cha
1119		void
1120		delete_isupport(const char *name)
1121		{
1122	<	dlink_node *ptr;
1129	<	struct Isupport *support;
1122	>	dlink_node *node = NULL;
1123
1124	<	DLINK_FOREACH(ptr, support_list.head)
1124	>	DLINK_FOREACH(node, support_list.head)
1125		{
1126	<	support = ptr->data;
1126	>	struct Isupport *support = node->data;
1127	>
1128		if (irccmp(support->name, name) == 0)
1129		{
1130	<	dlinkDelete(ptr, &support_list);
1130	>	dlinkDelete(node, &support_list);
1131		MyFree(support->name);
1132		MyFree(support->options);
1133		MyFree(support);
#	Line 1156 | Line 1150 | rebuild_isupport_message_line(void)
1150		{
1151		char isupportbuffer[IRCD_BUFSIZE];
1152		char *p = isupportbuffer;
1153	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1153	>	dlink_node *node = NULL, *node_next = NULL;
1154		int n = 0;
1155		int tokens = 0;
1156		size_t len = 0;
1157		size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1158
1159	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1159	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1160		{
1161	<	dlinkDelete(ptr, &support_list_lines);
1162	<	MyFree(ptr->data);
1163	<	free_dlink_node(ptr);
1161	>	dlinkDelete(node, &support_list_lines);
1162	>	MyFree(node->data);
1163	>	free_dlink_node(node);
1164		}
1165
1166	<	DLINK_FOREACH(ptr, support_list.head)
1166	>	DLINK_FOREACH(node, support_list.head)
1167		{
1168	<	struct Isupport *support = ptr->data;
1168	>	struct Isupport *support = node->data;
1169
1170		p += (n = sprintf(p, "%s", support->name));
1171		len += n;

Diff Legend

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