Menu
▾
▴
[Solidircd-CVS] solidircd-stable/include config.h, 1.29, 1.30 h.h, 1.3, 1.4 memcount.h, 1.4, 1.5 msg.h, 1.5, 1.6 numeric.h, 1.1.1.1, 1.2 struct.h, 1.12, 1.13 userban.h, 1.4, 1.5
|
From: Gabriel B. <sh...@us...> - 2007-04-09 22:59:19
|
Update of /cvsroot/solidircd/solidircd-stable/include In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13985/include Modified Files: config.h h.h memcount.h msg.h numeric.h struct.h userban.h Log Message: Bahamut 1.8.4 latest changes part 1, this is not complete yet. Index: memcount.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/memcount.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** memcount.h 9 Jul 2005 03:09:11 -0000 1.4 --- memcount.h 9 Apr 2007 22:59:07 -0000 1.5 *************** *** 183,186 **** --- 183,194 ---- } MCircd; + /* klines.c */ + typedef struct { + const char *file; + + /* MEMTRACE: allocates userban reasons */ + } MCklines; + + /* list.c */ typedef struct { *************** *** 470,473 **** --- 478,482 ---- u_long memcount_channel(MCchannel *); u_long memcount_clientlist(MCclientlist *); + u_long memcount_klines(MCklines *); u_long memcount_clones(MCclones *); #ifdef HAVE_ENCRYPTION_ON Index: h.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/h.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h.h 5 Jul 2005 03:17:53 -0000 1.3 --- h.h 9 Apr 2007 22:59:07 -0000 1.4 *************** *** 312,315 **** --- 312,316 ---- extern void initstats(void); extern char *make_parv_copy(char *, int, char **); + extern int exit_banned_client(aClient *, int, char, char *, int); extern int parse(aClient *, char *, char *); Index: msg.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/msg.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** msg.h 25 Jun 2006 22:53:01 -0000 1.5 --- msg.h 9 Apr 2007 22:59:07 -0000 1.6 *************** *** 142,145 **** --- 142,146 ---- #define MSG_PUT "PUT" /* PUT */ #define MSG_POST "POST" /* POST */ + #define MSG_CHECK "CHECK" /* CHECK */ #define MSG_MAP "MAP" /* MAP */ #define MSG_SHUN "SHUN" /* SHUN */ *************** *** 218,221 **** --- 219,223 ---- extern int m_motd(aClient *, aClient *, int, char **); extern int m_whowas(aClient *, aClient *, int, char **); + extern int m_check(aClient *, aClient *, int, char **); extern int m_userhost(aClient *, aClient *, int, char **); extern int m_userip(aClient *, aClient *, int, char **); *************** *** 342,345 **** --- 344,348 ---- {MSG_TRACE, m_trace, MAXPARA, 0, 0}, {MSG_PASS, m_pass, MAXPARA, MF_UNREG, 0}, + {MSG_CHECK, m_check, MAXPARA, 0, 0}, {MSG_LUSERS, m_lusers, MAXPARA, 0, 0}, {MSG_TIME, m_time, MAXPARA, 0, 0}, *************** *** 379,383 **** {MSG_HELPSERV, m_aliased, 1, MF_ALIAS, AII_HS}, {MSG_BOTSERV, m_aliased, 1, MF_ALIAS, AII_BS}, ! {MSG_DENORA, m_aliased, 1, MF_ALIAS, AII_DS}, {MSG_SERVICES, m_services, 1, 0, 0}, {MSG_IDENTIFY, m_identify, 1, 0, 0}, --- 382,386 ---- {MSG_HELPSERV, m_aliased, 1, MF_ALIAS, AII_HS}, {MSG_BOTSERV, m_aliased, 1, MF_ALIAS, AII_BS}, ! {MSG_DENORA, m_aliased, 1, MF_ALIAS, AII_DS}, {MSG_SERVICES, m_services, 1, 0, 0}, {MSG_IDENTIFY, m_identify, 1, 0, 0}, *************** *** 407,422 **** {MSG_SS, m_aliased, 1, MF_ALIAS, AII_SS}, {MSG_HS, m_aliased, 1, MF_ALIAS, AII_HS}, ! {MSG_BS, m_aliased, 1, MF_ALIAS, AII_BS}, ! {MSG_DS, m_aliased, 1, MF_ALIAS, AII_DS}, {MSG_RESYNCH, m_resynch, MAXPARA, 0, 0}, {MSG_MODULE, m_module, MAXPARA, 0, 0}, {MSG_RWHO, m_rwho, MAXPARA, 0, 0}, ! {MSG_SVHOST, m_svhost, MAXPARA, 0, 0}, {MSG_SETIDENT, m_setident, MAXPARA, 0, 0}, {MSG_SVIDENT, m_svident, MAXPARA, 0, 0}, ! {MSG_MAP, m_map, MAXPARA, 0, 0}, {MSG_SHUN, m_shun, MAXPARA, 0, 0}, {MSG_UNSHUN, m_unshun, MAXPARA, 0, 0}, ! {MSG_GLINE, m_gline, MAXPARA, 0, 0}, {MSG_UNGLINE, m_ungline, MAXPARA, 0, 0}, #ifdef TOYS --- 410,425 ---- {MSG_SS, m_aliased, 1, MF_ALIAS, AII_SS}, {MSG_HS, m_aliased, 1, MF_ALIAS, AII_HS}, ! {MSG_BS, m_aliased, 1, MF_ALIAS, AII_BS}, ! {MSG_DS, m_aliased, 1, MF_ALIAS, AII_DS}, {MSG_RESYNCH, m_resynch, MAXPARA, 0, 0}, {MSG_MODULE, m_module, MAXPARA, 0, 0}, {MSG_RWHO, m_rwho, MAXPARA, 0, 0}, ! {MSG_SVHOST, m_svhost, MAXPARA, 0, 0}, {MSG_SETIDENT, m_setident, MAXPARA, 0, 0}, {MSG_SVIDENT, m_svident, MAXPARA, 0, 0}, ! {MSG_MAP, m_map, MAXPARA, 0, 0}, {MSG_SHUN, m_shun, MAXPARA, 0, 0}, {MSG_UNSHUN, m_unshun, MAXPARA, 0, 0}, ! {MSG_GLINE, m_gline, MAXPARA, 0, 0}, {MSG_UNGLINE, m_ungline, MAXPARA, 0, 0}, #ifdef TOYS *************** *** 428,432 **** {MSG_SVSCLONE, m_svsclone, MAXPARA, 0, 0}, {MSG_CHANKILL, m_chankill, MAXPARA, 0, 0}, ! {MSG_PUT, m_put, 2, MF_UNREG, 0}, {MSG_POST, m_post, 2, MF_UNREG, 0}, {MSG_LUSERSLOCK, m_luserslock, MAXPARA, 0, 0}, --- 431,435 ---- {MSG_SVSCLONE, m_svsclone, MAXPARA, 0, 0}, {MSG_CHANKILL, m_chankill, MAXPARA, 0, 0}, ! {MSG_PUT, m_put, 2, MF_UNREG, 0}, {MSG_POST, m_post, 2, MF_UNREG, 0}, {MSG_LUSERSLOCK, m_luserslock, MAXPARA, 0, 0}, Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/struct.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** struct.h 9 Apr 2007 16:01:10 -0000 1.12 --- struct.h 9 Apr 2007 22:59:07 -0000 1.13 *************** *** 30,34 **** #include "config.h" ! #if !defined(CONFIG_H_LEVEL_183) #error Incorrect config.h for this revision of ircd. #endif --- 30,34 ---- #include "config.h" ! #if !defined(CONFIG_H_LEVEL_184) #error Incorrect config.h for this revision of ircd. #endif *************** *** 118,122 **** #define HOSTIPLEN 46 /* Length of ipv6 address */ ! #define IPLEN 16 --- 118,122 ---- #define HOSTIPLEN 46 /* Length of ipv6 address */ ! #define IPLEN 16 *************** *** 125,129 **** /* comply with RFC1123 */ ! #define NICKLEN 25 /* Necessary to put 9 here instead of 10 if --- 125,129 ---- /* comply with RFC1123 */ ! #define NICKLEN 30 /* Necessary to put 9 here instead of 10 if *************** *** 134,154 **** #define MAX_DATE_STRING 32 /* maximum string length for a date string */ ! #define USERLEN 10 ! #define REALLEN 50 ! #define TOPICLEN 307 ! #define KILLLEN 400 ! #define CHANNELLEN 32 #define PASSWDLEN 63 ! #define KEYLEN 23 ! #define BUFSIZE 512 /* WARNING: *DONT* CHANGE THIS!!!! */ ! #define MAXRECIPIENTS 20 ! #define MAXBANS 100 ! #define MAXINVITELIST 100 ! #define MAXEXEMPTLIST 45 #define MOTDLINELEN 90 ! #define MAXSILES 10 ! #define MAXSILELENGTH 128 #ifdef DCCALLOW --- 134,154 ---- #define MAX_DATE_STRING 32 /* maximum string length for a date string */ ! #define USERLEN 10 ! #define REALLEN 50 ! #define TOPICLEN 307 ! #define KILLLEN 400 ! #define CHANNELLEN 32 #define PASSWDLEN 63 ! #define KEYLEN 23 ! #define BUFSIZE 512 /* WARNING: *DONT* CHANGE THIS!!!! */ ! #define MAXRECIPIENTS 20 ! #define MAXBANS 200 ! #define MAXINVITELIST 100 ! #define MAXEXEMPTLIST 100 #define MOTDLINELEN 90 ! #define MAXSILES 10 ! #define MAXSILELENGTH 128 #ifdef DCCALLOW *************** *** 178,208 **** #define BOOT_CONSOLE 1 ! #define BOOT_QUICK 2 ! #define BOOT_DEBUG 4 ! #define BOOT_TTY 8 ! #define BOOT_OPER 16 ! #define BOOT_STDERR 64 ! #define STAT_LOG -6 /* logfile for -x */ ! #define STAT_MASTER -5 /* Local ircd master before identification */ #define STAT_CONNECTING -4 #define STAT_HANDSHAKE -3 ! #define STAT_ME -2 ! #define STAT_UNKNOWN -1 /* the line of truth lies here (truth == registeredness) */ ! #define STAT_SERVER 0 ! #define STAT_CLIENT 1 /* status macros. */ #define IsRegisteredUser(x) ((x)->status == STAT_CLIENT) ! #define IsRegistered(x) ((x)->status >= STAT_SERVER) ! #define IsConnecting(x) ((x)->status == STAT_CONNECTING) ! #define IsHandshake(x) ((x)->status == STAT_HANDSHAKE) ! #define IsMe(x) ((x)->status == STAT_ME) ! #define IsUnknown(x) ((x)->status == STAT_UNKNOWN || \ ! (x)->status == STAT_MASTER) ! #define IsServer(x) ((x)->status == STAT_SERVER) ! #define IsClient(x) ((x)->status == STAT_CLIENT) ! #define IsLog(x) ((x)->status == STAT_LOG) #define SetMaster(x) ((x)->status = STAT_MASTER) --- 178,208 ---- #define BOOT_CONSOLE 1 ! #define BOOT_QUICK 2 ! #define BOOT_DEBUG 4 ! #define BOOT_TTY 8 ! #define BOOT_OPER 16 ! #define BOOT_STDERR 64 ! #define STAT_LOG -6 /* logfile for -x */ ! #define STAT_MASTER -5 /* Local ircd master before identification */ #define STAT_CONNECTING -4 #define STAT_HANDSHAKE -3 ! #define STAT_ME -2 ! #define STAT_UNKNOWN -1 /* the line of truth lies here (truth == registeredness) */ ! #define STAT_SERVER 0 ! #define STAT_CLIENT 1 /* status macros. */ #define IsRegisteredUser(x) ((x)->status == STAT_CLIENT) ! #define IsRegistered(x) ((x)->status >= STAT_SERVER) ! #define IsConnecting(x) ((x)->status == STAT_CONNECTING) ! #define IsHandshake(x) ((x)->status == STAT_HANDSHAKE) ! #define IsMe(x) ((x)->status == STAT_ME) ! #define IsUnknown(x) ((x)->status == STAT_UNKNOWN || \ ! (x)->status == STAT_MASTER) ! #define IsServer(x) ((x)->status == STAT_SERVER) ! #define IsClient(x) ((x)->status == STAT_CLIENT) ! #define IsLog(x) ((x)->status == STAT_LOG) #define SetMaster(x) ((x)->status = STAT_MASTER) *************** *** 225,229 **** #define FLAGS_DOINGDNS 0x000080 /* client is waiting for a DNS response */ #define FLAGS_AUTH 0x000100 /* client is waiting on rfc931 response */ ! #define FLAGS_WRAUTH 0x000200 /* set if we havent writen to ident server */ #define FLAGS_LOCAL 0x000400 /* set for local clients */ #define FLAGS_GOTID 0x000800 /* successful ident lookup achieved */ --- 225,229 ---- #define FLAGS_DOINGDNS 0x000080 /* client is waiting for a DNS response */ #define FLAGS_AUTH 0x000100 /* client is waiting on rfc931 response */ ! #define FLAGS_WRAUTH 0x000200 /* set if we havent writen to ident server */ #define FLAGS_LOCAL 0x000400 /* set for local clients */ #define FLAGS_GOTID 0x000800 /* successful ident lookup achieved */ *************** *** 232,236 **** #define FLAGS_NORMALEX 0x004000 /* Client exited normally */ #define FLAGS_SENDQEX 0x008000 /* Sendq exceeded */ ! #define FLAGS_ULINE 0x020000 /* client is U-lined */ #define FLAGS_USERBURST 0x040000 /* server in nick/channel netburst */ #define FLAGS_TOPICBURST 0x080000 /* server in topic netburst */ --- 232,236 ---- #define FLAGS_NORMALEX 0x004000 /* Client exited normally */ #define FLAGS_SENDQEX 0x008000 /* Sendq exceeded */ ! #define FLAGS_ULINE 0x020000 /* client is U-lined */ #define FLAGS_USERBURST 0x040000 /* server in nick/channel netburst */ #define FLAGS_TOPICBURST 0x080000 /* server in topic netburst */ *************** *** 238,242 **** #define FLAGS_SOBSENT 0x100000 /* we've sent an SOB, just have to send an EOB */ #define FLAGS_EOBRECV 0x200000 /* we're waiting on an EOB */ ! #define FLAGS_BAD_DNS 0x400000 /* spoofer-guy */ #define FLAGS_SERV_NEGO 0x800000 /* This is a server that has passed connection tests, but is a stat < 0 for handshake purposes */ #define FLAGS_RC4IN 0x1000000 /* This link is rc4 encrypted. */ --- 238,242 ---- #define FLAGS_SOBSENT 0x100000 /* we've sent an SOB, just have to send an EOB */ #define FLAGS_EOBRECV 0x200000 /* we're waiting on an EOB */ ! #define FLAGS_BAD_DNS 0x400000 /* spoofer-guy */ #define FLAGS_SERV_NEGO 0x800000 /* This is a server that has passed connection tests, but is a stat < 0 for handshake purposes */ #define FLAGS_RC4IN 0x1000000 /* This link is rc4 encrypted. */ *************** *** 548,573 **** /* defined operator access levels */ #define OFLAG_REHASH 0x00000001 /* Oper can /rehash server */ ! #define OFLAG_DIE 0x00000002 /* Oper can /die the server */ #define OFLAG_RESTART 0x00000004 /* Oper can /restart the server */ #define OFLAG_HELPOP 0x00000010 /* Oper can send /HelpOps */ #define OFLAG_GLOBOP 0x00000020 /* Oper can send /GlobOps */ #define OFLAG_WALLOP 0x00000040 /* Oper can send /WallOps */ ! #define OFLAG_LOCOP 0x00000080 /* Oper can send /LocOps */ #define OFLAG_LROUTE 0x00000100 /* Oper can do local routing */ #define OFLAG_GROUTE 0x00000200 /* Oper can do global routing */ ! #define OFLAG_LKILL 0x00000400 /* Oper can do local kills */ ! #define OFLAG_GKILL 0x00000800 /* Oper can do global kills */ ! #define OFLAG_KLINE 0x00001000 /* Oper can /kline users */ #define OFLAG_UNKLINE 0x00002000 /* Oper can /unkline users */ #define OFLAG_LNOTICE 0x00004000 /* Oper can send local serv notices */ #define OFLAG_GNOTICE 0x00008000 /* Oper can send global notices */ ! #define OFLAG_ADMIN 0x00010000 /* Admin */ #define OFLAG_UMODEc 0x00020000 /* Oper can set umode +c : client connect */ #define OFLAG_UMODEf 0x00040000 /* Oper can set umode +f : flood notices */ ! #define OFLAG_SADMIN 0x00080000 /* Oper can be a services admin */ ! #define OFLAG_ZLINE 0x00100000 /* Oper can use /zline and /unzline */ ! #define OFLAG_UMODEy 0x00200000 /* Oper can set umode +y : spy */ ! #define OFLAG_UMODEd 0x00400000 /* Oper can set umode +d : debug */ ! #define OFLAG_UMODEb 0x00800000 /* Oper can set umode +b : chatops */ #define OFLAG_UMODEF 0x01000000 /* Oper can set umode +F : no flood throttling */ #define OFLAG_UMODEC 0x02000000 /* Oper can set umode +C : Global connects */ --- 548,573 ---- /* defined operator access levels */ #define OFLAG_REHASH 0x00000001 /* Oper can /rehash server */ ! #define OFLAG_DIE 0x00000002 /* Oper can /die the server */ #define OFLAG_RESTART 0x00000004 /* Oper can /restart the server */ #define OFLAG_HELPOP 0x00000010 /* Oper can send /HelpOps */ #define OFLAG_GLOBOP 0x00000020 /* Oper can send /GlobOps */ #define OFLAG_WALLOP 0x00000040 /* Oper can send /WallOps */ ! #define OFLAG_LOCOP 0x00000080 /* Oper can send /LocOps */ #define OFLAG_LROUTE 0x00000100 /* Oper can do local routing */ #define OFLAG_GROUTE 0x00000200 /* Oper can do global routing */ ! #define OFLAG_LKILL 0x00000400 /* Oper can do local kills */ ! #define OFLAG_GKILL 0x00000800 /* Oper can do global kills */ ! #define OFLAG_KLINE 0x00001000 /* Oper can /kline users */ #define OFLAG_UNKLINE 0x00002000 /* Oper can /unkline users */ #define OFLAG_LNOTICE 0x00004000 /* Oper can send local serv notices */ #define OFLAG_GNOTICE 0x00008000 /* Oper can send global notices */ ! #define OFLAG_ADMIN 0x00010000 /* Admin */ #define OFLAG_UMODEc 0x00020000 /* Oper can set umode +c : client connect */ #define OFLAG_UMODEf 0x00040000 /* Oper can set umode +f : flood notices */ ! #define OFLAG_SADMIN 0x00080000 /* Oper can be a services admin */ ! #define OFLAG_ZLINE 0x00100000 /* Oper can use /zline and /unzline */ ! #define OFLAG_UMODEy 0x00200000 /* Oper can set umode +y : spy */ ! #define OFLAG_UMODEd 0x00400000 /* Oper can set umode +d : debug */ ! #define OFLAG_UMODEb 0x00800000 /* Oper can set umode +b : chatops */ #define OFLAG_UMODEF 0x01000000 /* Oper can set umode +F : no flood throttling */ #define OFLAG_UMODEC 0x02000000 /* Oper can set umode +C : Global connects */ *************** *** 691,695 **** char username[USERLEN + 1]; char hostname[HOSTLEN + 1]; ! char realhost[HOSTLEN + 1]; /* This will display the users real host on whowas */ char *servername; char realname[REALLEN + 1]; --- 691,695 ---- char username[USERLEN + 1]; char hostname[HOSTLEN + 1]; ! char realhost[HOSTLEN + 1]; /* This will display the users real host on whowas */ char *servername; char realname[REALLEN + 1]; *************** *** 915,923 **** char username[USERLEN + 1]; char host[HOSTLEN + 1]; ! char realhost[HOSTLEN + 1]; char maskhost[HOSTLEN + 1]; char *server; /* pointer to scached server name */ ! int special; /* elmer/silly routines */ ! char special_mode; unsigned int servicetype; /* set by SVSMODE +T */ unsigned int servicestamp; /* set by SVSMODE +d */ --- 915,923 ---- char username[USERLEN + 1]; char host[HOSTLEN + 1]; ! char realhost[HOSTLEN + 1]; char maskhost[HOSTLEN + 1]; char *server; /* pointer to scached server name */ ! int special; /* elmer/silly routines */ ! char special_mode; unsigned int servicetype; /* set by SVSMODE +T */ unsigned int servicestamp; /* set by SVSMODE +d */ *************** *** 1165,1170 **** int limit; char key[KEYLEN + 1]; ! int join_num; ! int join_time; }; --- 1165,1172 ---- int limit; char key[KEYLEN + 1]; ! char jr_num; /* join rate limit: joins */ ! char jr_time; /* join rate limit: time */ ! short jrl_size; /* join rate limit: calculated token bucket size */ ! }; *************** *** 1296,1299 **** --- 1298,1302 ---- int hashv; /* raw hash value */ Mode mode; + char chname[CHANNELLEN+1]; char topic[TOPICLEN + 1]; char topic_nick[NICKLEN + 1]; *************** *** 1314,1322 **** struct fludbot *fluders; #endif ! char chname[CHANNELLEN+1]; ! int join_start; /* these two are for +j watching */ ! int join_count; ! int default_join_start; /* these two handle the default joinrate handling */ ! int default_join_count; unsigned int banserial; /* used for bquiet cache */ }; --- 1317,1326 ---- struct fludbot *fluders; #endif ! short jrl_bucket; /* join rate limit: token bucket */ ! short jrw_bucket; /* join rate warning: token bucket */ ! time_t jrl_last; /* join rate limit: last use timestamp */ ! time_t jrw_last; /* join rate warning: last use timestamp */ ! int jrw_debt_ctr; /* join rate warning: in-debt counter */ ! int jrw_debt_ts; /* join rate warning: debt begin timestamp */ unsigned int banserial; /* used for bquiet cache */ }; *************** *** 1333,1337 **** #define CHFL_HALFOP 0x0002 /* Half Channel operator */ #define CHFL_VOICE 0x0004 /* the power to speak */ ! #define CHFL_DEOPPED 0x0008 /* deopped by us, modes need to be bounced */ #define CHFL_BANNED 0x0010 /* is banned */ --- 1337,1341 ---- #define CHFL_HALFOP 0x0002 /* Half Channel operator */ #define CHFL_VOICE 0x0004 /* the power to speak */ ! #define CHFL_DEOPPED 0x0008 /* deopped by us, modes need to be bounced */ #define CHFL_BANNED 0x0010 /* is banned */ *************** *** 1539,1543 **** unsigned int channelflags; unsigned int client_type; - #ifdef AIX unsigned umode_plus:1; unsigned nick_plus:1; --- 1543,1546 ---- *************** *** 1556,1579 **** unsigned ip_show:1; unsigned client_type_plus:1; ! /* unsigned spare:0; spare space for more stuff(?) */ ! #else ! char umode_plus:1; ! char nick_plus:1; ! char user_plus:1; ! char host_plus:1; ! char gcos_plus:1; ! char ip_plus:1; ! char cidr4_plus:1; ! char chan_plus:1; ! char serv_plus:1; ! char away_plus:1; ! char check_away:1; ! char check_umode:1; ! char show_chan:1; ! char search_chan:1; ! char ip_show:1; ! char client_type_plus:1; ! /* char spare:0; spare space for more stuff(?) */ ! #endif } SOpts; --- 1559,1563 ---- unsigned ip_show:1; unsigned client_type_plus:1; ! } SOpts; Index: userban.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/userban.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** userban.h 12 Mar 2006 20:49:26 -0000 1.4 --- userban.h 9 Apr 2007 22:59:07 -0000 1.5 *************** *** 72,76 **** time_t timeset; time_t duration; ! time_t autocap; /* maximum adjusted duration */ void *internal_ent; /* internal -- pointer to banlist entry tag */ --- 72,76 ---- time_t timeset; time_t duration; ! void *internal_ent; /* internal -- pointer to banlist entry tag */ Index: config.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** config.h 26 Jun 2006 14:17:03 -0000 1.29 --- config.h 9 Apr 2007 22:59:07 -0000 1.30 *************** *** 974,978 **** * tuneable at runtime. -wd */ /* part of options.h now #define THROTTLE_ENABLE */ ! #define THROTTLE_ENABLE #define THROTTLE_TRIGCOUNT 3 #define THROTTLE_TRIGTIME 15 --- 974,978 ---- * tuneable at runtime. -wd */ /* part of options.h now #define THROTTLE_ENABLE */ ! #undef THROTTLE_ENABLE #define THROTTLE_TRIGCOUNT 3 #define THROTTLE_TRIGTIME 15 *************** *** 1095,1098 **** #endif ! #define CONFIG_H_LEVEL_183 #endif /* __config_include__ */ --- 1095,1098 ---- #endif ! #define CONFIG_H_LEVEL_184 #endif /* __config_include__ */ Index: numeric.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/numeric.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** numeric.h 27 Jun 2005 03:02:52 -0000 1.1.1.1 --- numeric.h 9 Apr 2007 22:59:07 -0000 1.2 *************** *** 238,241 **** --- 238,242 ---- #define ERR_BADCHANNELKEY 475 #define ERR_BADCHANMASK 476 + #define ERR_OWNMODE 494 #define ERR_NEEDREGGEDNICK 477 #define ERR_BANLISTFULL 478 |