#include "inspircd_config.h"
#include "inspircd.h"
#include "inspircd_io.h"
-#include "inspircd_util.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/errno.h>
#include <sstream>
#include <vector>
#include <deque>
-#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"
#include "inspstring.h"
#include "dns.h"
extern int MODCOUNT;
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];
+extern ServerConfig* Config;
/* 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) */
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 (int 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 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;
- unsigned int t = 0, a = 0;
+ 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);
}
int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
{
- DNS d(DNSServer);
+ DNS d(Config->DNSServer);
int fd = d.ReverseLookup(unresolvedHost);
- if (fd < 1)
+ if (fd < 0)
return 0;
time_t T = time(NULL)+1;
while ((!d.HasResult()) && (time(NULL)<T));
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 (!strcasecmp(user->server,ServerName))
+ 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 (!strcasecmp(user->server,ServerName))
+ 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 */
return 0;
}
/* can't occur ANYWHERE in an Ident! */
- if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
+ if (strchr("<>,/?:;@'~#=+()*&%$£ \"!",n[i]))
{
return 0;
}
log(DEFAULT,"*** BUG *** cmode was given an invalid parameter");
return "";
}
- for (int i = 0; i != MAXCHANS; i++)
+
+ for (unsigned int i = 0; i < user->chans.size(); i++)
{
if (user->chans[i].channel)
{
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)
{
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,userrec* source)
+std::string chlist(userrec *user,userrec* source)
{
- 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 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