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

Moved the strip new line/carriage return from the end of a line into a

Browse Source 
separate function.
This commit is contained in:
Robert James Kaes 2001-08-28 04:32:14 +00:00
parent 298784d80e
commit f9d0fcd1a2
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/reqs.c
View File

@ -1,10 +1,10 @@
/* $Id: reqs.c,v 1.16 2001-08-27 03:44:22 rjkaes Exp $ /* $Id: reqs.c,v 1.17 2001-08-28 04:32:14 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
* processes the headers from the client, the response from the server, * processes the headers from the client, the response from the server,
* and then relays the bytes between the two. * and then relays the bytes between the two.
* If the UPSTEAM_PROXY is enabled, then tinyproxy will actually work * If TUNNEL_SUPPORT is enabled, then tinyproxy will actually work
* as a simple buffering TCP tunnel. Very cool! (Robert actually uses * as a simple buffering TCP tunnel. Very cool! (Robert actually uses
* this feature for a buffering NNTP tunnel.) * this feature for a buffering NNTP tunnel.)
* *
@ -81,6 +81,29 @@ static ssize_t safe_read(int fd, void *buffer, size_t count)
return len; return len;
} }
/*
* Remove any new lines or carriage returns from the end of a string.
*/
static inline void trim(char *string, unsigned int len)
{
char *ptr;
assert(string != NULL);
assert(len > 0);
ptr = string + len - 1;
while (*ptr == '\r' || *ptr == '\n') {
*ptr-- = '\0';
/*
* Don't let the ptr back past the beginning of the
* string.
*/
if (ptr < string)
return;
}
}
/* /*
* Parse a client HTTP request and then establish connection. * Parse a client HTTP request and then establish connection.
*/ */
@ -89,7 +112,6 @@ static int process_method(struct conn_s *connptr)
URI *uri = NULL; URI *uri = NULL;
char inbuf[LINE_LENGTH]; char inbuf[LINE_LENGTH];
char *buffer = NULL, *request = NULL, *port = NULL; char *buffer = NULL, *request = NULL, *port = NULL;
char *inbuf_ptr = NULL;
regex_t preg; regex_t preg;
regmatch_t pmatch[NMATCH]; regmatch_t pmatch[NMATCH];
@ -112,9 +134,7 @@ static int process_method(struct conn_s *connptr)
/* /*
* Strip the newline and character return from the string. * Strip the newline and character return from the string.
*/ */
inbuf_ptr = inbuf + len - 1; trim(inbuf, len);
while (*inbuf_ptr == '\r' || *inbuf_ptr == '\n')
*inbuf_ptr-- = '\0';
log_message(LOG_CONN, "Request: %s", inbuf); log_message(LOG_CONN, "Request: %s", inbuf);