9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the can_join hook more flexible.

Browse source
This commit is contained in:
William Pitcock 2010-12-06 23:52:44 -06:00
parent 429cf1b74f
commit 8bb19bd7ab
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/channel.c
View file

@ -724,6 +724,10 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
s_assert(source_p->localClient != NULL); s_assert(source_p->localClient != NULL);
moduledata.client = source_p;
moduledata.chptr = chptr;
moduledata.approved = 0;
rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host); rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host);
rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost); rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost);
if(source_p->localClient->mangledhost != NULL) if(source_p->localClient->mangledhost != NULL)
@ -744,7 +748,10 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
} }
if((is_banned(chptr, source_p, NULL, src_host, src_iphost)) == CHFL_BAN) if((is_banned(chptr, source_p, NULL, src_host, src_iphost)) == CHFL_BAN)
return (ERR_BANNEDFROMCHAN); {
moduledata.approved = ERR_BANNEDFROMCHAN;
goto finish_join_check;
}
if(chptr->mode.mode & MODE_INVITEONLY) if(chptr->mode.mode & MODE_INVITEONLY)
{ {
@ -756,7 +763,7 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
if(invite == NULL) if(invite == NULL)
{ {
if(!ConfigChannel.use_invex) if(!ConfigChannel.use_invex)
return (ERR_INVITEONLYCHAN); moduledata.approved = ERR_INVITEONLYCHAN;
RB_DLINK_FOREACH(ptr, chptr->invexlist.head) RB_DLINK_FOREACH(ptr, chptr->invexlist.head)
{ {
invex = ptr->data; invex = ptr->data;
@ -768,12 +775,12 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
break; break;
} }
if(ptr == NULL) if(ptr == NULL)
return (ERR_INVITEONLYCHAN); moduledata.approved = ERR_INVITEONLYCHAN;
} }
} }
if(*chptr->mode.key && (EmptyString(key) || irccmp(chptr->mode.key, key))) if(*chptr->mode.key && (EmptyString(key) || irccmp(chptr->mode.key, key)))
return (ERR_BADCHANNELKEY); moduledata.approved = ERR_BADCHANNELKEY;
if(chptr->mode.limit && if(chptr->mode.limit &&
rb_dlink_list_length(&chptr->members) >= (unsigned long) chptr->mode.limit) rb_dlink_list_length(&chptr->members) >= (unsigned long) chptr->mode.limit)
@ -798,13 +805,10 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
break; break;
} }
if (invite == NULL) if (invite == NULL)
return i; moduledata.approved = i;
} }
moduledata.client = source_p; finish_join_check:
moduledata.chptr = chptr;
moduledata.approved = 0;
call_hook(h_can_join, &moduledata); call_hook(h_can_join, &moduledata);
return moduledata.approved; return moduledata.approved;