X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=c3fe6f37c1700536ffbb3f72e31d336605eba6a4;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=c8b868caa730ffee973f9ae46511dbb551821e17;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a;p=tinc diff --git a/src/protocol.c b/src/protocol.c index c8b868ca..c3fe6f37 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,7 +1,7 @@ /* protocol.c -- handle the meta-protocol, basic functions - Copyright (C) 1999-2001 Ivo Timmermans , - 2000,2001 Guus Sliepen + Copyright (C) 1999-2005 Ivo Timmermans, + 2000-2006 Guus Sliepen 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 @@ -17,33 +17,24 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: protocol.c,v 1.28.4.140 2003/07/12 17:41:46 guus Exp $ + $Id$ */ -#include "config.h" - -#include - -#include -#include -#include -#include -#include - -#include -#include +#include "system.h" #include "conf.h" -#include "protocol.h" -#include "meta.h" #include "connection.h" #include "logger.h" +#include "meta.h" +#include "protocol.h" +#include "utils.h" +#include "xalloc.h" -#include "system.h" +bool tunnelserver = false; /* Jumptable for the request handlers */ -static int (*request_handlers[])(connection_t *) = { +static bool (*request_handlers[])(connection_t *) = { id_h, metakey_h, challenge_h, chal_reply_h, ack_h, status_h, error_h, termreq_h, ping_h, pong_h, @@ -62,24 +53,20 @@ static char (*request_name[]) = { "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", }; -static avl_tree_t *past_request_tree; - -int check_id(char *id) -{ - int i; +static splay_tree_t *past_request_tree; - for(i = 0; i < strlen(id); i++) - if(!isalnum(id[i]) && id[i] != '_') - return -1; +bool check_id(const char *id) { + for(; *id; id++) + if(!isalnum(*id) && *id != '_') + return false; - return 0; + return true; } /* Generic request routines - takes care of logging and error detection as well */ -int send_request(connection_t *c, const char *format, ...) -{ +bool send_request(connection_t *c, const char *format, ...) { va_list args; char buffer[MAXBUFSIZE]; int len, request; @@ -97,7 +84,7 @@ int send_request(connection_t *c, const char *format, ...) if(len < 0 || len > MAXBUFSIZE - 1) { logger(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"), c->name, c->hostname); - return -1; + return false; } ifdebug(PROTOCOL) { @@ -112,16 +99,15 @@ int send_request(connection_t *c, const char *format, ...) buffer[len++] = '\n'; - if(c == broadcast) - return broadcast_meta(NULL, buffer, len); - else + if(c == broadcast) { + broadcast_meta(NULL, buffer, len); + return true; + } else return send_meta(c, buffer, len); } -int forward_request(connection_t *from) -{ +void forward_request(connection_t *from) { int request; - cp(); cp(); @@ -138,11 +124,10 @@ int forward_request(connection_t *from) from->buffer[from->reqlen - 1] = '\n'; - return broadcast_meta(from, from->buffer, from->reqlen); + broadcast_meta(from, from->buffer, from->reqlen); } -int receive_request(connection_t *c) -{ +bool receive_request(connection_t *c) { int request; cp(); @@ -156,7 +141,7 @@ int receive_request(connection_t *c) logger(LOG_ERR, _("Unknown request from %s (%s)"), c->name, c->hostname); - return -1; + return false; } else { ifdebug(PROTOCOL) { ifdebug(META) @@ -172,32 +157,30 @@ int receive_request(connection_t *c) if((c->allow_request != ALL) && (c->allow_request != request)) { logger(LOG_ERR, _("Unauthorized request from %s (%s)"), c->name, c->hostname); - return -1; + return false; } - if(request_handlers[request] (c)) + if(!request_handlers[request](c)) { /* Something went wrong. Probably scriptkiddies. Terminate. */ - { + logger(LOG_ERR, _("Error while processing %s from %s (%s)"), request_name[request], c->name, c->hostname); - return -1; + return false; } } else { logger(LOG_ERR, _("Bogus data received from %s (%s)"), c->name, c->hostname); - return -1; + return false; } - return 0; + return true; } -static int past_request_compare(past_request_t *a, past_request_t *b) -{ +static int past_request_compare(const past_request_t *a, const past_request_t *b) { return strcmp(a->request, b->request); } -static void free_past_request(past_request_t *r) -{ +static void free_past_request(past_request_t *r) { cp(); if(r->request) @@ -206,59 +189,66 @@ static void free_past_request(past_request_t *r) free(r); } -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) -{ - cp(); - - avl_delete_tree(past_request_tree); -} +static struct event past_request_event; -int seen_request(char *request) -{ - past_request_t p, *new; +bool seen_request(char *request) { + past_request_t *new, p = {0}; cp(); 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 1; + return true; } else { - new = (past_request_t *) xmalloc(sizeof(*new)); + new = xmalloc(sizeof(*new)); new->request = xstrdup(request); - new->firstseen = now; - avl_insert(past_request_tree, new); - return 0; + 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; +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); cp(); for(node = past_request_tree->head; node; node = next) { next = node->next; - p = (past_request_t *) node->data; + p = node->data; - if(p->firstseen + pingtimeout < now) - avl_delete_node(past_request_tree, node), deleted++; + if(p->firstseen + pinginterval < now) + splay_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\n"), + 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) { + cp(); + + 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) { + cp(); + + splay_delete_tree(past_request_tree); + + event_del(&past_request_event); }