/*
protocol.c -- handle the meta-protocol, basic functions
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2013 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
bool tunnelserver = false;
bool strictsubnets = false;
-bool experimental = false;
+bool experimental = true;
/* Jumptable for the request handlers */
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) */
+ udp_info_h, mtu_info_h,
};
/* Request names */
"PING", "PONG",
"ADD_SUBNET", "DEL_SUBNET",
"ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
+ "REQ_PUBKEY", "ANS_PUBKEY", "REQ_SPTPS", "UDP_INFO", "MTU_INFO",
};
static splay_tree_t *past_request_tree;
-bool check_id(const char *id) {
- if(!id || !*id)
- return false;
-
- for(; *id; id++)
- if(!isalnum(*id) && *id != '_')
- return false;
-
- return true;
-}
-
/* Generic request routines - takes care of logging and error
detection as well */
}
bool receive_request(connection_t *c, const char *request) {
- if(proxytype == PROXY_HTTP && c->allow_request == ID) {
+ if(c->outgoing && proxytype == PROXY_HTTP && c->allow_request == ID) {
if(!request[0] || request[0] == '\r')
return true;
if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
} else {
new = xmalloc(sizeof *new);
new->request = xstrdup(request);
- new->firstseen = time(NULL);
+ new->firstseen = now.tv_sec;
splay_insert(past_request_tree, new);
timeout_add(&past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
return false;