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 3171 by michael, Sun Mar 16 11:51:48 2014 UTC vs.
Revision 4967 by michael, Mon Dec 1 14:34:29 2014 UTC

#	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 27 | Line 27
27		#include "stdinc.h"
28		#include "list.h"
29		#include "client.h"
30	–	#include "channel_mode.h"
30		#include "event.h"
32	–	#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
33		#include "ircd.h"
36	–	#include "s_gline.h"
34		#include "numeric.h"
35	<	#include "packet.h"
39	<	#include "s_auth.h"
35	>	#include "auth.h"
36		#include "s_bsd.h"
37		#include "conf.h"
38		#include "log.h"
39	<	#include "s_misc.h"
40	<	#include "s_serv.h"
39	>	#include "misc.h"
40	>	#include "server.h"
41		#include "send.h"
42		#include "whowas.h"
43	<	#include "s_user.h"
48	<	#include "dbuf.h"
43	>	#include "user.h"
44		#include "memory.h"
45		#include "mempool.h"
46		#include "hostmask.h"
47		#include "listener.h"
53	–	#include "irc_res.h"
48		#include "userhost.h"
49		#include "watch.h"
50		#include "rng_mt.h"
51		#include "parse.h"
52	+	#include "ipcache.h"
53
59	–	dlink_list listing_client_list = { NULL, NULL, 0 };
60	–	/* Pointer to beginning of Client list */
61	–	dlink_list global_client_list = {NULL, NULL, 0};
62	–	/* unknown/client pointer lists */
63	–	dlink_list unknown_list = {NULL, NULL, 0};
64	–	dlink_list local_client_list = {NULL, NULL, 0};
65	–	dlink_list serv_list = {NULL, NULL, 0};
66	–	dlink_list global_serv_list = {NULL, NULL, 0};
67	–	dlink_list oper_list = {NULL, NULL, 0};
54
55	<	static EVH check_pings;
56	<
57	<	static mp_pool_t *client_pool  = NULL;
58	<	static mp_pool_t *lclient_pool = NULL;
59	<
60	<	static dlink_list dead_list  = { NULL, NULL, 0};
61	<	static dlink_list abort_list = { NULL, NULL, 0};
55	>	dlink_list listing_client_list;
56	>	dlink_list unknown_list;
57	>	dlink_list local_client_list;
58	>	dlink_list local_server_list;
59	>	dlink_list global_client_list;
60	>	dlink_list global_server_list;
61	>	dlink_list oper_list;
62
63	+	static mp_pool_t *client_pool, *connection_pool;
64	+	static dlink_list dead_list, abort_list;
65		static dlink_node *eac_next;  /* next aborted client to exit */
66
79	–	static void check_pings_list(dlink_list *);
80	–	static void check_unknowns_list(void);
81	–
82	–
83	–	/* client_init()
84	–	*
85	–	* inputs       - NONE
86	–	* output       - NONE
87	–	* side effects - initialize client free memory
88	–	*/
89	–	void
90	–	client_init(void)
91	–	{
92	–	/* start off the check ping event ..  -- adrian
93	–	* Every 30 seconds is plenty -- db
94	–	*/
95	–	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
96	–	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
97	–	eventAdd("check_pings", check_pings, NULL, 5);
98	–	}
67
68		/*
69		* make_client - create a new Client struct and set it to initial state.
#	Line 117 | Line 85 | make_client(struct Client *from)
85		{
86		struct Client *client_p = mp_pool_get(client_pool);
87
88	<	memset(client_p, 0, sizeof(*client_p));
121	<
122	<	if (from == NULL)
88	>	if (!from)
89		{
90		client_p->from                      = client_p; /* 'from' of local client is self! */
91	<	client_p->localClient               = mp_pool_get(lclient_pool);
92	<
93	<	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
94	<
95	<	client_p->localClient->since        = CurrentTime;
130	<	client_p->localClient->lasttime     = CurrentTime;
131	<	client_p->localClient->firsttime    = CurrentTime;
132	<	client_p->localClient->registration = REG_INIT;
91	>	client_p->connection               = mp_pool_get(connection_pool);
92	>	client_p->connection->since        = CurrentTime;
93	>	client_p->connection->lasttime     = CurrentTime;
94	>	client_p->connection->firsttime    = CurrentTime;
95	>	client_p->connection->registration = REG_INIT;
96
97		/* as good a place as any... */
98	<	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
98	>	dlinkAdd(client_p, &client_p->connection->lclient_node, &unknown_list);
99		}
100		else
101		client_p->from = from; /* 'from' of local client is self! */
#	Line 141 | Line 104 | make_client(struct Client *from)
104		client_p->hnext  = client_p;
105		SetUnknown(client_p);
106		strcpy(client_p->username, "unknown");
107	<	strcpy(client_p->svid, "0");
107	>	strcpy(client_p->account, "0");
108
109		return client_p;
110		}
#	Line 156 | Line 119 | make_client(struct Client *from)
119		static void
120		free_client(struct Client *client_p)
121		{
122	<	assert(client_p != NULL);
122	>	assert(client_p);
123		assert(client_p != &me);
124		assert(client_p->hnext == client_p);
125		assert(client_p->idhnext == client_p);
126		assert(client_p->channel.head == NULL);
127		assert(dlink_list_length(&client_p->channel) == 0);
128		assert(dlink_list_length(&client_p->whowas) == 0);
129	<	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
129	>	assert(!IsServer(client_p) || client_p->serv);
130
131		MyFree(client_p->serv);
132		MyFree(client_p->certfp);
133
134		if (MyConnect(client_p))
135		{
136	<	assert(client_p->localClient->invited.head == NULL);
137	<	assert(dlink_list_length(&client_p->localClient->invited) == 0);
138	<	assert(dlink_list_length(&client_p->localClient->watches) == 0);
136	>	assert(client_p->connection->invited.head == NULL);
137	>	assert(dlink_list_length(&client_p->connection->invited) == 0);
138	>	assert(dlink_list_length(&client_p->connection->watches) == 0);
139		assert(IsClosing(client_p) && IsDead(client_p));
140
141	<	MyFree(client_p->localClient->response);
142	<	MyFree(client_p->localClient->auth_oper);
141	>	MyFree(client_p->connection->challenge_response);
142	>	MyFree(client_p->connection->challenge_operator);
143	>	client_p->connection->challenge_response = NULL;
144	>	client_p->connection->challenge_operator = NULL;
145
146		/*
147	<	* clean up extra sockets from P-lines which have been discarded.
147	>	* Clean up extra sockets from listen{} blocks which have been discarded.
148		*/
149	<	if (client_p->localClient->listener)
149	>	if (client_p->connection->listener)
150		{
151	<	assert(0 < client_p->localClient->listener->ref_count);
152	<	if (0 == --client_p->localClient->listener->ref_count &&
188	<	!client_p->localClient->listener->active)
189	<	free_listener(client_p->localClient->listener);
151	>	listener_release(client_p->connection->listener);
152	>	client_p->connection->listener = NULL;
153		}
154
155	<	dbuf_clear(&client_p->localClient->buf_recvq);
156	<	dbuf_clear(&client_p->localClient->buf_sendq);
155	>	dbuf_clear(&client_p->connection->buf_recvq);
156	>	dbuf_clear(&client_p->connection->buf_sendq);
157
158	<	mp_pool_release(client_p->localClient);
158	>	mp_pool_release(client_p->connection);
159		}
160
161		mp_pool_release(client_p);
162		}
163
201	–	/*
202	–	* check_pings - go through the local client list and check activity
203	–	* kill off stuff that should die
204	–	*
205	–	* inputs       - NOT USED (from event)
206	–	* output       - next time_t when check_pings() should be called again
207	–	* side effects -
208	–	*
209	–	*
210	–	* A PING can be sent to clients as necessary.
211	–	*
212	–	* Client/Server ping outs are handled.
213	–	*/
214	–
215	–	/*
216	–	* Addon from adrian. We used to call this after nextping seconds,
217	–	* however I've changed it to run once a second. This is only for
218	–	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
219	–	* run once a second makes life a lot easier - when a new client connects
220	–	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
221	–	* we end up waiting 20 seconds. This is stupid. :-)
222	–	* I will optimise (hah!) check_pings() once I've finished working on
223	–	* tidying up other network IO evilnesses.
224	–	*     -- adrian
225	–	*/
226	–
227	–	static void
228	–	check_pings(void *notused)
229	–	{
230	–	check_pings_list(&local_client_list);
231	–	check_pings_list(&serv_list);
232	–	check_unknowns_list();
233	–	}
234	–
164		/* check_pings_list()
165		*
166		* inputs       - pointer to list to check
#	Line 241 | Line 170 | check_pings(void *notused)
170		static void
171		check_pings_list(dlink_list *list)
172		{
173	<	char scratch[IRCD_BUFSIZE];
173	>	char buf[IRCD_BUFSIZE] = "";
174		int ping = 0;      /* ping time value from client */
175	<	dlink_node *ptr = NULL, *next_ptr = NULL;
175	>	dlink_node *node = NULL, *node_next = NULL;
176
177	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
177	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
178		{
179	<	struct Client *client_p = ptr->data;
179	>	struct Client *client_p = node->data;
180
252	–	/*
253	–	** Note: No need to notify opers here. It's
254	–	** already done when "FLAGS_DEADSOCKET" is set.
255	–	*/
181		if (IsDead(client_p))
182	<	{
258	<	/* Ignore it, its been exited already */
259	<	continue;
260	<	}
182	>	continue;  /* Ignore it, its been exited already */
183
184		if (!IsRegistered(client_p))
185		ping = CONNECTTIMEOUT;
186		else
187	<	ping = get_client_ping(&client_p->localClient->confs);
187	>	ping = get_client_ping(&client_p->connection->confs);
188
189	<	if (ping < CurrentTime - client_p->localClient->lasttime)
189	>	if (ping < CurrentTime - client_p->connection->lasttime)
190		{
191		if (!IsPingSent(client_p))
192		{
193		/*
194	<	* if we havent PINGed the connection and we havent
194	>	* If we haven't PINGed the connection and we haven't
195		* heard from it in a while, PING it to make sure
196		* it is still alive.
197		*/
198		SetPingSent(client_p);
199	<	client_p->localClient->lasttime = CurrentTime - ping;
199	>	client_p->connection->lasttime = CurrentTime - ping;
200		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
201		}
202		else
203		{
204	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
204	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
205		{
206		/*
207		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 297 | Line 219 | check_pings_list(dlink_list *list)
219		get_client_name(client_p, HIDE_IP));
220		}
221
222	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
223	<	(int)(CurrentTime - client_p->localClient->lasttime));
224	<	exit_client(client_p, scratch);
222	>	snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
223	>	(int)(CurrentTime - client_p->connection->lasttime));
224	>	exit_client(client_p, buf);
225		}
226		}
227		}
#	Line 315 | Line 237 | check_pings_list(dlink_list *list)
237		static void
238		check_unknowns_list(void)
239		{
240	<	dlink_node *ptr, *next_ptr;
240	>	dlink_node *node = NULL, *node_next = NULL;
241
242	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
242	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
243		{
244	<	struct Client *client_p = ptr->data;
244	>	struct Client *client_p = node->data;
245
246		/*
247		* Check UNKNOWN connections - if they have been in this state
248		* for > 30s, close them.
249		*/
250	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
250	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->connection->firsttime) > 30)
251		exit_client(client_p, "Registration timed out");
252		}
253		}
254
255	+	/*
256	+	* check_pings - go through the local client list and check activity
257	+	* kill off stuff that should die
258	+	*
259	+	* inputs       - NOT USED (from event)
260	+	* output       - next time_t when check_pings() should be called again
261	+	* side effects -
262	+	*
263	+	*
264	+	* A PING can be sent to clients as necessary.
265	+	*
266	+	* Client/Server ping outs are handled.
267	+	*/
268	+
269	+	/*
270	+	* Addon from adrian. We used to call this after nextping seconds,
271	+	* however I've changed it to run once a second. This is only for
272	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
273	+	* run once a second makes life a lot easier - when a new client connects
274	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
275	+	* we end up waiting 20 seconds. This is stupid. :-)
276	+	* I will optimise (hah!) check_pings() once I've finished working on
277	+	* tidying up other network IO evilnesses.
278	+	*     -- adrian
279	+	*/
280	+
281	+	static void
282	+	check_pings(void *unused)
283	+	{
284	+	check_pings_list(&local_client_list);
285	+	check_pings_list(&local_server_list);
286	+	check_unknowns_list();
287	+	}
288	+
289		/* check_conf_klines()
290		*
291		* inputs       - NONE
#	Line 340 | Line 296 | check_unknowns_list(void)
296		void
297		check_conf_klines(void)
298		{
343	–	struct Client *client_p = NULL;       /* current local client_p being examined */
299		struct MaskItem *conf = NULL;
300	<	dlink_node *ptr, *next_ptr;
300	>	dlink_node *node = NULL, *node_next = NULL;
301
302	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
302	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
303		{
304	<	client_p = ptr->data;
304	>	struct Client *client_p = node->data;
305
306	<	/* If a client is already being exited
307	<	*/
353	<	if (IsDead(client_p) || !IsClient(client_p))
306	>	/* If a client is already being exited */
307	>	if (IsDead(client_p))
308		continue;
309
310	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
311	<	client_p->localClient->aftype)) != NULL)
310	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
311	>	client_p->connection->aftype, NULL, NULL, 1)))
312		{
359	–	if (conf->type == CONF_EXEMPT)
360	–	continue;
361	–
313		conf_try_ban(client_p, conf);
314		continue; /* and go examine next fd/client_p */
315		}
316
317	<	if (ConfigFileEntry.glines)
317	>	if (ConfigGeneral.glines)
318		{
319	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
320	<	CONF_GLINE, client_p->localClient->aftype,
319	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
320	>	CONF_GLINE, client_p->connection->aftype,
321		client_p->username, NULL, 1)))
322		{
323		conf_try_ban(client_p, conf);
#	Line 375 | Line 326 | check_conf_klines(void)
326		}
327		}
328
329	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
330	<	CONF_KLINE, client_p->localClient->aftype,
329	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
330	>	CONF_KLINE, client_p->connection->aftype,
331		client_p->username, NULL, 1)))
332		{
333		conf_try_ban(client_p, conf);
#	Line 392 | Line 343 | check_conf_klines(void)
343		}
344
345		/* also check the unknowns list for new dlines */
346	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
346	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
347		{
348	<	client_p = ptr->data;
348	>	struct Client *client_p = node->data;
349
350	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
351	<	client_p->localClient->aftype)))
350	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
351	>	client_p->connection->aftype, NULL, NULL, 1)))
352		{
353	<	if (conf->type == CONF_EXEMPT)
354	<	continue;
404	<
405	<	exit_client(client_p, "D-lined");
353	>	conf_try_ban(client_p, conf);
354	>	continue; /* and go examine next fd/client_p */
355		}
356		}
357		}
#	Line 439 | Line 388 | conf_try_ban(struct Client *client_p, st
388		type_string = kline_string;
389		break;
390		case CONF_DLINE:
391	+	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
392	+	client_p->connection->aftype, NULL, NULL, 1))
393	+	return;
394		type_string = dline_string;
395		break;
396		case CONF_GLINE:
#	Line 513 | Line 465 | find_person(const struct Client *const s
465
466		if (IsDigit(*name))
467		{
468	<	if (IsServer(source_p->from) || HasFlag(source_p->from, FLAGS_SERVICE))
468	>	if (IsServer(source_p->from))
469		target_p = hash_find_id(name);
470		}
471		else
#	Line 525 | Line 477 | find_person(const struct Client *const s
477		/*
478		* find_chasing - find the client structure for a nick name (name)
479		*      using history mechanism if necessary. If the client is not found,
480	<	*      an error message (NO SUCH NICK) is generated. If the client was found
529	<	*      through the history, chasing will be 1 and otherwise 0.
480	>	*      an error message (NO SUCH NICK) is generated.
481		*/
482		struct Client *
483	<	find_chasing(struct Client *source_p, const char *name, int *const chasing)
483	>	find_chasing(struct Client *source_p, const char *name)
484		{
485	<	struct Client *who = find_person(source_p, name);
535	<
536	<	if (chasing)
537	<	*chasing = 0;
485	>	struct Client *target_p = find_person(source_p, name);
486
487	<	if (who)
488	<	return who;
487	>	if (target_p)
488	>	return target_p;
489
490		if (IsDigit(*name))
491		return NULL;
492
493	<	if ((who = whowas_get_history(name,
494	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
495	<	== NULL)
493	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
494	>
495	>	if (!target_p)
496		{
497		sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
498		return NULL;
499		}
500
501	<	if (chasing)
554	<	*chasing = 1;
555	<
556	<	return who;
501	>	return target_p;
502		}
503
504		/*
#	Line 565 | Line 510 | find_chasing(struct Client *source_p, co
510		*        But, this can be used to any client structure.
511		*
512		* NOTE 1:
513	<	*        Watch out the allocation of "nbuf", if either source_p->name
513	>	*        Watch out the allocation of "buf", if either source_p->name
514		*        or source_p->sockhost gets changed into pointers instead of
515		*        directly allocated within the structure...
516		*
517		* NOTE 2:
518		*        Function return either a pointer to the structure (source_p) or
519	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
519	>	*        to internal buffer (buf). *NEVER* use the returned pointer
520		*        to modify what it points!!!
521		*/
522		const char *
523	<	get_client_name(const struct Client *client, enum addr_mask_type type)
523	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
524		{
525	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
525	>	static char buf[HOSTLEN * 2 + USERLEN + 5];
526
527	<	assert(client != NULL);
527	>	assert(client_p);
528
529	<	if (!MyConnect(client))
530	<	return client->name;
529	>	if (!MyConnect(client_p))
530	>	return client_p->name;
531
532	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
532	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
533		{
534	<	if (!irccmp(client->name, client->host))
535	<	return client->name;
534	>	if (!irccmp(client_p->name, client_p->host))
535	>	return client_p->name;
536		else if (ConfigServerHide.hide_server_ips)
537		type = MASK_IP;
538		}
539
595	–	if (ConfigFileEntry.hide_spoof_ips)
596	–	if (type == SHOW_IP && IsIPSpoof(client))
597	–	type = MASK_IP;
598	–
540		/* And finally, let's get the host information, ip or name */
541		switch (type)
542		{
543		case SHOW_IP:
544	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
545	<	client->name,
546	<	client->username, client->sockhost);
544	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
545	>	client_p->name,
546	>	client_p->username, client_p->sockhost);
547		break;
548		case MASK_IP:
549	<	if (client->localClient->aftype == AF_INET)
550	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
551	<	client->name, client->username);
549	>	if (client_p->connection->aftype == AF_INET)
550	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
551	>	client_p->name, client_p->username);
552		else
553	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
554	<	client->name, client->username);
553	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
554	>	client_p->name, client_p->username);
555		break;
556		default:
557	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
558	<	client->name,
559	<	client->username, client->host);
557	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
558	>	client_p->name,
559	>	client_p->username, client_p->host);
560		}
561
562	<	return nbuf;
562	>	return buf;
563		}
564
565		void
566		free_exited_clients(void)
567		{
568	<	dlink_node *ptr = NULL, *next = NULL;
568	>	dlink_node *node = NULL, *node_next = NULL;
569
570	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
570	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
571		{
572	<	free_client(ptr->data);
573	<	dlinkDelete(ptr, &dead_list);
574	<	free_dlink_node(ptr);
572	>	free_client(node->data);
573	>	dlinkDelete(node, &dead_list);
574	>	free_dlink_node(node);
575		}
576		}
577
#	Line 641 | Line 582 | free_exited_clients(void)
582		* The only messages generated are QUITs on channels.
583		*/
584		static void
585	<	exit_one_client(struct Client *source_p, const char *quitmsg)
585	>	exit_one_client(struct Client *source_p, const char *comment)
586		{
587	<	dlink_node *lp = NULL, *next_lp = NULL;
587	>	dlink_node *node = NULL, *node_next = NULL;
588
589		assert(!IsMe(source_p));
590	+	assert(source_p != &me);
591
592		if (IsClient(source_p))
593		{
594	<	if (source_p->servptr->serv != NULL)
595	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
594	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
595	>	dlinkDelete(&source_p->node, &global_client_list);
596
597		/*
598		* If a person is on a channel, send a QUIT notice
#	Line 660 | Line 602 | exit_one_client(struct Client *source_p,
602		*/
603		sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
604		source_p->name, source_p->username,
605	<	source_p->host, quitmsg);
606	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
607	<	remove_user_from_channel(lp->data);
605	>	source_p->host, comment);
606	>
607	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
608	>	remove_user_from_channel(node->data);
609
610		whowas_add_history(source_p, 0);
611		whowas_off_history(source_p);
#	Line 672 | Line 615 | exit_one_client(struct Client *source_p,
615		if (MyConnect(source_p))
616		{
617		/* Clean up invitefield */
618	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
619	<	del_invite(lp->data, source_p);
618	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
619	>	del_invite(node->data, source_p);
620
621		del_all_accepts(source_p);
622		}
#	Line 681 | Line 624 | exit_one_client(struct Client *source_p,
624		else if (IsServer(source_p))
625		{
626		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
627	+	dlinkDelete(&source_p->node, &global_client_list);
628
629	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
630	<	free_dlink_node(lp);
629	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
630	>	free_dlink_node(node);
631		}
632
633		/* Remove source_p from the client lists */
634	<	if (HasID(source_p))
634	>	if (source_p->id[0])
635		hash_del_id(source_p);
636	+
637		if (source_p->name[0])
638		hash_del_client(source_p);
639
640		if (IsUserHostIp(source_p))
641		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
642
698	–	/* remove from global client list
699	–	* NOTE: source_p->node.next cannot be NULL if the client is added
700	–	*       to global_client_list (there is always &me at its end)
701	–	*/
702	–	if (source_p->node.next != NULL) /* XXX: not needed? */
703	–	dlinkDelete(&source_p->node, &global_client_list);
704	–
643		update_client_exit_stats(source_p);
644
645		/* Check to see if the client isn't already on the dead list */
#	Line 719 | Line 657 | exit_one_client(struct Client *source_p,
657		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
658		*/
659		static void
660	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
660	>	recurse_remove_clients(struct Client *source_p, const char *comment)
661		{
662	<	dlink_node *ptr, *next;
662	>	dlink_node *node = NULL, *node_next = NULL;
663
664	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
665	<	exit_one_client(ptr->data, quitmsg);
664	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
665	>	exit_one_client(node->data, comment);
666
667	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
667	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
668		{
669	<	recurse_remove_clients(ptr->data, quitmsg);
670	<	exit_one_client(ptr->data, quitmsg);
669	>	recurse_remove_clients(node->data, comment);
670	>	exit_one_client(node->data, comment);
671		}
672		}
673
#	Line 753 | Line 691 | recurse_remove_clients(struct Client *so
691		void
692		exit_client(struct Client *source_p, const char *comment)
693		{
694	<	dlink_node *m = NULL;
695	<	/* Store the direction to source_p, close_connection sets it to NULL */
696	<	struct Client *client_p = source_p->from;
694	>	dlink_node *node = NULL;
695	>
696	>	assert(!IsMe(source_p));
697	>	assert(source_p != &me);
698
699		if (MyConnect(source_p))
700		{
#	Line 767 | Line 706 | exit_client(struct Client *source_p, con
706
707		SetClosing(source_p);
708
709	<	if (IsIpHash(source_p))
710	<	remove_one_ip(&source_p->localClient->ip);
709	>	if (HasFlag(source_p, FLAGS_IPHASH))
710	>	{
711	>	DelFlag(source_p, FLAGS_IPHASH);
712	>	ipcache_remove_address(&source_p->connection->ip);
713	>	}
714
715	<	delete_auth(&source_p->localClient->auth);
715	>	delete_auth(&source_p->connection->auth);
716
717		/*
718		* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
#	Line 783 | Line 725 | exit_client(struct Client *source_p, con
725		{
726		assert(dlinkFind(&unknown_list, source_p));
727
728	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
728	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
729		}
730		else if (IsClient(source_p))
731		{
732	<	time_t on_for = CurrentTime - source_p->localClient->firsttime;
732	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
733	>
734		assert(Count.local > 0);
735	<	Count.local--;
735	>	--Count.local;
736
737		if (HasUMode(source_p, UMODE_OPER))
738	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
739	<	free_dlink_node(m);
738	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
739	>	free_dlink_node(node);
740
741		assert(dlinkFind(&local_client_list, source_p));
742	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
742	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
743
744	<	if (source_p->localClient->list_task != NULL)
745	<	free_list_task(source_p->localClient->list_task, source_p);
744	>	if (source_p->connection->list_task)
745	>	free_list_task(source_p);
746
747		watch_del_watch_list(source_p);
748		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
749		"Client exiting: %s (%s@%s) [%s] [%s]",
750		source_p->name, source_p->username, source_p->host, comment,
751	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
752	<	"255.255.255.255" : source_p->sockhost);
751	>	source_p->sockhost);
752	>
753		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
754	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
754	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
755		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
756		source_p->name, source_p->username, source_p->host,
757	<	source_p->localClient->send.bytes>>10,
758	<	source_p->localClient->recv.bytes>>10);
757	>	source_p->connection->send.bytes>>10,
758	>	source_p->connection->recv.bytes>>10);
759		}
760		else if (IsServer(source_p))
761		{
762		assert(Count.myserver > 0);
763		--Count.myserver;
764
765	<	assert(dlinkFind(&serv_list, source_p));
766	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
765	>	assert(dlinkFind(&local_server_list, source_p));
766	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
767		}
768
769		if (!IsDead(source_p))
#	Line 831 | Line 774 | exit_client(struct Client *source_p, con
774		{
775		/* for them, we are exiting the network */
776		sendto_one(source_p, ":%s SQUIT %s :%s",
777	<	ID(&me), ID(&me), comment);
777	>	me.id, me.id, comment);
778		}
779		}
780
#	Line 839 | Line 782 | exit_client(struct Client *source_p, con
782		source_p->host, comment);
783		}
784
842	–	/*
843	–	** Currently only server connections can have
844	–	** depending remote clients here, but it does no
845	–	** harm to check for all local clients. In
846	–	** future some other clients than servers might
847	–	** have remotes too...
848	–	**
849	–	** Close the Client connection first and mark it
850	–	** so that no messages are attempted to send to it.
851	–	** Remember it makes source_p->from == NULL.
852	–	*/
785		close_connection(source_p);
786		}
787		else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
#	Line 863 | Line 795 | exit_client(struct Client *source_p, con
795		char splitstr[HOSTLEN + HOSTLEN + 2] = "";
796
797		/* This shouldn't ever happen */
798	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
798	>	assert(source_p->serv && source_p->servptr);
799
800		if (ConfigServerHide.hide_servers)
801		/*
#	Line 875 | Line 807 | exit_client(struct Client *source_p, con
807		snprintf(splitstr, sizeof(splitstr), "%s %s",
808		source_p->servptr->name, source_p->name);
809
810	<	/* Send SQUIT for source_p in every direction. source_p is already off of serv_list here */
810	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
811		if (!HasFlag(source_p, FLAGS_SQUIT))
812	<	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", ID(source_p), comment);
812	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
813
814		/* Now exit the clients internally */
815		recurse_remove_clients(source_p, splitstr);
816
817	<	if (source_p->servptr == &me)
817	>	if (MyConnect(source_p))
818		{
819	+	int connected = CurrentTime - source_p->connection->firsttime;
820		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
821	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
822	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
823	<	source_p->localClient->send.bytes >> 10,
824	<	source_p->localClient->recv.bytes >> 10);
825	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
826	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
827	<	source_p->localClient->send.bytes >> 10,
828	<	source_p->localClient->recv.bytes >> 10);
821	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
822	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
823	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
824	>	source_p->connection->send.bytes >> 10,
825	>	source_p->connection->recv.bytes >> 10);
826	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
827	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
828	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
829	>	source_p->connection->send.bytes >> 10,
830	>	source_p->connection->recv.bytes >> 10);
831		}
832		}
833		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
834	<	sendto_server(client_p, NOCAPS, NOCAPS, ":%s QUIT :%s",
835	<	ID(source_p), comment);
834	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
835	>	source_p->id, comment);
836
837		/* The client *better* be off all of the lists */
838		assert(dlinkFind(&unknown_list, source_p) == NULL);
839		assert(dlinkFind(&local_client_list, source_p) == NULL);
840	<	assert(dlinkFind(&serv_list, source_p) == NULL);
840	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
841		assert(dlinkFind(&oper_list, source_p) == NULL);
842
843		exit_one_client(source_p, comment);
#	Line 915 | Line 850 | exit_client(struct Client *source_p, con
850		void
851		dead_link_on_write(struct Client *client_p, int ierrno)
852		{
853	<	dlink_node *ptr;
853	>	dlink_node *node;
854
855		if (IsDefunct(client_p))
856		return;
857
858	<	dbuf_clear(&client_p->localClient->buf_recvq);
859	<	dbuf_clear(&client_p->localClient->buf_sendq);
858	>	dbuf_clear(&client_p->connection->buf_recvq);
859	>	dbuf_clear(&client_p->connection->buf_sendq);
860
861		assert(dlinkFind(&abort_list, client_p) == NULL);
862	<	ptr = make_dlink_node();
862	>	node = make_dlink_node();
863		/* don't let exit_aborted_clients() finish yet */
864	<	dlinkAddTail(client_p, ptr, &abort_list);
864	>	dlinkAddTail(client_p, node, &abort_list);
865
866		if (eac_next == NULL)
867	<	eac_next = ptr;
867	>	eac_next = node;
868
869		SetDead(client_p); /* You are dead my friend */
870		}
#	Line 947 | Line 882 | dead_link_on_read(struct Client *client_
882		if (IsDefunct(client_p))
883		return;
884
885	<	dbuf_clear(&client_p->localClient->buf_recvq);
886	<	dbuf_clear(&client_p->localClient->buf_sendq);
885	>	dbuf_clear(&client_p->connection->buf_recvq);
886	>	dbuf_clear(&client_p->connection->buf_sendq);
887
888	<	current_error = get_sockerr(client_p->localClient->fd.fd);
888	>	current_error = get_sockerr(client_p->connection->fd.fd);
889
890		if (IsServer(client_p) || IsHandshake(client_p))
891		{
892	<	int connected = CurrentTime - client_p->localClient->firsttime;
892	>	int connected = CurrentTime - client_p->connection->firsttime;
893
894		if (error == 0)
895		{
#	Line 980 | Line 915 | dead_link_on_read(struct Client *client_
915		}
916
917		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
918	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
918	>	"%s was connected for %d day%s, %2d:%02d:%02d",
919		client_p->name, connected/86400,
920		(connected/86400 == 1) ? "" : "s",
921		(connected % 86400) / 3600, (connected % 3600) / 60,
#	Line 1041 | Line 976 | exit_aborted_clients(void)
976		*/
977
978		void
979	<	del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
979	>	del_accept(struct split_nuh_item *accept, struct Client *client_p)
980		{
981	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
981	>	dlinkDelete(&accept->node, &client_p->connection->acceptlist);
982
983	<	MyFree(accept_p->nickptr);
984	<	MyFree(accept_p->userptr);
985	<	MyFree(accept_p->hostptr);
986	<	MyFree(accept_p);
983	>	MyFree(accept->nickptr);
984	>	MyFree(accept->userptr);
985	>	MyFree(accept->hostptr);
986	>	MyFree(accept);
987		}
988
989		struct split_nuh_item *
#	Line 1056 | Line 991 | find_accept(const char *nick, const char
991		const char *host, struct Client *client_p,
992		int (*cmpfunc)(const char *, const char *))
993		{
994	<	dlink_node *ptr = NULL;
994	>	dlink_node *node = NULL;
995
996	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
996	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
997		{
998	<	struct split_nuh_item *accept_p = ptr->data;
998	>	struct split_nuh_item *accept = node->data;
999
1000	<	if (!cmpfunc(accept_p->nickptr, nick) &&
1001	<	!cmpfunc(accept_p->userptr, user) &&
1002	<	!cmpfunc(accept_p->hostptr, host))
1003	<	return accept_p;
1000	>	if (!cmpfunc(accept->nickptr, nick) &&
1001	>	!cmpfunc(accept->userptr, user) &&
1002	>	!cmpfunc(accept->hostptr, host))
1003	>	return accept;
1004		}
1005
1006		return NULL;
#	Line 1082 | Line 1017 | int
1017		accept_message(struct Client *source,
1018		struct Client *target)
1019		{
1020	<	dlink_node *ptr = NULL;
1020	>	dlink_node *node = NULL;
1021
1022		if (source == target || find_accept(source->name, source->username,
1023		source->host, target, match))
1024		return 1;
1025
1026	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1027	<	DLINK_FOREACH(ptr, target->channel.head)
1028	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1026	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1027	>	DLINK_FOREACH(node, target->channel.head)
1028	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1029		return 1;
1030
1031		return 0;
#	Line 1105 | Line 1040 | accept_message(struct Client *source,
1040		void
1041		del_all_accepts(struct Client *client_p)
1042		{
1043	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1043	>	dlink_node *node = NULL, *node_next = NULL;
1044
1045	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1046	<	del_accept(ptr->data, client_p);
1045	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1046	>	del_accept(node->data, client_p);
1047		}
1048
1049		unsigned int
#	Line 1117 | Line 1052 | idle_time_get(const struct Client *sourc
1052		unsigned int idle = 0;
1053		unsigned int min_idle = 0;
1054		unsigned int max_idle = 0;
1055	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1055	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1056
1057		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1058	<	return CurrentTime - target_p->localClient->last_privmsg;
1058	>	return CurrentTime - target_p->connection->last_privmsg;
1059	>
1060		if (HasUMode(source_p, UMODE_OPER) &&
1061		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1062	<	return CurrentTime - target_p->localClient->last_privmsg;
1062	>	return CurrentTime - target_p->connection->last_privmsg;
1063
1064		min_idle = class->min_idle;
1065		max_idle = class->max_idle;
#	Line 1134 | Line 1070 | idle_time_get(const struct Client *sourc
1070		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1071		idle = genrand_int32();
1072		else
1073	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1073	>	idle = CurrentTime - target_p->connection->last_privmsg;
1074
1075	<	if (max_idle == 0)
1075	>	if (!max_idle)
1076		idle = 0;
1077		else
1078		idle %= max_idle;
#	Line 1146 | Line 1082 | idle_time_get(const struct Client *sourc
1082
1083		return idle;
1084		}
1085	+
1086	+	/* client_init()
1087	+	*
1088	+	* inputs       - NONE
1089	+	* output       - NONE
1090	+	* side effects - initialize client free memory
1091	+	*/
1092	+	void
1093	+	client_init(void)
1094	+	{
1095	+	static struct event event_ping =
1096	+	{
1097	+	.name = "check_pings",
1098	+	.handler = check_pings,
1099	+	.when = 5
1100	+	};
1101	+
1102	+	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1103	+	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1104	+	event_add(&event_ping, NULL);
1105	+	}

Diff Legend

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