diff options
author | in2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2002-08-23 19:33:01 +0800 |
---|---|---|
committer | in2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2002-08-23 19:33:01 +0800 |
commit | b2285929d8dca7928f8e4bb771f696408c37b078 (patch) | |
tree | 842560f711239886b9382c6610e82d677e2042db | |
parent | c72f2d637a43414543026a3d0c656aa7635c134e (diff) | |
download | pttbbs-b2285929d8dca7928f8e4bb771f696408c37b078.tar pttbbs-b2285929d8dca7928f8e4bb771f696408c37b078.tar.gz pttbbs-b2285929d8dca7928f8e4bb771f696408c37b078.tar.bz2 pttbbs-b2285929d8dca7928f8e4bb771f696408c37b078.tar.lz pttbbs-b2285929d8dca7928f8e4bb771f696408c37b078.tar.xz pttbbs-b2285929d8dca7928f8e4bb771f696408c37b078.tar.zst pttbbs-b2285929d8dca7928f8e4bb771f696408c37b078.zip |
DYMAX_ACTIVE
git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk@487 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r-- | pttbbs/mbbsd/cal.c | 9 | ||||
-rw-r--r-- | pttbbs/mbbsd/mbbsd.c | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/pttbbs/mbbsd/cal.c b/pttbbs/mbbsd/cal.c index ee23879b..e4ecc8cf 100644 --- a/pttbbs/mbbsd/cal.c +++ b/pttbbs/mbbsd/cal.c @@ -1,4 +1,4 @@ -/* $Id: cal.c,v 1.19 2002/07/22 19:02:00 in2 Exp $ */ +/* $Id: cal.c,v 1.20 2002/08/23 11:33:01 in2 Exp $ */ #include "bbs.h" /* 防堵 Multi play */ @@ -425,7 +425,12 @@ p_sysinfo(void) "編譯時間: %s\n" "起始時間: %s\n", cpuloadstr, SHM->UTMPnumber, - MAX_ACTIVE, COMPILE_TIME, ctime(&start_time)); +#ifdef DYMAX_ACTIVE + GLOBALVAR[9] > 1000 ? GLOBALVAR[9] : MAX_ACTIVE, +#else + MAX_ACTIVE, +#endif + COMPILE_TIME, ctime(&start_time)); pressanykey(); return 0; } diff --git a/pttbbs/mbbsd/mbbsd.c b/pttbbs/mbbsd/mbbsd.c index 3d626a59..29121dd9 100644 --- a/pttbbs/mbbsd/mbbsd.c +++ b/pttbbs/mbbsd/mbbsd.c @@ -1,4 +1,4 @@ -/* $Id: mbbsd.c,v 1.48 2002/08/20 17:19:11 in2 Exp $ */ +/* $Id: mbbsd.c,v 1.49 2002/08/23 11:33:01 in2 Exp $ */ #include "bbs.h" #define SOCKET_QLEN 4 @@ -523,7 +523,11 @@ login_query() show_file("etc/Welcome", 1, -1, NO_RELOAD); #endif output("1", 1); - if (attempts >= MAX_ACTIVE) { + if (attempts >= MAX_ACTIVE +#ifdef DYMAX_ACTIVE + || (GLOBALVAR[9] > 1000 && attempts >= GLOBALVAR[9] ) +#endif + ) { outs("由於人數太多,請您稍後再來。\n"); refresh(); exit(1); |