/*
protocol.c -- handle the meta-protocol, basic functions
- Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
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
#include "conf.h"
#include "connection.h"
#include "logger.h"
+#include "meshlink_internal.h"
#include "meta.h"
#include "protocol.h"
#include "utils.h"
#include "xalloc.h"
-bool tunnelserver = false;
-bool strictsubnets = false;
-bool experimental = false;
-
/* Jumptable for the request handlers */
-static bool (*request_handlers[])(connection_t *, char *) = {
- id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
+static bool (*request_handlers[])(meshlink_handle_t *, connection_t *, const char *) = {
+ id_h, NULL, NULL, NULL /* 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,
+ NULL, NULL, //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,
+ key_changed_h, req_key_h, ans_key_h, tcppacket_h, NULL, //control_h,
};
/* Request names */
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;
/* Generic request routines - takes care of logging and error
detection as well */
-bool send_request(connection_t *c, const char *format, ...) {
+bool send_request(meshlink_handle_t *mesh, connection_t *c, const char *format, ...) {
va_list args;
char request[MAXBUFSIZE];
int len;
request[len++] = '\n';
- if(c == everyone) {
- broadcast_meta(NULL, request, len);
+ if(c == mesh->everyone) {
+ broadcast_meta(mesh, NULL, request, len);
return true;
} else
- return send_meta(c, request, len);
+ return send_meta(mesh, c, request, len);
}
-void forward_request(connection_t *from, char *request) {
- /* Note: request is not zero terminated anymore after a call to this function! */
+void forward_request(meshlink_handle_t *mesh, connection_t *from, const char *request) {
logger(DEBUG_META, LOG_DEBUG, "Forwarding %s from %s (%s): %s", request_name[atoi(request)], from->name, from->hostname, request);
+ // Create a temporary newline-terminated copy of the request
int len = strlen(request);
- request[len++] = '\n';
- broadcast_meta(from, request, len);
+ char tmp[len + 1];
+ memcpy(tmp, request, len);
+ tmp[len] = '\n';
+ broadcast_meta(mesh, from, tmp, sizeof tmp);
}
-bool receive_request(connection_t *c, char *request) {
+bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ if(c->outgoing && mesh->proxytype == PROXY_HTTP && c->allow_request == ID) {
+ if(!request[0] || request[0] == '\r')
+ return true;
+ if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
+ if(!strncmp(request + 9, "200", 3)) {
+ logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
+ return true;
+ } else {
+ logger(DEBUG_ALWAYS, LOG_DEBUG, "Proxy request rejected: %s", request + 9);
+ return false;
+ }
+ }
+ }
+
int reqno = atoi(request);
if(reqno || *request == '0') {
return false;
}
- if(!request_handlers[reqno](c, request)) {
+ if(!request_handlers[reqno](mesh, c, request)) {
/* Something went wrong. Probably scriptkiddies. Terminate. */
logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
static void free_past_request(past_request_t *r) {
if(r->request)
- free(r->request);
+ free((void *)r->request);
free(r);
}
-static struct event past_request_event;
+static timeout_t past_request_timeout;
+
+static void age_past_requests(event_loop_t *loop, void *data) {
+ meshlink_handle_t *mesh = loop->data;
+ int left = 0, deleted = 0;
-bool seen_request(char *request) {
+ for splay_each(past_request_t, p, past_request_tree) {
+ if(p->firstseen + mesh->pinginterval <= mesh->loop.now.tv_sec)
+ splay_delete_node(past_request_tree, node), deleted++;
+ else
+ left++;
+ }
+
+ if(left || deleted)
+ logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
+
+ if(left)
+ timeout_set(&mesh->loop, &past_request_timeout, &(struct timeval){10, rand() % 100000});
+}
+
+bool seen_request(meshlink_handle_t *mesh, const char *request) {
past_request_t *new, p = {NULL};
p.request = request;
} else {
new = xmalloc(sizeof *new);
new->request = xstrdup(request);
- new->firstseen = time(NULL);
+ new->firstseen = mesh->loop.now.tv_sec;
splay_insert(past_request_tree, new);
- event_add(&past_request_event, &(struct timeval){10, 0});
+ timeout_add(&mesh->loop, &past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
return false;
}
}
-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)
- splay_delete_node(past_request_tree, node), deleted++;
- else
- left++;
- }
-
- if(left || deleted)
- logger(DEBUG_SCARY_THINGS, 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) {
+// TODO: move past_request_tree to meshlink_handle_t
+void init_requests(meshlink_handle_t *mesh) {
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) {
+void exit_requests(meshlink_handle_t *mesh) {
splay_delete_tree(past_request_tree);
- if(timeout_initialized(&past_request_event))
- event_del(&past_request_event);
+ timeout_del(&mesh->loop, &past_request_timeout);
}
projects / meshlink / blobdiff