From 198bbbeaa7379abfc7454177fe7e4012a62df0ef Mon Sep 17 00:00:00 2001 From: piaip Date: Fri, 12 Jun 2009 08:04:06 +0000 Subject: * refine cmbbs/cache.c: we don't need 'util_cache.o' anymore! simply common bbs library (libcmbbs.a). git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4569 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- common/bbs/cache.c | 346 ++++------------- common/bbs/string.c | 1 - common/bbs/time.c | 6 +- daemon/bpop3d/Makefile | 2 +- daemon/logind/Makefile | 2 +- daemon/utmpd/Makefile | 2 +- include/cmbbs.h | 44 +++ include/proto.h | 59 +-- innbbsd/Makefile | 3 +- mbbsd/cache.c | 993 ++----------------------------------------------- trans/Makefile | 6 +- util/Makefile | 6 +- 12 files changed, 169 insertions(+), 1301 deletions(-) diff --git a/common/bbs/cache.c b/common/bbs/cache.c index e282b484..03da6932 100644 --- a/common/bbs/cache.c +++ b/common/bbs/cache.c @@ -1,12 +1,42 @@ /* $Id$ */ -#include "bbs.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "cmsys.h" +#include "cmbbs.h" +#include "common.h" +#include "var.h" + +#include "modes.h" // for DEBUGSLEEPING + +// TODO some APIs currently in util_passwd.o and should be moved to +// common/bbs/passwd.c... +int passwd_query(int num, userec_t *buf); +int passwd_update_money(int num); + +////////////////////////////////////////////////////////////////////////// +// This is shared by utility library and core BBS, +// so do not put code using currutmp/cuser here. +////////////////////////////////////////////////////////////////////////// + +// these cannot be used! +#define currutmp YOU_FAILED +#define usernum YOU_FAILED +#define cuser YOU_FAILED +#define abort_bbs YOU_FAILED +#define log_usies YOU_FAILED -#if 0 - -#ifdef _BBS_UTIL_C_ -# define log_usies(a, b) ; -# define abort_bbs(a) exit(1) -#endif /* * the reason for "safe_sleep" is that we may call sleep during SIGALRM * handler routine, while SIGALRM is blocked. if we use the original sleep, @@ -22,7 +52,7 @@ safe_sleep(unsigned int seconds) sigprocmask(SIG_BLOCK, &set, &oldset); if (sigismember(&oldset, SIGALRM)) { unsigned int retv; - log_usies("SAFE_SLEEP ", "avoid hang"); + // log_usies("SAFE_SLEEP ", "avoid hang"); sigemptyset(&set); sigaddset(&set, SIGALRM); sigprocmask(SIG_UNBLOCK, &set, NULL); @@ -95,6 +125,7 @@ attach_SHM(void) /* * section - user cache(including uhash) */ + /* uhash ****************************************** */ /* * the design is this: we use another stand-alone program to create and load @@ -118,8 +149,12 @@ add_to_uhash(int n, const char *id) for (times = 0; times < MAX_USERS && *p != -1; ++times) p = &(SHM->next_in_hash[*p]); - if (times == MAX_USERS) - abort_bbs(0); + if (times >= MAX_USERS) + { + // abort_bbs(0); + fprintf(stderr, "add_to_uhash: exceed max users.\r\n"); + exit(0); + } SHM->next_in_hash[*p = n] = -1; } @@ -138,8 +173,12 @@ remove_from_uhash(int n) for (times = 0; times < MAX_USERS && (*p != -1 && *p != n); ++times) p = &(SHM->next_in_hash[*p]); - if (times == MAX_USERS) - abort_bbs(0); + if (times >= MAX_USERS) + { + // abort_bbs(0); + fprintf(stderr, "remove_from_uhash: current SHM exceed max users.\r\n"); + exit(0); + } if (*p == n) *p = SHM->next_in_hash[n]; @@ -149,6 +188,7 @@ remove_from_uhash(int n) #warning "Suggest to use bigger HASH_BITS for better searchuser() performance," #warning "searchuser() average chaining MAX_USERS/(1<userid) % USHM_SIZE; - for (i = 0; i < USHM_SIZE; i++, p++) { - if (p == USHM_SIZE) - p = 0; - uentp = &(SHM->uinfo[p]); - if (!(uentp->pid)) { - memcpy(uentp, up, sizeof(userinfo_t)); - currutmp = uentp; - return; - } - } - exit(1); -} - -int -apply_ulist(int (*fptr) (const userinfo_t *)) -{ - register userinfo_t *uentp; - register int i, state; - - for (i = 0; i < USHM_SIZE; i++) { - uentp = &(SHM->uinfo[i]); - if (uentp->pid && (PERM_HIDE(currutmp) || !PERM_HIDE(uentp))) - if ((state = (*fptr) (uentp))) - return state; - } - return 0; -} - userinfo_t * search_ulist_pid(int pid) { @@ -355,54 +361,6 @@ search_ulist_userid(const char *userid) return 0; } -#ifndef _BBS_UTIL_C_ -int -count_logins(int uid, int show) -{ - register int i = 0, j, start = 0, end = SHM->UTMPnumber - 1, count; - int *ulist; - userinfo_t *u; - if (end == -1) - return 0; - ulist = SHM->sorted[SHM->currsorted][7]; - for (i = ((start + end) / 2);; i = (start + end) / 2) { - u = &SHM->uinfo[ulist[i]]; - j = uid - u->uid; - if (!j) { - for (; i > 0 && uid == SHM->uinfo[ulist[i - 1]].uid; i--); - /* 指到第一筆 */ - for (count = 0; (ulist[i + count] && - (u = &SHM->uinfo[ulist[i + count]]) && - uid == u->uid); count++) { - if (show) - prints("(%d) 目前狀態為: %-17.16s(來自 %s)\n", - count + 1, modestring(u, 0), - u->from); - } - return count; - } - if (end == start) { - break; - } else if (i == start) { - i = end; - start = end; - } else if (j > 0) - start = i; - else - end = i; - } - return 0; -} - -void -purge_utmp(userinfo_t * uentp) -{ - logout_friend_online(uentp); - memset(uentp, 0, sizeof(userinfo_t)); - SHM->UTMPneedsort = 1; -} -#endif - /* * section - money cache */ @@ -418,11 +376,7 @@ int deumoney(int uid, int money) { if (uid <= 0 || uid > MAX_USERS){ -#if defined(_BBS_UTIL_C_) - printf("internal error: deumoney(%d, %d)\n", uid, money); -#else - vmsg("internal error"); -#endif + fprintf(stderr, "internal error: deumoney(%d, %d)\r\n", uid, money); return -1; } @@ -432,30 +386,6 @@ deumoney(int uid, int money) return setumoney(uid, SHM->money[uid - 1] + money); } -/* - * section - utmp - */ -#if !defined(_BBS_UTIL_C_) /* _BBS_UTIL_C_ 不會有 utmp */ -void -setutmpmode(unsigned int mode) -{ - if (currstat != mode) - currutmp->mode = currstat = mode; - /* 追蹤使用者 */ - if (HasUserPerm(PERM_LOGUSER)) { - log_user("setutmpmode to %s(%d)\n", modestring(currutmp, 0), mode); - } -} - -unsigned int -getutmpmode(void) -{ - if (currutmp) - return currutmp->mode; - return currstat; -} -#endif - /* * section - board cache */ @@ -465,7 +395,6 @@ void touchbtotal(int bid) { SHM->lastposttime[bid - 1] = 0; } - /** * qsort comparison function - 照板名排序 */ @@ -514,15 +443,14 @@ sort_bcache(void) SHM->Bbusystate = 0; } -#ifdef _BBS_UTIL_C_ void reload_bcache(void) { int i, fd; pid_t pid; for( i = 0 ; i < 10 && SHM->Bbusystate ; ++i ){ - printf("SHM->Bbusystate is currently locked (value: %d). " - "please wait... ", SHM->Bbusystate); + fprintf(stderr, "SHM->Bbusystate is currently locked (value: %d). " + "please wait... \r\n", SHM->Bbusystate); sleep(1); } @@ -538,11 +466,12 @@ reload_bcache(void) /* 等所有 boards 資料更新後再設定 uptime */ SHM->Buptime = SHM->Btouchtime; - log_usies("CACHE", "reload bcache"); + // log_usies("CACHE", "reload bcache"); + fprintf(stderr, "cache: reload bcache\r\n"); SHM->Bbusystate = 0; sort_bcache(); - printf("load bottom in background"); + fprintf(stderr, "load bottom in background\r\n"); if( (pid = fork()) > 0 ) return; setproctitle("loading bottom"); @@ -558,7 +487,7 @@ reload_bcache(void) n = 5; SHM->n_bottom[i] = n; } - printf("load bottom done"); + fprintf(stderr, "load bottom done\r\n"); if( pid == 0 ) exit(0); // if pid == -1 should be returned @@ -571,17 +500,6 @@ void resolve_boards(void) } numboards = SHM->Bnumber; } -#endif /* defined(_BBS_UTIL_C_)*/ - -#if 0 -/* Unused */ -void touch_boards(void) -{ - SHM->Btouchtime = COMMON_TIME; - numboards = -1; - resolve_boards(); -} -#endif void addbrd_touchcache(void) { @@ -618,22 +536,6 @@ reset_board(int bid) /* XXXbid: from 1 */ } } -#ifndef _BBS_UTIL_C_ /* because of HasBoardPerm() in board.c */ -int -apply_boards(int (*func) (boardheader_t *)) -{ - register int i; - register boardheader_t *bhdr; - - for (i = 0, bhdr = bcache; i < numboards; i++, bhdr++) { - if (!(bhdr->brdattr & BRD_GROUPBOARD) && HasBoardPerm(bhdr) && - (*func) (bhdr) == QUIT) - return QUIT; - } - return 0; -} -#endif - void setbottomtotal(int bid) { @@ -656,6 +558,7 @@ setbottomtotal(int bid) else SHM->n_bottom[bid-1]=n; } + void setbtotal(int bid) { @@ -715,64 +618,6 @@ getbnum(const char *bname) return 0; } -const char * -postperm_msg(const char *bname) -{ - register int i; - char buf[PATHLEN]; - boardheader_t *bp = NULL; - - if (!(i = getbnum(bname))) - return "看板不存在"; - - if (HasUserPerm(PERM_SYSOP)) - return NULL; - - setbfile(buf, bname, fn_water); - if (file_exist_record(buf, cuser.userid)) - return "使用者水桶中"; - - if (!strcasecmp(bname, DEFAULT_BOARD)) - return NULL; - - assert(0<=i-1 && i-1brdattr & BRD_GUESTPOST) - return NULL; - - if (!HasUserPerm(PERM_POST)) - return "無發文權限"; - - /* 秘密看板特別處理 */ - if (bp->brdattr & BRD_HIDE) - return NULL; - else if (bp->brdattr & BRD_RESTRICTEDPOST && - !is_hidden_board_friend(i, usernum)) - return "看板限制發文"; - - if (HasUserPerm(PERM_VIOLATELAW)) - { - // 在罰單的討論相關板可以發文 - if (bp->level & PERM_VIOLATELAW) - return NULL; - else - return "罰單未繳"; - } - - if (!(bp->level & ~PERM_POST)) - return NULL; - if (!HasUserPerm(bp->level & ~PERM_POST)) - return "未達看板要求權限"; - return NULL; -} - -int -haspostperm(const char *bname) -{ - return postperm_msg(bname) == NULL ? 1 : 0; -} - void buildBMcache(int bid) /* bid starts from 1 */ { char s[IDLEN * 3 + 3], *ptr; @@ -794,35 +639,10 @@ void buildBMcache(int bid) /* bid starts from 1 */ SHM->BMcache[bid-1][i] = -1; } -int is_BM_cache(int bid) /* bid starts from 1 */ -{ - assert(0<=bid-1 && bid-1BMcache[bid-1]; - // XXX potential issue: (thanks for mtdas@ptt) - // buildBMcache use -1 as "none". - // some function may call is_BM_cache early - // without having currutmp->uid (maybe?) - // and may get BM permission accidentally. - // quick check - if (!HasUserPerm(PERM_BASIC) || !currutmp->uid || currutmp->uid == -1) - return 0; - // XXX hard coded MAX_BMs=4 - if( currutmp->uid == pbm[0] || - currutmp->uid == pbm[1] || - currutmp->uid == pbm[2] || - currutmp->uid == pbm[3] ) - { - // auto enable BM permission - if (!HasUserPerm(PERM_BM)) - cuser.userlevel |= PERM_BM; - return 1; - } - return 0; -} - -/*-------------------------------------------------------*/ -/* PTT cache */ -/*-------------------------------------------------------*/ +/* + * section - PTT cache (movie cache?) + * 動態看板與其它 + */ int filter_aggressive(const char*s) { @@ -941,10 +761,8 @@ reload_pttcache(void) memset(SHM->notes[id], 0, sizeof(SHM->notes[0])); else id++; -#ifdef _BBS_UTIL_C_ // Debug purpose - // printf("found aggressive: %s\n", buf); -#endif + // fprintf(stderr, "found aggressive: %s\r\n", buf); } else { @@ -969,10 +787,8 @@ reload_pttcache(void) else set_aggressive_state(0); -#ifdef _BBS_UTIL_C_ - printf("id(%d)/agg(%d)/raw(%d)\n", - id, aggid, rawid); -#endif + // fprintf(stderr, "id(%d)/agg(%d)/raw(%d)\r\n", + // id, aggid, rawid); } SHM->last_film = id - 1; @@ -987,7 +803,8 @@ reload_pttcache(void) /* 等所有資料更新後再設定 uptime */ SHM->Puptime = SHM->Ptouchtime; - log_usies("CACHE", "reload pttcache"); + // log_usies("CACHE", "reload pttcache"); + fprintf(stderr, "cache: reload pttcache\r\n"); SHM->Pbusystate = 0; } } @@ -1007,17 +824,16 @@ resolve_garbage(void) * 又沒有人把他 解開 同樣的問題發生在reload passwd */ SHM->Pbusystate = 0; -#ifndef _BBS_UTIL_C_ - log_usies("CACHE", "refork Ptt dead lock"); -#endif + // log_usies("CACHE", "refork Ptt dead lock"); + fprintf(stderr, "cache: refork Ptt dead lock\r\n"); } } } -/*-------------------------------------------------------*/ -/* PTT's cache */ -/*-------------------------------------------------------*/ -/* cache for from host 與最多上線人數 */ +/* + * section - from host (deprecated by fromd / logind?) + * cache for from host 與最多上線人數 + */ void reload_fcache(void) { @@ -1073,9 +889,8 @@ reload_fcache(void) /* 等所有資料更新後再設定 uptime */ SHM->Fuptime = SHM->Ftouchtime; -#if !defined(_BBS_UTIL_C_) - log_usies("CACHE", "reload fcache"); -#endif + // log_usies("CACHE", "reload fcache"); + fprintf(stderr, "cache: reload from cache\r\n"); SHM->Fbusystate = 0; } } @@ -1138,7 +953,11 @@ is_hidden_board_friend(int bid, int uid) return 0; } +/* + * section - cooldown + */ #ifdef USE_COOLDOWN + void add_cooldowntime(int uid, int min) { // Ptt: I will use the number below 15 seconds. @@ -1156,6 +975,5 @@ void add_posttimes(int uid, int times) else SHM->cooldowntime[uid - 1] |= 0xF; } -#endif #endif diff --git a/common/bbs/string.c b/common/bbs/string.c index 22c93abb..5f8e1c9f 100644 --- a/common/bbs/string.c +++ b/common/bbs/string.c @@ -19,7 +19,6 @@ bool is_valid_brdname(const char *brdname) { int i; - char ch; int len; assert(brdname); diff --git a/common/bbs/time.c b/common/bbs/time.c index 6ea402b8..9d084fb6 100644 --- a/common/bbs/time.c +++ b/common/bbs/time.c @@ -1,5 +1,7 @@ -#include "bbs.h" -#include "cmsys.h" +#include "cmbbs.h" +#include "var.h" + +void syncnow(void); // Now() is a maple3 flavor API. const char * diff --git a/daemon/bpop3d/Makefile b/daemon/bpop3d/Makefile index 5024827f..69621d70 100644 --- a/daemon/bpop3d/Makefile +++ b/daemon/bpop3d/Makefile @@ -4,7 +4,7 @@ SRCROOT= ../.. PROGRAMS= bpop3d UTILDIR= $(SRCROOT)/util -UTILOBJ= $(UTILDIR)/util_var.o $(UTILDIR)/util_cache.o $(UTILDIR)/util_passwd.o +UTILOBJ= $(UTILDIR)/util_var.o $(UTILDIR)/util_passwd.o LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ $(SRCROOT)/common/sys/libcmsys.a \ diff --git a/daemon/logind/Makefile b/daemon/logind/Makefile index c984239c..246b6c5e 100644 --- a/daemon/logind/Makefile +++ b/daemon/logind/Makefile @@ -4,7 +4,7 @@ SRCROOT= ../.. PROGRAMS= logind loginc UTILDIR= $(SRCROOT)/util -UTILOBJ= $(UTILDIR)/util_var.o $(UTILDIR)/util_cache.o $(UTILDIR)/util_passwd.o +UTILOBJ= $(UTILDIR)/util_var.o $(UTILDIR)/util_passwd.o LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ $(SRCROOT)/common/sys/libcmsys.a \ diff --git a/daemon/utmpd/Makefile b/daemon/utmpd/Makefile index e03d8dae..97270836 100644 --- a/daemon/utmpd/Makefile +++ b/daemon/utmpd/Makefile @@ -5,7 +5,7 @@ SRCROOT= ../.. PROGRAMS= utmpserver utmpsync utmpserver2 utmpserver3 authserver UTILDIR= $(SRCROOT)/util -UTILOBJ= $(UTILDIR)/util_var.o $(UTILDIR)/util_cache.o $(UTILDIR)/util_passwd.o +UTILOBJ= $(UTILDIR)/util_var.o $(UTILDIR)/util_passwd.o LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ $(SRCROOT)/common/sys/libcmsys.a \ diff --git a/include/cmbbs.h b/include/cmbbs.h index 1ae86161..48d36ed3 100644 --- a/include/cmbbs.h +++ b/include/cmbbs.h @@ -37,4 +37,48 @@ extern int stampfile(char *fpath, fileheader_t * fh); extern int stampdir(char *fpath, fileheader_t * fh); extern int stamplink(char *fpath, fileheader_t * fh); +/* cache.c */ +#define search_ulist(uid) search_ulistn(uid, 1) +#define getbcache(bid) (bcache + bid - 1) +#define moneyof(uid) SHM->money[uid - 1] +#define getbtotal(bid) SHM->total[bid - 1] +#define getbottomtotal(bid) SHM->n_bottom[bid-1] +extern unsigned int safe_sleep(unsigned int seconds); +extern void *attach_shm(int shmkey, int shmsize); +extern void attach_SHM(void); +extern void add_to_uhash(int n, const char *id); +extern void remove_from_uhash(int n); +extern int dosearchuser(const char *userid, char *rightid); +extern int searchuser(const char *userid, char *rightid); +extern void setuserid(int num, const char *userid); +extern int getuser(const char *userid, userec_t *xuser); +extern userinfo_t *search_ulistn(int uid, int unum); +extern userinfo_t *search_ulist_pid(int pid); +extern userinfo_t *search_ulist_userid(const char *userid); +extern int setumoney(int uid, int money); +extern int deumoney(int uid, int money); +extern void touchbtotal(int bid); +extern void sort_bcache(void); +extern void reload_bcache(void); +extern void resolve_boards(void); +extern void addbrd_touchcache(void); +extern void reset_board(int bid); +extern void setbottomtotal(int bid); +extern void setbtotal(int bid); +extern void touchbpostnum(int bid, int delta); +extern int getbnum(const char *bname); +extern void buildBMcache(int); +extern void reload_fcache(void); +extern void reload_pttcache(void); +extern void resolve_garbage(void); +extern void resolve_fcache(void); +extern void hbflreload(int bid); +extern int is_hidden_board_friend(int bid, int uid); +#ifdef USE_COOLDOWN +# define cooldowntimeof(uid) (SHM->cooldowntime[uid - 1] & 0xFFFFFFF0) +# define posttimesof(uid) (SHM->cooldowntime[uid - 1] & 0xF) +extern void add_cooldowntime(int uid, int min); +extern void add_posttimes(int uid, int times); +# endif + #endif diff --git a/include/proto.h b/include/proto.h index c30835a5..6716aa30 100644 --- a/include/proto.h +++ b/include/proto.h @@ -111,67 +111,24 @@ void brc_toggle_all_read(int bid, int is_all_read); /* cache */ #define demoney(money) deumoney(usernum, money) -#define search_ulist(uid) search_ulistn(uid, 1) -#define getbcache(bid) (bcache + bid - 1) -#define moneyof(uid) SHM->money[uid - 1] -#define getbtotal(bid) SHM->total[bid - 1] -#define getbottomtotal(bid) SHM->n_bottom[bid-1] -void sort_bcache(void); -int getuser(const char *userid, userec_t *xuser); -void setuserid(int num, const char *userid); -int dosearchuser(const char *userid, char *rightid); -int searchuser(const char *userid, char *rightid); -int getbnum(const char *bname); -void touchbpostnum(int bid, int delta); -void reset_board(int bid); -void touch_boards(void); -void addbrd_touchcache(void); +unsigned int getutmpmode(void); void setutmpmode(unsigned int mode); -unsigned int getutmpmode(void); -int apply_boards(int (*func)(boardheader_t *)); -int haspostperm(const char *bname); -const char * postperm_msg(const char *bname); -void setbtotal(int bid); -void setbottomtotal(int bid); -unsigned int safe_sleep(unsigned int seconds); -int apply_ulist(int (*fptr)(const userinfo_t *)); -userinfo_t *search_ulistn(int uid, int unum); void purge_utmp(userinfo_t *uentp); void getnewutmpent(const userinfo_t *up); -void resolve_garbage(void); -void resolve_boards(void); -void resolve_fcache(void); -void sem_init(int semkey,int *semid); -void sem_lock(int op,int semid); +int apply_ulist(int (*fptr)(const userinfo_t *)); char *getuserid(int num); int searchnewuser(int mode); int count_logins(int uid, int show); -void remove_from_uhash(int n); -void add_to_uhash(int n, const char *id); -int setumoney(int uid, int money); -userinfo_t *search_ulist_pid(int pid); -userinfo_t *search_ulist_userid(const char *userid); -void hbflreload(int bid); -int is_hidden_board_friend(int bid, int uid); -void *attach_shm(int shmkey, int shmsize); -void attach_SHM(void); int is_BM_cache(int); -void buildBMcache(int); -void reload_bcache(void); -void reload_fcache(void); -#ifdef USE_COOLDOWN -#define cooldowntimeof(uid) (SHM->cooldowntime[uid - 1] & 0xFFFFFFF0) -#define posttimesof(uid) (SHM->cooldowntime[uid - 1] & 0xF) -void add_cooldowntime(int uid, int min); -void add_posttimes(int uid, int times); -#endif +int apply_boards(int (*func)(boardheader_t *)); +int haspostperm(const char *bname); +const char * postperm_msg(const char *bname); /* cal */ int give_tax(int money); const char* money_level(int money); int vice(int money, const char* item); #define reload_money() cuser.money=moneyof(usernum) -int deumoney(int uid, int money); int lockutmpmode(int unmode, int state); int unlockutmpmode(void); int x_file(void); @@ -751,10 +708,4 @@ int pwcuBitUnsetLevel (unsigned int mask); int calendar(void); int ParseDate(const char *date, int *year, int *month, int *day); -/* util */ -void touchbtotal(int bid); - -/* util_cache.c */ -void reload_pttcache(void); - #endif diff --git a/innbbsd/Makefile b/innbbsd/Makefile index e698e6f0..ff4497f5 100644 --- a/innbbsd/Makefile +++ b/innbbsd/Makefile @@ -29,8 +29,7 @@ all: ${PROGS} # bbs util UTIL_DIR= $(SRCROOT)/util -UTIL_OBJS= \ - util_cache.o util_passwd.o util_var.o +UTIL_OBJS= util_passwd.o util_var.o .for fn in ${UTIL_OBJS} LINK_UTIL_OBJS+= ${UTIL_DIR}/${fn} diff --git a/mbbsd/cache.c b/mbbsd/cache.c index 38f4a0b0..ebbf164f 100644 --- a/mbbsd/cache.c +++ b/mbbsd/cache.c @@ -2,212 +2,13 @@ #include "bbs.h" #ifdef _BBS_UTIL_C_ -# define log_usies(a, b) ; -# define abort_bbs(a) exit(1) +#error sorry, mbbsd/cache.c does not support utility mode anymore. please use libcmbbs instead. #endif -/* - * the reason for "safe_sleep" is that we may call sleep during SIGALRM - * handler routine, while SIGALRM is blocked. if we use the original sleep, - * we'll never wake up. - */ -unsigned int -safe_sleep(unsigned int seconds) -{ - /* jochang sleep有問題時用 */ - sigset_t set, oldset; - - sigemptyset(&set); - sigprocmask(SIG_BLOCK, &set, &oldset); - if (sigismember(&oldset, SIGALRM)) { - unsigned int retv; - log_usies("SAFE_SLEEP ", "avoid hang"); - sigemptyset(&set); - sigaddset(&set, SIGALRM); - sigprocmask(SIG_UNBLOCK, &set, NULL); - retv = sleep(seconds); - sigprocmask(SIG_BLOCK, &set, NULL); - return retv; - } - return sleep(seconds); -} - -/* - * section - SHM - */ -static void -attach_err(int shmkey, const char *name) -{ - fprintf(stderr, "[%s error] key = %x\n", name, shmkey); - fprintf(stderr, "errno = %d: %s\n", errno, strerror(errno)); - exit(1); -} - -void * -attach_shm(int shmkey, int shmsize) -{ - void *shmptr = (void *)NULL; - int shmid; - - shmid = shmget(shmkey, shmsize, -#ifdef USE_HUGETLB - SHM_HUGETLB | -#endif - 0); - if (shmid < 0) { - // SHM should be created by uhash_loader, NOT mbbsd or other utils - attach_err(shmkey, "shmget"); - } else { - shmptr = (void *)shmat(shmid, NULL, 0); - if (shmptr == (void *)-1) - attach_err(shmkey, "shmat"); - } - - return shmptr; -} - -void -attach_SHM(void) -{ - SHM = attach_shm(SHM_KEY, SHMSIZE); - if(SHM->version != SHM_VERSION) { - fprintf(stderr, "Error: SHM->version(%d) != SHM_VERSION(%d)\n", SHM->version, SHM_VERSION); - fprintf(stderr, "Please use the source code version corresponding to SHM,\n" - "or use ipcrm(1) command to clean share memory.\n"); - exit(1); - } - if (!SHM->loaded) /* (uhash) assume fresh shared memory is - * zeroed */ - exit(1); - if (SHM->Btouchtime == 0) - SHM->Btouchtime = 1; - bcache = SHM->bcache; - numboards = SHM->Bnumber; - - if (SHM->Ptouchtime == 0) - SHM->Ptouchtime = 1; - - if (SHM->Ftouchtime == 0) - SHM->Ftouchtime = 1; -} /* - * section - user cache(including uhash) - */ -/* uhash ****************************************** */ -/* - * the design is this: we use another stand-alone program to create and load - * data into the hash. (that program could be run in rc-scripts or something - * like that) after loading completes, the stand-alone program sets loaded to - * 1 and exits. - * - * the bbs exits if it can't attach to the shared memory or the hash is not - * loaded yet. + * section - utmp cache */ -void -add_to_uhash(int n, const char *id) -{ - int *p, h = StringHash(id)%(1<userid[n], id, sizeof(SHM->userid[n])); - - p = &(SHM->hash_head[h]); - - for (times = 0; times < MAX_USERS && *p != -1; ++times) - p = &(SHM->next_in_hash[*p]); - - if (times == MAX_USERS) - abort_bbs(0); - - SHM->next_in_hash[*p = n] = -1; -} - -void -remove_from_uhash(int n) -{ -/* - * note: after remove_from_uhash(), you should add_to_uhash() (likely with a - * different name) - */ - int h = StringHash(SHM->userid[n])%(1<hash_head[h]); - int times; - - for (times = 0; times < MAX_USERS && (*p != -1 && *p != n); ++times) - p = &(SHM->next_in_hash[*p]); - - if (times == MAX_USERS) - abort_bbs(0); - - if (*p == n) - *p = SHM->next_in_hash[n]; -} - -#if (1<hash_head[h]; - - for (times = 0; times < MAX_USERS && p != -1 && p < MAX_USERS ; ++times) { - if (strcasecmp(SHM->userid[p], userid) == 0) { - if(userid[0] && rightid) strcpy(rightid, SHM->userid[p]); - return p + 1; - } - p = SHM->next_in_hash[p]; - } - - return 0; -} - -int -searchuser(const char *userid, char *rightid) -{ - if(userid[0]=='\0') - return 0; - return dosearchuser(userid, rightid); -} - -int -getuser(const char *userid, userec_t *xuser) -{ - int uid; - - if ((uid = searchuser(userid, NULL))) { - passwd_query(uid, xuser); - xuser->money = moneyof(uid); - } - return uid; -} - -char * -getuserid(int num) -{ - if (--num >= 0 && num < MAX_USERS) - return ((char *)SHM->userid[num]); - return NULL; -} - -void -setuserid(int num, const char *userid) -{ - if (num > 0 && num <= MAX_USERS) { -/* Ptt: it may cause problems - if (num > SHM->number) - SHM->number = num; - else -*/ - remove_from_uhash(num - 1); - add_to_uhash(num - 1, userid); - } -} - void getnewutmpent(const userinfo_t * up) { @@ -243,117 +44,6 @@ apply_ulist(int (*fptr) (const userinfo_t *)) return 0; } -userinfo_t * -search_ulist_pid(int pid) -{ - register int i = 0, j, start = 0, end = SHM->UTMPnumber - 1; - int *ulist; - register userinfo_t *u; - if (end == -1) - return NULL; - ulist = SHM->sorted[SHM->currsorted][8]; - for (i = ((start + end) / 2);; i = (start + end) / 2) { - u = &SHM->uinfo[ulist[i]]; - j = pid - u->pid; - if (!j) { - return u; - } - if (end == start) { - break; - } else if (i == start) { - i = end; - start = end; - } else if (j > 0) - start = i; - else - end = i; - } - return 0; -} - -userinfo_t * -search_ulistn(int uid, int unum) -{ - register int i = 0, j, start = 0, end = SHM->UTMPnumber - 1; - int *ulist; - register userinfo_t *u; - if (end == -1) - return NULL; - ulist = SHM->sorted[SHM->currsorted][7]; - for (i = ((start + end) / 2);; i = (start + end) / 2) { - u = &SHM->uinfo[ulist[i]]; - j = uid - u->uid; - if (j == 0) { - for (; i > 0 && uid == SHM->uinfo[ulist[i - 1]].uid; --i) - ;/* 指到第一筆 */ - // piaip Tue Jan 8 09:28:03 CST 2008 - // many people bugged about that their utmp have invalid - // entry on record. - // we found them caused by crash process (DEBUGSLEEPING) which - // may occupy utmp entries even after process was killed. - // because the memory is invalid, it is not safe for those process - // to wipe their utmp entry. it should be done by some external - // daemon. - // however, let's make a little workaround here... - for (; unum > 0 && i >= 0 && ulist[i] >= 0 && - SHM->uinfo[ulist[i]].uid == uid; unum--, i++) - { - if (SHM->uinfo[ulist[i]].mode == DEBUGSLEEPING) - unum ++; - } - if (unum == 0 && i > 0 && ulist[i-1] >= 0 && - SHM->uinfo[ulist[i-1]].uid == uid) - return &SHM->uinfo[ulist[i-1]]; - /* - if ( i + unum - 1 >= 0 && - (ulist[i + unum - 1] >= 0 && - uid == SHM->uinfo[ulist[i + unum - 1]].uid ) ) - return &SHM->uinfo[ulist[i + unum - 1]]; - */ - break; /* 超過範圍 */ - } - if (end == start) { - break; - } else if (i == start) { - i = end; - start = end; - } else if (j > 0) - start = i; - else - end = i; - } - return 0; -} - -userinfo_t * -search_ulist_userid(const char *userid) -{ - register int i = 0, j, start = 0, end = SHM->UTMPnumber - 1; - int *ulist; - register userinfo_t * u; - if (end == -1) - return NULL; - ulist = SHM->sorted[SHM->currsorted][0]; - for (i = ((start + end) / 2);; i = (start + end) / 2) { - u = &SHM->uinfo[ulist[i]]; - j = strcasecmp(userid, u->userid); - if (!j) { - return u; - } - if (end == start) { - break; - } else if (i == start) { - i = end; - start = end; - } else if (j > 0) - start = i; - else - end = i; - } - return 0; -} - -#ifndef _BBS_UTIL_C_ int count_logins(int uid, int show) { @@ -399,41 +89,7 @@ purge_utmp(userinfo_t * uentp) memset(uentp, 0, sizeof(userinfo_t)); SHM->UTMPneedsort = 1; } -#endif - -/* - * section - money cache - */ -int -setumoney(int uid, int money) -{ - SHM->money[uid - 1] = money; - passwd_update_money(uid); - return SHM->money[uid - 1]; -} -int -deumoney(int uid, int money) -{ - if (uid <= 0 || uid > MAX_USERS){ -#if defined(_BBS_UTIL_C_) - printf("internal error: deumoney(%d, %d)\n", uid, money); -#else - vmsg("internal error"); -#endif - return -1; - } - - if (money < 0 && moneyof(uid) < -money) - return setumoney(uid, 0); - else - return setumoney(uid, SHM->money[uid - 1] + money); -} - -/* - * section - utmp - */ -#if !defined(_BBS_UTIL_C_) /* _BBS_UTIL_C_ 不會有 utmp */ void setutmpmode(unsigned int mode) { @@ -452,171 +108,12 @@ getutmpmode(void) return currutmp->mode; return currstat; } -#endif /* - * section - board cache + * section - board */ -void touchbtotal(int bid) { - assert(0<=bid-1 && bid-1total[bid - 1] = 0; - SHM->lastposttime[bid - 1] = 0; -} - -/** - * qsort comparison function - 照板名排序 - */ -static int -cmpboardname(const void * i, const void * j) -{ - return strcasecmp(bcache[*(int*)i].brdname, bcache[*(int*)j].brdname); -} - -/** - * qsort comparison function - 先照群組排序、同一個群組內依板名排 - */ -static int -cmpboardclass(const void * i, const void * j) -{ - boardheader_t *brd1 = &bcache[*(int*)i], *brd2 = &bcache[*(int*)j]; - int cmp; - - cmp=strncmp(brd1->title, brd2->title, 4); - if(cmp!=0) return cmp; - return strcasecmp(brd1->brdname, brd2->brdname); -} - - -void -sort_bcache(void) -{ - int i; - /* critical section 盡量不要呼叫 */ - /* 只有新增 或移除看板 需要呼叫到 */ - if(SHM->Bbusystate) { - sleep(1); - return; - } - SHM->Bbusystate = 1; - for (i = 0; i < SHM->Bnumber; i++) { - SHM->bsorted[0][i] = SHM->bsorted[1][i] = i; - } - qsort(SHM->bsorted[0], SHM->Bnumber, sizeof(int), cmpboardname); - qsort(SHM->bsorted[1], SHM->Bnumber, sizeof(int), cmpboardclass); - - for (i = 0; i < SHM->Bnumber; i++) { - bcache[i].firstchild[0] = 0; - bcache[i].firstchild[1] = 0; - } - SHM->Bbusystate = 0; -} - -#ifdef _BBS_UTIL_C_ -void -reload_bcache(void) -{ - int i, fd; - pid_t pid; - for( i = 0 ; i < 10 && SHM->Bbusystate ; ++i ){ - printf("SHM->Bbusystate is currently locked (value: %d). " - "please wait... ", SHM->Bbusystate); - sleep(1); - } - - SHM->Bbusystate = 1; - if ((fd = open(fn_board, O_RDONLY)) > 0) { - SHM->Bnumber = - read(fd, bcache, MAX_BOARD * sizeof(boardheader_t)) / - sizeof(boardheader_t); - close(fd); - } - memset(SHM->lastposttime, 0, MAX_BOARD * sizeof(time4_t)); - memset(SHM->total, 0, MAX_BOARD * sizeof(int)); - - /* 等所有 boards 資料更新後再設定 uptime */ - SHM->Buptime = SHM->Btouchtime; - log_usies("CACHE", "reload bcache"); - SHM->Bbusystate = 0; - sort_bcache(); - - printf("load bottom in background"); - if( (pid = fork()) > 0 ) - return; - setproctitle("loading bottom"); - for( i = 0 ; i < MAX_BOARD ; ++i ) - if( SHM->bcache[i].brdname[0] ){ - char fn[128]; - int n; - sprintf(fn, "boards/%c/%s/" FN_DIR ".bottom", - SHM->bcache[i].brdname[0], - SHM->bcache[i].brdname); - n = get_num_records(fn, sizeof(fileheader_t)); - if( n > 5 ) - n = 5; - SHM->n_bottom[i] = n; - } - printf("load bottom done"); - if( pid == 0 ) - exit(0); - // if pid == -1 should be returned -} - -void resolve_boards(void) -{ - while (SHM->Buptime < SHM->Btouchtime) { - reload_bcache(); - } - numboards = SHM->Bnumber; -} -#endif /* defined(_BBS_UTIL_C_)*/ - -#if 0 -/* Unused */ -void touch_boards(void) -{ - SHM->Btouchtime = COMMON_TIME; - numboards = -1; - resolve_boards(); -} -#endif - -void addbrd_touchcache(void) -{ - SHM->Bnumber++; - numboards = SHM->Bnumber; - reset_board(numboards); - sort_bcache(); -} - -void -reset_board(int bid) /* XXXbid: from 1 */ -{ /* Ptt: 這樣就不用老是touch board了 */ - int fd; - boardheader_t *bhdr; - - if (--bid < 0) - return; - assert(0<=bid && bidBbusystate || COMMON_TIME - SHM->busystate_b[bid] < 10) { - safe_sleep(1); - } else { - SHM->busystate_b[bid] = COMMON_TIME; - - bhdr = bcache; - bhdr += bid; - if ((fd = open(fn_board, O_RDONLY)) > 0) { - lseek(fd, (off_t) (bid * sizeof(boardheader_t)), SEEK_SET); - read(fd, bhdr, sizeof(boardheader_t)); - close(fd); - } - SHM->busystate_b[bid] = 0; - - buildBMcache(bid + 1); /* XXXbid */ - } -} - -#ifndef _BBS_UTIL_C_ /* because of HasBoardPerm() in board.c */ +/* HasBoardPerm() in board.c... */ int apply_boards(int (*func) (boardheader_t *)) { @@ -630,89 +127,34 @@ apply_boards(int (*func) (boardheader_t *)) } return 0; } -#endif - -void -setbottomtotal(int bid) -{ - boardheader_t *bh = getbcache(bid); - char fname[PATHLEN]; - int n; - - assert(0<=bid-1 && bid-1brdname[0]) return; - setbfile(fname, bh->brdname, FN_DIR ".bottom"); - n = get_num_records(fname, sizeof(fileheader_t)); - if(n>5) - { -#ifdef DEBUG_BOTTOM - log_file("fix_bottom", LOG_CREAT | LOG_VF, "%s n:%d\n", fname, n); -#endif - unlink(fname); - SHM->n_bottom[bid-1]=0; - } - else - SHM->n_bottom[bid-1]=n; -} -void -setbtotal(int bid) -{ - boardheader_t *bh = getbcache(bid); - struct stat st; - char genbuf[PATHLEN]; - int num, fd; - - assert(0<=bid-1 && bid-1brdname, FN_DIR); - if ((fd = open(genbuf, O_RDWR)) < 0) - return; /* .DIR掛了 */ - fstat(fd, &st); - num = st.st_size / sizeof(fileheader_t); - assert(0<=bid-1 && bid-1total[bid - 1] = num; - if (num > 0) { - lseek(fd, (off_t) (num - 1) * sizeof(fileheader_t), SEEK_SET); - if (read(fd, genbuf, FNLEN) >= 0) { - SHM->lastposttime[bid - 1] = (time4_t) atoi(&genbuf[2]); - } - } else - SHM->lastposttime[bid - 1] = 0; - close(fd); -} - -void -touchbpostnum(int bid, int delta) +int is_BM_cache(int bid) /* bid starts from 1 */ { - int *total = &SHM->total[bid - 1]; assert(0<=bid-1 && bid-1Bnumber - 1; - int *blist = SHM->bsorted[0]; - if(SHM->Bbusystate) - sleep(1); - for (i = ((start + end) / 2);; i = (start + end) / 2) { - if (!(j = strcasecmp(bname, bcache[blist[i]].brdname))) - return (int)(blist[i] + 1); - if (end == start) { - break; - } else if (i == start) { - i = end; - start = end; - } else if (j > 0) - start = i; - else - end = i; + int *pbm = SHM->BMcache[bid-1]; + // XXX potential issue: (thanks for mtdas@ptt) + // buildBMcache use -1 as "none". + // some function may call is_BM_cache early + // without having currutmp->uid (maybe?) + // and may get BM permission accidentally. + // quick check + if (!HasUserPerm(PERM_BASIC) || !currutmp->uid || currutmp->uid == -1) + return 0; + // XXX hard coded MAX_BMs=4 + if( currutmp->uid == pbm[0] || + currutmp->uid == pbm[1] || + currutmp->uid == pbm[2] || + currutmp->uid == pbm[3] ) + { + // auto enable BM permission + if (!HasUserPerm(PERM_BM)) + cuser.userlevel |= PERM_BM; + return 1; } return 0; } +// TODO move this to board.c const char * postperm_msg(const char *bname) { @@ -765,393 +207,10 @@ postperm_msg(const char *bname) return NULL; } +// TODO move this to board.c int haspostperm(const char *bname) { return postperm_msg(bname) == NULL ? 1 : 0; } -void buildBMcache(int bid) /* bid starts from 1 */ -{ - char s[IDLEN * 3 + 3], *ptr; - int i, uid; - char *strtok_pos; - - assert(0<=bid-1 && bid-1BM, sizeof(s)); - for( i = 0 ; s[i] != 0 ; ++i ) - if( !isalpha((int)s[i]) && !isdigit((int)s[i]) ) - s[i] = ' '; - - for( ptr = strtok_r(s, " ", &strtok_pos), i = 0 ; - i < MAX_BMs && ptr != NULL ; - ptr = strtok_r(NULL, " ", &strtok_pos), ++i ) - if( (uid = searchuser(ptr, NULL)) != 0 ) - SHM->BMcache[bid-1][i] = uid; - for( ; i < MAX_BMs ; ++i ) - SHM->BMcache[bid-1][i] = -1; -} - -int is_BM_cache(int bid) /* bid starts from 1 */ -{ - assert(0<=bid-1 && bid-1BMcache[bid-1]; - // XXX potential issue: (thanks for mtdas@ptt) - // buildBMcache use -1 as "none". - // some function may call is_BM_cache early - // without having currutmp->uid (maybe?) - // and may get BM permission accidentally. - // quick check - if (!HasUserPerm(PERM_BASIC) || !currutmp->uid || currutmp->uid == -1) - return 0; - // XXX hard coded MAX_BMs=4 - if( currutmp->uid == pbm[0] || - currutmp->uid == pbm[1] || - currutmp->uid == pbm[2] || - currutmp->uid == pbm[3] ) - { - // auto enable BM permission - if (!HasUserPerm(PERM_BM)) - cuser.userlevel |= PERM_BM; - return 1; - } - return 0; -} - -/*-------------------------------------------------------*/ -/* PTT cache */ -/*-------------------------------------------------------*/ -int -filter_aggressive(const char*s) -{ - if ( - /* - strstr(s, "此處放較不適當的爭議性字句") != NULL || - */ - 0 - ) - return 1; - return 0; -} - -int -filter_dirtywords(const char*s) -{ - if ( - strstr(s, "幹你娘") != NULL || - 0) - return 1; - return 0; -} - -#define AGGRESSIVE_FN ".aggressive" -static char drop_aggressive = 0; - -void -load_aggressive_state() -{ - if (dashf(AGGRESSIVE_FN)) - drop_aggressive = 1; - else - drop_aggressive = 0; -} - -void -set_aggressive_state(int s) -{ - FILE *fp = NULL; - if (s) - { - fp = fopen(AGGRESSIVE_FN, "wb"); - fclose(fp); - } else { - remove(AGGRESSIVE_FN); - } -} - -/* cache for 動態看板 */ -void -reload_pttcache(void) -{ - if (SHM->Pbusystate) - safe_sleep(1); - else { /* jochang: temporary workaround */ - fileheader_t item, subitem; - char pbuf[256], buf[256], *chr; - FILE *fp, *fp1, *fp2; - int id, aggid, rawid; - - SHM->Pbusystate = 1; - SHM->last_film = 0; - bzero(SHM->notes, sizeof(SHM->notes)); - setapath(pbuf, BN_NOTE); - setadir(buf, pbuf); - - load_aggressive_state(); - id = aggid = rawid = 0; // effective count, aggressive count, total (raw) count - - if ((fp = fopen(buf, "r"))) { - // .DIR loop - while (fread(&item, sizeof(item), 1, fp)) { - - int chkagg = 0; // should we check aggressive? - - if (item.title[3] != '<' || item.title[8] != '>') - continue; - -#ifdef BN_NOTE_AGGCHKDIR - // TODO aggressive: only count '<點歌>' section - if (strcmp(item.title+3, BN_NOTE_AGGCHKDIR) == 0) - chkagg = 1; -#endif - - snprintf(buf, sizeof(buf), "%s/%s/" FN_DIR, - pbuf, item.filename); - - if (!(fp1 = fopen(buf, "r"))) - continue; - - // file loop - while (fread(&subitem, sizeof(subitem), 1, fp1)) { - - snprintf(buf, sizeof(buf), - "%s/%s/%s", pbuf, item.filename, - subitem.filename); - - if (!(fp2 = fopen(buf, "r"))) - continue; - - fread(SHM->notes[id], sizeof(char), sizeof(SHM->notes[0]), fp2); - SHM->notes[id][sizeof(SHM->notes[0]) - 1] = 0; - rawid ++; - - // filtering - if (filter_dirtywords(SHM->notes[id])) - { - memset(SHM->notes[id], 0, sizeof(SHM->notes[0])); - rawid --; - } - else if (chkagg && filter_aggressive(SHM->notes[id])) - { - aggid++; - // handle aggressive notes by last detemined state - if (drop_aggressive) - memset(SHM->notes[id], 0, sizeof(SHM->notes[0])); - else - id++; -#ifdef _BBS_UTIL_C_ - // Debug purpose - // printf("found aggressive: %s\n", buf); -#endif - } - else - { - id++; - } - - fclose(fp2); - if (id >= MAX_MOVIE) - break; - - } // end of file loop - fclose(fp1); - - if (id >= MAX_MOVIE) - break; - } // end of .DIR loop - fclose(fp); - - // decide next aggressive state - if (rawid && aggid*3 >= rawid) // if aggressive exceed 1/3 - set_aggressive_state(1); - else - set_aggressive_state(0); - -#ifdef _BBS_UTIL_C_ - printf("id(%d)/agg(%d)/raw(%d)\n", - id, aggid, rawid); -#endif - } - SHM->last_film = id - 1; - - fp = fopen("etc/today_is", "r"); - if (fp) { - fgets(SHM->today_is, 15, fp); - if ((chr = strchr(SHM->today_is, '\n'))) - *chr = 0; - SHM->today_is[15] = 0; - fclose(fp); - } - /* 等所有資料更新後再設定 uptime */ - - SHM->Puptime = SHM->Ptouchtime; - log_usies("CACHE", "reload pttcache"); - SHM->Pbusystate = 0; - } -} - -void -resolve_garbage(void) -{ - int count = 0; - - while (SHM->Puptime < SHM->Ptouchtime) { /* 不用while等 */ - reload_pttcache(); - if (count++ > 10 && SHM->Pbusystate) { - /* - * Ptt: 這邊會有問題 load超過10 秒會所有進loop的process tate = 0 - * 這樣會所有prcosee都會在load 動態看板 會造成load大增 - * 但沒有用這個function的話 萬一load passwd檔的process死了 - * 又沒有人把他 解開 同樣的問題發生在reload passwd - */ - SHM->Pbusystate = 0; -#ifndef _BBS_UTIL_C_ - log_usies("CACHE", "refork Ptt dead lock"); -#endif - } - } -} - -/*-------------------------------------------------------*/ -/* PTT's cache */ -/*-------------------------------------------------------*/ -/* cache for from host 與最多上線人數 */ -void -reload_fcache(void) -{ - if (SHM->Fbusystate) - safe_sleep(1); - else { - FILE *fp; - - SHM->Fbusystate = 1; - bzero(SHM->home_ip, sizeof(SHM->home_ip)); - if ((fp = fopen("etc/domain_name_query.cidr", "r"))) { - char buf[256], *ip, *mask; - char *strtok_pos; - - SHM->home_num = 0; - while (fgets(buf, sizeof(buf), fp)) { - if (!buf[0] || buf[0] == '#' || buf[0] == ' ' || buf[0] == '\n') - continue; - - if (buf[0] == '@') { - SHM->home_ip[0] = 0; - SHM->home_mask[0] = 0xFFFFFFFF; - SHM->home_num++; - continue; - } - - ip = strtok_r(buf, " \t", &strtok_pos); - if ((mask = strchr(ip, '/')) != NULL) { - int shift = 32 - atoi(mask + 1); - SHM->home_ip[SHM->home_num] = ipstr2int(ip); - SHM->home_mask[SHM->home_num] = (0xFFFFFFFF >> shift ) << shift; - } - else { - SHM->home_ip[SHM->home_num] = ipstr2int(ip); - SHM->home_mask[SHM->home_num] = 0xFFFFFFFF; - } - ip = strtok_r(NULL, " \t", &strtok_pos); - if (ip == NULL) { - strcpy(SHM->home_desc[SHM->home_num], "雲深不知處"); - } - else { - strlcpy(SHM->home_desc[SHM->home_num], ip, - sizeof(SHM->home_desc[SHM->home_num])); - chomp(SHM->home_desc[SHM->home_num]); - } - (SHM->home_num)++; - if (SHM->home_num == MAX_FROM) - break; - } - fclose(fp); - } - SHM->max_user = 0; - - /* 等所有資料更新後再設定 uptime */ - SHM->Fuptime = SHM->Ftouchtime; -#if !defined(_BBS_UTIL_C_) - log_usies("CACHE", "reload fcache"); -#endif - SHM->Fbusystate = 0; - } -} - -void -resolve_fcache(void) -{ - while (SHM->Fuptime < SHM->Ftouchtime) - reload_fcache(); -} - -/* - * section - hbfl (hidden board friend list) - */ -void -hbflreload(int bid) -{ - int hbfl[MAX_FRIEND + 1], i, num, uid; - char buf[128]; - FILE *fp; - - assert(0<=bid-1 && bid-1hbfl[bid-1], hbfl, sizeof(hbfl)); -} - -/* 是否通過板友測試. 如果在板友名單中的話傳回 1, 否則為 0 */ -int -is_hidden_board_friend(int bid, int uid) -{ - int i; - - assert(0<=bid-1 && bid-1hbfl[bid-1][0] < login_start_time - HBFLexpire) - hbflreload(bid); - for (i = 1; SHM->hbfl[bid-1][i] != 0 && i <= MAX_FRIEND; ++i) { - if (SHM->hbfl[bid-1][i] == uid) - return 1; - } - return 0; -} - -#ifdef USE_COOLDOWN -void add_cooldowntime(int uid, int min) -{ - // Ptt: I will use the number below 15 seconds. - time4_t base= now > SHM->cooldowntime[uid - 1]? - now : SHM->cooldowntime[uid - 1]; - base += min*60; - base &= 0xFFFFFFF0; - - SHM->cooldowntime[uid - 1] = base; -} -void add_posttimes(int uid, int times) -{ - if((SHM->cooldowntime[uid - 1] & 0xF) + times <0xF) - SHM->cooldowntime[uid - 1] += times; - else - SHM->cooldowntime[uid - 1] |= 0xF; -} -#endif diff --git a/trans/Makefile b/trans/Makefile index 17f90bcd..a9622cbd 100644 --- a/trans/Makefile +++ b/trans/Makefile @@ -7,11 +7,9 @@ CFLAGS+= -DPTTBBS_UTIL BBSBASE= $(SRCROOT)/include/var.h -UTIL_OBJS= \ - util_cache.o util_passwd.o util_var.o +UTIL_OBJS= util_passwd.o util_var.o -MBBSD_OBJS= \ - cache record passwd var +MBBSD_OBJS= record passwd var # 下面這些程式, 會被 compile 並且和 $(UTIL_OBJS) 聯結 CPROG_WITH_UTIL= \ diff --git a/util/Makefile b/util/Makefile index 82a26302..0bbfc0bd 100644 --- a/util/Makefile +++ b/util/Makefile @@ -7,11 +7,9 @@ CFLAGS+= -DPTTBBS_UTIL BBSBASE= $(SRCROOT)/include/var.h -UTIL_OBJS= \ - util_cache.o util_passwd.o util_var.o +UTIL_OBJS= util_passwd.o util_var.o -MBBSD_OBJS= \ - cache record passwd var +MBBSD_OBJS= record passwd var # 下面這些程式, 會被 compile 並且和 $(UTIL_OBJS) 聯結 CPROG_WITH_UTIL= \ -- cgit v1.2.3