diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-06-13 00:29:59 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-06-13 00:29:59 +0800 |
| commit | 2254eb52d8cb36f32c0151e0f1c3be5e5281274b (patch) | |
| tree | 773d12e5b84ba1635a948990942a3001ec82fcd8 | |
| parent | 1dc564bc0c0626e0491012c32b5e11c7e677a6f8 (diff) | |
| download | pttbbs-2254eb52d8cb36f32c0151e0f1c3be5e5281274b.tar pttbbs-2254eb52d8cb36f32c0151e0f1c3be5e5281274b.tar.gz pttbbs-2254eb52d8cb36f32c0151e0f1c3be5e5281274b.tar.bz2 pttbbs-2254eb52d8cb36f32c0151e0f1c3be5e5281274b.tar.lz pttbbs-2254eb52d8cb36f32c0151e0f1c3be5e5281274b.tar.xz pttbbs-2254eb52d8cb36f32c0151e0f1c3be5e5281274b.tar.zst pttbbs-2254eb52d8cb36f32c0151e0f1c3be5e5281274b.zip | |
* add timeout to logind
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4581 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | daemon/logind/logind.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/daemon/logind/logind.c b/daemon/logind/logind.c index 880b05d7..f0b25bff 100644 --- a/daemon/logind/logind.c +++ b/daemon/logind/logind.c @@ -48,6 +48,10 @@ #define BAN_SLEEP_SEC (60) #endif +#ifndef IDLE_TIMEOUT_SEC +#define IDLE_TIMEOUT_SEC (20*60) +#endif + #define MAX_TEXT_SCREEN_LINES (24) #ifndef MAX_FDS @@ -1035,13 +1039,19 @@ client_cb(int fd, short event, void *arg) int len, r; unsigned char buf[64], ch, *s = buf; - // ignore clients that timeout + // for time-out, simply close connection. if (event & EV_TIMEOUT) + { + endconn_cb(fd, EV_TIMEOUT, (void*) conn); return; + } // XXX will this happen? if (!(event & EV_READ)) + { + assert(event & EV_READ); return; + } if ( (len = read(fd, buf, sizeof(buf))) <= 0) { @@ -1152,6 +1162,7 @@ listen_cb(int lfd, short event, void *arg) { int fd; struct sockaddr_in xsin = {0}; + struct timeval idle_tv = { IDLE_TIMEOUT_SEC, 0}; socklen_t szxsin = sizeof(xsin); login_conn_ctx *conn; bind_event *pbindev = (bind_event*) arg; @@ -1198,7 +1209,7 @@ listen_cb(int lfd, short event, void *arg) // set events event_set(&conn->ev, fd, EV_READ|EV_PERSIST, client_cb, conn); - event_add(&conn->ev, NULL); + event_add(&conn->ev, &idle_tv); // check ban here? XXX can we directly use xsin.sin_addr instead of ASCII form? if (g_banned || check_banip(conn->ctx.hostip) ) @@ -1210,7 +1221,14 @@ listen_cb(int lfd, short event, void *arg) } // draw banner -#ifdef INSCREEN + // XXX for systems that needs high performance, you must reduce the + // string in INSCREEN/banner. + // if you have your own banner, define as INSCREEN in pttbbs.conf + // if you don't want anny benner, define NO_INSCREEN +#ifndef NO_INSCREEN +# ifndef INSCREEN +# define INSCREEN "Ħi" BBSNAME "ĦjĦ·(" MYHOSTNAME ", " MYIP ") \r\n" +# endif _buff_write(conn, INSCREEN, sizeof(INSCREEN)); #endif |