[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-03-13 02:51:47
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-03-13 02:51:21 UTC Modified files: ChangeLog.X3 src/opserv.c src/proto-common.c Log message: another srvx->x3 update, fixed changelog ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.5 x3/ChangeLog.X3:1.6 --- x3/ChangeLog.X3:1.5 Sat Mar 12 13:10:47 2005 +++ x3/ChangeLog.X3 Sat Mar 12 18:51:11 2005 @@ -1,7 +1,9 @@ /*********************************************************************** X3 ChangeLog -2005-03-07 Alex Schumann <ru...@af...> +2005-03-12 Alex Schumann <ru...@af...> + + * 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 @@ -23,5 +25,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.5 $" +#define CVS_VERSION "$Revision: 1.6 $" Index: x3/src/opserv.c diff -u x3/src/opserv.c:1.11 x3/src/opserv.c:1.12 --- x3/src/opserv.c:1.11 Sat Mar 12 12:13:14 2005 +++ x3/src/opserv.c Sat Mar 12 18:51:11 2005 @@ -1705,7 +1705,7 @@ 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, @@ -4278,7 +4278,7 @@ 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); Index: x3/src/proto-common.c diff -u x3/src/proto-common.c:1.9 x3/src/proto-common.c:1.10 --- x3/src/proto-common.c:1.9 Sat Mar 12 12:13:14 2005 +++ x3/src/proto-common.c Sat Mar 12 18:51:11 2005 @@ -737,7 +737,7 @@ 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; ----------------------- End of diff ----------------------- |