idolpx/fsp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use long, not time_t as timeout.

Browse Source
This commit is contained in:
Radim Kolar 2020-06-05 17:26:30 +02:00
parent dc69111e84
commit 5b0e93d84c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/s_extern.h
View File

@ -71,7 +71,7 @@ extern time_t cur_time;
extern int shutdowning; extern int shutdowning;
RETSIGTYPE server_interrupt (int signum); RETSIGTYPE server_interrupt (int signum);
RETSIGTYPE server_dump (int signum); RETSIGTYPE server_dump (int signum);
int server_loop (int fd,time_t timeout); int server_loop (int fd,long timeout);
int server_reply (struct sockaddr_in *, UBUF *, unsigned int, unsigned int); int server_reply (struct sockaddr_in *, UBUF *, unsigned int, unsigned int);
void serve_file (struct sockaddr_in *, UBUF *, FILE *, unsigned int, void serve_file (struct sockaddr_in *, UBUF *, FILE *, unsigned int,
unsigned char *); unsigned char *);

6
server/server.c
View File

@ -152,13 +152,15 @@ static void send_error (struct sockaddr_in * from, UBUF * ub, const char * msg)
} }
/**************************************************************************** /****************************************************************************
* This is the message filter. It is called by main with a timeout value. * This is the message filter. It is called by main with a timeout value in
* milliseconds.
*
* If timeout is -1, it will never time out. Otherwise, it waits for a * If timeout is -1, it will never time out. Otherwise, it waits for a
* message. If timed out, it returns. Otherwise it pass it through checks. * message. If timed out, it returns. Otherwise it pass it through checks.
* Those message that passed get sent to the dispatch loop. * Those message that passed get sent to the dispatch loop.
****************************************************************************/ ****************************************************************************/
int server_loop (int fd, time_t timeout) int server_loop (int fd, long timeout)
{ {
HTAB *hp; HTAB *hp;
const char *ir; const char *ir;