projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add warnings for bad combinations of Device and Interface.
[tinc]
/
src
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
78781a6
..
5d5518f
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.c
@@
-1,7
+1,7
@@
/*
protocol.c -- handle the meta-protocol, basic functions
Copyright (C) 1999-2005 Ivo Timmermans,
/*
protocol.c -- handle the meta-protocol, basic functions
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
13
Guus Sliepen <guus@tinc-vpn.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
+29,7
@@
#include "xalloc.h"
bool tunnelserver = false;
#include "xalloc.h"
bool tunnelserver = false;
+bool strictsubnets = false;
/* Jumptable for the request handlers */
/* Jumptable for the request handlers */
@@
-67,9
+68,7
@@
bool check_id(const char *id) {
bool send_request(connection_t *c, const char *format, ...) {
va_list args;
char buffer[MAXBUFSIZE];
bool send_request(connection_t *c, const char *format, ...) {
va_list args;
char buffer[MAXBUFSIZE];
- int len, request;
-
- cp();
+ int len, request = 0;
/* Use vsnprintf instead of vxasprintf: faster, no memory
fragmentation, cleanup is automatic, and there is a limit on the
/* Use vsnprintf instead of vxasprintf: faster, no memory
fragmentation, cleanup is automatic, and there is a limit on the
@@
-80,7
+79,7
@@
bool send_request(connection_t *c, const char *format, ...) {
va_end(args);
if(len < 0 || len > MAXBUFSIZE - 1) {
va_end(args);
if(len < 0 || len > MAXBUFSIZE - 1) {
- logger(LOG_ERR,
_("Output buffer overflow while sending request to %s (%s)")
,
+ logger(LOG_ERR,
"Output buffer overflow while sending request to %s (%s)"
,
c->name, c->hostname);
return false;
}
c->name, c->hostname);
return false;
}
@@
-88,16
+87,16
@@
bool send_request(connection_t *c, const char *format, ...) {
ifdebug(PROTOCOL) {
sscanf(buffer, "%d", &request);
ifdebug(META)
ifdebug(PROTOCOL) {
sscanf(buffer, "%d", &request);
ifdebug(META)
- logger(LOG_DEBUG,
_("Sending %s to %s (%s): %s")
,
+ logger(LOG_DEBUG,
"Sending %s to %s (%s): %s"
,
request_name[request], c->name, c->hostname, buffer);
else
request_name[request], c->name, c->hostname, buffer);
else
- logger(LOG_DEBUG,
_("Sending %s to %s (%s)")
, request_name[request],
+ logger(LOG_DEBUG,
"Sending %s to %s (%s)"
, request_name[request],
c->name, c->hostname);
}
buffer[len++] = '\n';
c->name, c->hostname);
}
buffer[len++] = '\n';
- if(c ==
broadcast
) {
+ if(c ==
everyone
) {
broadcast_meta(NULL, buffer, len);
return true;
} else
broadcast_meta(NULL, buffer, len);
return true;
} else
@@
-107,16
+106,14
@@
bool send_request(connection_t *c, const char *format, ...) {
void forward_request(connection_t *from) {
int request;
void forward_request(connection_t *from) {
int request;
- cp();
-
ifdebug(PROTOCOL) {
sscanf(from->buffer, "%d", &request);
ifdebug(META)
ifdebug(PROTOCOL) {
sscanf(from->buffer, "%d", &request);
ifdebug(META)
- logger(LOG_DEBUG,
_("Forwarding %s from %s (%s): %s")
,
+ logger(LOG_DEBUG,
"Forwarding %s from %s (%s): %s"
,
request_name[request], from->name, from->hostname,
from->buffer);
else
request_name[request], from->name, from->hostname,
from->buffer);
else
- logger(LOG_DEBUG,
_("Forwarding %s from %s (%s)")
,
+ logger(LOG_DEBUG,
"Forwarding %s from %s (%s)"
,
request_name[request], from->name, from->hostname);
}
request_name[request], from->name, from->hostname);
}
@@
-128,32
+125,30
@@
void forward_request(connection_t *from) {
bool receive_request(connection_t *c) {
int request;
bool receive_request(connection_t *c) {
int request;
- cp();
-
if(sscanf(c->buffer, "%d", &request) == 1) {
if((request < 0) || (request >= LAST) || !request_handlers[request]) {
ifdebug(META)
if(sscanf(c->buffer, "%d", &request) == 1) {
if((request < 0) || (request >= LAST) || !request_handlers[request]) {
ifdebug(META)
- logger(LOG_DEBUG,
_("Unknown request from %s (%s): %s")
,
+ logger(LOG_DEBUG,
"Unknown request from %s (%s): %s"
,
c->name, c->hostname, c->buffer);
else
c->name, c->hostname, c->buffer);
else
- logger(LOG_ERR,
_("Unknown request from %s (%s)")
,
+ logger(LOG_ERR,
"Unknown request from %s (%s)"
,
c->name, c->hostname);
return false;
} else {
ifdebug(PROTOCOL) {
ifdebug(META)
c->name, c->hostname);
return false;
} else {
ifdebug(PROTOCOL) {
ifdebug(META)
- logger(LOG_DEBUG,
_("Got %s from %s (%s): %s")
,
+ logger(LOG_DEBUG,
"Got %s from %s (%s): %s"
,
request_name[request], c->name, c->hostname,
c->buffer);
else
request_name[request], c->name, c->hostname,
c->buffer);
else
- logger(LOG_DEBUG,
_("Got %s from %s (%s)")
,
+ logger(LOG_DEBUG,
"Got %s from %s (%s)"
,
request_name[request], c->name, c->hostname);
}
}
if((c->allow_request != ALL) && (c->allow_request != request)) {
request_name[request], c->name, c->hostname);
}
}
if((c->allow_request != ALL) && (c->allow_request != request)) {
- logger(LOG_ERR,
_("Unauthorized request from %s (%s)")
, c->name,
+ logger(LOG_ERR,
"Unauthorized request from %s (%s)"
, c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}
@@
-161,12
+156,12
@@
bool receive_request(connection_t *c) {
if(!request_handlers[request](c)) {
/* Something went wrong. Probably scriptkiddies. Terminate. */
if(!request_handlers[request](c)) {
/* Something went wrong. Probably scriptkiddies. Terminate. */
- logger(LOG_ERR,
_("Error while processing %s from %s (%s)")
,
+ logger(LOG_ERR,
"Error while processing %s from %s (%s)"
,
request_name[request], c->name, c->hostname);
return false;
}
} else {
request_name[request], c->name, c->hostname);
return false;
}
} else {
- logger(LOG_ERR,
_("Bogus data received from %s (%s)")
,
+ logger(LOG_ERR,
"Bogus data received from %s (%s)"
,
c->name, c->hostname);
return false;
}
c->name, c->hostname);
return false;
}
@@
-179,8
+174,6
@@
static int past_request_compare(const past_request_t *a, const past_request_t *b
}
static void free_past_request(past_request_t *r) {
}
static void free_past_request(past_request_t *r) {
- cp();
-
if(r->request)
free(r->request);
if(r->request)
free(r->request);
@@
-188,26
+181,20
@@
static void free_past_request(past_request_t *r) {
}
void init_requests(void) {
}
void init_requests(void) {
- cp();
-
past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
}
void exit_requests(void) {
past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
}
void exit_requests(void) {
- cp();
-
avl_delete_tree(past_request_tree);
}
bool seen_request(char *request) {
avl_delete_tree(past_request_tree);
}
bool seen_request(char *request) {
- past_request_t *new, p = {0};
-
- cp();
+ past_request_t *new, p = {NULL};
p.request = request;
if(avl_search(past_request_tree, &p)) {
p.request = request;
if(avl_search(past_request_tree, &p)) {
- ifdebug(SCARY_THINGS) logger(LOG_DEBUG,
_("Already seen request")
);
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG,
"Already seen request"
);
return true;
} else {
new = xmalloc(sizeof(*new));
return true;
} else {
new = xmalloc(sizeof(*new));
@@
-223,19
+210,17
@@
void age_past_requests(void) {
past_request_t *p;
int left = 0, deleted = 0;
past_request_t *p;
int left = 0, deleted = 0;
- cp();
-
for(node = past_request_tree->head; node; node = next) {
next = node->next;
p = node->data;
for(node = past_request_tree->head; node; node = next) {
next = node->next;
p = node->data;
- if(p->firstseen + pinginterval < now)
+ if(p->firstseen + pinginterval <
=
now)
avl_delete_node(past_request_tree, node), deleted++;
else
left++;
}
if(left || deleted)
avl_delete_node(past_request_tree, node), deleted++;
else
left++;
}
if(left || deleted)
- ifdebug(SCARY_THINGS) logger(LOG_DEBUG,
_("Aging past requests: deleted %d, left %d")
,
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG,
"Aging past requests: deleted %d, left %d"
,
deleted, left);
}
deleted, left);
}