/***********************************************************************
X3 ChangeLog
-2005-03-07 Alex Schumann <rubin@afternet.org>
+2005-03-12 Alex Schumann <rubin@afternet.org>
+
+ * opserv.c: fixed SRVX defines to X3
* src/nickserv.c: Applied patch to bring up to date with
local uncommitted changes on afternets srvx2 tree. improved
return 1;
}
-#if defined(WITH_MALLOC_SRVX)
+#if defined(WITH_MALLOC_X3)
static MODCMD_FUNC(cmd_stats_memory) {
extern unsigned long alloc_count, alloc_size;
send_message_type(MSG_TYPE_NOXLATE, user, cmd->parent->bot,
opserv_define_func("STATS UPLINK", cmd_stats_uplink, 0, 0, 0);
opserv_define_func("STATS UPTIME", cmd_stats_uptime, 0, 0, 0);
opserv_define_func("STATS WARN", cmd_stats_warn, 0, 0, 0);
-#if defined(WITH_MALLOC_SRVX) || defined(WITH_MALLOC_SLAB)
+#if defined(WITH_MALLOC_X3) || defined(WITH_MALLOC_SLAB)
opserv_define_func("STATS MEMORY", cmd_stats_memory, 0, 0, 0);
#endif
opserv_define_func("TRACE", cmd_trace, 100, 0, 3);
mask = ~0 << masklen;
masked_ip = ntohl(user->ip.s_addr) & mask;
hostname = alloca(32);
- if (options & GENMASK_SRVXMASK) {
+ if (options & GENMASK_X3MASK) {
sprintf(hostname, "%d.%d.%d.%d/%d", (masked_ip>>24)&0xFF, (masked_ip>>16)&0xFF, (masked_ip>>8)&0xFF, masked_ip&0xFF, masklen);
} else {
int ofs = 0;