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
0089ac8
..
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,10
+28,11
@@
#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) {
@@
-49,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, size_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 %
lu bytes of metadata to %s (%s)", (unsigned long)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);
@@
-77,7
+78,7
@@
bool send_meta(connection_t *c, const char *buffer, size_t 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;
@@
-93,14
+94,14
@@
bool send_meta(connection_t *c, const char *buffer, size_t length) {
return true;
}
return true;
}
-void send_meta_raw(connection_t *c, const
char
*buffer, size_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 %
lu bytes of raw metadata to %s (%s)", (unsigned long)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);
buffer_add(&c->outbuf, buffer, length);
@@
-108,7
+109,7
@@
void send_meta_raw(connection_t *c, const char *buffer, size_t length) {
}
void broadcast_meta(connection_t *from, const char *buffer, size_t length) {
}
void broadcast_meta(connection_t *from, const char *buffer, size_t length) {
- for list_each(connection_t, c, connection_list)
+ 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);
}
@@
-226,7
+227,7
@@
bool receive_meta(connection_t *c) {
}
bufp += len;
}
bufp += len;
- inlen -= len;
+ inlen -=
(ssize_t)
len;
continue;
}
continue;
}
@@
-257,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) || (size_t)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;