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

makenewline() now copies the data into the structure rather than just

Browse Source 
storing the pointer to the data.
add_to_buffer() is now exported.
Renamed writebuff() and readbuff() to write_buffer() and read_buffer().
This commit is contained in:
Robert James Kaes 2001-11-25 22:05:42 +00:00
parent b0748328d7
commit e9cfd1f82e
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/buffer.c
View File

@ -1,4 +1,4 @@
/* $Id: buffer.c,v 1.16 2001-11-22 00:31:10 rjkaes Exp $ /* $Id: buffer.c,v 1.17 2001-11-25 22:05:42 rjkaes Exp $
* *
* The buffer used in each connection is a linked list of lines. As the lines * The buffer used in each connection is a linked list of lines. As the lines
* are read in and written out the buffer expands and contracts. Basically, * are read in and written out the buffer expands and contracts. Basically,
@ -8,7 +8,7 @@
* functions act on each end (the names are taken from what Perl uses to act on * functions act on each end (the names are taken from what Perl uses to act on
* the ends of an array. :) * the ends of an array. :)
* *
* Copyright (C) 1999 Robert James Kaes (rjkaes@flarenet.com) * Copyright (C) 1999,2001 Robert James Kaes (rjkaes@users.sourceforge.net)
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
@ -39,9 +39,8 @@ struct bufline_s {
/* /*
* Take a string of data and a length and make a new line which can be added * Take a string of data and a length and make a new line which can be added
* to the buffer. We don't make a copy of the data, but simply copy the * to the buffer. The data IS copied, so make sure if you allocated your
* pointer into the structure. In other words, when you insert data into the * data buffer on the heap, delete it because you now have TWO copies.
* buffer, the buffer becomes responsible for freeing it.
*/ */
static struct bufline_s * static struct bufline_s *
makenewline(unsigned char *data, size_t length) makenewline(unsigned char *data, size_t length)
@ -54,7 +53,13 @@ makenewline(unsigned char *data, size_t length)
if (!(newline = safemalloc(sizeof(struct bufline_s)))) if (!(newline = safemalloc(sizeof(struct bufline_s))))
return NULL; return NULL;
newline->string = data; if (!(newline->string = safemalloc(length))) {
safefree(newline);
return NULL;
}
memcpy(newline->string, data, length);
newline->next = NULL; newline->next = NULL;
newline->length = length; newline->length = length;
@ -123,9 +128,9 @@ delete_buffer(struct buffer_s *buffptr)
} }
/* /*
* Push a new line on to the end of the buffer * Push a new line on to the end of the buffer.
*/ */
static int int
add_to_buffer(struct buffer_s *buffptr, unsigned char *data, size_t length) add_to_buffer(struct buffer_s *buffptr, unsigned char *data, size_t length)
{ {
struct bufline_s *newline; struct bufline_s *newline;
@ -184,11 +189,10 @@ remove_from_buffer(struct buffer_s *buffptr)
*/ */
#define READ_BUFFER_SIZE (1024 * 2) #define READ_BUFFER_SIZE (1024 * 2)
ssize_t ssize_t
readbuff(int fd, struct buffer_s * buffptr) read_buffer(int fd, struct buffer_s * buffptr)
{ {
ssize_t bytesin; ssize_t bytesin;
unsigned char *buffer; unsigned char buffer[READ_BUFFER_SIZE];
unsigned char *newbuffer;
assert(fd >= 0); assert(fd >= 0);
assert(buffptr != NULL); assert(buffptr != NULL);
@ -196,20 +200,10 @@ readbuff(int fd, struct buffer_s * buffptr)
if (BUFFER_SIZE(buffptr) >= READ_BUFFER_SIZE) if (BUFFER_SIZE(buffptr) >= READ_BUFFER_SIZE)
return 0; return 0;
buffer = safemalloc(READ_BUFFER_SIZE);
if (!buffer)
return 0;
bytesin = read(fd, buffer, READ_BUFFER_SIZE - BUFFER_SIZE(buffptr)); bytesin = read(fd, buffer, READ_BUFFER_SIZE - BUFFER_SIZE(buffptr));
if (bytesin > 0) { if (bytesin > 0) {
newbuffer = saferealloc(buffer, bytesin); if (add_to_buffer(buffptr, buffer, bytesin) < 0) {
if (!newbuffer) {
safefree(buffer);
return 0;
}
if (add_to_buffer(buffptr, newbuffer, bytesin) < 0) {
log_message(LOG_ERR, log_message(LOG_ERR,
"readbuff: add_to_buffer() error."); "readbuff: add_to_buffer() error.");
return -1; return -1;
@ -217,7 +211,6 @@ readbuff(int fd, struct buffer_s * buffptr)
return bytesin; return bytesin;
} else { } else {
safefree(buffer);
if (bytesin == 0) { if (bytesin == 0) {
/* connection was closed by client */ /* connection was closed by client */
return -1; return -1;
@ -247,7 +240,7 @@ readbuff(int fd, struct buffer_s * buffptr)
* Takes a connection and returns the number of bytes written. * Takes a connection and returns the number of bytes written.
*/ */
ssize_t ssize_t
writebuff(int fd, struct buffer_s * buffptr) write_buffer(int fd, struct buffer_s * buffptr)
{ {
ssize_t bytessent; ssize_t bytessent;
struct bufline_s *line; struct bufline_s *line;

12
src/buffer.h
View File

@ -1,4 +1,4 @@
/* $Id: buffer.h,v 1.6 2001-11-22 00:31:10 rjkaes Exp $ /* $Id: buffer.h,v 1.7 2001-11-25 22:05:42 rjkaes Exp $
* *
* See 'buffer.c' for a detailed description. * See 'buffer.c' for a detailed description.
* *
@ -36,7 +36,13 @@ struct buffer_s {
extern struct buffer_s *new_buffer(void); extern struct buffer_s *new_buffer(void);
extern void delete_buffer(struct buffer_s *buffptr); extern void delete_buffer(struct buffer_s *buffptr);
extern ssize_t readbuff(int fd, struct buffer_s *buffptr); /*
extern ssize_t writebuff(int fd, struct buffer_s *buffptr); * Add a new line to the given buffer. The data IS copied into the structure.
*/
extern int add_to_buffer(struct buffer_s *buffptr, unsigned char *data,
size_t length);
extern ssize_t read_buffer(int fd, struct buffer_s *buffptr);
extern ssize_t write_buffer(int fd, struct buffer_s *buffptr);
#endif /* __BUFFER_H_ */ #endif /* __BUFFER_H_ */