X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=116e139eebc98c686652bb62e8b4d0095b3a525e;hp=7dbee7171d99f985b3a8acf7505fb48ab5053d4f;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hpb=65e8e06c6dc7349b11c3c1e8f4071b51e2994c65 diff --git a/src/protocol.c b/src/protocol.c index 7dbee717..116e139e 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -30,16 +30,17 @@ bool tunnelserver = false; bool strictsubnets = false; +bool experimental = false; /* Jumptable for the request handlers */ -static bool (*request_handlers[])(connection_t *) = { +static bool (*request_handlers[])(connection_t *, char *) = { id_h, metakey_h, challenge_h, chal_reply_h, ack_h, status_h, error_h, termreq_h, ping_h, pong_h, add_subnet_h, del_subnet_h, add_edge_h, del_edge_h, - key_changed_h, req_key_h, ans_key_h, tcppacket_h, + key_changed_h, req_key_h, ans_key_h, tcppacket_h, control_h, }; /* Request names */ @@ -49,10 +50,10 @@ static char (*request_name[]) = { "STATUS", "ERROR", "TERMREQ", "PING", "PONG", "ADD_SUBNET", "DEL_SUBNET", - "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", + "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL", }; -static avl_tree_t *past_request_tree; +static splay_tree_t *past_request_tree; bool check_id(const char *id) { for(; *id; id++) @@ -67,15 +68,15 @@ bool check_id(const char *id) { bool send_request(connection_t *c, const char *format, ...) { va_list args; - char buffer[MAXBUFSIZE]; - int len, request; + char request[MAXBUFSIZE]; + int len; /* Use vsnprintf instead of vxasprintf: faster, no memory fragmentation, cleanup is automatic, and there is a limit on the input buffer anyway */ va_start(args, format); - len = vsnprintf(buffer, MAXBUFSIZE, format, args); + len = vsnprintf(request, MAXBUFSIZE, format, args); va_end(args); if(len < 0 || len > MAXBUFSIZE - 1) { @@ -85,51 +86,47 @@ bool send_request(connection_t *c, const char *format, ...) { } ifdebug(PROTOCOL) { - sscanf(buffer, "%d", &request); ifdebug(META) logger(LOG_DEBUG, "Sending %s to %s (%s): %s", - request_name[request], c->name, c->hostname, buffer); + request_name[atoi(request)], c->name, c->hostname, request); else - logger(LOG_DEBUG, "Sending %s to %s (%s)", request_name[request], + logger(LOG_DEBUG, "Sending %s to %s (%s)", request_name[atoi(request)], c->name, c->hostname); } - buffer[len++] = '\n'; + request[len++] = '\n'; if(c == everyone) { - broadcast_meta(NULL, buffer, len); + broadcast_meta(NULL, request, len); return true; } else - return send_meta(c, buffer, len); + return send_meta(c, request, len); } -void forward_request(connection_t *from) { - int request; - +void forward_request(connection_t *from, char *request) { + /* Note: request is not zero terminated anymore after a call to this function! */ ifdebug(PROTOCOL) { - sscanf(from->buffer, "%d", &request); ifdebug(META) logger(LOG_DEBUG, "Forwarding %s from %s (%s): %s", - request_name[request], from->name, from->hostname, - from->buffer); + request_name[atoi(request)], from->name, from->hostname, request); else logger(LOG_DEBUG, "Forwarding %s from %s (%s)", - request_name[request], from->name, from->hostname); + request_name[atoi(request)], from->name, from->hostname); } - from->buffer[from->reqlen - 1] = '\n'; - - broadcast_meta(from, from->buffer, from->reqlen); + int len = strlen(request); + request[len++] = '\n'; + broadcast_meta(from, request, len); } -bool receive_request(connection_t *c) { - int request; +bool receive_request(connection_t *c, char *request) { + int reqno = atoi(request); - if(sscanf(c->buffer, "%d", &request) == 1) { - if((request < 0) || (request >= LAST) || !request_handlers[request]) { + if(reqno || *request == '0') { + if((reqno < 0) || (reqno >= LAST) || !request_handlers[reqno]) { ifdebug(META) logger(LOG_DEBUG, "Unknown request from %s (%s): %s", - c->name, c->hostname, c->buffer); + c->name, c->hostname, request); else logger(LOG_ERR, "Unknown request from %s (%s)", c->name, c->hostname); @@ -139,25 +136,24 @@ bool receive_request(connection_t *c) { ifdebug(PROTOCOL) { ifdebug(META) logger(LOG_DEBUG, "Got %s from %s (%s): %s", - request_name[request], c->name, c->hostname, - c->buffer); + request_name[reqno], c->name, c->hostname, request); else logger(LOG_DEBUG, "Got %s from %s (%s)", - request_name[request], c->name, c->hostname); + request_name[reqno], c->name, c->hostname); } } - if((c->allow_request != ALL) && (c->allow_request != request)) { + if((c->allow_request != ALL) && (c->allow_request != reqno)) { logger(LOG_ERR, "Unauthorized request from %s (%s)", c->name, c->hostname); return false; } - if(!request_handlers[request](c)) { + if(!request_handlers[reqno](c, request)) { /* Something went wrong. Probably scriptkiddies. Terminate. */ logger(LOG_ERR, "Error while processing %s from %s (%s)", - request_name[request], c->name, c->hostname); + request_name[reqno], c->name, c->hostname); return false; } } else { @@ -180,42 +176,38 @@ static void free_past_request(past_request_t *r) { free(r); } -void init_requests(void) { - past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request); -} - -void exit_requests(void) { - avl_delete_tree(past_request_tree); -} +static struct event past_request_event; bool seen_request(char *request) { past_request_t *new, p = {NULL}; p.request = request; - if(avl_search(past_request_tree, &p)) { + if(splay_search(past_request_tree, &p)) { ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Already seen request"); return true; } else { - new = xmalloc(sizeof(*new)); + new = xmalloc(sizeof *new); new->request = xstrdup(request); - new->firstseen = now; - avl_insert(past_request_tree, new); + new->firstseen = time(NULL); + splay_insert(past_request_tree, new); + event_add(&past_request_event, &(struct timeval){10, 0}); return false; } } -void age_past_requests(void) { - avl_node_t *node, *next; +static void age_past_requests(int fd, short events, void *data) { + splay_node_t *node, *next; past_request_t *p; int left = 0, deleted = 0; + time_t now = time(NULL); for(node = past_request_tree->head; node; node = next) { next = node->next; p = node->data; if(p->firstseen + pinginterval <= now) - avl_delete_node(past_request_tree, node), deleted++; + splay_delete_node(past_request_tree, node), deleted++; else left++; } @@ -223,4 +215,20 @@ void age_past_requests(void) { if(left || deleted) ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left); + + if(left) + event_add(&past_request_event, &(struct timeval){10, 0}); +} + +void init_requests(void) { + past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request); + + timeout_set(&past_request_event, age_past_requests, NULL); +} + +void exit_requests(void) { + splay_delete_tree(past_request_tree); + + if(timeout_initialized(&past_request_event)) + event_del(&past_request_event); }