X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=1c7df5e9c4857333406d8e68a7aa3a96cf57bc4c;hb=4ce1695b8f1f04cdbfb0af09b902859259d9918d;hp=28104218c251f66db999fe9208ea0a9db3a1998e;hpb=afa0188bfdaeb8e08df8acca5014bdd9a16a5888;p=citadel.git diff --git a/citadel/sysdep.c b/citadel/sysdep.c index 28104218c..1c7df5e9c 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Citadel "system dependent" stuff. * See COPYING for copyright information. * @@ -49,6 +47,7 @@ #include #include #include +#define SHOW_ME_VAPPEND_PRINTF #include #include "citadel.h" #include "server.h" @@ -92,7 +91,7 @@ int verbosity = DEFAULT_VERBOSITY; /* Logging level */ int syslog_facility = LOG_DAEMON; int enable_syslog = 0; - +int print_to_logfile = 1; /* * CtdlLogPrintf() ... Write logging information @@ -106,14 +105,13 @@ void CtdlLogPrintf(enum LogLevel loglevel, const char *format, ...) { void vCtdlLogPrintf(enum LogLevel loglevel, const char *format, va_list arg_ptr) { - char buf[SIZ], buf2[SIZ]; if (enable_syslog) { vsyslog((syslog_facility | loglevel), format, arg_ptr); } /* stderr output code */ - if (enable_syslog || running_as_daemon) return; + if (enable_syslog || !print_to_logfile) return; /* if we run in forground and syslog is disabled, log to terminal */ if (loglevel <= verbosity) { @@ -121,28 +119,51 @@ void vCtdlLogPrintf(enum LogLevel loglevel, const char *format, va_list arg_ptr) struct tm tim; time_t unixtime; CitContext *CCC = CC; + ThreadTSD *cTSD = CTP; + CtdlThreadNode *node = NULL; + long lwpid = 0; + char formatbuf[SIZ]; + char LWP[64]; + char SESS[64]; + + if (cTSD != NULL) { + node = cTSD->self; + } + + if ((node != NULL) && (node->reltid != 0)) { + lwpid = node->reltid; + } gettimeofday(&tv, NULL); + /* Promote to time_t; types differ on some OSes (like darwin) */ unixtime = tv.tv_sec; localtime_r(&unixtime, &tim); - if ((CCC != NULL) && (CCC->cs_pid != 0)) { - sprintf(buf, - "%04d/%02d/%02d %2d:%02d:%02d.%06ld [%3d] ", - tim.tm_year + 1900, tim.tm_mon + 1, - tim.tm_mday, tim.tm_hour, tim.tm_min, - tim.tm_sec, (long)tv.tv_usec, - CCC->cs_pid); - } else { - sprintf(buf, - "%04d/%02d/%02d %2d:%02d:%02d.%06ld ", - tim.tm_year + 1900, tim.tm_mon + 1, - tim.tm_mday, tim.tm_hour, tim.tm_min, - tim.tm_sec, (long)tv.tv_usec); + + *LWP = '\0'; + if (lwpid != 0) { + snprintf(LWP, 64, "[LWP:%ld] ", lwpid); + } + + *SESS = '\0'; + if (CCC != NULL) { + if (CCC->cs_pid != 0) { + snprintf(SESS, 64, " [%3d] ", CCC->cs_pid); + } + else if (CCC->user.usernum != 0) { + snprintf(SESS, 64, " [:%ld] ", CCC->user.usernum); + } } - vsnprintf(buf2, SIZ, format, arg_ptr); - fprintf(stderr, "%s%s", buf, buf2); + snprintf(formatbuf, SIZ, + "%04d/%02d/%02d %2d:%02d:%02d.%06ld %s%s%s", + tim.tm_year + 1900, tim.tm_mon + 1, + tim.tm_mday, tim.tm_hour, tim.tm_min, + tim.tm_sec, (long)tv.tv_usec, + LWP, SESS, format + ); + + vfprintf(stderr, formatbuf, arg_ptr); fflush(stderr); } } @@ -169,6 +190,10 @@ static RETSIGTYPE signal_cleanup(int signum) { } } +static RETSIGTYPE signal_exit(int signum) { + exit(1); +} + /* @@ -209,21 +234,22 @@ void init_sysdep(void) { * call signal_cleanup() to gracefully shut down the server. */ sigemptyset(&set); - sigaddset(&set, SIGINT); - sigaddset(&set, SIGQUIT); + sigaddset(&set, SIGINT); // intr = shutdown + // sigaddset(&set, SIGQUIT); // quit = force quit sigaddset(&set, SIGHUP); sigaddset(&set, SIGTERM); - // sigaddset(&set, SIGSEGV); commented out because - // sigaddset(&set, SIGILL); we want core dumps + // sigaddset(&set, SIGSEGV); // we want core dumps + // sigaddset(&set, SIGILL); // we want core dumps // sigaddset(&set, SIGBUS); sigprocmask(SIG_UNBLOCK, &set, NULL); - signal(SIGINT, signal_cleanup); - signal(SIGQUIT, signal_cleanup); + signal(SIGINT, signal_cleanup); // intr = shutdown + // signal(SIGQUIT, signal_cleanup); // quit = force quit signal(SIGHUP, signal_cleanup); signal(SIGTERM, signal_cleanup); - // signal(SIGSEGV, signal_cleanup); commented out because - // signal(SIGILL, signal_cleanup); we want core dumps + signal(SIGUSR2, signal_exit); + // signal(SIGSEGV, signal_cleanup); // we want coredumps + // signal(SIGILL, signal_cleanup); // we want core dumps // signal(SIGBUS, signal_cleanup); /* @@ -235,90 +261,121 @@ void init_sysdep(void) { } - - -/* +/* * This is a generic function to set up a master socket for listening on - * a TCP port. The server shuts down if the bind fails. + * a TCP port. The server shuts down if the bind fails. (IPv4/IPv6 version) * + * ip_addr IP address to bind + * port_number port number to bind + * queue_len number of incoming connections to allow in the queue */ -int ig_tcp_server(char *ip_addr, int port_number, int queue_len, char **errormessage) +int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errormessage) { - struct sockaddr_in sin; - int s, i; - int actual_queue_len; - - actual_queue_len = queue_len; - if (actual_queue_len < 5) actual_queue_len = 5; - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_port = htons((u_short)port_number); - if (ip_addr == NULL) { - sin.sin_addr.s_addr = INADDR_ANY; + struct protoent *p; + struct sockaddr_in6 sin6; + struct sockaddr_in sin4; + int s, i, b; + int ip_version = 6; + + memset(&sin6, 0, sizeof(sin6)); + memset(&sin4, 0, sizeof(sin4)); + sin6.sin6_family = AF_INET6; + sin4.sin_family = AF_INET; + + if ( (ip_addr == NULL) /* any IPv6 */ + || (IsEmptyStr(ip_addr)) + || (!strcmp(ip_addr, "*")) + ) { + ip_version = 6; + sin6.sin6_addr = in6addr_any; } - else { - sin.sin_addr.s_addr = inet_addr(ip_addr); + else if (!strcmp(ip_addr, "0.0.0.0")) /* any IPv4 */ + { + ip_version = 4; + sin4.sin_addr.s_addr = INADDR_ANY; + } + else if ((strchr(ip_addr, '.')) && (!strchr(ip_addr, ':'))) /* specific IPv4 */ + { + ip_version = 4; + if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) { + snprintf(errormessage, SIZ, + "Error binding to [%s] : %s", ip_addr, strerror(errno) + ); + CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + return (-1); + } + } + else /* specific IPv6 */ + { + ip_version = 6; + if (inet_pton(AF_INET6, ip_addr, &sin6.sin6_addr) <= 0) { + snprintf(errormessage, SIZ, + "Error binding to [%s] : %s", ip_addr, strerror(errno) + ); + CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + return (-1); + } } - - if (sin.sin_addr.s_addr == !INADDR_ANY) { - sin.sin_addr.s_addr = INADDR_ANY; + + if (port_number == 0) { + snprintf(errormessage, SIZ, + "Can't start: no port number specified." + ); + CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + return (-1); } + sin6.sin6_port = htons((u_short) port_number); + sin4.sin_port = htons((u_short) port_number); - s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + p = getprotobyname("tcp"); + s = socket( ((ip_version == 6) ? PF_INET6 : PF_INET), SOCK_STREAM, (p->p_proto)); if (s < 0) { - *errormessage = (char*) malloc(SIZ + 1); - snprintf(*errormessage, SIZ, - "citserver: Can't create a socket: %s", - strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage); - return(-1); + snprintf(errormessage, SIZ, + "Can't create a listening socket: %s", strerror(errno) + ); + CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + return (-1); } - + /* Set some socket options that make sense. */ i = 1; setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); - if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) { - *errormessage = (char*) malloc(SIZ + 1); - snprintf(*errormessage, SIZ, - "citserver: Can't bind: %s", - strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage); - close(s); - return(-1); + if (ip_version == 6) { + b = bind(s, (struct sockaddr *) &sin6, sizeof(sin6)); } - - /* set to nonblock - we need this for some obscure situations */ - if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) { - *errormessage = (char*) malloc(SIZ + 1); - snprintf(*errormessage, SIZ, - "citserver: Can't set socket to non-blocking: %s", - strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage); - close(s); - return(-1); + else { + b = bind(s, (struct sockaddr *) &sin4, sizeof(sin4)); } - if (listen(s, actual_queue_len) < 0) { - *errormessage = (char*) malloc(SIZ + 1); - snprintf(*errormessage, SIZ, - "citserver: Can't listen: %s", - strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage); - close(s); - return(-1); + if (b < 0) { + snprintf(errormessage, SIZ, + "Can't bind: %s", strerror(errno) + ); + CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + return (-1); } - return(s); + fcntl(s, F_SETFL, O_NONBLOCK); + + if (listen(s, ((queue_len >= 5) ? queue_len : 5) ) < 0) { + snprintf(errormessage, SIZ, + "Can't listen: %s", strerror(errno) + ); + CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + return (-1); + } + return (s); } + + /* * Create a Unix domain socket and listen on it */ -int ig_uds_server(char *sockpath, int queue_len, char **errormessage) +int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) { struct sockaddr_un addr; int s; @@ -333,10 +390,10 @@ int ig_uds_server(char *sockpath, int queue_len, char **errormessage) i = unlink(sockpath); if ((i != 0) && (errno != ENOENT)) { - *errormessage = (char*) malloc(SIZ + 1); - snprintf(*errormessage, SIZ, "citserver: can't unlink %s: %s", - sockpath, strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage); + snprintf(errormessage, SIZ, "citserver: can't unlink %s: %s", + sockpath, strerror(errno) + ); + CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); return(-1); } @@ -346,40 +403,36 @@ int ig_uds_server(char *sockpath, int queue_len, char **errormessage) s = socket(AF_UNIX, SOCK_STREAM, 0); if (s < 0) { - *errormessage = (char*) malloc(SIZ + 1); - snprintf(*errormessage, SIZ, + snprintf(errormessage, SIZ, "citserver: Can't create a socket: %s", strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage); + CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); return(-1); } if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - *errormessage = (char*) malloc(SIZ + 1); - snprintf(*errormessage, SIZ, + snprintf(errormessage, SIZ, "citserver: Can't bind: %s", strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage); + CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); return(-1); } /* set to nonblock - we need this for some obscure situations */ if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) { - *errormessage = (char*) malloc(SIZ + 1); - snprintf(*errormessage, SIZ, + snprintf(errormessage, SIZ, "citserver: Can't set socket to non-blocking: %s", strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage); + CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); close(s); return(-1); } if (listen(s, actual_queue_len) < 0) { - *errormessage = (char*) malloc(SIZ + 1); - snprintf(*errormessage, SIZ, + snprintf(errormessage, SIZ, "citserver: Can't listen: %s", strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage); + CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); return(-1); } @@ -436,14 +489,16 @@ void flush_output(void) { #endif } +/* static void flush_client_inbuf(void) { CitContext *CCC=CC; FlushStrBuf(CCC->ReadBuf); - CCC->Pos = NULL; + CCC->RecvBuf->ReadWritePointer = NULL; } +*/ /* * client_write() ... Send binary data to the client. @@ -459,17 +514,33 @@ int client_write(const char *buf, int nbytes) CitContext *Ctx; int fdflags; -// flush_client_inbuf(); + if (nbytes < 1) return(0); + Ctx = CC; - if (Ctx->redirect_buffer != NULL) { - if ((Ctx->redirect_len + nbytes + 2) >= Ctx->redirect_alloc) { - Ctx->redirect_alloc = (Ctx->redirect_alloc * 2) + nbytes; - Ctx->redirect_buffer = realloc(Ctx->redirect_buffer, - Ctx->redirect_alloc); + +#ifdef BIGBAD_IODBG + { + int rv = 0; + char fn [SIZ]; + FILE *fd; + + snprintf(fn, SIZ, "/tmp/foolog_%s.%d", Ctx->ServiceName, Ctx->cs_pid); + + fd = fopen(fn, "a+"); + if (fd) + { + fprintf(fd, "Sending: BufSize: %d BufContent: [", + nbytes); + rv = fwrite(buf, nbytes, 1, fd); + fprintf(fd, "]\n"); + fclose(fd); } - memcpy(&Ctx->redirect_buffer[Ctx->redirect_len], buf, nbytes); - Ctx->redirect_len += nbytes; - Ctx->redirect_buffer[Ctx->redirect_len] = 0; + } +#endif +// flush_client_inbuf(); + if (Ctx->redirect_buffer != NULL) { + StrBufAppendBufPlain(Ctx->redirect_buffer, + buf, nbytes, 0); return 0; } @@ -569,43 +640,151 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) #ifdef HAVE_OPENSSL if (CCC->redirect_ssl) { +#ifdef BIGBAD_IODBG + int rv = 0; + char fn [SIZ]; + FILE *fd; + + snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); + + fd = fopen(fn, "a+"); + fprintf(fd, "Reading BLOB: BufSize: %d ", + bytes); + rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); + fprintf(fd, "]\n"); + + + fclose(fd); +#endif retval = client_read_sslblob(Target, bytes, timeout); + if (retval < 0) { + CtdlLogPrintf(CTDL_CRIT, + "%s failed\n", + __FUNCTION__); + } +#ifdef BIGBAD_IODBG + snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); + + fd = fopen(fn, "a+"); + fprintf(fd, "Read: %d BufContent: [", + StrLength(Target)); + rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); + fprintf(fd, "]\n"); + + + fclose(fd); +#endif } else #endif - + { +#ifdef BIGBAD_IODBG + int rv = 0; + char fn [SIZ]; + FILE *fd; + + snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); + + fd = fopen(fn, "a+"); + fprintf(fd, "Reading BLOB: BufSize: %d ", + bytes); + rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); + fprintf(fd, "]\n"); + + + fclose(fd); +#endif retval = StrBufReadBLOBBuffered(Target, - CCC->ReadBuf, - &CCC->Pos, + CCC->RecvBuf.Buf, + &CCC->RecvBuf.ReadWritePointer, &CCC->client_socket, 1, bytes, O_TERM, &Error); - if (retval < 0) { - CtdlLogPrintf(CTDL_CRIT, - "%s failed: %s\n", - __FUNCTION__, - Error); + if (retval < 0) { + CtdlLogPrintf(CTDL_CRIT, + "%s failed: %s\n", + __FUNCTION__, + Error); + return retval; + } +#ifdef BIGBAD_IODBG + snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); + + fd = fopen(fn, "a+"); + fprintf(fd, "Read: %d BufContent: [", + StrLength(Target)); + rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); + fprintf(fd, "]\n"); + + + fclose(fd); +#endif } - else - { - char fn [SIZ]; - FILE *fd; + return retval; +} - snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); - fd = fopen(fn, "a+"); - fprintf(fd, "Read: BufSize: %d BufContent: [", - StrLength(Target)); - fwrite(ChrPtr(Target), StrLength(Target), 1, fd); - fprintf(fd, "]\n"); +/* + * to make client_read_random_blob() more efficient, increase buffer size. + * just use in greeting function, else your buffer may be flushed + */ +void client_set_inbound_buf(long N) +{ + CitContext *CCC=CC; + FlushStrBuf(CCC->RecvBuf.Buf); + ReAdjustEmptyBuf(CCC->RecvBuf.Buf, N * SIZ, N * SIZ); +} + +int client_read_random_blob(StrBuf *Target, int timeout) +{ + CitContext *CCC=CC; + int rc; + + rc = client_read_blob(Target, 1, timeout); + if (rc > 0) + { + long len; + const char *pch; - - fclose(fd); + len = StrLength(CCC->RecvBuf.Buf); + pch = ChrPtr(CCC->RecvBuf.Buf); + if (len > 0) + { + if (CCC->RecvBuf.ReadWritePointer != NULL) { + len -= CCC->RecvBuf.ReadWritePointer - pch; + pch = CCC->RecvBuf.ReadWritePointer; + } + StrBufAppendBufPlain(Target, pch, len, 0); + FlushStrBuf(CCC->RecvBuf.Buf); + CCC->RecvBuf.ReadWritePointer = NULL; +#ifdef BIGBAD_IODBG + { + int rv = 0; + char fn [SIZ]; + FILE *fd; + + snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); + + fd = fopen(fn, "a+"); + fprintf(fd, "Read: BufSize: %d BufContent: [", + StrLength(Target)); + rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); + fprintf(fd, "]\n"); + + + fclose(fd); + } +#endif + + return StrLength(Target); + } + return rc; } - return retval == bytes; + else + return rc; } int client_read_to(char *buf, int bytes, int timeout) @@ -632,7 +811,10 @@ int client_read_to(char *buf, int bytes, int timeout) int HaveMoreLinesWaiting(CitContext *CCC) { - if ((CCC->Pos == NULL) && (StrLength(CCC->ReadBuf) == 0)) + if ((CCC->kill_me == 1) || ( + (CCC->RecvBuf.ReadWritePointer == NULL) && + (StrLength(CCC->RecvBuf.Buf) == 0) && + (CCC->client_socket != -1)) ) return 0; else return 1; @@ -658,13 +840,64 @@ int CtdlClientGetLine(StrBuf *Target) FlushStrBuf(Target); #ifdef HAVE_OPENSSL if (CCC->redirect_ssl) { - return client_readline_sslbuffer(Target, - CCC->ReadBuf, - 1); +#ifdef BIGBAD_IODBG + char fn [SIZ]; + FILE *fd; + int len = 0; + int rlen = 0; + int nlen = 0; + int nrlen = 0; + const char *pch; + + snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); + + fd = fopen(fn, "a+"); + pch = ChrPtr(CCC->RecvBuf.Buf); + len = StrLength(CCC->RecvBuf.Buf); + if (CCC->RecvBuf.ReadWritePointer != NULL) + rlen = CCC->RecvBuf.ReadWritePointer - pch; + else + rlen = 0; + +/* fprintf(fd, "\n\n\nBufSize: %d BufPos: %d \nBufContent: [%s]\n\n_____________________\n", + len, rlen, pch); +*/ + fprintf(fd, "\n\n\nSSL1: BufSize: %d BufPos: %d \n_____________________\n", + len, rlen); +#endif + rc = client_readline_sslbuffer(Target, + CCC->RecvBuf.Buf, + &CCC->RecvBuf.ReadWritePointer, + 1); +#ifdef BIGBAD_IODBG + pch = ChrPtr(CCC->RecvBuf.Buf); + nlen = StrLength(CCC->RecvBuf.Buf); + if (CCC->RecvBuf.ReadWritePointer != NULL) + nrlen = CCC->RecvBuf.ReadWritePointer - pch; + else + nrlen = 0; +/* + fprintf(fd, "\n\n\nBufSize: was: %d is: %d BufPos: was: %d is: %d \nBufContent: [%s]\n\n_____________________\n", + len, nlen, rlen, nrlen, pch); +*/ + fprintf(fd, "\n\n\nSSL2: BufSize: was: %d is: %d BufPos: was: %d is: %d \n", + len, nlen, rlen, nrlen); + + fprintf(fd, "SSL3: Read: BufSize: %d BufContent: [%s]\n\n*************\n", + StrLength(Target), ChrPtr(Target)); + fclose(fd); + + if (rc < 0) + CtdlLogPrintf(CTDL_CRIT, + "%s failed\n", + __FUNCTION__); +#endif + return rc; } else #endif { +#ifdef BIGBAD_IODBG char fn [SIZ]; FILE *fd; int len, rlen, nlen, nrlen; @@ -673,10 +906,10 @@ int CtdlClientGetLine(StrBuf *Target) snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); fd = fopen(fn, "a+"); - pch = ChrPtr(CCC->ReadBuf); - len = StrLength(CCC->ReadBuf); - if (CCC->Pos != NULL) - rlen = CC->Pos - pch; + pch = ChrPtr(CCC->RecvBuf.Buf); + len = StrLength(CCC->RecvBuf.Buf); + if (CCC->RecvBuf.ReadWritePointer != NULL) + rlen = CCC->RecvBuf.ReadWritePointer - pch; else rlen = 0; @@ -685,18 +918,20 @@ int CtdlClientGetLine(StrBuf *Target) */ fprintf(fd, "\n\n\nBufSize: %d BufPos: %d \n_____________________\n", len, rlen); +#endif rc = StrBufTCP_read_buffered_line_fast(Target, - CCC->ReadBuf, - &CCC->Pos, + CCC->RecvBuf.Buf, + &CCC->RecvBuf.ReadWritePointer, &CCC->client_socket, 5, 1, &Error); - pch = ChrPtr(CCC->ReadBuf); - nlen = StrLength(CCC->ReadBuf); - if (CCC->Pos != NULL) - nrlen = CC->Pos - pch; +#ifdef BIGBAD_IODBG + pch = ChrPtr(CCC->RecvBuf.Buf); + nlen = StrLength(CCC->RecvBuf.Buf); + if (CCC->RecvBuf.ReadWritePointer != NULL) + nrlen = CCC->RecvBuf.ReadWritePointer - pch; else nrlen = 0; /* @@ -715,6 +950,7 @@ int CtdlClientGetLine(StrBuf *Target) "%s failed: %s\n", __FUNCTION__, Error); +#endif return rc; } } @@ -732,6 +968,9 @@ int client_getln(char *buf, int bufsize) const char *pCh; retval = CtdlClientGetLine(CCC->MigrateBuf); + if (retval < 0) + return(retval >= 0); + i = StrLength(CCC->MigrateBuf); pCh = ChrPtr(CCC->MigrateBuf); @@ -814,6 +1053,7 @@ void sysdep_master_cleanup(void) { CtdlDestroySessionHooks(); CtdlDestroyServiceHook(); CtdlDestroyRoomHooks(); + CtdlDestroySearchHooks(); #ifdef HAVE_BACKTRACE /// eCrash_Uninit(); #endif @@ -1026,11 +1266,13 @@ do_select: force_purge = 0; begin_critical_section(S_SESSION_TABLE); for (ptr = ContextList; ptr != NULL; ptr = ptr->next) { int client_socket; + if ((ptr->state == CON_SYS) && (ptr->client_socket == 0)) + continue; client_socket = ptr->client_socket; /* Dont select on dead sessions only truly idle ones */ if ((ptr->state == CON_IDLE) && (CC->kill_me == 0) && - (client_socket != -1)) + (client_socket > 0)) { FD_SET(client_socket, &readfds); if (client_socket > highest) @@ -1098,17 +1340,24 @@ do_select: force_purge = 0; begin_critical_section(S_SESSION_TABLE); for (ptr = ContextList; ptr != NULL; ptr = ptr->next) { int checkfd = ptr->client_socket; - if ((checkfd != -1) && - (FD_ISSET(checkfd, &readfds)) && - (ptr->state == CON_IDLE) ) - { - ptr->input_waiting = 1; - if (!bind_me) { - bind_me = ptr; /* I choose you! */ - bind_me->state = CON_EXECUTING; - } - else { - ptr->state = CON_READY; + if ((checkfd != -1) && (ptr->state == CON_IDLE) ){ + if (FD_ISSET(checkfd, &readfds)) { + ptr->input_waiting = 1; + if (!bind_me) { + bind_me = ptr; /* I choose you! */ + bind_me->state = CON_EXECUTING; + } + else { + ptr->state = CON_READY; + } + } else if ((ptr->is_async) && (ptr->async_waiting) && (ptr->h_async_function)) { + if (!bind_me) { + bind_me = ptr; /* I choose you! */ + bind_me->state = CON_EXECUTING; + } + else { + ptr->state = CON_READY; + } } } } @@ -1173,6 +1422,10 @@ void *select_on_master (void *arg) int m; int i; int retval; + struct CitContext select_on_master_CC; + + CtdlFillSystemContext(&select_on_master_CC, "select_on_master"); + citthread_setspecific(MyConKey, (void *)&select_on_master_CC); while (!CtdlThreadCheckStop()) { /* Initialize the fdset. */ @@ -1276,6 +1529,8 @@ void *select_on_master (void *arg) } } } + CtdlClearSystemContext(); + return NULL; }