ViewVC Help

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

root/svn/branches/ircd-hybrid-newconf/src/channel.c

Comparing ircd-hybrid/src/channel.c (file contents):
Revision 741 by adx, Sun Jul 23 13:49:20 2006 UTC vs.
Revision 743 by adx, Sun Jul 23 20:03:42 2006 UTC

#	Line 25 | Line 25
25		*/
26
27		#include "stdinc.h"
28	+	#include "conf/conf.h"
29		#include "channel.h"
30		#include "channel_mode.h"
31		#include "client.h"
#	Line 37 | Line 38
38		#include "s_user.h"
39		#include "send.h"
40
40	–	struct config_channel_entry ConfigChannel;
41		dlink_list global_channel_list = { NULL, NULL, 0 };
42		BlockHeap *ban_heap;    /*! \todo ban_heap shouldn't be a global var */
43
#	Line 321 | Line 321 | check_channel_name(const char *name, int
321		if (!IsChanPrefix(*p))
322		return 0;
323
324	<	if (!local || !ConfigChannel.disable_fake_channels)
324	>	if (!local || !Channel.disable_fake_channels)
325		{
326		while (*++p)
327		if (!IsChanChar(*p))
#	Line 515 | Line 515 | add_invite(struct Channel *chptr, struct
515		* delete last link in chain if the list is max length
516		*/
517		if (dlink_list_length(&who->localClient->invited) >=
518	<	ConfigChannel.max_chans_per_user)
518	>	Channel.max_chans_per_user)
519		del_invite(who->localClient->invited.tail->data, who);
520
521		/* add client to channel invite list */
#	Line 641 | Line 641 | is_banned(const struct Channel *chptr, c
641		assert(IsClient(who));
642
643		if (find_bmask(who, &chptr->banlist))
644	<	if (!ConfigChannel.use_except || !find_bmask(who, &chptr->exceptlist))
644	>	if (!Channel.use_except || !find_bmask(who, &chptr->exceptlist))
645		return 1;
646
647		return 0;
#	Line 685 | Line 685 | can_send(struct Channel *chptr, struct C
685		return CAN_SEND_OPV;
686
687		if (MyClient(source_p) && !IsExemptResv(source_p))
688	<	if (!(IsOper(source_p) && ConfigFileEntry.oper_pass_resv))
689	<	if (!hash_find_resv(chptr->chname) == ConfigChannel.restrict_channels)
688	>	if (!(IsOper(source_p) && General.oper_pass_resv))
689	>	if (!hash_find_resv(chptr->chname) == Channel.restrict_channels)
690		return CAN_SEND_NO;
691
692		if (ms != NULL || (ms = find_channel_link(source_p, chptr)))
#	Line 695 | Line 695 | can_send(struct Channel *chptr, struct C
695		return CAN_SEND_OPV;
696
697		/* cache can send if quiet_on_ban and banned */
698	<	if (ConfigChannel.quiet_on_ban && MyClient(source_p))
698	>	if (Channel.quiet_on_ban && MyClient(source_p))
699		{
700		if (ms->flags & CHFL_BAN_SILENCED)
701		return CAN_SEND_NO;
#	Line 793 | Line 793 | check_spambot_warning(struct Client *sou
793		void
794		check_splitmode(void *unused)
795		{
796	<	if (splitchecking && (ConfigChannel.no_join_on_split ||
797	<	ConfigChannel.no_create_on_split))
796	>	if (splitchecking && (Channel.no_join_on_split ||
797	>	Channel.no_create_on_split))
798		{
799		const unsigned int server = dlink_list_length(&global_serv_list);
800
#	Line 908 | Line 908 | set_channel_topic(struct Channel *chptr,
908		static int
909		exceeding_sendq(struct Client *to)
910		{
911	<	if (dbuf_length(&to->localClient->buf_sendq) > (get_sendq(to) / 2))
912	<	return 1;
913	<	else
914	<	return 0;
911	>	return dbuf_length(&to->localClient->buf_sendq) >
912	>	(to->localClient->class->sendq_size / 2);
913		}
914
915		/* free_list_task()

Diff Legend

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