X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=6d664389d318d15230527dcf0a751a2cebed8baa;hb=ff3f693c894d2a7f689d3f85f5aa0efa47135df4;hp=404005ba38c173a25fe8f0128cef1012d43d1757;hpb=2e816169a426511ec7c2a45b7bc7947358310b2d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 404005ba3..6d664389d 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -27,18 +27,6 @@ using namespace std; #include #include #include - -#ifdef USE_KQUEUE -#include -#include -#include -#endif - -#ifdef USE_EPOLL -#include -#define EP_DELAY 5 -#endif - #include #include #ifdef GCC3 @@ -69,6 +57,7 @@ using namespace std; #include "helperfuncs.h" #include "hashcomp.h" #include "socketengine.h" +#include "userprocess.h" #include "socket.h" #include "dns.h" @@ -116,6 +105,12 @@ extern int MODCOUNT; int openSockfd[MAXSOCKS]; bool nofork = false; bool unlimitcore = false; +struct sockaddr_in client,server; +char addrs[MAXBUF][255]; +socklen_t length; +char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; + +extern InspSocket* socket_ref[65535]; time_t TIME = time(NULL), OLDTIME = time(NULL); @@ -721,39 +716,33 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri log(DEBUG,"Passed channel checks"); - for (int index =0; index != MAXCHANS; index++) + for (unsigned int index =0; index < user->chans.size(); index++) { - log(DEBUG,"Check location %d",index); if (user->chans[index].channel == NULL) { - log(DEBUG,"Adding into their channel list at location %d",index); - - if (created == 2) - { - /* first user in is given ops */ - user->chans[index].uc_modes = UCMODE_OP; - } - else - { - user->chans[index].uc_modes = 0; - } - user->chans[index].channel = Ptr; - Ptr->AddUser((char*)user); - WriteChannel(Ptr,user,"JOIN :%s",Ptr->name); - - log(DEBUG,"Sent JOIN to client"); - - if (Ptr->topicset) - { - WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic); - WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset); - } - userlist(user,Ptr); - WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name); - //WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name,chanmodes(Ptr)); - //WriteServ(user->fd,"329 %s %s %lu", user->nick, Ptr->name, (unsigned long)Ptr->created); - FOREACH_MOD OnUserJoin(user,Ptr); - return Ptr; + return ForceChan(Ptr,user->chans[index],user,created); + } + } + /* XXX: If the user is an oper here, we can just extend their user->chans vector by one + * and put the channel in here. Same for remote users which are not bound by + * the channel limits. Otherwise, nope, youre boned. + */ + if (strcasecmp(user->server,ServerName)) + { + ucrec a; + chanrec* c = ForceChan(Ptr,a,user,created); + user->chans.push_back(a); + return c; + } + else if (strchr(user->modes,'o')) + { + /* Oper allows extension up to the OPERMAXCHANS value */ + if (user->chans.size() < OPERMAXCHANS) + { + ucrec a; + chanrec* c = ForceChan(Ptr,a,user,created); + user->chans.push_back(a); + return c; } } log(DEBUG,"add_channel: user channel max exceeded: %s %s",user->nick,cname); @@ -761,6 +750,32 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri return NULL; } +chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created) +{ + if (created == 2) + { + /* first user in is given ops */ + a.uc_modes = UCMODE_OP; + } + else + { + a.uc_modes = 0; + } + a.channel = Ptr; + Ptr->AddUser((char*)user); + WriteChannel(Ptr,user,"JOIN :%s",Ptr->name); + log(DEBUG,"Sent JOIN to client"); + if (Ptr->topicset) + { + WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic); + WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset); + } + userlist(user,Ptr); + WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name); + FOREACH_MOD OnUserJoin(user,Ptr); + return Ptr; +} + /* remove a channel from a users record, and remove the record from memory * if the channel has become empty */ @@ -789,7 +804,7 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool FOREACH_MOD OnUserPart(user,Ptr); log(DEBUG,"del_channel: removing: %s %s",user->nick,Ptr->name); - for (int i =0; i != MAXCHANS; i++) + for (unsigned int i =0; i < user->chans.size(); i++) { /* zap it from the channel list of the user */ if (user->chans[i].channel == Ptr) @@ -884,7 +899,7 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) FOREACH_MOD OnUserKick(src,user,Ptr,reason); - for (int i =0; i != MAXCHANS; i++) + for (unsigned int i =0; i < user->chans.size(); i++) { /* zap it from the channel list of the user */ if (user->chans[i].channel) @@ -1185,15 +1200,6 @@ void kill_link_silent(userrec *user,const char* r) } -/*void *task(void *arg) -{ - for (;;) { - cout << (char *)arg; - cout.flush(); - } - return NULL; -}*/ - int main(int argc, char** argv) { Start(); @@ -1457,11 +1463,11 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) clientlist[tempnick]->sendqmax = class_sqmax; clientlist[tempnick]->recvqmax = class_rqmax; + ucrec a; + a.channel = NULL; + a.uc_modes = 0; for (int i = 0; i < MAXCHANS; i++) - { - clientlist[tempnick]->chans[i].channel = NULL; - clientlist[tempnick]->chans[i].uc_modes = 0; - } + clientlist[tempnick]->chans.push_back(a); if (clientlist.size() > SoftLimit) { @@ -1503,12 +1509,6 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) } fd_ref_table[socket] = clientlist[tempnick]; SE->AddFd(socket,true,X_ESTAB_CLIENT); - - // initialize their dns lookup thread - //if (pthread_create(&clientlist[tempnick]->dnsthread, NULL, dns_task, (void *)clientlist[tempnick]) != 0) - //{ - // log(DEBUG,"Failed to create DNS lookup thread for user %s",clientlist[tempnick]->nick); - //} } /* shows the message of the day, and any other on-logon stuff */ @@ -2273,291 +2273,78 @@ bool LoadModule(const char* filename) return true; } - -void ProcessUser(userrec* cu) +int BindPorts() { - int result = EAGAIN; - log(DEBUG,"Processing user with fd %d",cu->fd); - int MOD_RESULT = 0; - int result2 = 0; - FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2)); - if (!MOD_RESULT) - { - result = cu->ReadData(data, 65535); - } - else + int clientportcount = 0; + for (int count = 0; count < ConfValueEnum("bind",&config_f); count++) { - log(DEBUG,"Data result returned by module: %d",MOD_RESULT); - result = result2; + ConfValue("bind","port",count,configToken,&config_f); + ConfValue("bind","address",count,Addr,&config_f); + ConfValue("bind","type",count,Type,&config_f); + if (strcmp(Type,"servers")) + { + // modules handle server bind types now, + // its not a typo in the strcmp. + ports[clientportcount] = atoi(configToken); + strlcpy(addrs[clientportcount],Addr,256); + clientportcount++; + log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type); + } } - log(DEBUG,"Read result: %d",result); - if (result) + portCount = clientportcount; + + for (int count = 0; count < portCount; count++) { - statsRecv += result; - // perform a check on the raw buffer as an array (not a string!) to remove - // characters 0 and 7 which are illegal in the RFC - replace them with spaces. - // hopefully this should stop even more people whining about "Unknown command: *" - for (int checker = 0; checker < result; checker++) + if ((openSockfd[boundPortCount] = OpenTCPSocket()) == ERROR) { - if ((data[checker] == 0) || (data[checker] == 7)) - data[checker] = ' '; + log(DEBUG,"InspIRCd: startup: bad fd %lu",(unsigned long)openSockfd[boundPortCount]); + return(ERROR); } - if (result > 0) - data[result] = '\0'; - userrec* current = cu; - int currfd = current->fd; - int floodlines = 0; - // add the data to the users buffer - if (result > 0) - { - if (!current->AddBuffer(data)) - { - // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good. - if (current->registered == 7) - { - kill_link(current,"RecvQ exceeded"); - } - else - { - WriteOpers("*** Excess flood from %s",current->ip); - log(DEFAULT,"Excess flood from: %s",current->ip); - add_zline(120,ServerName,"Flood from unregistered connection",current->ip); - apply_lines(); - } - return; - } - if (current->recvq.length() > (unsigned)NetBufferSize) - { - if (current->registered == 7) - { - kill_link(current,"RecvQ exceeded"); - } - else - { - WriteOpers("*** Excess flood from %s",current->ip); - log(DEFAULT,"Excess flood from: %s",current->ip); - add_zline(120,ServerName,"Flood from unregistered connection",current->ip); - apply_lines(); - } - return; - } - // while there are complete lines to process... - while (current->BufferIsReady()) - { - floodlines++; - if (TIME > current->reset_due) - { - current->reset_due = TIME + current->threshold; - current->lines_in = 0; - } - current->lines_in++; - if (current->lines_in > current->flood) - { - log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - kill_link(current,"Excess flood"); - return; - } - if ((floodlines > current->flood) && (current->flood != 0)) - { - if (current->registered == 7) - { - log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - kill_link(current,"Excess flood"); - } - else - { - add_zline(120,ServerName,"Flood from unregistered connection",current->ip); - apply_lines(); - } - return; - } - char sanitized[MAXBUF]; - // use GetBuffer to copy single lines into the sanitized string - std::string single_line = current->GetBuffer(); - current->bytes_in += single_line.length(); - current->cmds_in++; - if (single_line.length()>512) - { - log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - kill_link(current,"Excess flood"); - return; - } - strlcpy(sanitized,single_line.c_str(),MAXBUF); - if (*sanitized) - { - userrec* old_comp = fd_ref_table[currfd]; - // we're gonna re-scan to check if the nick is gone, after every - // command - if it has, we're gonna bail - process_buffer(sanitized,current); - // look for the user's record in case it's changed... if theyve quit, - // we cant do anything more with their buffer, so bail. - // there used to be an ugly, slow loop here. Now we have a reference - // table, life is much easier (and FASTER) - userrec* new_comp = fd_ref_table[currfd]; - if ((currfd < 0) || (!fd_ref_table[currfd]) || (old_comp != new_comp)) - return; - } - } - return; + if (BindSocket(openSockfd[boundPortCount],client,server,ports[count],addrs[count]) == ERROR) + { + log(DEFAULT,"InspIRCd: startup: failed to bind port %lu",(unsigned long)ports[count]); } - if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) + else /* well we at least bound to one socket so we'll continue */ { - log(DEBUG,"killing: %s",cu->nick); - kill_link(cu,strerror(errno)); - return; + boundPortCount++; } } - // result EAGAIN means nothing read - else if (result == EAGAIN) - { - } - else if (result == 0) - { - log(DEBUG,"InspIRCd: Exited: %s",cu->nick); - kill_link(cu,"Client exited"); - log(DEBUG,"Bailing from client exit"); - return; - } -} - -void DoBackgroundUserStuff() -{ - for (user_hash::iterator count2 = clientlist.begin(); count2 != clientlist.end(); count2++) - { - userrec* curr = NULL; - if (count2->second) - curr = count2->second; - if ((long)curr == -1) - return; - - if ((curr) && (curr->fd != 0)) - { - int currfd = curr->fd; - // we don't check the state of remote users. - if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER)) - { - curr->FlushWriteBuf(); - if (curr->GetWriteError() != "") - { - log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str()); - kill_link(curr,curr->GetWriteError().c_str()); - return; - } - // registration timeout -- didnt send USER/NICK/HOST in the time specified in - // their connection class. - if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7)) - { - log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); - kill_link(curr,"Registration timeout"); - return; - } - if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) - { - log(DEBUG,"signon exceed, registered=3, and modules ready, OK: %d %d",TIME,curr->signon); - curr->dns_done = true; - statsDnsBad++; - FullConnectUser(curr); - if (fd_ref_table[currfd] != curr) // something changed, bail pronto - return; - } - if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) - { - log(DEBUG,"dns done, registered=3, and modules ready, OK"); - FullConnectUser(curr); - if (fd_ref_table[currfd] != curr) // something changed, bail pronto - return; - } - if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) - { - if ((!curr->lastping) && (curr->registered == 7)) - { - log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick); - kill_link(curr,"Ping timeout"); - return; - } - Write(curr->fd,"PING :%s",ServerName); - log(DEBUG,"InspIRCd: pinging: %s",curr->nick); - curr->lastping = 0; - curr->nping = TIME+curr->pingmax; // was hard coded to 120 - } - } - } - } -} -void OpenLog(char** argv, int argc) -{ - std::string logpath = GetFullProgDir(argv,argc) + "/ircd.log"; - log_file = fopen(logpath.c_str(),"a+"); - if (!log_file) + /* if we didn't bind to anything then abort */ + if (!boundPortCount) { - 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,"InspIRCd: startup: no ports bound, bailing!"); + printf("\nERROR: Was not able to bind any of %lu ports! Please check your configuration.\n\n", (unsigned long)portCount); + return (ERROR); + } -void CheckRoot() -{ - if (geteuid() == 0) - { - printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n"); - log(DEFAULT,"InspIRCd: startup: not starting with UID 0!"); - Exit(ERROR); - } + return boundPortCount; } int InspIRCd(char** argv, int argc) { - struct sockaddr_in client,server; - char addrs[MAXBUF][255]; + bool expire_run = false; + std::vector activefds; int incomingSockfd; - socklen_t length; - int count = 0; - int clientportcount = 0; - char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; - + int in_port; + userrec* cu = NULL; + InspSocket* s = NULL; + InspSocket* s_del = NULL; + char* target; + unsigned int numberactive; + sockaddr_in sock_us; // our port number + socklen_t uslen; // length of our port number + + /* Beta 7 moved all this stuff out of the main function + * into smaller sub-functions, much tidier -- Brain + */ OpenLog(argv, argc); CheckRoot(); SetupCommandTable(); ReadConfig(true,NULL); AddServerName(ServerName); - - if (DieValue[0]) - { - 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"); - - for (count = 0; count < ConfValueEnum("bind",&config_f); count++) - { - ConfValue("bind","port",count,configToken,&config_f); - ConfValue("bind","address",count,Addr,&config_f); - ConfValue("bind","type",count,Type,&config_f); - if (!strcmp(Type,"servers")) - { - // modules handle this bind type now. - } - else - { - ports[clientportcount] = atoi(configToken); - strlcpy(addrs[clientportcount],Addr,256); - clientportcount++; - } - log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type); - } - portCount = clientportcount; - - log(DEBUG,"InspIRCd: startup: read %lu total client ports",(unsigned long)portCount); + CheckDie(); + boundPortCount = BindPorts(); printf("\n"); startup_time = time(NULL); @@ -2566,69 +2353,25 @@ int InspIRCd(char** argv, int argc) ConfValue("pid","file",0,PID,&config_f); // write once here, to try it out and make sure its ok WritePID(PID); - - log(VERBOSE,"InspIRCd: startup: portCount = %lu", (unsigned long)portCount); - for (count = 0; count < portCount; count++) - { - if ((openSockfd[boundPortCount] = OpenTCPSocket()) == ERROR) - { - log(DEBUG,"InspIRCd: startup: bad fd %lu",(unsigned long)openSockfd[boundPortCount]); - return(ERROR); - } - if (BindSocket(openSockfd[boundPortCount],client,server,ports[count],addrs[count]) == ERROR) - { - log(DEFAULT,"InspIRCd: startup: failed to bind port %lu",(unsigned long)ports[count]); - } - else /* well we at least bound to one socket so we'll continue */ - { - boundPortCount++; - } - } - - log(DEBUG,"InspIRCd: startup: total bound ports %lu",(unsigned long)boundPortCount); - - /* if we didn't bind to anything then abort */ - if (boundPortCount == 0) - { - log(DEFAULT,"InspIRCd: startup: no ports bound, bailing!"); - printf("\nERROR: Was not able to bind any of %lu ports! Please check your configuration.\n\n", (unsigned long)portCount); - return (ERROR); - } - - if (nofork) - { - log(VERBOSE,"Not forking as -nofork was specified"); - } - else + if (!nofork) { if (DaemonSeed() == ERROR) { - log(DEFAULT,"InspIRCd: startup: can't daemonise"); printf("ERROR: could not go into daemon mode. Shutting down.\n"); Exit(ERROR); } } + /* Because of limitations in kqueue on freebsd, we must fork BEFORE we + * initialize the socket engine. + */ SE = new SocketEngine(); /* We must load the modules AFTER initializing the socket engine, now */ - MODCOUNT = -1; - for (count = 0; count < ConfValueEnum("module",&config_f); count++) - { - ConfValue("module","name",count,configToken,&config_f); - printf("Loading module... \033[1;32m%s\033[0m\n",configToken); - if (!LoadModule(configToken)) - { - log(DEFAULT,"Exiting due to a module loader error."); - printf("\nThere was an error loading a module: %s\n\nYou might want to do './inspircd start' instead of 'bin/inspircd'\n\n",ModuleError()); - Exit(0); - } - } - log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1); + LoadAllModules(); printf("\nInspIRCd is now running!\n"); - if (!nofork) { freopen("/dev/null","w",stdout); @@ -2638,110 +2381,152 @@ int InspIRCd(char** argv, int argc) /* Add the listening sockets used for client inbound connections * to the socket engine */ - for (count = 0; count < portCount; count++) + for (int count = 0; count < portCount; count++) SE->AddFd(openSockfd[count],true,X_LISTEN); - std::vector activefds; - WritePID(PID); - bool expire_run = false; /* main loop, this never returns */ for (;;) { -#ifdef _POSIX_PRIORITY_SCHEDULING - sched_yield(); -#endif - // we only read time() once per iteration rather than tons of times! + /* time() seems to be a pretty expensive syscall, so avoid calling it too much. + * Once per loop iteration is pleanty. + */ OLDTIME = TIME; TIME = time(NULL); - // *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 (((TIME % 5) == 0) && (!expire_run)) + /* Run background module timers every few seconds + * (the docs say modules shouldnt rely on accurate + * timing using this event, so we dont have to + * time this exactly). + */ + if (((TIME % 8) == 0) && (!expire_run)) { expire_lines(); FOREACH_MOD OnBackgroundTimer(TIME); expire_run = true; continue; } - if ((TIME % 5) == 1) + if ((TIME % 8) == 1) expire_run = false; - DoBackgroundUserStuff(); - + /* Once a second, do the background processing */ + if (TIME != OLDTIME) + while (DoBackgroundUserStuff(TIME)); + + /* Call the socket engine to wait on the active + * file descriptors. The socket engine has everything's + * descriptors in its list... dns, modules, users, + * servers... so its nice and easy, just one call. + */ SE->Wait(activefds); - for (unsigned int activefd = 0; activefd < activefds.size(); activefd++) + /** + * Now process each of the fd's. For users, we have a fast + * lookup table which can find a user by file descriptor, so + * processing them by fd isnt expensive. If we have a lot of + * listening ports or module sockets though, things could get + * ugly. + */ + numberactive = activefds.size(); + for (unsigned int activefd = 0; activefd < numberactive; activefd++) { - if (SE->GetType(activefds[activefd]) == X_ESTAB_CLIENT) - { - log(DEBUG,"Got a ready socket of type X_ESTAB_CLIENT"); - userrec* cu = fd_ref_table[activefds[activefd]]; - if (cu) - { - /* It's a user */ - ProcessUser(cu); - } - } - else if (SE->GetType(activefds[activefd]) == X_ESTAB_MODULE) + int socket_type = SE->GetType(activefds[activefd]); + switch (socket_type) { - log(DEBUG,"Got a ready socket of type X_ESTAB_MODULE"); - unsigned int numsockets = module_sockets.size(); - for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) - { - InspSocket* s = (InspSocket*)*a; - if ((s) && (s->GetFd() == activefds[activefd])) + case X_ESTAB_CLIENT: + + cu = fd_ref_table[activefds[activefd]]; + if (cu) + ProcessUser(cu); + + break; + + case X_ESTAB_MODULE: + + /* Process module-owned sockets. + * Modules are encouraged to inherit their sockets from + * InspSocket so we can process them neatly like this. + */ + s = socket_ref[activefds[activefd]]; + + if ((s) && (!s->Poll())) { - if (!s->Poll()) + log(DEBUG,"Socket poll returned false, close and bail"); + SE->DelFd(s->GetFd()); + for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) { - log(DEBUG,"Socket poll returned false, close and bail"); - SE->DelFd(s->GetFd()); - s->Close(); - module_sockets.erase(a); - delete s; - break; + s_del = (InspSocket*)*a; + if ((s_del) && (s_del->GetFd() == activefds[activefd])) + { + module_sockets.erase(a); + break; + } } - if (module_sockets.size() != numsockets) break; + s->Close(); + delete s; } - } - } - else if (SE->GetType(activefds[activefd]) == X_ESTAB_DNS) - { - log(DEBUG,"Got a ready socket of type X_ESTAB_DNS"); + + break; + + case X_ESTAB_DNS: + + /* When we are using single-threaded dns, + * the sockets for dns end up in our mainloop. + * When we are using multi-threaded dns, + * each thread has its own basic poll() loop + * within it, making them 'fire and forget' + * and independent of the mainloop. + */ #ifndef THREADED_DNS - dns_poll(activefds[activefd]); + dns_poll(activefds[activefd]); #endif - } - else if (SE->GetType(activefds[activefd]) == X_LISTEN) - { - log(DEBUG,"Got a ready socket of type X_LISTEN"); - /* It maybe a listener */ - for (count = 0; count < boundPortCount; count++) - { - if (activefds[activefd] == openSockfd[count]) + break; + + case X_LISTEN: + + /* It's a listener */ + uslen = sizeof(sock_us); + length = sizeof(client); + incomingSockfd = accept (activefds[activefd],(struct sockaddr*)&client,&length); + if (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen)) { - char target[MAXBUF], resolved[MAXBUF]; - length = sizeof (client); - incomingSockfd = accept (openSockfd[count], (struct sockaddr *) &client, &length); + in_port = ntohs(sock_us.sin_port); log(DEBUG,"Accepted socket %d",incomingSockfd); - strlcpy (target, (char *) inet_ntoa (client.sin_addr), MAXBUF); - strlcpy (resolved, target, MAXBUF); + target = (char*)inet_ntoa(client.sin_addr); + /* Years and years ago, we used to resolve here + * using gethostbyaddr(). That is sucky and we + * don't do that any more... + */ if (incomingSockfd >= 0) { - FOREACH_MOD OnRawSocketAccept(incomingSockfd, resolved, ports[count]); + FOREACH_MOD OnRawSocketAccept(incomingSockfd, target, in_port); statsAccept++; - AddClient(incomingSockfd, resolved, ports[count], false, inet_ntoa (client.sin_addr)); - log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)ports[count],(unsigned long)incomingSockfd); + AddClient(incomingSockfd, target, in_port, false, target); + log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd); } else { - WriteOpers("*** WARNING: accept() failed on port %lu (%s)",(unsigned long)ports[count],target); - log(DEBUG,"accept failed: %lu",(unsigned long)ports[count]); + WriteOpers("*** WARNING: accept() failed on port %lu (%s)",(unsigned long)in_port,target); + log(DEBUG,"accept failed: %lu",(unsigned long)in_port); statsRefused++; } } - } + else + { + log(DEBUG,"Couldnt look up the port number for fd %lu (OS BROKEN?!)",incomingSockfd); + shutdown(incomingSockfd,2); + close(incomingSockfd); + } + break; + + default: + /* Something went wrong if we're in here. + * In fact, so wrong, im not quite sure + * what we would do, so for now, its going + * to safely do bugger all. + */ + break; } }