projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix invalid logger() calls in Solaris device code.
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
5b47aa6
..
f6a9ba1
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-1,6
+1,6
@@
/*
meta.c -- handle the meta communication
/*
meta.c -- handle the meta communication
- Copyright (C) 2000-201
4
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-201
8
Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
2006 Scott Lamb <slamb@slamb.org>
2000-2005 Ivo Timmermans
2006 Scott Lamb <slamb@slamb.org>
@@
-28,13
+28,15
@@
#include "net.h"
#include "protocol.h"
#include "utils.h"
#include "net.h"
#include "protocol.h"
#include "utils.h"
-#include "xalloc.h"
#ifndef MIN
#ifndef MIN
-#define MIN(x, y) (((x)<(y))?(x):(y))
+static ssize_t MIN(ssize_t x, ssize_t y) {
+ return x < y ? x : y;
+}
#endif
bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
#endif
bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
+ (void)type;
connection_t *c = handle;
if(!c) {
connection_t *c = handle;
if(!c) {
@@
-48,14
+50,14
@@
bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t leng
return true;
}
return true;
}
-bool send_meta(connection_t *c, const
char *buffer, in
t length) {
+bool send_meta(connection_t *c, const
void *buffer, size_
t length) {
if(!c) {
logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!");
abort();
}
if(!c) {
logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!");
abort();
}
- logger(DEBUG_META, LOG_DEBUG, "Sending %
d bytes of metadata to %s (%s)", length
,
- c->name, c->hostname);
+ logger(DEBUG_META, LOG_DEBUG, "Sending %
zu bytes of metadata to %s (%s)"
,
+
length,
c->name, c->hostname);
if(c->protocol_minor >= 2) {
return sptps_send_record(&c->sptps, 0, buffer, length);
if(c->protocol_minor >= 2) {
return sptps_send_record(&c->sptps, 0, buffer, length);
@@
-76,7
+78,7
@@
bool send_meta(connection_t *c, const char *buffer, int length) {
size_t outlen = length;
size_t outlen = length;
- if(!cipher_encrypt(c->outcipher, buffer, 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(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
c->name, c->hostname);
return false;
logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
c->name, c->hostname);
return false;
@@
-92,22
+94,22
@@
bool send_meta(connection_t *c, const char *buffer, int length) {
return true;
}
return true;
}
-void send_meta_raw(connection_t *c, const
char *buffer, in
t length) {
+void send_meta_raw(connection_t *c, const
void *buffer, size_
t length) {
if(!c) {
logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!");
abort();
}
if(!c) {
logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!");
abort();
}
- logger(DEBUG_META, LOG_DEBUG, "Sending %
d bytes of raw metadata to %s (%s)", length
,
- c->name, c->hostname);
+ logger(DEBUG_META, LOG_DEBUG, "Sending %
zu bytes of raw metadata to %s (%s)"
,
+
length,
c->name, c->hostname);
buffer_add(&c->outbuf, buffer, length);
io_set(&c->io, IO_READ | IO_WRITE);
}
buffer_add(&c->outbuf, buffer, length);
io_set(&c->io, IO_READ | IO_WRITE);
}
-void broadcast_meta(connection_t *from, const char *buffer,
in
t length) {
- for list_each(connection_t, c, connection_list)
+void broadcast_meta(connection_t *from, const char *buffer,
size_
t length) {
+ for list_each(connection_t, c,
&
connection_list)
if(c != from && c->edge) {
send_meta(c, buffer, length);
}
if(c != from && c->edge) {
send_meta(c, buffer, length);
}
@@
-158,7
+160,7
@@
bool receive_meta_sptps(void *handle, uint8_t type, const void *vdata, uint16_t
}
bool receive_meta(connection_t *c) {
}
bool receive_meta(connection_t *c) {
-
in
t inlen;
+
ssize_
t inlen;
char inbuf[MAXBUFSIZE];
char *bufp = inbuf, *endp;
char inbuf[MAXBUFSIZE];
char *bufp = inbuf, *endp;
@@
-197,7
+199,7
@@
bool receive_meta(connection_t *c) {
/* Are we receiving a SPTPS packet? */
if(c->sptpslen) {
/* Are we receiving a SPTPS packet? */
if(c->sptpslen) {
-
in
t len = MIN(inlen, c->sptpslen - c->inbuf.len);
+
ssize_
t len = MIN(inlen, c->sptpslen - c->inbuf.len);
buffer_add(&c->inbuf, bufp, len);
char *sptpspacket = buffer_read(&c->inbuf, c->sptpslen);
buffer_add(&c->inbuf, bufp, len);
char *sptpspacket = buffer_read(&c->inbuf, c->sptpslen);
@@
-218,14
+220,14
@@
bool receive_meta(connection_t *c) {
}
if(c->protocol_minor >= 2) {
}
if(c->protocol_minor >= 2) {
-
in
t len = sptps_receive_data(&c->sptps, bufp, inlen);
+
size_
t len = sptps_receive_data(&c->sptps, bufp, inlen);
if(!len) {
return false;
}
bufp += len;
if(!len) {
return false;
}
bufp += len;
- inlen -= len;
+ inlen -=
(ssize_t)
len;
continue;
}
continue;
}
@@
-247,8
+249,8
@@
bool receive_meta(connection_t *c) {
return false;
#else
return false;
#else
- if(inlen > c->inbudget) {
- logger(DEBUG_META, LOG_ERR, "yte limit exceeded for decryption from %s (%s)", c->name, c->hostname);
+ if(
(size_t)
inlen > c->inbudget) {
+ logger(DEBUG_META, LOG_ERR, "
B
yte limit exceeded for decryption from %s (%s)", c->name, c->hostname);
return false;
} else {
c->inbudget -= inlen;
return false;
} else {
c->inbudget -= inlen;
@@
-256,7
+258,7
@@
bool receive_meta(connection_t *c) {
size_t outlen = inlen;
size_t outlen = inlen;
- if(!cipher_decrypt(
c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) ||
inlen != outlen) {
+ if(!cipher_decrypt(
&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || (size_t)
inlen != outlen) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
c->name, c->hostname);
return false;
logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
c->name, c->hostname);
return false;