X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=43638941db697b76ed04e592c984cda12f2eaaa4;hp=0385c9c0c8bb1aa6f61e6c00b1ae94a92abad633;hb=82ebfc923ddb050c88bdf5d65ac943a15ca8748a;hpb=a7ad161d2b115b6a2a69c5dc8ddd33008d3562d0 diff --git a/src/protocol.c b/src/protocol.c index 0385c9c0..644e89e9 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,7 +1,7 @@ /* - protocol.c -- handle the meta-protocol - Copyright (C) 1999,2000 Ivo Timmermans , - 2000 Guus Sliepen + protocol.c -- handle the meta-protocol, basic functions + Copyright (C) 1999-2001 Ivo Timmermans , + 2000,2001 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,7 +17,7 @@ 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.27 2000/05/29 23:40:05 guus Exp $ + $Id: protocol.c,v 1.28.4.132 2002/09/04 13:48:52 guus Exp $ */ #include "config.h" @@ -27,786 +27,218 @@ #include #include #include -#include -#include #include +#include +#include #include #include #include "conf.h" -#include "encr.h" -#include "net.h" -#include "netutl.h" #include "protocol.h" +#include "meta.h" +#include "connection.h" #include "system.h" -char buffer[MAXBUFSIZE+1]; -int buflen; +avl_tree_t *past_request_tree; -/* Outgoing request routines */ - -int send_ack(conn_list_t *cl) -{ -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Send ACK to %s"), cl->hostname); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", ACK); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %d:%d: %m"), __FILE__, __LINE__); - return -1; - } - - syslog(LOG_NOTICE, _("Connection with %s activated."), cl->hostname); -cp - return 0; -} - -int send_termreq(conn_list_t *cl) -{ -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Send TERMREQ to " IP_ADDR_S), - IP_ADDR_V(cl->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip); - - if(write(cl->meta_socket, buffer, buflen) < 0) - { - if(debug_lvl > 1) - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} - -int send_timeout(conn_list_t *cl) -{ -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Send TIMEOUT to " IP_ADDR_S), - IP_ADDR_V(cl->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} - -int send_del_host(conn_list_t *cl, conn_list_t *new_host) +int check_id(char *id) { -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Sending delete host " IP_ADDR_S " to " IP_ADDR_S), - IP_ADDR_V(new_host->vpn_ip), IP_ADDR_V(cl->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip); + int i; - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); + for (i = 0; i < strlen(id); i++) + if(!isalnum(id[i]) && id[i] != '_') return -1; - } -cp - return 0; -} - -int send_ping(conn_list_t *cl) -{ -cp - if(debug_lvl > 3) - syslog(LOG_DEBUG, _("pinging " IP_ADDR_S), IP_ADDR_V(cl->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} - -int send_pong(conn_list_t *cl) -{ -cp - buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} - -int send_add_host(conn_list_t *cl, conn_list_t *new_host) -{ -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Sending add host to " IP_ADDR_S), - IP_ADDR_V(cl->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x\n", ADD_HOST, new_host->real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} - -int send_key_changed(conn_list_t *cl, conn_list_t *src) -{ -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Sending KEY_CHANGED to " IP_ADDR_S), - IP_ADDR_V(cl->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} - -void send_key_changed_all(void) -{ - conn_list_t *p; -cp - for(p = conn_list; p != NULL; p = p->next) - if(p->status.meta && p->status.active) - send_key_changed(p, myself); -cp -} - -int send_basic_info(conn_list_t *cl) -{ -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Send BASIC_INFO to " IP_ADDR_S), - IP_ADDR_V(cl->real_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %d %lx/%lx:%x\n", BASIC_INFO, PROT_CURRENT, myself->vpn_ip, myself->vpn_mask, myself->port); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} - -int send_passphrase(conn_list_t *cl) -{ - passphrase_t tmp; -cp - encrypt_passphrase(&tmp); - - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Send PASSPHRASE %s to " IP_ADDR_S), - tmp.phrase, IP_ADDR_V(cl->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PASSPHRASE, tmp.phrase); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} - -int send_public_key(conn_list_t *cl) -{ -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Send PUBLIC_KEY %s to " IP_ADDR_S), - my_public_key_base36, IP_ADDR_V(cl->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp + return 0; } -int send_calculate(conn_list_t *cl, char *k) -{ -cp - buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", CALCULATE, k); - - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} +/* Generic request routines - takes care of logging and error + detection as well */ -int send_key_request(ip_t to) +int send_request(connection_t *c, const char *format, ...) { - conn_list_t *fw; -cp - fw = lookup_conn(to); - if(!fw) - { - syslog(LOG_ERR, _("Attempting to send key request to " IP_ADDR_S ", which does not exist?"), - IP_ADDR_V(to)); - return -1; - } - - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Sending out request for public key to " IP_ADDR_S), - IP_ADDR_V(fw->nexthop->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip); + va_list args; + char buffer[MAXBUFSIZE]; + int len, request; - if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } - fw->status.waitingforkey = 1; cp - return 0; -} + /* Use vsnprintf instead of vasprintf: faster, no memory + fragmentation, cleanup is automatic, and there is a limit on the + input buffer anyway */ -int send_key_answer(conn_list_t *cl, ip_t to) -{ - conn_list_t *fw; -cp + va_start(args, format); + len = vsnprintf(buffer, MAXBUFSIZE, format, args); + va_end(args); - fw = lookup_conn(to); - - if(!fw) + if(len < 0 || len > MAXBUFSIZE-1) { - syslog(LOG_ERR, _("Attempting to send key answer to " IP_ADDR_S ", which does not exist?"), - IP_ADDR_V(to)); + syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"), c->name, c->hostname); return -1; } - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Sending public key to " IP_ADDR_S), - IP_ADDR_V(fw->nexthop->vpn_ip)); - - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36); - - if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0) + if(debug_lvl >= DEBUG_PROTOCOL) { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; + sscanf(buffer, "%d", &request); + if(debug_lvl >= DEBUG_META) + syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request], c->name, c->hostname, buffer); + else + syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], c->name, c->hostname); } -cp - return 0; -} - -/* - notify all my direct connections of a new host - that was added to the vpn, with the exception - of the source of the announcement. -*/ -int notify_others(conn_list_t *new, conn_list_t *source, - int (*function)(conn_list_t*, conn_list_t*)) -{ - conn_list_t *p; -cp - for(p = conn_list; p != NULL; p = p->next) - if(p != new && p != source && p->status.meta && p->status.active) - function(p, new); -cp - return 0; -} -/* - notify one connection of everything - i have connected -*/ -int notify_one(conn_list_t *new) -{ - conn_list_t *p; -cp - for(p = conn_list; p != NULL; p = p->next) - if(p != new && p->status.active) - send_add_host(new, p); + buffer[len++] = '\n'; cp - return 0; + return send_meta(c, buffer, len); } -/* - The incoming request handlers -*/ - -int basic_info_h(conn_list_t *cl) +int receive_request(connection_t *c) { + int request; cp - if(sscanf(cl->buffer, "%*d %d %lx/%lx:%hx", &cl->protocol_version, &cl->vpn_ip, &cl->vpn_mask, &cl->port) != 4) - { - syslog(LOG_ERR, _("got bad BASIC_INFO request: %s"), cl->buffer); - return -1; - } - - if(cl->protocol_version != PROT_CURRENT) + if(sscanf(c->buffer, "%d", &request) == 1) { - syslog(LOG_ERR, _("Peer uses incompatible protocol version %d."), - cl->protocol_version); - return -1; - } - - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("got BASIC_INFO(%hd," IP_ADDR_S "," IP_ADDR_S ")"), cl->port, - IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->vpn_mask)); - if(debug_lvl > 1) - syslog(LOG_DEBUG, _("Peer uses protocol version %d"), - cl->protocol_version); + if((request < 0) || (request >= LAST) || (request_handlers[request] == NULL)) + { + if(debug_lvl >= DEBUG_META) + syslog(LOG_DEBUG, _("Unknown request from %s (%s): %s"), + c->name, c->hostname, c->buffer); + else + syslog(LOG_ERR, _("Unknown request from %s (%s)"), + c->name, c->hostname); + + return -1; + } + else + { + if(debug_lvl >= DEBUG_PROTOCOL) + { + if(debug_lvl >= DEBUG_META) + syslog(LOG_DEBUG, _("Got %s from %s (%s): %s"), + request_name[request], c->name, c->hostname, c->buffer); + else + syslog(LOG_DEBUG, _("Got %s from %s (%s)"), + request_name[request], c->name, c->hostname); + } + } + + if((c->allow_request != ALL) && (c->allow_request != request)) + { + syslog(LOG_ERR, _("Unauthorized request from %s (%s)"), c->name, c->hostname); + return -1; + } - if(cl->status.outgoing) - { - if(setup_vpn_connection(cl) < 0) - return -1; - send_basic_info(cl); + if(request_handlers[request](c)) + /* Something went wrong. Probably scriptkiddies. Terminate. */ + { + syslog(LOG_ERR, _("Error while processing %s from %s (%s)"), + request_name[request], c->name, c->hostname); + return -1; + } } else { - if(setup_vpn_connection(cl) < 0) - return -1; - send_passphrase(cl); - } -cp - return 0; -} - -int passphrase_h(conn_list_t *cl) -{ -cp - cl->pp = xmalloc(sizeof(*(cl->pp))); - - if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1) - { - syslog(LOG_ERR, _("got bad PASSPHRASE request: %s"), cl->buffer); + syslog(LOG_ERR, _("Bogus data received from %s (%s)"), + c->name, c->hostname); return -1; } - cl->pp->len = strlen(cl->pp->phrase); - - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("got PASSPHRASE")); - - if(cl->status.outgoing) - send_passphrase(cl); - else - send_public_key(cl); cp return 0; } -int public_key_h(conn_list_t *cl) +int past_request_compare(past_request_t *a, past_request_t *b) { - char *g_n; - conn_list_t *old; cp - if(sscanf(cl->buffer, "%*d %as", &g_n) != 1) - { - syslog(LOG_ERR, _("got bad PUBLIC_KEY request: %s"), cl->buffer); - return -1; - } - - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("got PUBLIC_KEY %s"), g_n); - - if(verify_passphrase(cl, g_n)) - { - /* intruder! */ - syslog(LOG_ERR, _("Intruder: passphrase does not match.")); - return -1; - } - - if(debug_lvl > 2) - syslog(LOG_INFO, _("Passphrase OK")); - - if(cl->status.outgoing) - send_public_key(cl); - else - { - send_ack(cl); - - /* Okay, before we active the connection, we check if there is another entry - in the connection list with the same vpn_ip. If so, it presumably is an - old connection that has timed out but we don't know it yet. Because our - conn_list entry is not active, lookup_conn will skip ourself. */ - - while(old=lookup_conn(cl->vpn_ip)) - terminate_connection(old); - - cl->status.active = 1; - notify_others(cl, NULL, send_add_host); - notify_one(cl); - } -cp - return 0; + return strcmp(a->request, b->request); } -int ack_h(conn_list_t *cl) +void free_past_request(past_request_t *r) { cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("got ACK")); - - cl->status.active = 1; - syslog(LOG_NOTICE, _("Connection with %s activated."), cl->hostname); + if(r->request) + free(r->request); + free(r); cp - return 0; } -int termreq_h(conn_list_t *cl) +void init_requests(void) { cp - syslog(LOG_NOTICE, _(IP_ADDR_S " wants to quit"), IP_ADDR_V(cl->vpn_ip)); - cl->status.termreq = 1; - terminate_connection(cl); - - notify_others(cl, NULL, send_del_host); + past_request_tree = avl_alloc_tree((avl_compare_t)past_request_compare, (avl_action_t)free_past_request); cp - return 0; } -int timeout_h(conn_list_t *cl) +void exit_requests(void) { cp - if(!cl->status.active) return -1; - syslog(LOG_NOTICE, _(IP_ADDR_S " says it's gotten a timeout from us"), IP_ADDR_V(cl->vpn_ip)); - cl->status.termreq = 1; - terminate_connection(cl); + avl_delete_tree(past_request_tree); cp - return 0; } -int del_host_h(conn_list_t *cl) +int seen_request(char *request) { - ip_t vpn_ip; - conn_list_t *fw; + past_request_t p, *new; cp - if(!cl->status.active) return -1; + p.request = request; - if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1) + if(avl_search(past_request_tree, &p)) { - syslog(LOG_ERR, _("got bad DEL_HOST request: %s"), cl->buffer); - return -1; - } - - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("got DEL_HOST for " IP_ADDR_S), - IP_ADDR_V(vpn_ip)); - - if(!(fw = lookup_conn(vpn_ip))) - { - syslog(LOG_ERR, _("Somebody wanted to delete " IP_ADDR_S " which does not exist?"), - IP_ADDR_V(vpn_ip)); - return 0; + if(debug_lvl >= DEBUG_SCARY_THINGS) + syslog(LOG_DEBUG, _("Already seen request")); + return 1; } - - notify_others(cl, fw, send_del_host); - - fw->status.termreq = 1; - terminate_connection(fw); -cp - return 0; -} - -int ping_h(conn_list_t *cl) -{ -cp - if(!cl->status.active) return -1; - if(debug_lvl > 3) - syslog(LOG_DEBUG, _("responding to ping from " IP_ADDR_S), IP_ADDR_V(cl->vpn_ip)); - cl->status.pinged = 0; - cl->status.got_pong = 1; - - send_pong(cl); -cp - return 0; -} - -int pong_h(conn_list_t *cl) -{ -cp - if(!cl->status.active) return -1; - if(debug_lvl > 3) - syslog(LOG_DEBUG, _("ok, got pong from " IP_ADDR_S), IP_ADDR_V(cl->vpn_ip)); - cl->status.got_pong = 1; -cp - return 0; -} - -int add_host_h(conn_list_t *cl) -{ - ip_t real_ip; - ip_t vpn_ip; - ip_t vpn_mask; - unsigned short port; - conn_list_t *ncn, *fw; -cp - if(!cl->status.active) return -1; - if(sscanf(cl->buffer, "%*d %lx %lx/%lx:%hx", &real_ip, &vpn_ip, &vpn_mask, &port) != 4) - { - syslog(LOG_ERR, _("got bad ADD_HOST request: %s"), cl->buffer); - return -1; - } - - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Add host request from " IP_ADDR_S), IP_ADDR_V(cl->vpn_ip)); - if(debug_lvl > 3) - syslog(LOG_DEBUG, _("got ADD_HOST(" IP_ADDR_S "," IP_ADDR_S ",%hd)"), - IP_ADDR_V(vpn_ip), IP_ADDR_V(vpn_mask), port); - - /* - Suggestion of Hans Bayle - */ - if((fw = lookup_conn(vpn_ip))) - { - notify_others(fw, cl, send_add_host); - return 0; - } - - ncn = new_conn_list(); - ncn->real_ip = real_ip; - ncn->vpn_ip = vpn_ip; - ncn->vpn_mask = vpn_mask; - ncn->port = port; - ncn->hostname = hostlookup(real_ip); - ncn->nexthop = cl; - ncn->next = conn_list; - conn_list = ncn; - ncn->status.active = 1; - notify_others(ncn, cl, send_add_host); -cp - return 0; -} - -int req_key_h(conn_list_t *cl) -{ - ip_t to; - ip_t from; - conn_list_t *fw; -cp - if(!cl->status.active) return -1; - if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2) + else { - syslog(LOG_ERR, _("got bad request: %s"), cl->buffer); - return -1; - } - - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("got REQ_KEY from " IP_ADDR_S " for " IP_ADDR_S), - IP_ADDR_V(from), IP_ADDR_V(to)); - - if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask)) - { /* hey! they want something from ME! :) */ - send_key_answer(cl, from); + new = (past_request_t *)xmalloc(sizeof(*new)); + new->request = xstrdup(request); + new->firstseen = now; + avl_insert(past_request_tree, new); return 0; } - - fw = lookup_conn(to); - - if(!fw) - { - syslog(LOG_ERR, _("Attempting to forward key request to " IP_ADDR_S ", which does not exist?"), - IP_ADDR_V(to)); - return -1; - } - - if(debug_lvl > 3) - syslog(LOG_DEBUG, _("Forwarding request for public key to " IP_ADDR_S), - IP_ADDR_V(fw->nexthop->vpn_ip)); - - cl->buffer[cl->reqlen-1] = '\n'; - - if(write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } -cp - return 0; -} - -void set_keys(conn_list_t *cl, int expiry, char *key) -{ - char *ek; -cp - if(!cl->public_key) - { - cl->public_key = xmalloc(sizeof(*cl->key)); - cl->public_key->key = NULL; - } - - if(cl->public_key->key) - free(cl->public_key->key); - cl->public_key->length = strlen(key); - cl->public_key->expiry = expiry; - cl->public_key->key = xmalloc(cl->public_key->length + 1); - strcpy(cl->public_key->key, key); - - ek = make_shared_key(key); - - if(!cl->key) - { - cl->key = xmalloc(sizeof(*cl->key)); - cl->key->key = NULL; - } - - if(cl->key->key) - free(cl->key->key); - - cl->key->length = strlen(ek); - cl->key->expiry = expiry; - cl->key->key = xmalloc(cl->key->length + 1); - strcpy(cl->key->key, ek); -cp +cp } -int ans_key_h(conn_list_t *cl) +void age_past_requests(void) { - ip_t to; - ip_t from; - int expiry; - char *key; - conn_list_t *fw, *gk; -cp - if(!cl->status.active) return -1; - if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4) - { - syslog(LOG_ERR, _("got bad ANS_KEY request: %s"), cl->buffer); - return -1; - } - - if(debug_lvl > 3) - syslog(LOG_DEBUG, _("got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S), - IP_ADDR_V(from), IP_ADDR_V(to)); - - if(to == myself->vpn_ip) - { /* hey! that key's for ME! :) */ - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Yeah! key arrived. Now do something with it.")); - gk = lookup_conn(from); - - if(!gk) - { - syslog(LOG_ERR, _("Receiving key from " IP_ADDR_S ", which does not exist?"), - IP_ADDR_V(from)); - return -1; - } - - set_keys(gk, expiry, key); - gk->status.validkey = 1; - gk->status.waitingforkey = 0; - flush_queues(gk); - return 0; - } - - fw = lookup_conn(to); - - if(!fw) + avl_node_t *node, *next; + past_request_t *p; + int left = 0, deleted = 0; +cp + for(node = past_request_tree->head; node; node = next) { - syslog(LOG_ERR, _("Attempting to forward key to " IP_ADDR_S ", which does not exist?"), - IP_ADDR_V(to)); - return -1; + next = node->next; + p = (past_request_t *)node->data; + if(p->firstseen + pingtimeout < now) + avl_delete_node(past_request_tree, node), deleted++; + else + left++; } - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Forwarding public key to " IP_ADDR_S), - IP_ADDR_V(fw->nexthop->vpn_ip)); - - cl->buffer[cl->reqlen-1] = '\n'; - - if((write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen)) < 0) - { - syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } + if(debug_lvl >= DEBUG_SCARY_THINGS && left + deleted) + syslog(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"), deleted, left); cp - return 0; } -int key_changed_h(conn_list_t *cl) -{ - ip_t from; - conn_list_t *ik; -cp - if(!cl->status.active) return -1; - if(sscanf(cl->buffer, "%*d %lx", &from) != 1) - { - syslog(LOG_ERR, _("got bad ANS_KEY request: %s"), cl->buffer); - return -1; - } - - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("got KEY_CHANGED from " IP_ADDR_S), - IP_ADDR_V(from)); - - ik = lookup_conn(from); +/* Jumptable for the request handlers */ - if(!ik) - { - syslog(LOG_ERR, _("Got changed key from " IP_ADDR_S ", which does not exist?"), - IP_ADDR_V(from)); - return -1; - } - - ik->status.validkey = 0; - ik->status.waitingforkey = 0; - - if(debug_lvl > 3) - syslog(LOG_DEBUG, _("Forwarding key invalidation request")); +int (*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, + add_subnet_h, del_subnet_h, + add_edge_h, del_edge_h, + key_changed_h, req_key_h, ans_key_h, + tcppacket_h, +}; - notify_others(cl, ik, send_key_changed); -cp - return 0; -} +/* Request names */ -int (*request_handlers[256])(conn_list_t*) = { - 0, ack_h, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - termreq_h, timeout_h, del_host_h, 0, 0, 0, 0, 0, 0, 0, - ping_h, pong_h, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - add_host_h, basic_info_h, passphrase_h, public_key_h, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - req_key_h, ans_key_h, key_changed_h, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +char (*request_name[]) = { + "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK", + "STATUS", "ERROR", "TERMREQ", + "PING", "PONG", + "ADD_SUBNET", "DEL_SUBNET", + "ADD_EDGE", "DEL_EDGE", + "KEY_CHANGED", "REQ_KEY", "ANS_KEY", + "PACKET", };