extern std::vector<ircd_module*> factory;
std::vector<int> fd_reap;
-std::vector<userrec*> pending_connects;
-
extern int MODCOUNT;
-
+int openSockfd[MAXSOCKS];
bool nofork = false;
namespace nspace
int has_channel(userrec *u, chanrec *c);
int usercount(chanrec *c);
int usercount_i(chanrec *c);
-void update_stats_l(int fd,int data_out);
char* Passwd(userrec *user);
bool IsDenied(userrec *user);
void AddWhoWas(userrec* u);
if (sock != -1)
{
write(sock,tb,strlen(tb));
- update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */
}
}
if (sock != -1)
{
write(sock,tb,strlen(tb));
- update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */
}
}
if (sock != -1)
{
write(sock,tb,strlen(tb));
- update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */
}
}
/* Find a user record by nickname and return a pointer to it */
-userrec* Find(string nick)
+userrec* Find(std::string nick)
{
user_hash::iterator iter = clientlist.find(nick);
return iter->second;
}
-void update_stats_l(int fd,int data_out) /* add one line-out to stats L for this fd */
-{
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if (i->second)
- {
- if (i->second->fd == fd)
- {
- i->second->bytes_out+=data_out;
- i->second->cmds_out++;
- }
- }
- }
-}
-
-
/* find a channel record by channel name and return a pointer to it */
chanrec* FindChan(const char* chan)
}
+long GetMaxBans(char* name)
+{
+ char CM[MAXBUF];
+ for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++)
+ {
+ ConfValue("banlist","chan",count,CM,&config_f);
+ if (match(name,CM))
+ {
+ ConfValue("banlist","limit",count,CM,&config_f);
+ return atoi(CM);
+ }
+ }
+ return 64;
+}
+
+
void purge_empty_chans(void)
{
int go_again = 1, purge = 0;
{
/* list overflowed into
* multiple numerics */
- WriteServ(user->fd,list);
+ WriteServ(user->fd,"%s",list);
snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
}
}
}
/* if whats left in the list isnt empty, send it */ if (list[strlen(list)-1] != ':')
{
- WriteServ(user->fd,list);
+ WriteServ(user->fd,"%s",list);
}
}
// the override flag allows us to bypass channel modes
// and bans (used by servers)
- if (!override)
+ if ((!override) || (!strcasecmp(user->server,ServerName)))
{
+ log(DEBUG,"Not overriding...");
int MOD_RESULT = 0;
FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
if (MOD_RESULT == 1) {
return NULL;
}
+ log(DEBUG,"MOD_RESULT=%d",MOD_RESULT);
- if (MOD_RESULT == 0)
+ if (!MOD_RESULT)
{
-
+ log(DEBUG,"add_channel: checking key, invite, etc");
if (strcmp(Ptr->key,""))
{
log(DEBUG,"add_channel: %s has key %s",Ptr->name,Ptr->key);
/* This function pokes and hacks at a parameter list like the following:
*
- * PART #winbot, #darkgalaxy :m00!
+ * PART #winbot,#darkgalaxy :m00!
*
* to turn it into a series of individual calls like this:
*
if (user->registered == 7) {
purge_empty_chans();
}
+ user = NULL;
}
void kill_link_silent(userrec *user,const char* r)
strncpy(clientlist[tempnick]->server, ServerName,256);
strncpy(clientlist[tempnick]->ident, "unknown",9);
clientlist[tempnick]->registered = 0;
- clientlist[tempnick]->signon = time(NULL);
- clientlist[tempnick]->nping = time(NULL)+240;
+ clientlist[tempnick]->signon = time(NULL)+dns_timeout;
+ clientlist[tempnick]->nping = time(NULL)+240+dns_timeout;
clientlist[tempnick]->lastping = 1;
clientlist[tempnick]->port = port;
strncpy(clientlist[tempnick]->ip,ip,32);
- lookup_dns(clientlist[tempnick]);
-
// set the registration timeout for this user
unsigned long class_regtimeout = 90;
for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
if (clientlist.size() == MAXCLIENTS)
kill_link(clientlist[tempnick],"No more connections allowed in this class");
+
char* r = matches_zline(ip);
- if (r)
+ char* e = matches_exception(ip);
+ if ((r) && (!e))
{
char reason[MAXBUF];
snprintf(reason,MAXBUF,"Z-Lined: %s",r);
void ShowMOTD(userrec *user)
{
- if (!MOTD.size())
- {
- WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
- return;
- }
- WriteServ(user->fd,"375 %s :- %s message of the day",user->nick,ServerName);
- for (int i = 0; i != MOTD.size(); i++)
- {
- WriteServ(user->fd,"372 %s :- %s",user->nick,MOTD[i].c_str());
- }
- WriteServ(user->fd,"376 %s :End of %s message of the day.",user->nick,ServerName);
+ std::string WholeMOTD = "";
+ if (!MOTD.size())
+ {
+ WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
+ return;
+ }
+ WholeMOTD = std::string(":") + std::string(ServerName) + std::string(" 375 ") + std::string(user->nick) + std::string(" :- ") + std::string(ServerName) + " message of the day\r\n";
+ for (int i = 0; i != MOTD.size(); i++)
+ {
+ WholeMOTD = WholeMOTD + std::string(":") + std::string(ServerName) + std::string(" 372 ") + std::string(user->nick) + std::string(" :- ") + MOTD[i] + std::string("\r\n");
+ }
+ WholeMOTD = WholeMOTD + std::string(":") + std::string(ServerName) + std::string(" 376 ") + std::string(user->nick) + std::string(" :End of message of the day.\r\n");
+ // only one write operation
+ send(user->fd,WholeMOTD.c_str(),WholeMOTD.length(),NULL);
+
}
void ShowRULES(userrec *user)
char match_against[MAXBUF];
snprintf(match_against,MAXBUF,"%s@%s",user->ident,user->host);
- char* r = matches_gline(match_against);
- if (r)
- {
- char reason[MAXBUF];
- snprintf(reason,MAXBUF,"G-Lined: %s",r);
- kill_link_silent(user,reason);
- return;
- }
-
- r = matches_kline(user->host);
- if (r)
- {
- char reason[MAXBUF];
- snprintf(reason,MAXBUF,"K-Lined: %s",r);
- kill_link_silent(user,reason);
- return;
- }
+ char* e = matches_exception(match_against);
+ if (!e)
+ {
+ char* r = matches_gline(match_against);
+ if (r)
+ {
+ char reason[MAXBUF];
+ snprintf(reason,MAXBUF,"G-Lined: %s",r);
+ kill_link_silent(user,reason);
+ return;
+ }
+ r = matches_kline(user->host);
+ if (r)
+ {
+ char reason[MAXBUF];
+ snprintf(reason,MAXBUF,"K-Lined: %s",r);
+ kill_link_silent(user,reason);
+ return;
+ }
+ }
WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Network);
WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Network,user->nick,user->ident,user->host);
NetSendToAll(buffer);
}
-// handles any connects where DNS isnt done yet, times out stale dns queries on users, and lets completed queries connect.
-void HandlePendingConnects()
-{
- if (pending_connects.size())
- {
- for (std::vector<userrec*>::iterator i = pending_connects.begin(); i <= pending_connects.end(); i++)
- {
- userrec* a = *i;
- if (a)
- {
- // this user's dns is done now.
- if ((a->dns_done) && (a->registered == 3))
- {
- FullConnectUser(a); // attack! attack!....
- pending_connects.erase(i);
- return; // ...RUN AWAY! RUN AWAY!
- }
- // this users dns is NOT done, but its timed out.
- if ((time(NULL) > a->signon+dns_timeout) && (a->registered == 3))
- {
- WriteServ(a->fd,"NOTICE Auth :Failed to resolve your hostname, using your IP address instead.");
- FullConnectUser(a);
- pending_connects.erase(i);
- return;
- }
- }
- else
- {
- pending_connects.erase(i);
- return;
- }
- }
- }
-}
-
/* shows the message of the day, and any other on-logon stuff */
void ConnectUser(userrec *user)
{
// dns is already done, things are fast. no need to wait for dns to complete just pass them straight on
- if (user->dns_done)
+ if ((user->dns_done) && (user->registered >= 3))
{
FullConnectUser(user);
}
- else
- {
- // add them to the pending queue
- pending_connects.push_back(user);
- }
}
void handle_version(char **parameters, int pcnt, userrec *user)
{
user->bytes_in += strlen(temp);
user->cmds_in++;
+ user->bytes_out+=strlen(temp);
+ user->cmds_out++;
}
cmdlist[i].use_count++;
cmdlist[i].total_bytes+=strlen(temp);
createcommand("GLINE",handle_gline,'o',1);
createcommand("ZLINE",handle_zline,'o',1);
createcommand("QLINE",handle_qline,'o',1);
+ createcommand("ELINE",handle_eline,'o',1);
createcommand("SERVER",handle_server,0,0);
}
{
struct sockaddr_in client,server;
char addrs[MAXBUF][255];
- int openSockfd[MAXSOCKS], incomingSockfd, result = TRUE;
+ int incomingSockfd, result = TRUE;
socklen_t length;
int count = 0;
int selectResult = 0, selectResult2 = 0;
char *temp, configToken[MAXBUF], stuff[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
char resolvedHost[MAXBUF];
fd_set selectFds;
- struct timeval tv;
+ timeval tv;
log_file = fopen("ircd.log","a+");
if (!log_file)
if (strcmp(DieValue,""))
{
printf("WARNING: %s\n\n",DieValue);
+ log(DEFAULT,"Ut-Oh, somebody didn't read their config file: '%s'",DieValue);
exit(0);
}
log(DEBUG,"InspIRCd: startup: read config");
Exit(ERROR);
}
}
+
+ char PID[MAXBUF];
+ ConfValue("pid","file",0,PID,&config_f);
+ WritePID(PID);
/* setup select call */
length = sizeof (client);
char udp_msg[MAXBUF], tcp_host[MAXBUF];
+
+ fd_set serverfds;
+ timeval tvs;
+ tvs.tv_usec = 10000L;
+ tvs.tv_sec = 0;
+ tv.tv_sec = 0;
+ tv.tv_usec = 10000L;
+ char data[10240];
+ timeval tval;
+ fd_set sfd;
+ tval.tv_usec = 10000L;
+ tval.tv_sec = 0;
+ int total_in_this_set = 0;
+ int v = 0;
/* main loop, this never returns */
for (;;)
#ifdef _POSIX_PRIORITY_SCHEDULING
sched_yield();
#endif
- // update the status of klines, etc
- expire_lines();
+ // poll dns queue
+ dns_poll();
- fd_set sfd;
- timeval tval;
FD_ZERO(&sfd);
- // poll dns queue
- dns_poll();
-
- // handle pending connects
- HandlePendingConnects();
-
user_hash::iterator count2 = clientlist.begin();
// *FIX* Instead of closing sockets in kill_link when they receive the ERROR :blah line, we should queue
// them in a list, then reap the list every second or so.
+ if ((reap_counter % 50) == 0)
+ {
+ // These functions eat cpu, and should not be done so often!
+
+ // update the status of klines, etc
+ expire_lines();
+#ifdef _POSIX_PRIORITY_SCHEDULING
+ sched_yield();
+#endif
+ }
if (reap_counter>300)
{
if (fd_reap.size() > 0)
{
for( int n = 0; n < fd_reap.size(); n++)
{
- Blocking(fd_reap[n]);
+ //Blocking(fd_reap[n]);
close(fd_reap[n]);
- NonBlocking(fd_reap[n]);
+ shutdown (fd_reap[n],2);
+ //NonBlocking(fd_reap[n]);
}
}
fd_reap.clear();
}
reap_counter++;
- fd_set serverfds;
FD_ZERO(&serverfds);
- timeval tvs;
for (int x = 0; x != UDPportCount; x++)
{
FD_SET(me[x]->fd, &serverfds);
}
- tvs.tv_usec = 0;
- tvs.tv_sec = 0;
+ // serverFds timevals went here
+ tvs.tv_usec = 10000L;
int servresult = select(32767, &serverfds, NULL, NULL, &tvs);
if (servresult > 0)
{
while (count2 != clientlist.end())
{
- char data[10240];
- tval.tv_usec = tval.tv_sec = 0;
FD_ZERO(&sfd);
- int total_in_this_set = 0;
+ total_in_this_set = 0;
user_hash::iterator xcount = count2;
user_hash::iterator endingiter = count2;
- if (!count2->second) break;
+ if (count2 == clientlist.end()) break;
if (count2->second)
if (count2->second->fd != 0)
kill_link(count2->second,"Registration timeout");
goto label;
}
+ if ((time(NULL) > count2->second->signon) && (count2->second->registered == 3))
+ {
+ count2->second->dns_done = true;
+ FullConnectUser(count2->second);
+ goto label;
+ }
+ if ((count2->second->dns_done) && (count2->second->registered == 3)) // both NICK and USER... and DNS
+ {
+ FullConnectUser(count2->second);
+ goto label;
+ }
if (((time(NULL)) > count2->second->nping) && (isnick(count2->second->nick)) && (count2->second->registered == 7))
{
if ((!count2->second->lastping) && (count2->second->registered == 7))
endingiter = count2;
count2 = xcount; // roll back to where we were
- int v = 0;
+ v = 0;
+
+ // tvals defined here
- tval.tv_usec = 0;
- tval.tv_sec = 0;
+ tval.tv_usec = 10000L;
selectResult2 = select(65535, &sfd, NULL, NULL, &tval);
// now loop through all of the items in this pool if any are waiting
result = EAGAIN;
if ((count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd)))
{
- log(DEBUG,"Reading fd %d",count2a->second->fd);
memset(data, 0, 10240);
result = read(count2a->second->fd, data, 10240);
if (result)
{
- if (result > 0)
- log(DEBUG,"Read %d characters from socket",result);
userrec* current = count2a->second;
int currfd = current->fd;
char* l = strtok(data,"\n");
FD_SET (openSockfd[count], &selectFds);
}
- tv.tv_usec = 1;
+ tv.tv_usec = 10000L;
selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv);
/* select is reporting a waiting socket. Poll them all to find out which */