using namespace std;
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
#include <map>
#include <sstream>
#include <vector>
#include <deque>
+#include "configreader.h"
+#include "inspircd.h"
+#include "hash_map.h"
#include "users.h"
#include "ctables.h"
#include "globals.h"
#include "helperfuncs.h"
#include "typedefs.h"
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
extern ServerConfig* Config;
extern int MODCOUNT;
extern std::vector<Module*> modules;
extern std::vector<ircd_module*> factory;
-extern int WHOWAS_STALE;
-extern int WHOWAS_MAX;
extern time_t TIME;
extern chan_hash chanlist;
-using namespace std;
chanrec* ForceChan(chanrec* Ptr,ucrec *a,userrec* user, int created);
chanrec::chanrec()
{
*name = *topic = *setby = *key = 0;
- created = topicset = limit = binarymodes = 0;
+ created = topicset = limit = 0;
internal_userlist.clear();
- memset(&custom_modes,0,64);
+ memset(&modes,0,64);
}
-void chanrec::SetCustomMode(char mode,bool mode_on)
+void chanrec::SetMode(char mode,bool mode_on)
{
- custom_modes[mode-65] = mode_on;
+ modes[mode-65] = mode_on;
if (!mode_on)
- this->SetCustomModeParam(mode,"",false);
+ this->SetModeParam(mode,"",false);
}
-void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
+void chanrec::SetModeParam(char mode,char* parameter,bool mode_on)
{
- log(DEBUG,"SetCustomModeParam called");
+ log(DEBUG,"SetModeParam called");
- std::map<char,char*>::iterator n = custom_mode_params.find(mode);
+ CustomModeList::iterator n = custom_mode_params.find(mode);
if (mode_on)
{
- log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
if (n == custom_mode_params.end())
{
custom_mode_params[mode] = strdup(parameter);
+ log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
+ }
+ else
+ {
+ log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
}
}
else
}
}
-bool chanrec::IsCustomModeSet(char mode)
+bool chanrec::IsModeSet(char mode)
{
- return custom_modes[mode-65];
+ return modes[mode-65];
}
std::string chanrec::GetModeParameter(char mode)
{
- std::map<char,char*>::iterator n = custom_mode_params.find(mode);
- if (n != custom_mode_params.end())
+ if (mode == 'k')
+ {
+ return this->key;
+ }
+ else if (mode == 'l')
{
- return n->second;
+ return ConvToStr(this->limit);
+ }
+ else
+ {
+ CustomModeList::iterator n = custom_mode_params.find(mode);
+ if (n != custom_mode_params.end())
+ {
+ return n->second;
+ }
+ return "";
}
- return "";
}
long chanrec::GetUserCounter()
unsigned long chanrec::DelUser(userrec* user)
{
- CUList::iterator a = internal_userlist.find(user);
+ CUListIter a = internal_userlist.find(user);
+
if (a != internal_userlist.end())
{
internal_userlist.erase(a);
DelOppedUser(user);
DelHalfoppedUser(user);
DelVoicedUser(user);
- return internal_userlist.size();
}
+
return internal_userlist.size();
}
void chanrec::DelOppedUser(userrec* user)
{
- CUList::iterator a = internal_op_userlist.find(user);
+ CUListIter a = internal_op_userlist.find(user);
if (a != internal_op_userlist.end())
{
internal_op_userlist.erase(a);
void chanrec::DelHalfoppedUser(userrec* user)
{
- CUList::iterator a = internal_halfop_userlist.find(user);
+ CUListIter a = internal_halfop_userlist.find(user);
+
if (a != internal_halfop_userlist.end())
{
internal_halfop_userlist.erase(a);
- return;
}
}
void chanrec::DelVoicedUser(userrec* user)
{
- CUList::iterator a = internal_voice_userlist.find(user);
+ CUListIter a = internal_voice_userlist.find(user);
+
if (a != internal_voice_userlist.end())
{
internal_voice_userlist.erase(a);
- return;
}
}
/* create a new one */
chanlist[cname] = new chanrec();
strlcpy(chanlist[cname]->name, cname,CHANMAX);
- chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL;
+ chanlist[cname]->modes[CM_TOPICLOCK] = chanlist[cname]->modes[CM_NOEXTERNAL] = 1;
+ //chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL;
chanlist[cname]->created = TIME;
*chanlist[cname]->topic = 0;
strlcpy(chanlist[cname]->setby, user->nick,NICKMAX-1);
}
}
}
- if (Ptr->binarymodes & CM_INVITEONLY)
+ if (Ptr->modes[CM_INVITEONLY])
{
MOD_RESULT = 0;
irc::string xname(Ptr->name);
log(DEBUG,"Passed channel checks");
- for (std::vector<ucrec*>::const_iterator index = user->chans.begin(); index != user->chans.end(); index++)
+ for (UserChanList::const_iterator index = user->chans.begin(); index != user->chans.end(); index++)
{
- if ((ucrec*)(*index)->channel == NULL)
+ if ((*index)->channel == NULL)
{
- return ForceChan(Ptr,(ucrec*)(*index),user,created);
+ return ForceChan(Ptr, *index, user, created);
}
}
if (n != chanlist.end())
{
Ptr->DelUser(user);
- delete Ptr;
+ DELETE(Ptr);
chanlist.erase(n);
for (unsigned int index =0; index < user->chans.size(); index++)
{
}
}
}
+ else
+ {
+ for (unsigned int index =0; index < user->chans.size(); index++)
+ {
+ if (user->chans[index]->channel == Ptr)
+ {
+ user->chans[index]->channel = NULL;
+ user->chans[index]->uc_modes = 0;
+ }
+ }
+ }
return NULL;
}
a->channel = Ptr;
Ptr->AddUser(user);
WriteChannel(Ptr,user,"JOIN :%s",Ptr->name);
- log(DEBUG,"Sent JOIN to client");
- if (Ptr->topicset)
+ /* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
+ if (IS_LOCAL(user))
{
- WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
- WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
+ log(DEBUG,"Sent JOIN to client");
+ if (Ptr->topicset)
+ {
+ WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
+ WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
+ }
+ userlist(user,Ptr);
+ WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
}
-
- userlist(user,Ptr);
- WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
FOREACH_MOD(I_OnUserJoin,OnUserJoin(user,Ptr));
return Ptr;
}
{
log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
- delete Ptr;
+ DELETE(Ptr);
chanlist.erase(iter);
}
}
if (iter != chanlist.end())
{
log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
- FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
- delete Ptr;
+ FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
+ DELETE(Ptr);
chanlist.erase(iter);
}
}
WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name);
return;
}
+ if ((is_uline(user->server)) && (!is_uline(src->server)))
+ {
+ WriteServ(src->fd,"482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, Ptr->name);
+ return;
+ }
int MOD_RESULT = 0;
if (!is_uline(src->server))
FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,Ptr,reason));
- for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+ for (UserChanList::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
/* zap it from the channel list of the user */
- if ((((ucrec*)(*i))->channel) && (((ucrec*)(*i))->channel == Ptr))
+ if ((*i)->channel && ((*i)->channel == Ptr))
{
WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason);
- ((ucrec*)(*i))->uc_modes = 0;
- ((ucrec*)(*i))->channel = NULL;
+ (*i)->uc_modes = 0;
+ (*i)->channel = NULL;
log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
break;
}
{
log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
- delete Ptr;
+ DELETE(Ptr);
chanlist.erase(iter);
}
}
}
-
-
projects / user / henk / code / inspircd.git / blobdiff