#include "common.h"
#include "s_conf.h"
#include "s_newconf.h"
-#include "tools.h"
#include "client.h"
-#include "memory.h"
#include "s_serv.h"
#include "send.h"
#include "hostmask.h"
#include "newconf.h"
#include "hash.h"
-#include "balloc.h"
-#include "event.h"
#include "sprintf_irc.h"
#include "irc_dictionary.h"
rb_dlink_list nd_list; /* nick delay */
rb_dlink_list tgchange_list;
-patricia_tree_t *tgchange_tree;
+rb_patricia_tree_t *tgchange_tree;
static BlockHeap *nd_heap = NULL;
struct remote_conf *
make_remote_conf(void)
{
- struct remote_conf *remote_p = MyMalloc(sizeof(struct remote_conf));
+ struct remote_conf *remote_p = rb_malloc(sizeof(struct remote_conf));
return remote_p;
}
if(remote_p == NULL)
return;
- MyFree(remote_p->username);
- MyFree(remote_p->host);
- MyFree(remote_p->server);
- MyFree(remote_p);
+ rb_free(remote_p->username);
+ rb_free(remote_p->host);
+ rb_free(remote_p->server);
+ rb_free(remote_p);
}
int
struct oper_conf *
make_oper_conf(void)
{
- struct oper_conf *oper_p = MyMalloc(sizeof(struct oper_conf));
+ struct oper_conf *oper_p = rb_malloc(sizeof(struct oper_conf));
return oper_p;
}
if(oper_p == NULL)
return;
- MyFree(oper_p->username);
- MyFree(oper_p->host);
- MyFree(oper_p->name);
+ rb_free(oper_p->username);
+ rb_free(oper_p->host);
+ rb_free(oper_p->name);
if(oper_p->passwd)
{
memset(oper_p->passwd, 0, strlen(oper_p->passwd));
- MyFree(oper_p->passwd);
+ rb_free(oper_p->passwd);
}
#ifdef HAVE_LIBCRYPTO
- MyFree(oper_p->rsa_pubkey_file);
+ rb_free(oper_p->rsa_pubkey_file);
if(oper_p->rsa_pubkey)
RSA_free(oper_p->rsa_pubkey);
#endif
- MyFree(oper_p);
+ rb_free(oper_p);
}
struct oper_conf *
struct server_conf *
make_server_conf(void)
{
- struct server_conf *server_p = MyMalloc(sizeof(struct server_conf));
+ struct server_conf *server_p = rb_malloc(sizeof(struct server_conf));
server_p->aftype = AF_INET;
return server_p;
}
if(!EmptyString(server_p->passwd))
{
memset(server_p->passwd, 0, strlen(server_p->passwd));
- MyFree(server_p->passwd);
+ rb_free(server_p->passwd);
}
if(!EmptyString(server_p->spasswd))
{
memset(server_p->spasswd, 0, strlen(server_p->spasswd));
- MyFree(server_p->spasswd);
+ rb_free(server_p->spasswd);
}
- MyFree(server_p->name);
- MyFree(server_p->host);
- MyFree(server_p->class_name);
- MyFree(server_p);
+ rb_free(server_p->name);
+ rb_free(server_p->host);
+ rb_free(server_p->class_name);
+ rb_free(server_p);
}
void
{
if(EmptyString(server_p->class_name))
{
- DupString(server_p->class_name, "default");
+ server_p->class_name = rb_strdup("default");
server_p->class = default_class;
return;
}
conf_report_error("Warning connect::class invalid for %s",
server_p->name);
- MyFree(server_p->class_name);
- DupString(server_p->class_name, "default");
+ rb_free(server_p->class_name);
+ server_p->class_name = rb_strdup("default");
}
if(strchr(server_p->host, '*') || strchr(server_p->host, '?'))
if(find_tgchange(host))
return;
- target = MyMalloc(sizeof(tgchange));
+ target = rb_malloc(sizeof(tgchange));
pnode = make_and_lookup(tgchange_tree, host);
pnode->data = target;
target->pnode = pnode;
- DupString(target->ip, host);
+ target->ip = rb_strdup(host);
target->expiry = CurrentTime + (60*60*12);
rb_dlinkAdd(target, &target->node, &tgchange_list);