summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-10-22 15:58:13 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-10-22 15:58:13 +0000
commit08b8c64bb6b6aa1d8cc5a7963c4ffa0a24e81960 (patch)
tree0870f52bd5d499235bce3fd65cc764ec1d1f9eb6 /src
parentc2dd98bd7dd310e76e5e69bfd964c01981fdb454 (diff)
Change around some dns stuff (dont use this yet)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5522 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/dns.cpp7
-rw-r--r--src/users.cpp4
2 files changed, 8 insertions, 3 deletions
diff --git a/src/dns.cpp b/src/dns.cpp
index ca08b93ba..5a79d0d2e 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -126,7 +126,12 @@ class RequestTimeout : public InspTimer
/* Still exists, whack it */
if (rl.find(watchid)->second == watch)
{
- watch->OnError(RESOLVER_TIMEOUT, "Request timed out");
+ if (ServerInstance->Res->Classes[watchid])
+ {
+ ServerInstance->Res->Classes[watchid]->OnError(RESOLVER_TIMEOUT, "Request timed out");
+ delete ServerInstance->Res->Classes[watchid];
+ ServerInstance->Res->Classes[watchid] = NULL;
+ }
rl.erase(rl.find(watchid));
delete watch;
ServerInstance->Log(DEBUG, "DNS timeout on %08x squished pointer", watch);
diff --git a/src/users.cpp b/src/users.cpp
index c666fd7bd..796893be6 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -282,8 +282,8 @@ userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
for (unsigned int n = 0; n < MAXCHANS; n++)
{
chans[n] = new ucrec();
- x->channel = NULL;
- x->uc_modes = 0;
+ chans[n]->channel = NULL;
+ chans[n]->uc_modes = 0;
}
}