/*
protocol.c -- handle the meta-protocol, basic functions
- Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2013 Guus Sliepen <guus@meshlink.io>
+ 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 experimental = true;
-
/* Jumptable for the request handlers */
static bool (*request_handlers[])(connection_t *, const char *) = {
- id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
+ id_h, NULL, NULL, NULL /* metakey_h, challenge_h, chal_reply_h */, ack_h,
status_h, error_h, termreq_h,
ping_h, pong_h,
NULL, NULL, //add_subnet_h, del_subnet_h,
request[len++] = '\n';
- if(c == everyone) {
+ if(c == mesh->everyone) {
broadcast_meta(NULL, request, len);
return true;
} else
}
bool receive_request(connection_t *c, const char *request) {
- if(c->outgoing && proxytype == PROXY_HTTP && c->allow_request == ID) {
+ 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)) {
static timeout_t past_request_timeout;
-static void age_past_requests(void *data) {
+static void age_past_requests(event_loop_t *loop, void *data) {
int left = 0, deleted = 0;
for splay_each(past_request_t, p, past_request_tree) {
- if(p->firstseen + pinginterval <= now.tv_sec)
+ if(p->firstseen + mesh->pinginterval <= now.tv_sec)
splay_delete_node(past_request_tree, node), deleted++;
else
left++;
logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
if(left)
- timeout_set(&past_request_timeout, &(struct timeval){10, rand() % 100000});
+ timeout_set(&mesh->loop, &past_request_timeout, &(struct timeval){10, rand() % 100000});
}
bool seen_request(const char *request) {
new->request = xstrdup(request);
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});
+ timeout_add(&mesh->loop, &past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
return false;
}
}
void exit_requests(void) {
splay_delete_tree(past_request_tree);
- timeout_del(&past_request_timeout);
+ timeout_del(&mesh->loop, &past_request_timeout);
}