void Write_NoFormat(int sock, const char *text)
{
- if ((sock < 0) || (!text))
+ if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
return;
char tb[MAXBUF];
{
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
- Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ try
+ {
+ Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
}
else
{
void Write(int sock,char *text, ...)
{
- if (sock < 0)
+ if ((sock < 0) || (sock > MAX_DESCRIPTORS))
return;
if (!text)
{
{
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
- Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ try
+ {
+ Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
}
else
{
void WriteServ_NoFormat(int sock, const char* text)
{
- if ((sock < 0) || (!text))
+ if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
return;
char tb[MAXBUF];
int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
{
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
- Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ try
+ {
+ Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
}
else
{
void WriteServ(int sock, char* text, ...)
{
- if (sock < 0)
+ if ((sock < 0) || (sock > MAX_DESCRIPTORS))
return;
if (!text)
{
{
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
- Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ try
+ {
+ Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
}
else
{
void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
{
- if ((sock < 0) || (!text) || (!user))
+ if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS))
return;
char tb[MAXBUF];
- int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,text);
+ int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
chop(tb);
if (fd_ref_table[sock])
{
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
- Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ try
+ {
+ Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
}
else
{
void WriteFrom(int sock, userrec *user,char* text, ...)
{
- if (sock < 0)
+ if ((sock < 0) || (sock > MAX_DESCRIPTORS))
return;
if ((!text) || (!user))
{
char textbuffer[MAXBUF],tb[MAXBUF];
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer);
+ int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer);
chop(tb);
if (fd_ref_table[sock])
{
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
- Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ try
+ {
+ Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
}
else
{
// if no source given send it from the server.
if (!source)
{
- WriteServ(dest->fd,":%s %s",Config->ServerName,textbuffer);
+ WriteServ_NoFormat(dest->fd,textbuffer);
}
else
{
return;
if (!source)
{
- WriteServ(dest->fd,":%s %s",Config->ServerName,data);
+ WriteServ_NoFormat(dest->fd,data);
}
else
{
/* write formatted text from a source user to all users on a channel except
* for the sender (for privmsg etc) */
-void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
+void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...)
{
if ((!Ptr) || (!user) || (!text))
{
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- std::map<char*,char*> *ulist= Ptr->GetUsers();
+ std::map<char*,char*> *ulist;
+ switch (status)
+ {
+ case '@':
+ ulist = Ptr->GetOppedUsers();
+ break;
+ case '%':
+ ulist = Ptr->GetHalfoppedUsers();
+ break;
+ case '+':
+ ulist = Ptr->GetVoicedUsers();
+ break;
+ default:
+ ulist = Ptr->GetUsers();
+ break;
+ }
+ log(DEBUG,"%d users to write to",ulist->size());
for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
{
char* o = i->second;
}
}
-void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, const char* text)
+void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text)
{
if ((!Ptr) || (!user) || (!text))
{
log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
return;
}
- std::map<char*,char*> *ulist= Ptr->GetUsers();
+ std::map<char*,char*> *ulist;
+ switch (status)
+ {
+ case '@':
+ ulist = Ptr->GetOppedUsers();
+ break;
+ case '%':
+ ulist = Ptr->GetHalfoppedUsers();
+ break;
+ case '+':
+ ulist = Ptr->GetVoicedUsers();
+ break;
+ default:
+ ulist = Ptr->GetUsers();
+ break;
+ }
for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
{
char* o = i->second;
}
-
/* write a formatted string to all users who share at least one common
* channel, NOT including the source user e.g. for use in QUIT */
}
char textbuffer[MAXBUF];
+ char oper_quit[MAXBUF];
+ bool quit_munge = false;
+
va_list argsPtr;
va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ int total = vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
+ if ((Config->HideSplits) && (total > 6))
+ {
+ /* Yeah yeah, this is ugly. But its fast, live with it. */
+ char* check = textbuffer;
+ if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':'))
+ {
+ std::stringstream split(check);
+ std::string server_one;
+ std::string server_two;
+ split >> server_one;
+ split >> server_two;
+ if ((FindServerName(server_one)) && (FindServerName(server_two)))
+ {
+ strlcpy(oper_quit,textbuffer,MAXBUF);
+ strlcpy(check,"*.net *.split",MAXQUIT);
+ quit_munge = true;
+ }
+ }
+ }
+
memset(&already_sent,0,MAX_DESCRIPTORS);
unsigned int y = u->chans.size();
if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
{
already_sent[otheruser->fd] = 1;
- WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
+ if (quit_munge)
+ {
+ if (*otheruser->oper)
+ {
+ WriteFrom_NoFormat(otheruser->fd,u,oper_quit);
+ }
+ else
+ {
+ WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
+ }
+ }
+ else WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
}
}
}
return iter->second;
}
+userrec* Find(const char* nick)
+{
+ if (!nick)
+ return NULL;
+ user_hash::iterator iter = clientlist.find(nick);
+
+ if (iter == clientlist.end())
+ return NULL;
+
+ return iter->second;
+}
+
/* find a channel record by channel name and return a pointer to it */
chanrec* FindChan(const char* chan)
}
-char* chanmodes(chanrec *chan)
+char* chanmodes(chanrec *chan, bool showkey)
{
static char scratch[MAXBUF];
static char sparam[MAXBUF];
if (chan->binarymodes & CM_PRIVATE)
*offset++ = 'p';
if (*chan->key)
- snprintf(sparam,MAXBUF," %s",chan->key);
+ {
+ snprintf(sparam,MAXBUF," %s",showkey ? chan->key : "<key>");
+ }
if (chan->limit)
{
char foo[24];
int usercount_opers(void)
{
- return all_opers.size();
+ int c = 0;
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ if (*i->second->oper) c++;
+ return c;
}
int usercount_unknown(void)
// only one write operation
if (Config->GetIOHook(user->port))
{
- Config->GetIOHook(user->port)->OnRawSocketWrite(user->fd,(char*)WholeMOTD.c_str(),WholeMOTD.length());
+ try
+ {
+ Config->GetIOHook(user->port)->OnRawSocketWrite(user->fd,(char*)WholeMOTD.c_str(),WholeMOTD.length());
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
+
}
else
{
return otherdir;
}
+int InsertMode(std::string &output, const char* mode, unsigned short section)
+{
+ unsigned short currsection = 1;
+ unsigned int pos = output.find("CHANMODES=", 0) + 10; // +10 for the length of "CHANMODES="
+
+ if(section > 4 || section == 0)
+ {
+ log(DEBUG, "InsertMode: CHANMODES doesn't have a section %dh :/", section);
+ return 0;
+ }
+
+ for(; pos < output.size(); pos++)
+ {
+ if(section == currsection)
+ break;
+
+ if(output[pos] == ',')
+ currsection++;
+ }
+
+ output.insert(pos, mode);
+ return 1;
+}
+
+bool IsValidChannelName(const char *chname)
+{
+ char *c;
+
+ /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
+ if (!chname || *chname != '#')
+ {
+ return false;
+ }
+
+ c = (char *)chname + 1;
+ while (*c)
+ {
+ switch (*c)
+ {
+ case ' ':
+ case ',':
+ case 7:
+ return false;
+ }
+
+ c++;
+ }
+
+ /* too long a name - note funky pointer arithmetic here. */
+ if ((c - chname) > CHANMAX)
+ {
+ return false;
+ }
+
+ return true;
+}
projects / user / henk / code / inspircd.git / blobdiff