ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/client.c (file contents):
Revision 1991 by michael, Thu May 9 16:01:15 2013 UTC vs.
Revision 3160 by michael, Sat Mar 15 17:47:46 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.c: Controls clients.
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-2014 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 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file client.c
23	>	* \brief Controls clients.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 52 | Line 54
54		#include "userhost.h"
55		#include "watch.h"
56		#include "rng_mt.h"
57	+	#include "parse.h"
58
59		dlink_list listing_client_list = { NULL, NULL, 0 };
60		/* Pointer to beginning of Client list */
#	Line 75 | Line 78 | static dlink_node *eac_next;  /* next ab
78
79		static void check_pings_list(dlink_list *);
80		static void check_unknowns_list(void);
78	–	static void ban_them(struct Client *, struct MaskItem *);
81
82
83		/* client_init()
#	Line 137 | Line 139 | make_client(struct Client *from)
139
140		client_p->idhnext = client_p;
141		client_p->hnext  = client_p;
142	<	client_p->status = STAT_UNKNOWN;
142	>	SetUnknown(client_p);
143		strcpy(client_p->username, "unknown");
144		strcpy(client_p->svid, "0");
145
#	Line 164 | Line 166 | free_client(struct Client *client_p)
166		assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
167
168		MyFree(client_p->serv);
169	+	MyFree(client_p->certfp);
170
171		if (MyConnect(client_p))
172		{
173		assert(client_p->localClient->invited.head == NULL);
174		assert(dlink_list_length(&client_p->localClient->invited) == 0);
175	<	assert(dlink_list_length(&client_p->localClient->watches) == 0);
175	>	assert(dlink_list_length(&client_p->localClient->watches) == 0);
176		assert(IsClosing(client_p) && IsDead(client_p));
177
178		MyFree(client_p->localClient->response);
#	Line 182 | Line 185 | free_client(struct Client *client_p)
185		{
186		assert(0 < client_p->localClient->listener->ref_count);
187		if (0 == --client_p->localClient->listener->ref_count &&
188	<	!client_p->localClient->listener->active)
188	>	!client_p->localClient->listener->active)
189		free_listener(client_p->localClient->listener);
190		}
191
#	Line 201 | Line 204 | free_client(struct Client *client_p)
204		*
205		* inputs       - NOT USED (from event)
206		* output       - next time_t when check_pings() should be called again
207	<	* side effects -
207	>	* side effects -
208		*
209		*
210		* A PING can be sent to clients as necessary.
#	Line 223 | Line 226 | free_client(struct Client *client_p)
226
227		static void
228		check_pings(void *notused)
229	<	{
229	>	{
230		check_pings_list(&local_client_list);
231		check_pings_list(&serv_list);
232		check_unknowns_list();
#	Line 233 | Line 236 | check_pings(void *notused)
236		*
237		* inputs       - pointer to list to check
238		* output       - NONE
239	<	* side effects -
239	>	* side effects -
240		*/
241		static void
242		check_pings_list(dlink_list *list)
243		{
244	<	char scratch[32];        /* way too generous but... */
244	>	char scratch[IRCD_BUFSIZE];
245		int ping = 0;      /* ping time value from client */
246		dlink_node *ptr = NULL, *next_ptr = NULL;
247
#	Line 253 | Line 256 | check_pings_list(dlink_list *list)
256		if (IsDead(client_p))
257		{
258		/* Ignore it, its been exited already */
259	<	continue;
259	>	continue;
260		}
261
262		if (!IsRegistered(client_p))
#	Line 265 | Line 268 | check_pings_list(dlink_list *list)
268		{
269		if (!IsPingSent(client_p))
270		{
271	<	/*
272	<	* if we havent PINGed the connection and we havent
273	<	* heard from it in a while, PING it to make sure
274	<	* it is still alive.
275	<	*/
276	<	SetPingSent(client_p);
277	<	client_p->localClient->lasttime = CurrentTime - ping;
278	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
271	>	/*
272	>	* if we havent PINGed the connection and we havent
273	>	* heard from it in a while, PING it to make sure
274	>	* it is still alive.
275	>	*/
276	>	SetPingSent(client_p);
277	>	client_p->localClient->lasttime = CurrentTime - ping;
278	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
279		}
280		else
281		{
#	Line 283 | Line 286 | check_pings_list(dlink_list *list)
286		* and it has a ping time, then close its connection.
287		*/
288		if (IsServer(client_p) || IsHandshake(client_p))
289	<	{
290	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
291	<	"No response from %s, closing link",
292	<	get_client_name(client_p, HIDE_IP));
293	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
294	<	"No response from %s, closing link",
295	<	get_client_name(client_p, MASK_IP));
296	<	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
297	<	get_client_name(client_p, HIDE_IP));
298	<	}
289	>	{
290	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
291	>	"No response from %s, closing link",
292	>	get_client_name(client_p, HIDE_IP));
293	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
294	>	"No response from %s, closing link",
295	>	get_client_name(client_p, MASK_IP));
296	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
297	>	get_client_name(client_p, HIDE_IP));
298	>	}
299
300		snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
301		(int)(CurrentTime - client_p->localClient->lasttime));
#	Line 334 | Line 337 | check_unknowns_list(void)
337		* side effects - Check all connections for a pending kline against the
338		*                client, exit the client if a kline matches.
339		*/
340	<	void
340	>	void
341		check_conf_klines(void)
342	<	{
342	>	{
343		struct Client *client_p = NULL;       /* current local client_p being examined */
344		struct MaskItem *conf = NULL;
345		dlink_node *ptr, *next_ptr;
#	Line 354 | Line 357 | check_conf_klines(void)
357		client_p->localClient->aftype)) != NULL)
358		{
359		if (conf->type == CONF_EXEMPT)
360	<	continue;
360	>	continue;
361
362	<	ban_them(client_p, conf);
362	>	conf_try_ban(client_p, conf);
363		continue; /* and go examine next fd/client_p */
364		}
365
366	<	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
366	>	if (ConfigFileEntry.glines)
367		{
368	<	if (IsExemptKline(client_p) ||
369	<	IsExemptGline(client_p))
368	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
369	>	CONF_GLINE, client_p->localClient->aftype,
370	>	client_p->username, NULL, 1)))
371		{
372	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
373	<	"GLINE over-ruled for %s, client is %sline_exempt",
370	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
372	>	conf_try_ban(client_p, conf);
373	>	/* and go examine next fd/client_p */
374		continue;
375		}
376	+	}
377
378	<	ban_them(client_p, conf);
379	<	/* and go examine next fd/client_p */
380	<	continue;
377	<	}
378	<
379	<	if ((conf = find_kill(client_p)) != NULL)
378	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
379	>	CONF_KLINE, client_p->localClient->aftype,
380	>	client_p->username, NULL, 1)))
381		{
382	<	if (IsExemptKline(client_p))
383	<	{
383	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
384	<	"KLINE over-ruled for %s, client is kline_exempt",
385	<	get_client_name(client_p, HIDE_IP));
386	<	continue;
387	<	}
388	<
389	<	ban_them(client_p, conf);
390	<	continue;
382	>	conf_try_ban(client_p, conf);
383	>	continue;
384		}
385
386		if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
387		NULL, NULL, 0)))
388		{
389	<	ban_them(client_p, conf);
389	>	conf_try_ban(client_p, conf);
390		continue;
391		}
392		}
#	Line 415 | Line 408 | check_conf_klines(void)
408		}
409
410		/*
411	<	* ban_them
411	>	* conf_try_ban
412		*
413		* inputs       - pointer to client to ban
414		*              - pointer to MaskItem
415		* output       - NONE
416		* side effects - given client_p is banned
417		*/
418	<	static void
419	<	ban_them(struct Client *client_p, struct MaskItem *conf)
418	>	void
419	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
420		{
421	<	const char *user_reason = NULL;       /* What is sent to user */
421	>	const char *user_reason = NULL;  /* What is sent to user */
422		const char *type_string = NULL;
423		const char dline_string[] = "D-line";
424		const char kline_string[] = "K-line";
#	Line 435 | Line 428 | ban_them(struct Client *client_p, struct
428		switch (conf->type)
429		{
430		case CONF_KLINE:
431	+	if (IsExemptKline(client_p))
432	+	{
433	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
434	+	"KLINE over-ruled for %s, client is kline_exempt",
435	+	get_client_name(client_p, HIDE_IP));
436	+	return;
437	+	}
438	+
439		type_string = kline_string;
440		break;
441		case CONF_DLINE:
442		type_string = dline_string;
443		break;
444		case CONF_GLINE:
445	+	if (IsExemptKline(client_p) ||
446	+	IsExemptGline(client_p))
447	+	{
448	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
449	+	"GLINE over-ruled for %s, client is %sline_exempt",
450	+	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
451	+	return;
452	+	}
453	+
454		type_string = gline_string;
455		break;
456		case CONF_XLINE:
#	Line 458 | Line 468 | ban_them(struct Client *client_p, struct
468		type_string, get_client_name(client_p, HIDE_IP));
469
470		if (IsClient(client_p))
471	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
462	<	me.name, client_p->name, user_reason);
471	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
472
473		exit_client(client_p, &me, user_reason);
474		}
#	Line 468 | Line 477 | ban_them(struct Client *client_p, struct
477		*
478		* input        - pointer to client
479		* output       - NONE
480	<	* side effects -
480	>	* side effects -
481		*/
482		static void
483		update_client_exit_stats(struct Client *client_p)
#	Line 498 | Line 507 | update_client_exit_stats(struct Client *
507		* side effects - find person by (nick)name
508		*/
509		struct Client *
510	<	find_person(const struct Client *client_p, const char *name)
510	>	find_person(const struct Client *const client_p, const char *name)
511		{
512	<	struct Client *c2ptr = NULL;
512	>	struct Client *target_p = NULL;
513
514		if (IsDigit(*name))
515		{
516	<	if ((c2ptr = hash_find_id(name)) != NULL)
517	<	{
509	<	/* invisible users shall not be found by UID guessing */
510	<	if (HasUMode(c2ptr, UMODE_INVISIBLE))
511	<	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
512	<	c2ptr = NULL;
513	<	}
516	>	if (IsServer(client_p->from) || HasFlag(client_p->from, FLAGS_SERVICE))
517	>	target_p = hash_find_id(name);
518		}
519		else
520	<	c2ptr = hash_find_client(name);
520	>	target_p = hash_find_client(name);
521
522	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
522	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
523		}
524
525		/*
526	<	* find_chasing - find the client structure for a nick name (user)
527	<	*      using history mechanism if necessary. If the client is not found,
526	>	* find_chasing - find the client structure for a nick name (name)
527	>	*      using history mechanism if necessary. If the client is not found,
528		*      an error message (NO SUCH NICK) is generated. If the client was found
529		*      through the history, chasing will be 1 and otherwise 0.
530		*/
531		struct Client *
532	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
532	>	find_chasing(struct Client *source_p, const char *name, int *const chasing)
533		{
534	<	struct Client *who = find_person(client_p, user);
534	>	struct Client *who = find_person(source_p, name);
535
536		if (chasing)
537		*chasing = 0;
#	Line 535 | Line 539 | find_chasing(struct Client *client_p, st
539		if (who)
540		return who;
541
542	<	if (IsDigit(*user))
542	>	if (IsDigit(*name))
543		return NULL;
544
545	<	if ((who = get_history(user,
546	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
547	<	== NULL)
545	>	if ((who = whowas_get_history(name,
546	>	(time_t)ConfigFileEntry.kill_chase_time_limit))
547	>	== NULL)
548		{
549	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
546	<	me.name, source_p->name, user);
549	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
550		return NULL;
551		}
552
#	Line 578 | Line 581 | get_client_name(const struct Client *cli
581
582		assert(client != NULL);
583
584	<	if (!MyConnect(client))
584	>	if (!MyConnect(client))
585		return client->name;
586
587		if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
#	Line 622 | Line 625 | void
625		free_exited_clients(void)
626		{
627		dlink_node *ptr = NULL, *next = NULL;
628	<
628	>
629		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
630		{
631		free_client(ptr->data);
#	Line 661 | Line 664 | exit_one_client(struct Client *source_p,
664		DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
665		remove_user_from_channel(lp->data);
666
667	<	add_history(source_p, 0);
668	<	off_history(source_p);
667	>	whowas_add_history(source_p, 0);
668	>	whowas_off_history(source_p);
669
670		watch_check_hash(source_p, RPL_LOGOFF);
671
#	Line 751 | Line 754 | recurse_send_quits(struct Client *origin
754		}
755		}
756
757	<	/*
757	>	/*
758		* Remove all clients that depend on source_p; assumes all (S)QUITs have
759	<	* already been sent.  we make sure to exit a server's dependent clients
760	<	* and servers before the server itself; exit_one_client takes care of
759	>	* already been sent.  we make sure to exit a server's dependent clients
760	>	* and servers before the server itself; exit_one_client takes care of
761		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
762		*/
763		static void
#	Line 826 | Line 829 | exit_client(struct Client *source_p, str
829		if (IsIpHash(source_p))
830		remove_one_ip(&source_p->localClient->ip);
831
832	<	if (source_p->localClient->auth)
830	<	{
831	<	delete_auth(source_p->localClient->auth);
832	<	source_p->localClient->auth = NULL;
833	<	}
832	>	delete_auth(&source_p->localClient->auth);
833
834		/*
835		* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
#	Line 867 | Line 866 | exit_client(struct Client *source_p, str
866		source_p->name, source_p->username, source_p->host, comment,
867		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
868		"255.255.255.255" : source_p->sockhost);
870	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
871	–	"CLIEXIT: %s %s %s %s 0 %s",
872	–	source_p->name,
873	–	source_p->username,
874	–	source_p->host,
875	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
876	–	"255.255.255.255" : source_p->sockhost,
877	–	comment);
869		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
870		myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
871		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
#	Line 889 | Line 880 | exit_client(struct Client *source_p, str
880
881		assert(dlinkFind(&serv_list, source_p));
882		dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
892	–	unset_chcap_usage_counts(source_p);
883		}
884
885		if (!IsDead(source_p))
#	Line 898 | Line 888 | exit_client(struct Client *source_p, str
888		{
889		/* for them, we are exiting the network */
890		sendto_one(source_p, ":%s SQUIT %s :%s",
891	<	ID_or_name(from, source_p), me.name, comment);
891	>	ID_or_name(from, source_p), me.name, comment);
892		}
893
894		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
#	Line 933 | Line 923 | exit_client(struct Client *source_p, str
923
924		if (ConfigServerHide.hide_servers)
925		/*
926	<	* Set netsplit message to "*.net *.split" to still show
926	>	* Set netsplit message to "*.net *.split" to still show
927		* that its a split, but hide the servers splitting
928		*/
929		strcpy(splitstr, "*.net *.split");
#	Line 951 | Line 941 | exit_client(struct Client *source_p, str
941		source_p->localClient->send.bytes >> 10,
942		source_p->localClient->recv.bytes >> 10);
943		ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
944	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
944	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
945		source_p->localClient->send.bytes >> 10,
946		source_p->localClient->recv.bytes >> 10);
947		}
948		}
949		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
950	<	{
951	<	sendto_server(from->from, CAP_TS6, NOCAPS,
962	<	":%s QUIT :%s", ID(source_p), comment);
963	<	sendto_server(from->from, NOCAPS, CAP_TS6,
964	<	":%s QUIT :%s", source_p->name, comment);
965	<	}
950	>	sendto_server(from->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
951	>	ID(source_p), comment);
952
953		/* The client *better* be off all of the lists */
954		assert(dlinkFind(&unknown_list, source_p) == NULL);
#	Line 1006 | Line 992 | dead_link_on_write(struct Client *client
992		void
993		dead_link_on_read(struct Client *client_p, int error)
994		{
995	<	char errmsg[255];
995	>	char errmsg[IRCD_BUFSIZE];
996		int current_error;
997
998		if (IsDefunct(client_p))
#	Line 1020 | Line 1006 | dead_link_on_read(struct Client *client_
1006		if (IsServer(client_p) || IsHandshake(client_p))
1007		{
1008		int connected = CurrentTime - client_p->localClient->firsttime;
1009	<
1009	>
1010		if (error == 0)
1011		{
1012		/* Admins get the real IP */
1013		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1014	<	"Server %s closed the connection",
1015	<	get_client_name(client_p, SHOW_IP));
1014	>	"Server %s closed the connection",
1015	>	get_client_name(client_p, SHOW_IP));
1016
1017		/* Opers get a masked IP */
1018		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1019	<	"Server %s closed the connection",
1020	<	get_client_name(client_p, MASK_IP));
1019	>	"Server %s closed the connection",
1020	>	get_client_name(client_p, MASK_IP));
1021
1022		ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1023	<	get_client_name(client_p, SHOW_IP));
1023	>	get_client_name(client_p, SHOW_IP));
1024		}
1025		else
1026		{
1027		report_error(L_ADMIN, "Lost connection to %s: %s",
1028	<	get_client_name(client_p, SHOW_IP), current_error);
1028	>	get_client_name(client_p, SHOW_IP), current_error);
1029		report_error(L_OPER, "Lost connection to %s: %s",
1030	<	get_client_name(client_p, MASK_IP), current_error);
1030	>	get_client_name(client_p, MASK_IP), current_error);
1031		}
1032
1033		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1034	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
1035	<	client_p->name, connected/86400,
1036	<	(connected/86400 == 1) ? "" : "s",
1037	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1038	<	connected % 60);
1034	>	"%s had been connected for %d day%s, %2d:%02d:%02d",
1035	>	client_p->name, connected/86400,
1036	>	(connected/86400 == 1) ? "" : "s",
1037	>	(connected % 86400) / 3600, (connected % 3600) / 60,
1038	>	connected % 60);
1039		}
1040
1041		if (error == 0)
#	Line 1090 | Line 1076 | exit_aborted_clients(void)
1076		else
1077		notice = "Write error: connection closed";
1078
1079	<	exit_client(target_p, &me, notice);
1079	>	exit_client(target_p, &me, notice);
1080		free_dlink_node(ptr);
1081		}
1082		}
#	Line 1118 | Line 1104 | del_accept(struct split_nuh_item *accept
1104
1105		struct split_nuh_item *
1106		find_accept(const char *nick, const char *user,
1107	<	const char *host, struct Client *client_p, int do_match)
1107	>	const char *host, struct Client *client_p,
1108	>	int (*cmpfunc)(const char *, const char *))
1109		{
1110		dlink_node *ptr = NULL;
1124	–	/* XXX We wouldn't need that if match() would return 0 on match */
1125	–	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
1111
1112		DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1113		{
#	Line 1151 | Line 1136 | accept_message(struct Client *source,
1136		dlink_node *ptr = NULL;
1137
1138		if (source == target || find_accept(source->name, source->username,
1139	<	source->host, target, 1))
1139	>	source->host, target, match))
1140		return 1;
1141
1142		if (HasUMode(target, UMODE_SOFTCALLERID))

Diff Legend

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