projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert sizeof foo to sizeof(foo).
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
260cb00
..
8191983
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-65,6
+65,13
@@
bool send_meta(connection_t *c, const char *buffer, int length) {
#ifdef DISABLE_LEGACY
return false;
#else
#ifdef DISABLE_LEGACY
return false;
#else
+ if(length > c->outbudget) {
+ logger(DEBUG_META, LOG_ERR, "Byte limit exceeded for encryption to %s (%s)", c->name, c->hostname);
+ return false;
+ } else {
+ c->outbudget -= length;
+ }
+
size_t outlen = length;
if(!cipher_encrypt(c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
size_t outlen = length;
if(!cipher_encrypt(c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
@@
-157,12
+164,12
@@
bool receive_meta(connection_t *c) {
buffer_compact(&c->inbuf, MAXBUFSIZE);
buffer_compact(&c->inbuf, MAXBUFSIZE);
- if(sizeof
inbuf
<= c->inbuf.len) {
+ if(sizeof
(inbuf)
<= c->inbuf.len) {
logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
return false;
}
- inlen = recv(c->socket, inbuf, sizeof
inbuf
- c->inbuf.len, 0);
+ inlen = recv(c->socket, inbuf, sizeof
(inbuf)
- c->inbuf.len, 0);
if(inlen <= 0) {
if(!inlen || !sockerrno) {
if(inlen <= 0) {
if(!inlen || !sockerrno) {
@@
-220,6
+227,13
@@
bool receive_meta(connection_t *c) {
#ifdef DISABLE_LEGACY
return false;
#else
#ifdef DISABLE_LEGACY
return false;
#else
+ if(inlen > c->inbudget) {
+ logger(DEBUG_META, LOG_ERR, "yte limit exceeded for decryption from %s (%s)", c->name, c->hostname);
+ return false;
+ } else {
+ c->inbudget -= inlen;
+ }
+
size_t outlen = inlen;
if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
size_t outlen = inlen;
if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {