along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net_packet.c,v 1.1.2.24 2002/09/15 14:55:53 guus Exp $
+ $Id: net_packet.c,v 1.1.2.29 2003/05/06 23:14:45 guus Exp $
*/
#include "config.h"
#include <openssl/hmac.h>
#include <zlib.h>
+#include <lzo1x.h>
#include <utils.h>
#include <xalloc.h>
int keylifetime = 0;
int keyexpires = 0;
+EVP_CIPHER_CTX packet_ctx;
+char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_COMPRESS : LZO1X_1_MEM_COMPRESS];
+
#define MAX_SEQNO 1073741824
+length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level)
+{
+ if(level == 10) {
+ lzo_uint lzolen = sizeof(lzo_wrkmem);
+ lzo1x_1_compress(source, len, dest, &lzolen, lzo_wrkmem);
+ return lzolen;
+ } else if(level < 10) {
+ unsigned long destlen = MAXSIZE;
+ if(compress2(dest, &destlen, source, len, level) == Z_OK)
+ return destlen;
+ else
+ return -1;
+ } else {
+ lzo_uint lzolen = sizeof(lzo_wrkmem);
+ lzo1x_999_compress(source, len, dest, &lzolen, lzo_wrkmem);
+ return lzolen;
+ }
+
+ return -1;
+}
+
+length_t uncompress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level)
+{
+ if(level > 9) {
+ lzo_uint lzolen = sizeof(lzo_wrkmem);
+ if(lzo1x_decompress_safe(source, len, dest, &lzolen, NULL) == LZO_E_OK)
+ return lzolen;
+ else
+ return -1;
+ } else {
+ unsigned long destlen = MAXSIZE;
+ if(uncompress(dest, &destlen, source, len) == Z_OK)
+ return destlen;
+ else
+ return -1;
+ }
+
+ return -1;
+}
+
/* VPN packet I/O */
void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
int nextpkt = 0;
vpn_packet_t *outpkt = pkt[0];
int outlen, outpad;
- long int complen = MTU + 12;
- EVP_CIPHER_CTX ctx;
char hmac[EVP_MAX_MD_SIZE];
+ int i;
cp();
if(myself->cipher) {
outpkt = pkt[nextpkt++];
- EVP_DecryptInit(&ctx, myself->cipher, myself->key,
- myself->key + myself->cipher->key_len);
- EVP_DecryptUpdate(&ctx, (char *) &outpkt->seqno, &outlen,
+// EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key,
+// myself->key + myself->cipher->key_len);
+ EVP_DecryptInit_ex(&packet_ctx, NULL, NULL, NULL, NULL);
+ EVP_DecryptUpdate(&packet_ctx, (char *) &outpkt->seqno, &outlen,
(char *) &inpkt->seqno, inpkt->len);
- EVP_DecryptFinal(&ctx, (char *) &outpkt->seqno + outlen, &outpad);
-
+ EVP_DecryptFinal_ex(&packet_ctx, (char *) &outpkt->seqno + outlen, &outpad);
+
outpkt->len = outlen + outpad;
inpkt = outpkt;
}
inpkt->len -= sizeof(inpkt->seqno);
inpkt->seqno = ntohl(inpkt->seqno);
- if(inpkt->seqno <= n->received_seqno) {
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_DEBUG,
- _("Got late or replayed packet from %s (%s), seqno %d"),
- n->name, n->hostname, inpkt->seqno);
- return;
+ if(inpkt->seqno != n->received_seqno + 1) {
+ if(inpkt->seqno >= n->received_seqno + sizeof(n->late) * 8) {
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_WARNING, _("Lost %d packets from %s (%s)"),
+ inpkt->seqno - n->received_seqno - 1, n->name, n->hostname);
+
+ memset(n->late, 0, sizeof(n->late));
+ } else if (inpkt->seqno <= n->received_seqno) {
+ if(inpkt->seqno <= n->received_seqno - sizeof(n->late) * 8 || !(n->late[(inpkt->seqno / 8) % sizeof(n->late)] & (1 << inpkt->seqno % 8))) {
+ syslog(LOG_WARNING, _("Got late or replayed packet from %s (%s), seqno %d, last received %d"),
+ n->name, n->hostname, inpkt->seqno, n->received_seqno);
+ } else
+ for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
+ n->late[(inpkt->seqno / 8) % sizeof(n->late)] |= 1 << i % 8;
+ }
}
-
+
n->received_seqno = inpkt->seqno;
-
+ n->late[(n->received_seqno / 8) % sizeof(n->late)] &= ~(1 << n->received_seqno % 8);
+
if(n->received_seqno > MAX_SEQNO)
keyexpires = 0;
if(myself->compression) {
outpkt = pkt[nextpkt++];
- if(uncompress(outpkt->data, &complen, inpkt->data, inpkt->len) != Z_OK) {
+ if((outpkt->len = uncompress_packet(outpkt->data, inpkt->data, inpkt->len, myself->compression)) < 0) {
syslog(LOG_ERR, _("Error while uncompressing packet from %s (%s)"),
n->name, n->hostname);
return;
}
- outpkt->len = complen;
inpkt = outpkt;
}
vpn_packet_t *outpkt;
int origlen;
int outlen, outpad;
- long int complen = MTU + 12;
- EVP_CIPHER_CTX ctx;
vpn_packet_t *copy;
static int priority = 0;
int origpriority;
if(n->compression) {
outpkt = pkt[nextpkt++];
- if(compress2
- (outpkt->data, &complen, inpkt->data, inpkt->len,
- n->compression) != Z_OK) {
+ if((outpkt->len = compress_packet(outpkt->data, inpkt->data, inpkt->len, n->compression)) < 0) {
syslog(LOG_ERR, _("Error while compressing packet to %s (%s)"),
n->name, n->hostname);
return;
}
- outpkt->len = complen;
inpkt = outpkt;
}
if(n->cipher) {
outpkt = pkt[nextpkt++];
- EVP_EncryptInit(&ctx, n->cipher, n->key, n->key + n->cipher->key_len);
- EVP_EncryptUpdate(&ctx, (char *) &outpkt->seqno, &outlen,
+// EVP_EncryptInit_ex(&packet_ctx, n->cipher, NULL, n->key, n->key + n->cipher->key_len);
+ EVP_EncryptInit_ex(&n->packet_ctx, NULL, NULL, NULL, NULL);
+ EVP_EncryptUpdate(&n->packet_ctx, (char *) &outpkt->seqno, &outlen,
(char *) &inpkt->seqno, inpkt->len);
- EVP_EncryptFinal(&ctx, (char *) &outpkt->seqno + outlen, &outpad);
+ EVP_EncryptFinal_ex(&n->packet_ctx, (char *) &outpkt->seqno + outlen, &outpad);
outpkt->len = outlen + outpad;
inpkt = outpkt;
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Setting outgoing packet priority to %d"),
priority);
- if(setsockopt(sock, SOL_IP, IP_TOS, &priority, sizeof(priority))) /* SO_PRIORITY doesn't seem to work */
+ if(setsockopt(listen_socket[sock].udp, SOL_IP, IP_TOS, &priority, sizeof(priority))) /* SO_PRIORITY doesn't seem to work */
syslog(LOG_ERR, _("System call `%s' failed: %s"), "setsockopt",
strerror(errno));
}
projects / tinc / blobdiff