j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Several fixes for the buffer code.

Browse source
This commit is contained in:
Guus Sliepen 2011-05-14 22:30:23 +02:00
parent cdb793f687
commit ffa3a443b9
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/buffer.c
View file

@ -22,6 +22,14 @@
#include "buffer.h" #include "buffer.h"
#include "xalloc.h" #include "xalloc.h"
void buffer_compact(buffer_t *buffer) {
if(buffer->offset / 7 > buffer->len / 8) {
memmove(buffer->data, buffer->data + buffer->offset, buffer->len - buffer->offset);
buffer->len -= buffer->offset;
buffer->offset = 0;
}
}
// Make sure we can add size bytes to the buffer, and return a pointer to the start of those bytes. // Make sure we can add size bytes to the buffer, and return a pointer to the start of those bytes.
char *buffer_prepare(buffer_t *buffer, int size) { char *buffer_prepare(buffer_t *buffer, int size) {
@ -41,8 +49,11 @@ char *buffer_prepare(buffer_t *buffer, int size) {
} }
} }
char *start = buffer->data + buffer->len;
buffer->len += size; buffer->len += size;
return buffer->data + buffer->offset;
return start;
} }
// Copy data into the buffer. // Copy data into the buffer.
@ -61,8 +72,6 @@ static char *buffer_consume(buffer_t *buffer, int size) {
if(buffer->offset >= buffer->len) { if(buffer->offset >= buffer->len) {
buffer->offset = 0; buffer->offset = 0;
buffer->len = 0; buffer->len = 0;
} else {
buffer->offset += size;
} }
return start; return start;
@ -76,7 +85,7 @@ char *buffer_readline(buffer_t *buffer) {
if(!newline) if(!newline)
return NULL; return NULL;
int len = newline + 1 - buffer->data + buffer->offset; int len = newline + 1 - (buffer->data + buffer->offset);
*newline = 0; *newline = 0;
return buffer_consume(buffer, len); return buffer_consume(buffer, len);
} }

1
src/buffer.h
View file

@ -8,6 +8,7 @@ typedef struct buffer_t {
int offset; int offset;
} buffer_t; } buffer_t;
extern void buffer_compact(buffer_t *buffer);
extern char *buffer_prepare(buffer_t *buffer, int size); extern char *buffer_prepare(buffer_t *buffer, int size);
extern char *buffer_add(buffer_t *buffer, const char *data, int size); extern char *buffer_add(buffer_t *buffer, const char *data, int size);
extern char *buffer_readline(buffer_t *buffer); extern char *buffer_readline(buffer_t *buffer);

5
src/meta.c
View file

@ -42,10 +42,9 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
/* Add our data to buffer */ /* Add our data to buffer */
if(c->status.encryptout) { if(c->status.encryptout) {
char outbuf[length];
size_t outlen = length; size_t outlen = length;
if(!cipher_encrypt(&c->outcipher, outbuf, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) { if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
logger(LOG_ERR, "Error while encrypting metadata to %s (%s)", logger(LOG_ERR, "Error while encrypting metadata to %s (%s)",
c->name, c->hostname); c->name, c->hostname);
return false; return false;
@ -152,5 +151,7 @@ bool receive_meta(connection_t *c) {
} }
} while(inlen); } while(inlen);
buffer_compact(&c->inbuf);
return true; return true;
} }