projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed error logging on "Input buffer full" condition.
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
ac93775
..
849a0c6
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-85,6
+85,13
@@
bool receive_meta(connection_t *c) {
- If not, keep stuff in buffer and exit.
*/
- If not, keep stuff in buffer and exit.
*/
+ buffer_compact(&c->inbuf, MAXBUFSIZE);
+
+ if(sizeof inbuf <= c->inbuf.len) {
+ logger(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);
if(inlen <= 0) {
inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
if(inlen <= 0) {
@@
-130,6
+137,7
@@
bool receive_meta(connection_t *c) {
if(c->tcplen) {
char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
if(tcpbuffer) {
if(c->tcplen) {
char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
if(tcpbuffer) {
+ c->tcplen = 0;
receive_tcppacket(c, tcpbuffer, c->tcplen);
continue;
} else {
receive_tcppacket(c, tcpbuffer, c->tcplen);
continue;
} else {
@@
-151,7
+159,5
@@
bool receive_meta(connection_t *c) {
}
} while(inlen);
}
} while(inlen);
- buffer_compact(&c->inbuf);
-
return true;
}
return true;
}