typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache;
typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash;
typedef std::deque<command_t> command_table;
+typedef std::map<std::string,time_t> autoconnects;
// This table references users by file descriptor.
// its an array to make it VERY fast, as all lookups are referenced
chan_hash chanlist;
whowas_hash whowas;
command_table cmdlist;
+autoconnects autoconns;
file_cache MOTD;
file_cache RULES;
address_cache IP;
}
}
-long GetRevision()
+std::string GetRevision()
{
char Revision[] = "$Revision$";
char *s1 = Revision;
s1 = savept;
v2 = strtok_r(s1," ",&savept);
s1 = savept;
- return (long)(atof(v2)*10000);
+ return std::string(v2);
}
read_xline_defaults();
log(DEFAULT,"Applying K lines, Q lines and Z lines...");
apply_lines();
+
+ autoconns.clear();
+ for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
+ {
+ char Link_ServerName[MAXBUF],Link_AConn[MAXBUF];
+ ConfValue("link","name",i,Link_ServerName,&config_f);
+ ConfValue("link","autoconnect",i,Link_AConn,&config_f);
+ if (strcmp(Link_AConn,""))
+ {
+ autoconns[std::string(Link_ServerName)] = atoi(Link_AConn) + time(NULL);
+ }
+ }
+
+
log(DEFAULT,"Done reading configuration file, InspIRCd is now starting.");
if (!bail)
{
NetSendToAll(buffer);
}
+ user->FlushWriteBuf();
+
FOREACH_MOD OnUserDisconnect(user);
if (user->fd > -1)
log(DEBUG,"epoll: List deletion failure!");
}
#endif
- shutdown(user->fd,2);
- close(user->fd);
- }
-
- if (user->registered == 7) {
- WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason);
- AddWhoWas(user);
+ user->CloseSocket();
}
+ // this must come before the WriteOpers so that it doesnt try to fill their buffer with anything
+ // if they were an oper with +s.
if (user->registered == 7) {
purge_empty_chans(user);
- }
+ WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason);
+ AddWhoWas(user);
+ }
if (iter != clientlist.end())
{
Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
log(DEBUG,"closing fd %lu",(unsigned long)user->fd);
+ user->FlushWriteBuf();
+
if (user->registered == 7) {
FOREACH_MOD OnUserQuit(user);
WriteCommonExcept(user,"QUIT :%s",reason);
log(DEBUG,"epoll: List deletion failure!");
}
#endif
- shutdown(user->fd,2);
- close(user->fd);
+ user->CloseSocket();
}
if (user->registered == 7) {
bool LoadModule(const char* filename)
{
char modfile[MAXBUF];
+#ifdef STATIC_LINK
+ snprintf(modfile,MAXBUF,"%s",filename);
+#else
snprintf(modfile,MAXBUF,"%s/%s",ModPath,filename);
+#endif
std::string filename_str = filename;
+#ifndef STATIC_LINK
if (!DirValid(modfile))
{
log(DEFAULT,"Module %s is not within the modules directory.",modfile);
snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
return false;
}
+#endif
log(DEBUG,"Loading module: %s",modfile);
+#ifndef STATIC_LINK
if (FileExists(modfile))
{
+#endif
for (int j = 0; j < module_names.size(); j++)
{
if (module_names[j] == filename_str)
snprintf(MODERR,MAXBUF,"Factory function failed!");
return false;
}
+#ifndef STATIC_LINK
}
else
{
snprintf(MODERR,MAXBUF,"Module file could not be found");
return false;
}
+#endif
MODCOUNT++;
return true;
}
+
+bool GotServer(std::string name)
+{
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ if (name == me[j]->connectors[k].GetServerName())
+ {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+}
+
+
int InspIRCd(char** argv, int argc)
{
struct sockaddr_in client,server;
printf("ERROR: Could not write to logfile %s, bailing!\n\n",logpath.c_str());
Exit(ERROR);
}
+
+#ifdef IS_CYGWIN
+ printf("Logging to ircd.log...\n");
+#else
printf("Logging to %s...\n",logpath.c_str());
+#endif
log(DEFAULT,"$Id$");
if (geteuid() == 0)
// them in a list, then reap the list every second or so.
if (((TIME % 5) == 0) && (!expire_run))
{
+ for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
+ {
+ char Link_ServerName[MAXBUF],Link_AConn[MAXBUF];
+ ConfValue("link","name",i,Link_ServerName,&config_f);
+ ConfValue("link","autoconnect",i,Link_AConn,&config_f);
+ if ((Link_AConn[0]) && (!GotServer(Link_ServerName)))
+ {
+ autoconnects::iterator a = autoconns.find(std::string(Link_ServerName));
+ if (a != autoconns.end())
+ {
+ if (TIME > a->second)
+ {
+ ConnectServer(Link_ServerName,NULL);
+ a->second = TIME + atoi(Link_AConn);
+ }
+ }
+ }
+ }
+
expire_lines();
FOREACH_MOD OnBackgroundTimer(TIME);
expire_run = true;
#ifdef USE_EPOLL
i = epoll_wait(sep, event, 1, EP_DELAY);
-#ifdef _POSIX_PRIORITY_SCHEDULING
- sched_yield();
-#endif
if (i > 0)
{
log(DEBUG,"epoll: Listening server socket event, i=%d, event.data.fd=%d",i,event[0].data.fd);
}
tvs.tv_usec = 30000L;
tvs.tv_sec = 0;
- int servresult = select(32767, &serverfds, NULL, NULL, &tvs);
+ int servresult = select(FD_SETSIZE, &serverfds, NULL, NULL, &tvs);
if (servresult > 0)
{
for (int x = 0; x != SERVERportCount; x++)
std::deque<std::string> sums;
for (int x = 0; x < SERVERportCount; x++)
{
+ if (me[x])
+ me[x]->FlushWriteBuffers();
sums.clear();
msgs.clear();
while ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host, sums))) // returns 0 or more lines (can be multiple lines!)
strlcpy(tcp_msg,msg.c_str(),MAXBUF);
if (me[x])
handle_link_packet(tcp_msg, tcp_host, me[x], tcp_sum);
+ if (!me[x]->FindHost(tcp_host))
+ {
+ log(DEBUG,"Connector gone, bailing!");
+ goto label;
+ }
}
sums.clear(); // we're done, clear the list for the next operation
msgs.clear();
statsDnsBad++;
FullConnectUser(curr);
if (fd_ref_table[currfd] != curr) // something changed, bail pronto
- goto label;
+ goto label;
}
if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) // both NICK and USER... and DNS
{
userrec* cu = fd_ref_table[ke.ident];
#endif
#ifdef USE_SELECT
+ tval.tv_sec = 0;
tval.tv_usec = 1000L;
- selectResult2 = select(65535, &sfd, NULL, NULL, &tval);
-
+ selectResult2 = select(FD_SETSIZE, &sfd, NULL, NULL, &tval);
// now loop through all of the items in this pool if any are waiting
- if (selectResult2 > 0)
+ if ((selectResult2 > 0) && (xcount != clientlist.end()))
for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++)
{
// SELECT: we have to iterate...
+ if (count2a == clientlist.end())
+ break;
userrec* cu = count2a->second;
#endif
FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2));
if (!MOD_RESULT)
{
- result = read(cu->fd, data, 65535);
+ result = cu->ReadData(data, 65535);
}
else result = result2;
log(DEBUG,"Read result: %d",result);
}
}
- if ((currfd < 0) || (!fd_ref_table[currfd]))
- goto label;
+ goto label;
}
if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
{
#endif
#ifdef USE_EPOLL
-#ifdef _POSIX_PRIORITY_SCHEDULING
- sched_yield();
-#endif
i = epoll_wait(lep, event, 32, EP_DELAY);
-#ifdef _POSIX_PRIORITY_SCHEDULING
- sched_yield();
-#endif
if (i > 0) for (j = 0; j < i; j++)
{
log(DEBUG,"epoll: Listening socket event, i=%d,events[j].data.fd=%d",i,event[j].data.fd);
projects / user / henk / code / inspircd.git / blobdiff