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 5558 by michael, Fri Feb 13 20:45:49 2015 UTC vs.
Revision 5752 by michael, Thu Apr 2 17:27:33 2015 UTC

#	Line 104 | 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->account, "0");
107	>	strcpy(client_p->account, "*");
108
109		return client_p;
110		}
#	Line 125 | Line 125 | free_client(struct Client *client_p)
125		assert(client_p->channel.head == NULL);
126		assert(dlink_list_length(&client_p->channel) == 0);
127		assert(dlink_list_length(&client_p->whowas) == 0);
128	<	assert(!IsServer(client_p) || client_p->serv);
128	>	assert(dlink_list_length(&client_p->svstags) == 0);
129
130		MyFree(client_p->serv);
131		MyFree(client_p->certfp);
#	Line 143 | Line 143 | free_client(struct Client *client_p)
143		client_p->connection->challenge_operator = NULL;
144
145		/*
146	<	* Clean up extra sockets from listen{} blocks which have been discarded.
146	>	* Clean up extra sockets from listen {} blocks which have been discarded.
147		*/
148		if (client_p->connection->listener)
149		{
#	Line 349 | Line 349 | check_conf_klines(void)
349		client_p->connection->aftype, NULL, NULL, 1)))
350		{
351		conf_try_ban(client_p, conf);
352	<	continue; /* and go examine next fd/client_p */
352	>	continue;  /* and go examine next Client */
353		}
354
355		if (ConfigGeneral.glines)
#	Line 359 | Line 359 | check_conf_klines(void)
359		client_p->username, NULL, 1)))
360		{
361		conf_try_ban(client_p, conf);
362	<	/* and go examine next fd/client_p */
363	<	continue;
362	>	continue;  /* and go examine next Client */
363		}
364		}
365
#	Line 369 | Line 368 | check_conf_klines(void)
368		client_p->username, NULL, 1)))
369		{
370		conf_try_ban(client_p, conf);
371	<	continue;
371	>	continue;  /* and go examine next Client */
372		}
373
374	<	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
374	>	if ((conf = find_matching_name_conf(CONF_XLINE, client_p->info,
375		NULL, NULL, 0)))
376		{
377		conf_try_ban(client_p, conf);
378	<	continue;
378	>	continue;  /* and go examine next Client */
379		}
380		}
381
382	<	/* also check the unknowns list for new dlines */
382	>	/* Also check the unknowns list for new dlines */
383		DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
384		{
385		struct Client *client_p = node->data;
#	Line 389 | Line 388 | check_conf_klines(void)
388		client_p->connection->aftype, NULL, NULL, 1)))
389		{
390		conf_try_ban(client_p, conf);
391	<	continue; /* and go examine next fd/client_p */
391	>	continue;  /* and go examine next Client */
392		}
393		}
394		}
#	Line 835 | Line 834 | exit_client(struct Client *source_p, con
834		{
835		char splitstr[HOSTLEN + HOSTLEN + 2] = "";
836
837	<	/* This shouldn't ever happen */
838	<	assert(source_p->serv && source_p->servptr);
837	>	assert(source_p->serv);
838	>	assert(source_p->servptr);
839
840		if (ConfigServerHide.hide_servers)
841		/*
#	Line 866 | Line 865 | exit_client(struct Client *source_p, con
865		source_p->connection->recv.bytes >> 10);
866		ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
867		source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
868	<	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
869	<	source_p->connection->send.bytes >> 10,
870	<	source_p->connection->recv.bytes >> 10);
868	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
869	>	source_p->connection->send.bytes >> 10,
870	>	source_p->connection->recv.bytes >> 10);
871		}
872		}
873		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))

Diff Legend

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