#include "stdinc.h"
#include "client.h"
#include "res.h"
-#include "tools.h"
-#include "memory.h"
#include "numeric.h"
#include "reject.h"
#include "s_conf.h"
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"blacklist_dns_callback(): blcptr->client_p->preClient (%s) is NULL", get_client_name(blcptr->client_p, HIDE_IP));
- MyFree(blcptr);
+ rb_free(blcptr);
return;
}
if (reply->addr.ss_family == AF_INET &&
!memcmp(&((struct sockaddr_in *)&reply->addr)->sin_addr, "\177\0\0", 3))
listed = TRUE;
- else if (blcptr->blacklist->lastwarning + 3600 < CurrentTime)
+ else if (blcptr->blacklist->lastwarning + 3600 < rb_current_time())
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Garbage reply from blacklist %s",
blcptr->blacklist->host);
- blcptr->blacklist->lastwarning = CurrentTime;
+ blcptr->blacklist->lastwarning = rb_current_time();
}
}
register_local_user(blcptr->client_p, blcptr->client_p, buf);
}
- MyFree(blcptr);
+ rb_free(blcptr);
}
/* XXX: no IPv6 implementation, not to concerned right now though. */
static void initiate_blacklist_dnsquery(struct Blacklist *blptr, struct Client *client_p)
{
- struct BlacklistClient *blcptr = MyMalloc(sizeof(struct BlacklistClient));
+ struct BlacklistClient *blcptr = rb_malloc(sizeof(struct BlacklistClient));
char buf[IRCD_BUFSIZE];
int ip[4];
blptr = find_blacklist(name);
if (blptr == NULL)
{
- blptr = MyMalloc(sizeof(struct Blacklist));
+ blptr = rb_malloc(sizeof(struct Blacklist));
rb_dlinkAddAlloc(blptr, &blacklist_list);
}
else
if (blptr->status & CONF_ILLEGAL && blptr->refcount <= 0)
{
rb_dlinkFindDestroy(blptr, &blacklist_list);
- MyFree(blptr);
+ rb_free(blptr);
}
}
rb_dlinkDelete(&blcptr->node, &client_p->preClient->dnsbl_queries);
unref_blacklist(blcptr->blacklist);
delete_resolver_queries(&blcptr->dns_query);
- MyFree(blcptr);
+ rb_free(blcptr);
}
}
blptr->status |= CONF_ILLEGAL;
else
{
- MyFree(ptr->data);
+ rb_free(ptr->data);
rb_dlinkDestroy(ptr, &blacklist_list);
}
}