bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced all calls to buffer_size() with the macro BUFFER_SIZE().

Browse Source
This commit is contained in:
Robert James Kaes 2001-11-05 15:23:34 +00:00
parent 270af08171
commit ddb002d57e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/reqs.c
View File

@ -1,4 +1,4 @@
/* $Id: reqs.c,v 1.36 2001-11-02 21:19:46 rjkaes Exp $ /* $Id: reqs.c,v 1.37 2001-11-05 15:23:34 rjkaes Exp $
* *
* This is where all the work in tinyproxy is actually done. Incoming * This is where all the work in tinyproxy is actually done. Incoming
* connections have a new thread created for them. The thread then * connections have a new thread created for them. The thread then
@ -620,13 +620,13 @@ static void relay_connection(struct conn_s *connptr)
tv.tv_sec = config.idletimeout - difftime(time(NULL), last_access); tv.tv_sec = config.idletimeout - difftime(time(NULL), last_access);
tv.tv_usec = 0; tv.tv_usec = 0;
if (buffer_size(connptr->sbuffer) > 0) if (BUFFER_SIZE(connptr->sbuffer) > 0)
FD_SET(connptr->client_fd, &wset); FD_SET(connptr->client_fd, &wset);
if (buffer_size(connptr->cbuffer) > 0) if (BUFFER_SIZE(connptr->cbuffer) > 0)
FD_SET(connptr->server_fd, &wset); FD_SET(connptr->server_fd, &wset);
if (buffer_size(connptr->sbuffer) < MAXBUFFSIZE) if (BUFFER_SIZE(connptr->sbuffer) < MAXBUFFSIZE)
FD_SET(connptr->server_fd, &rset); FD_SET(connptr->server_fd, &rset);
if (buffer_size(connptr->cbuffer) < MAXBUFFSIZE) if (BUFFER_SIZE(connptr->cbuffer) < MAXBUFFSIZE)
FD_SET(connptr->client_fd, &rset); FD_SET(connptr->client_fd, &rset);
ret = select(maxfd, &rset, &wset, NULL, &tv); ret = select(maxfd, &rset, &wset, NULL, &tv);
@ -672,7 +672,7 @@ static void relay_connection(struct conn_s *connptr)
* remainder to the client and then exit. * remainder to the client and then exit.
*/ */
socket_blocking(connptr->client_fd); socket_blocking(connptr->client_fd);
while (buffer_size(connptr->sbuffer) > 0) { while (BUFFER_SIZE(connptr->sbuffer) > 0) {
if (writebuff(connptr->client_fd, connptr->sbuffer) < 0) if (writebuff(connptr->client_fd, connptr->sbuffer) < 0)
break; break;
} }
@ -681,7 +681,7 @@ static void relay_connection(struct conn_s *connptr)
* Try to send any remaining data to the server if we can. * Try to send any remaining data to the server if we can.
*/ */
socket_blocking(connptr->server_fd); socket_blocking(connptr->server_fd);
while (buffer_size(connptr->cbuffer) > 0) { while (BUFFER_SIZE(connptr->cbuffer) > 0) {
if (writebuff(connptr->client_fd, connptr->cbuffer) < 0) if (writebuff(connptr->client_fd, connptr->cbuffer) < 0)
break; break;
} }