projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert sizeof foo to sizeof(foo).
[tinc]
/
src
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
fb90c94
..
79d5273
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.c
@@
-41,7
+41,8
@@
static bool (*request_handlers[])(connection_t *, const char *) = {
add_subnet_h, del_subnet_h,
add_edge_h, del_edge_h,
key_changed_h, req_key_h, ans_key_h, tcppacket_h, control_h,
add_subnet_h, del_subnet_h,
add_edge_h, del_edge_h,
key_changed_h, req_key_h, ans_key_h, tcppacket_h, control_h,
- NULL, NULL, NULL, /* Not "real" requests (yet) */
+ NULL, NULL, /* Not "real" requests (yet) */
+ sptps_tcppacket_h,
udp_info_h, mtu_info_h,
};
udp_info_h, mtu_info_h,
};
@@
-71,10
+72,11
@@
bool send_request(connection_t *c, const char *format, ...) {
input buffer anyway */
va_start(args, format);
input buffer anyway */
va_start(args, format);
- len = vsnprintf(request, MAXBUFSIZE, format, args);
+ len = vsnprintf(request, sizeof(request), format, args);
+ request[sizeof(request) - 1] = 0;
va_end(args);
va_end(args);
- if(len < 0 || len >
MAXBUFSIZE
- 1) {
+ if(len < 0 || len >
sizeof(request)
- 1) {
logger(DEBUG_ALWAYS, LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
c->name, c->hostname);
return false;
logger(DEBUG_ALWAYS, LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
c->name, c->hostname);
return false;
@@
-99,7
+101,7
@@
void forward_request(connection_t *from, const char *request) {
char tmp[len + 1];
memcpy(tmp, request, len);
tmp[len] = '\n';
char tmp[len + 1];
memcpy(tmp, request, len);
tmp[len] = '\n';
- broadcast_meta(from, tmp, sizeof
tmp
);
+ broadcast_meta(from, tmp, sizeof
(tmp)
);
}
bool receive_request(connection_t *c, const char *request) {
}
bool receive_request(connection_t *c, const char *request) {
@@
-186,7
+188,7
@@
bool seen_request(const char *request) {
logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Already seen request");
return true;
} else {
logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Already seen request");
return true;
} else {
- new = xmalloc(sizeof
*new
);
+ new = xmalloc(sizeof
(*new)
);
new->request = xstrdup(request);
new->firstseen = now.tv_sec;
splay_insert(past_request_tree, new);
new->request = xstrdup(request);
new->firstseen = now.tv_sec;
splay_insert(past_request_tree, new);