* ---------------------------------------------------
*/
+using namespace std;
+
+#include "inspircd_config.h"
#include "inspircd.h"
#include "inspircd_io.h"
#include "inspircd_util.h"
-#include "inspircd_config.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/errno.h>
-#include <sys/ioctl.h>
#include <sys/utsname.h>
-#include <cstdio>
#include <time.h>
#include <string>
#ifdef GCC3
#include <map>
#include <sstream>
#include <vector>
-#include <errno.h>
#include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
-#include "connection.h"
#include "users.h"
-#include "servers.h"
#include "ctables.h"
#include "globals.h"
#include "modules.h"
#include "dynamic.h"
#include "wildcard.h"
+#include "commands.h"
#include "message.h"
-
-using namespace std;
+#include "inspstring.h"
+#include "dns.h"
+#include "helperfuncs.h"
extern int MODCOUNT;
-extern vector<Module*> modules;
-extern vector<ircd_module*> factory;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
+
+extern char ServerName[MAXBUF];
+
+extern time_t TIME;
+
+extern FILE *log_file;
+extern char DNSServer[MAXBUF];
/* return 0 or 1 depending if users u and u2 share one or more common channels
* (used by QUIT, NICK etc which arent channel specific notices) */
int common_channels(userrec *u, userrec *u2)
{
- int i = 0;
- int z = 0;
-
if ((!u) || (!u2))
{
log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
return 0;
}
- for (int i = 0; i != MAXCHANS; i++)
+ for (unsigned int i = 0; i < u->chans.size(); i++)
{
- for (z = 0; z != MAXCHANS; z++)
+ for (unsigned int z = 0; z != u2->chans.size(); z++)
{
if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL))
{
return 0;
}
-
-void safedelete(userrec *p)
-{
- if (p)
- {
- log(DEBUG,"deleting %s %s %s %s",p->nick,p->ident,p->dhost,p->fullname);
- log(DEBUG,"safedelete(userrec*): pointer is safe to delete");
- delete p;
- p = NULL;
- }
- else
- {
- log(DEBUG,"safedelete(userrec*): unsafe pointer operation squished");
- }
-}
-
-void safedelete(chanrec *p)
-{
- if (p)
- {
- delete p;
- p = NULL;
- log(DEBUG,"safedelete(chanrec*): pointer is safe to delete");
- }
- else
- {
- log(DEBUG,"safedelete(chanrec*): unsafe pointer operation squished");
- }
-}
-
-
void tidystring(char* str)
{
// strips out double spaces before a : parameter
-
+
char temp[MAXBUF];
bool go_again = true;
-
+
if (!str)
- {
return;
- }
-
- while ((str[0] == ' ') && (strlen(str)>0))
- {
+
+ // pointer voodoo++ --w00t
+ while ((*str) && (*str == ' '))
str++;
- }
-
+
while (go_again)
{
bool noparse = false;
int t = 0, a = 0;
go_again = false;
- while (a < strlen(str))
+ const int lenofstr = strlen(str);
+
+ /*
+ * by caching strlen() of str, we theoretically avoid 3 expensive calls each time this loop
+ * rolls around.. should speed things up a nanosecond or two. ;)
+ */
+
+ while (a < lenofstr)
{
- if ((a<strlen(str)-1) && (noparse==false))
+ if ((a < lenofstr - 1) && (noparse == false))
{
if ((str[a] == ' ') && (str[a+1] == ' '))
{
a++;
}
}
-
- if (a<strlen(str)-1)
+
+ if (a < lenofstr - 1)
{
if ((str[a] == ' ') && (str[a+1] == ':'))
{
noparse = true;
}
}
-
+
temp[t++] = str[a++];
}
+
temp[t] = '\0';
strlcpy(str,temp,MAXBUF);
}
void chop(char* str)
{
- if (!str)
- {
- log(DEBUG,"ERROR! Null string passed to chop()!");
- return;
- }
- string temp = str;
- FOREACH_MOD OnServerRaw(temp,false,NULL);
- const char* str2 = temp.c_str();
- snprintf(str,MAXBUF,"%s",str2);
-
-
- if (strlen(str) >= 512)
- {
- str[509] = '\r';
- str[510] = '\n';
- str[511] = '\0';
- }
+ if (!str)
+ {
+ log(DEBUG,"ERROR! Null string passed to chop()!");
+ return;
+ }
+ string temp = str;
+ FOREACH_MOD OnServerRaw(temp,false,NULL);
+ const char* str2 = temp.c_str();
+ snprintf(str,MAXBUF,"%s",str2);
+ if (strlen(str) >= 511)
+ {
+ str[510] = '\r';
+ str[511] = '\n';
+ str[512] = '\0';
+ log(DEBUG,"Excess line chopped.");
+ }
}
void Blocking(int s)
{
- int flags;
- log(DEBUG,"Blocking: %d",s);
- flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
+ int flags;
+ log(DEBUG,"Blocking: %d",s);
+ flags = fcntl(s, F_GETFL, 0);
+ fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
}
void NonBlocking(int s)
{
- int flags;
- log(DEBUG,"NonBlocking: %d",s);
- flags = fcntl(s, F_GETFL, 0);
- //fcntl(s, F_SETFL, O_NONBLOCK);
- fcntl(s, F_SETFL, flags | O_NONBLOCK);
+ int flags;
+ log(DEBUG,"NonBlocking: %d",s);
+ flags = fcntl(s, F_GETFL, 0);
+ fcntl(s, F_SETFL, flags | O_NONBLOCK);
}
int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
{
- struct hostent *hostPtr = NULL;
- struct in_addr addr;
-
- memset (resolvedHost, '\0',MAXBUF);
- if(unresolvedHost == NULL)
- return(ERROR);
- if ((inet_aton(unresolvedHost,&addr)) == 0)
- return(ERROR);
- hostPtr = gethostbyaddr ((char *)&addr.s_addr,sizeof(addr.s_addr),AF_INET);
- if (hostPtr != NULL)
- snprintf(resolvedHost,MAXBUF,"%s",hostPtr->h_name);
- else
- snprintf(resolvedHost,MAXBUF,"%s",unresolvedHost);
- return (TRUE);
+ DNS d(DNSServer);
+ int fd = d.ReverseLookup(unresolvedHost);
+ if (fd < 1)
+ return 0;
+ time_t T = time(NULL)+1;
+ while ((!d.HasResult()) && (time(NULL)<T));
+ std::string ipaddr = d.GetResult();
+ strlcpy(resolvedHost,ipaddr.c_str(),MAXBUF);
+ return (ipaddr != "");
}
int c_count(userrec* u)
{
int z = 0;
- for (int i =0; i != MAXCHANS; i++)
+ for (unsigned int i =0; i < u->chans.size(); i++)
if (u->chans[i].channel != NULL)
z++;
return z;
void ChangeName(userrec* user, const char* gecos)
{
+ if (user->fd > -1)
+ {
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(OnChangeLocalUserGECOS(user,gecos));
+ if (MOD_RESULT)
+ return;
+ FOREACH_MOD OnChangeName(user,gecos);
+ }
strlcpy(user->fullname,gecos,MAXBUF);
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos);
- NetSendToAll(buffer);
}
void ChangeDisplayedHost(userrec* user, const char* host)
{
+ if (user->fd > -1)
+ {
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(OnChangeLocalUserHost(user,host));
+ if (MOD_RESULT)
+ return;
+ FOREACH_MOD OnChangeHost(user,host);
+ }
strlcpy(user->dhost,host,160);
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"b %s %s",user->nick,host);
- NetSendToAll(buffer);
}
/* verify that a user's ident and nickname is valid */
int isident(const char* n)
{
- char v[MAXBUF];
if (!n)
{
{
return 0;
}
- for (int i = 0; i != strlen(n); i++)
+ for (unsigned int i = 0; i < strlen(n); i++)
{
if ((n[i] < 33) || (n[i] > 125))
{
return 0;
}
/* can't occur ANYWHERE in an Ident! */
- if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
+ if (strchr("<>,/?:;@'~#=+()*&%$£ \"!",n[i]))
{
return 0;
}
int isnick(const char* n)
{
- int i = 0;
- char v[MAXBUF];
if (!n)
{
return 0;
{
return 0;
}
- if (strlen(n) > NICKMAX-1)
+ if (strlen(n) > NICKMAX)
{
return 0;
}
- for (int i = 0; i != strlen(n); i++)
+ for (unsigned int i = 0; i != strlen(n); i++)
{
if ((n[i] < 33) || (n[i] > 125))
{
return "";
}
- int i;
- for (int i = 0; i != MAXCHANS; i++)
+ for (unsigned int i = 0; i < user->chans.size(); i++)
{
if (user->chans[i].channel)
{
}
}
}
+ return "";
}
/* returns the status value for a given user on a channel, e.g. STATUS_OP for
return 0;
}
- for (int i = 0; i != MAXCHANS; i++)
+ if (is_uline(user->server))
+ return STATUS_OP;
+
+ for (unsigned int i = 0; i < user->chans.size(); i++)
{
if (user->chans[i].channel)
{
}
}
}
+ return STATUS_NORMAL;
}
/* returns 1 if user u has channel c in their record, 0 if not */
log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter");
return 0;
}
- for (int i =0; i != MAXCHANS; i++)
+ for (unsigned int i =0; i < u->chans.size(); i++)
{
if (u->chans[i].channel)
{
char lst[MAXBUF];
-char* chlist(userrec *user)
+std::string chlist(userrec *user,userrec* source)
{
- int i = 0;
- char cmp[MAXBUF];
-
+ std::string cmp = "";
+ std::string lst = "";
log(DEBUG,"chlist: %s",user->nick);
- strcpy(lst,"");
if (!user)
{
return lst;
}
- for (int i = 0; i != MAXCHANS; i++)
+ for (unsigned int i = 0; i < user->chans.size(); i++)
{
if (user->chans[i].channel != NULL)
{
if (user->chans[i].channel->name)
{
- strlcpy(cmp,user->chans[i].channel->name,MAXBUF);
- strlcat(cmp," ",MAXBUF);
- if (!strstr(lst,cmp))
+ cmp = std::string(user->chans[i].channel->name) + " ";
+ if (!strstr(lst.c_str(),cmp.c_str()))
{
- if ((!user->chans[i].channel->c_private) && (!user->chans[i].channel->secret))
+ // if the channel is NOT private/secret, OR the source user is on the channel
+ if (((!(user->chans[i].channel->binarymodes & CM_PRIVATE)) && (!(user->chans[i].channel->binarymodes & CM_SECRET))) || (has_channel(source,user->chans[i].channel)))
{
- strlcat(lst,cmode(user,user->chans[i].channel),MAXBUF);
- strlcat(lst,user->chans[i].channel->name,MAXBUF);
- strlcat(lst," ",MAXBUF);
+ lst = lst + std::string(cmode(user,user->chans[i].channel)) + std::string(user->chans[i].channel->name) + " ";
}
}
}
}
}
- if (strlen(lst))
- {
- lst[strlen(lst)-1] = '\0'; // chop trailing space
- }
return lst;
}
-
-void send_network_quit(const char* nick, const char* reason)
-{
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason);
- NetSendToAll(buffer);
-}
-
-
projects / user / henk / code / inspircd.git / blobdiff