projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'VittGam/master'
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
9c38fef
..
09c063d
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-1,7
+1,8
@@
/*
meta.c -- handle the meta communication
/*
meta.c -- handle the meta communication
- Copyright (C) 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-20
16
Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
2000-2005 Ivo Timmermans
+ 2006 Scott Lamb <slamb@slamb.org>
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
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
@@
-29,6
+30,7
@@
#include "meta.h"
#include "net.h"
#include "protocol.h"
#include "meta.h"
#include "net.h"
#include "protocol.h"
+#include "proxy.h"
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
@@
-37,11
+39,11
@@
bool send_meta(connection_t *c, const char *buffer, int length) {
int result;
if(!c) {
int result;
if(!c) {
- logger(LOG_ERR,
_("send_meta() called with NULL pointer!")
);
+ logger(LOG_ERR,
"send_meta() called with NULL pointer!"
);
abort();
}
abort();
}
- ifdebug(META) logger(LOG_DEBUG,
_("Sending %d bytes of metadata to %s (%s)")
, length,
+ ifdebug(META) logger(LOG_DEBUG,
"Sending %d bytes of metadata to %s (%s)"
, length,
c->name, c->hostname);
if(!c->outbuflen)
c->name, c->hostname);
if(!c->outbuflen)
@@
-60,14
+62,22
@@
bool send_meta(connection_t *c, const char *buffer, int length) {
/* Add our data to buffer */
if(c->status.encryptout) {
/* Add our data to buffer */
if(c->status.encryptout) {
+ /* Check encryption limits */
+ if(length > c->outbudget) {
+ ifdebug(META) logger(LOG_ERR, "Byte limit exceeded for encryption to %s (%s)", c->name, c->hostname);
+ return false;
+ } else {
+ c->outbudget -= length;
+ }
+
result = EVP_EncryptUpdate(c->outctx, (unsigned char *)c->outbuf + c->outbufstart + c->outbuflen,
&outlen, (unsigned char *)buffer, length);
if(!result || outlen < length) {
result = EVP_EncryptUpdate(c->outctx, (unsigned char *)c->outbuf + c->outbufstart + c->outbuflen,
&outlen, (unsigned char *)buffer, length);
if(!result || outlen < length) {
- logger(LOG_ERR,
_("Error while encrypting metadata to %s (%s): %s")
,
+ logger(LOG_ERR,
"Error while encrypting metadata to %s (%s): %s"
,
c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
} else if(outlen > length) {
c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
} else if(outlen > length) {
- logger(LOG_EMERG,
_("Encrypted data too long! Heap corrupted!")
);
+ logger(LOG_EMERG,
"Encrypted data too long! Heap corrupted!"
);
abort();
}
c->outbuflen += outlen;
abort();
}
c->outbuflen += outlen;
@@
-82,26
+92,24
@@
bool send_meta(connection_t *c, const char *buffer, int length) {
bool flush_meta(connection_t *c) {
int result;
bool flush_meta(connection_t *c) {
int result;
- ifdebug(META) logger(LOG_DEBUG,
_("Flushing %d bytes to %s (%s)")
,
+ ifdebug(META) logger(LOG_DEBUG,
"Flushing %d bytes to %s (%s)"
,
c->outbuflen, c->name, c->hostname);
while(c->outbuflen) {
result = send(c->socket, c->outbuf + c->outbufstart, c->outbuflen, 0);
if(result <= 0) {
if(!errno || errno == EPIPE) {
c->outbuflen, c->name, c->hostname);
while(c->outbuflen) {
result = send(c->socket, c->outbuf + c->outbufstart, c->outbuflen, 0);
if(result <= 0) {
if(!errno || errno == EPIPE) {
- ifdebug(CONNECTIONS) logger(LOG_NOTICE,
_("Connection closed by %s (%s)")
,
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE,
"Connection closed by %s (%s)"
,
c->name, c->hostname);
} else if(errno == EINTR) {
continue;
c->name, c->hostname);
} else if(errno == EINTR) {
continue;
-#ifdef EWOULDBLOCK
- } else if(errno == EWOULDBLOCK) {
- ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s) would block"),
+ } else if(sockwouldblock(sockerrno)) {
+ ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Flushing %d bytes to %s (%s) would block",
c->outbuflen, c->name, c->hostname);
return true;
c->outbuflen, c->name, c->hostname);
return true;
-#endif
} else {
} else {
- logger(LOG_ERR,
_("Flushing meta data to %s (%s) failed: %s")
, c->name,
- c->hostname, s
trerror(
errno));
+ logger(LOG_ERR,
"Flushing meta data to %s (%s) failed: %s"
, c->name,
+ c->hostname, s
ockstrerror(sock
errno));
}
return false;
}
return false;
@@
-146,13
+154,13
@@
bool receive_meta(connection_t *c) {
if(lenin <= 0) {
if(!lenin || !errno) {
if(lenin <= 0) {
if(!lenin || !errno) {
- ifdebug(CONNECTIONS) logger(LOG_NOTICE,
_("Connection closed by %s (%s)")
,
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE,
"Connection closed by %s (%s)"
,
c->name, c->hostname);
c->name, c->hostname);
- } else if(
errno == EINTR
)
+ } else if(
sockwouldblock(sockerrno)
)
return true;
else
return true;
else
- logger(LOG_ERR,
_("Metadata socket read error for %s (%s): %s")
,
- c->name, c->hostname, s
trerror(
errno));
+ logger(LOG_ERR,
"Metadata socket read error for %s (%s): %s"
,
+ c->name, c->hostname, s
ockstrerror(sock
errno));
return false;
}
return false;
}
@@
-161,12
+169,31
@@
bool receive_meta(connection_t *c) {
c->buflen += lenin;
while(lenin > 0) {
c->buflen += lenin;
while(lenin > 0) {
+ reqlen = 0;
+
+ /* Is it proxy metadata? */
+
+ if(c->allow_request == PROXY) {
+ reqlen = receive_proxy_meta(c, oldlen, lenin);
+ if(reqlen < 0)
+ return false;
+ goto consume;
+ }
+
/* Decrypt */
if(c->status.decryptin && !decrypted) {
/* Decrypt */
if(c->status.decryptin && !decrypted) {
+ /* Check decryption limits */
+ if(lenin > c->inbudget) {
+ ifdebug(META) logger(LOG_ERR, "Byte limit exceeded for decryption from %s (%s)", c->name, c->hostname);
+ return false;
+ } else {
+ c->inbudget -= lenin;
+ }
+
result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &lenout, (unsigned char *)c->buffer + oldlen, lenin);
if(!result || lenout != lenin) {
result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &lenout, (unsigned char *)c->buffer + oldlen, lenin);
if(!result || lenout != lenin) {
- logger(LOG_ERR,
_("Error while decrypting metadata from %s (%s): %s")
,
+ logger(LOG_ERR,
"Error while decrypting metadata from %s (%s): %s"
,
c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
}
c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
}
@@
-178,36
+205,32
@@
bool receive_meta(connection_t *c) {
if(c->tcplen) {
if(c->tcplen <= c->buflen) {
if(c->tcplen) {
if(c->tcplen <= c->buflen) {
- receive_tcppacket(c, c->buffer, c->tcplen);
+ if(c->allow_request != ALL) {
+ logger(LOG_ERR, "Got unauthorized TCP packet from %s (%s)", c->name, c->hostname);
+ return false;
+ }
- c->buflen -= c->tcplen;
- lenin -= c->tcplen - oldlen;
- memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
- oldlen = 0;
+ receive_tcppacket(c, c->buffer, c->tcplen);
+ reqlen = c->tcplen;
c->tcplen = 0;
c->tcplen = 0;
- continue;
- } else {
- break;
}
}
- }
-
- /* Otherwise we are waiting for a request */
-
- reqlen = 0;
-
- for(i = oldlen; i < c->buflen; i++) {
- if(c->buffer[i] == '\n') {
- c->buffer[i] = '\0'; /* replace end-of-line by end-of-string so we can use sscanf */
- reqlen = i + 1;
- break;
+ } else {
+ /* Otherwise we are waiting for a request */
+
+ for(i = oldlen; i < c->buflen; i++) {
+ if(c->buffer[i] == '\n') {
+ c->buffer[i] = '\0'; /* replace end-of-line by end-of-string so we can use sscanf */
+ c->reqlen = reqlen = i + 1;
+ break;
+ }
}
}
- }
- if(reqlen) {
- c->reqlen = reqlen;
- if(!receive_request(c))
+ if(reqlen && !receive_request(c))
return false;
return false;
+ }
+consume:
+ if(reqlen) {
c->buflen -= reqlen;
lenin -= reqlen - oldlen;
memmove(c->buffer, c->buffer + reqlen, c->buflen);
c->buflen -= reqlen;
lenin -= reqlen - oldlen;
memmove(c->buffer, c->buffer + reqlen, c->buflen);
@@
-219,12
+242,10
@@
bool receive_meta(connection_t *c) {
}
if(c->buflen >= MAXBUFSIZE) {
}
if(c->buflen >= MAXBUFSIZE) {
- logger(LOG_ERR,
_("Metadata read buffer overflow for %s (%s)")
,
+ logger(LOG_ERR,
"Metadata read buffer overflow for %s (%s)"
,
c->name, c->hostname);
return false;
}
c->name, c->hostname);
return false;
}
- c->last_ping_time = now;
-
return true;
}
return true;
}