ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 11:09:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add missing feature: /rehash reinitializes dns subsytem (and can handle changed addresses)

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6193 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2006-12-31 19:17:04 +00:00
parent 739b087705
commit 6a6f5b2275
5 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/dns.h
View File

@ -352,6 +352,11 @@ class DNS : public EventHandler
*/
DNS(InspIRCd* Instance);
/**
* Re-initialize the DNS subsystem.
*/
void Rehash();
/**
* Destructor
*/

1
src/cmd_rehash.cpp
View File

@ -40,6 +40,7 @@ CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
ServerInstance->RehashUsersAndChans();
FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
ServerInstance->Config->Read(false,user);
ServerInstance->Res->Rehash();
}
if (old_disabled != ServerInstance->Config->DisabledCommands)
InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);

52
src/dns.cpp
View File

@ -250,40 +250,23 @@ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id)
return req;
}
/** Initialise the DNS UDP socket so that we can send requests */
DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance)
void DNS::Rehash()
{
ServerInstance->Log(DEBUG,"DNS::DNS: Instance = %08x",Instance);
insp_inaddr addr;
/* Clear the Resolver class table */
memset(Classes,0,sizeof(Classes));
/* Clear the requests class table */
memset(requests,0,sizeof(requests));
/* Set the id of the next request to 0
*/
currid = 0;
/* By default we're not munging ip's
*/
ip6munge = false;
/* Clear the namesever address */
memset(&myserver,0,sizeof(insp_inaddr));
if (this->GetFd() > -1)
{
shutdown(this->GetFd(), 2);
close(this->GetFd());
this->SetFd(-1);
}
/* Convert the nameserver address into an insp_inaddr */
if (insp_aton(ServerInstance->Config->DNSServer,&addr) > 0)
{
memcpy(&myserver,&addr,sizeof(insp_inaddr));
if ((strstr(ServerInstance->Config->DNSServer,"::ffff:") == (char*)&ServerInstance->Config->DNSServer) || (strstr(ServerInstance->Config->DNSServer,"::FFFF:") == (char*)&ServerInstance->Config->DNSServer))
{
/* These dont come back looking like they did when they went in.
* We're forced to turn some checks off.
* If anyone knows how to fix this, let me know. --Brain
*/
ServerInstance->Log(DEFAULT,"WARNING: Using IPv4 addresses over IPv6 forces some DNS checks to be disabled.");
ServerInstance->Log(DEFAULT," This should not cause a problem, however it is recommended you migrate");
ServerInstance->Log(DEFAULT," to a true IPv6 environment.");
@ -313,6 +296,7 @@ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance)
{
ServerInstance->Log(DEBUG,"I cant socket() this socket! (%s)",strerror(errno));
}
/* Have we got a socket and is it nonblocking? */
if (this->GetFd() != -1)
{
@ -357,6 +341,26 @@ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance)
}
}
/** Initialise the DNS UDP socket so that we can send requests */
DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance)
{
ServerInstance->Log(DEBUG,"DNS::DNS: Instance = %08x",Instance);
/* Clear the Resolver class table */
memset(Classes,0,sizeof(Classes));
/* Clear the requests class table */
memset(requests,0,sizeof(requests));
/* Set the id of the next request to 0
*/
currid = 0;
this->SetFd(-1);
this->Rehash();
}
/** Build a payload to be placed after the header, based upon input data, a resource type, a class and a pointer to a buffer */
int DNS::MakePayload(const char * const name, const QueryType rr, const unsigned short rr_class, unsigned char * const payload)
{

1
src/inspircd.cpp
View File

@ -143,6 +143,7 @@ void InspIRCd::Rehash(int status)
SI->RehashUsersAndChans();
FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect());
SI->Config->Read(false,NULL);
SI->Res->Rehash();
FOREACH_MOD_I(SI,I_OnRehash,OnRehash(""));
}

1
src/modules.cpp
View File

@ -348,6 +348,7 @@ void InspIRCd::RehashServer()
this->WriteOpers("*** Rehashing config file");
this->RehashUsersAndChans();
this->Config->Read(false,NULL);
this->Res->Rehash();
}
/* This is ugly, yes, but hash_map's arent designed to be