#include "s_conf.h"
#include "s_newconf.h"
#include "hash.h"
-#include "s_log.h"
-#include "sprintf_irc.h"
+#include "logger.h"
static int mo_resv(struct Client *, struct Client *, int, const char **);
static int ms_resv(struct Client *, struct Client *, int, const char **);
/*
* mo_resv()
- * parv[0] = sender prefix
* parv[1] = channel/nick to forbid
* parv[2] = reason
*/
}
/* ms_resv()
- * parv[0] = sender prefix
* parv[1] = target server
* parv[2] = channel/nick to forbid
* parv[3] = reason
ms_resv(struct Client *client_p, struct Client *source_p,
int parc, const char *parv[])
{
- /* parv[0] parv[1] parv[2] parv[3]
- * oper target server resv reason
+ /* source_p parv[1] parv[2] parv[3]
+ * oper target server resv reason
*/
propagate_resv(source_p, parv[1], 0, parv[2], parv[3]);
aconf = make_conf();
aconf->status = CONF_RESV_CHANNEL;
aconf->port = 0;
- DupString(aconf->name, name);
- DupString(aconf->passwd, reason);
+ aconf->name = rb_strdup(name);
+ aconf->passwd = rb_strdup(reason);
add_to_resv_hash(aconf->name, aconf);
if(temp_time > 0)
{
- aconf->hold = CurrentTime + temp_time;
+ aconf->hold = rb_current_time() + temp_time;
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s added temporary %d min. RESV for [%s] [%s]",
aconf = make_conf();
aconf->status = CONF_RESV_NICK;
aconf->port = 0;
- DupString(aconf->name, name);
- DupString(aconf->passwd, reason);
- dlinkAddAlloc(aconf, &resv_conf_list);
+ aconf->name = rb_strdup(name);
+ aconf->passwd = rb_strdup(reason);
+ rb_dlinkAddAlloc(aconf, &resv_conf_list);
if(temp_time > 0)
{
- aconf->hold = CurrentTime + temp_time;
+ aconf->hold = rb_current_time() + temp_time;
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s added temporary %d min. RESV for [%s] [%s]",
/*
* mo_unresv()
- * parv[0] = sender prefix
* parv[1] = channel/nick to unforbid
*/
static int
}
/* ms_unresv()
- * parv[0] = sender prefix
* parv[1] = target server
* parv[2] = resv to remove
*/
static int
ms_unresv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- /* parv[0] parv[1] parv[2]
- * oper target server resv to remove
+ /* source_p parv[1] parv[2]
+ * oper target server resv to remove
*/
propagate_generic(source_p, "UNRESV", parv[1], CAP_CLUSTER,
"%s", parv[2]);
ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
}
/* already have ptr from the loop above.. */
- dlinkDestroy(ptr, &resv_conf_list);
+ rb_dlinkDestroy(ptr, &resv_conf_list);
}
free_conf(aconf);
int error_on_write = 0;
int found_resv = 0;
- ircsprintf(temppath, "%s.tmp", ConfigFileEntry.resvfile);
+ rb_sprintf(temppath, "%s.tmp", ConfigFileEntry.resvfile);
filename = get_conf_name(RESV_TYPE);
if((in = fopen(filename, "r")) == NULL)
break;
}
- strlcpy(buff, buf, sizeof(buff));
+ rb_strlcpy(buff, buf, sizeof(buff));
if((p = strchr(buff, '\n')) != NULL)
*p = '\0';