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
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
/* Jumptable for the request handlers */
static bool (*request_handlers[])(meshlink_handle_t *, connection_t *, const char *) = {
/* Jumptable for the request handlers */
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,
- 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, NULL, //control_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,
+ add_edge_h, del_edge_h,
+ key_changed_h, req_key_h, ans_key_h, tcppacket_h, NULL, //control_h,
- "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", "CONTROL",
+ "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", "CONTROL",
-bool send_request(meshlink_handle_t *mesh, connection_t *c, const char *format, ...) {
+bool send_request(meshlink_handle_t *mesh, connection_t *c, submesh_t *s, const char *format, ...) {
/* Use vsnprintf instead of vxasprintf: faster, no memory
fragmentation, cleanup is automatic, and there is a limit on the
input buffer anyway */
/* Use vsnprintf instead of vxasprintf: faster, no memory
fragmentation, cleanup is automatic, and there is a limit on the
input buffer anyway */
- logger(mesh, MESHLINK_ERROR, "Output buffer overflow while sending request to %s (%s)",
- c->name, c->hostname);
+ logger(mesh, MESHLINK_ERROR, "Output buffer overflow while sending request to %s", c->name);
- logger(mesh, MESHLINK_DEBUG, "Sending %s to %s (%s): %s", request_name[atoi(request)], c->name, c->hostname, request);
+ logger(mesh, MESHLINK_DEBUG, "Sending %s to %s: %s", request_name[atoi(request)], c->name, request);
- broadcast_meta(mesh, NULL, request, len);
+
+ if(s) {
+ broadcast_submesh_meta(mesh, NULL, s, request, len);
+ } else {
+ broadcast_meta(mesh, NULL, request, len);
+ }
+
return send_meta(mesh, c, request, len);
return send_meta(mesh, c, request, len);
-void forward_request(meshlink_handle_t *mesh, connection_t *from, const char *request) {
- logger(mesh, MESHLINK_DEBUG, "Forwarding %s from %s (%s): %s", request_name[atoi(request)], from->name, from->hostname, request);
+void forward_request(meshlink_handle_t *mesh, connection_t *from, submesh_t *s, const char *request) {
+ logger(mesh, MESHLINK_DEBUG, "Forwarding %s from %s: %s", request_name[atoi(request)], from->name, request);
- broadcast_meta(mesh, from, tmp, sizeof tmp);
+
+ if(s) {
+ broadcast_submesh_meta(mesh, from, s, tmp, sizeof(tmp));
+ } else {
+ broadcast_meta(mesh, from, tmp, sizeof(tmp));
+ }
}
bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *request) {
if(c->outgoing && mesh->proxytype == PROXY_HTTP && c->allow_request == ID) {
}
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(!strncasecmp(request, "HTTP/1.1 ", 9)) {
if(!strncmp(request + 9, "200", 3)) {
logger(mesh, MESHLINK_DEBUG, "Proxy request granted");
if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
if(!strncmp(request + 9, "200", 3)) {
logger(mesh, MESHLINK_DEBUG, "Proxy request granted");
- logger(mesh, MESHLINK_DEBUG, "Unknown request from %s (%s): %s", c->name, c->hostname, request);
+ logger(mesh, MESHLINK_DEBUG, "Unknown request from %s: %s", c->name, request);
- logger(mesh, MESHLINK_DEBUG, "Got %s from %s (%s): %s", request_name[reqno], c->name, c->hostname, request);
+ logger(mesh, MESHLINK_DEBUG, "Got %s from %s: %s", request_name[reqno], c->name, request);
- logger(mesh, MESHLINK_ERROR, "Unauthorized request from %s (%s)", c->name, c->hostname);
+ logger(mesh, MESHLINK_ERROR, "Unauthorized request from %s", c->name);
return false;
}
if(!request_handlers[reqno](mesh, c, request)) {
/* Something went wrong. Probably scriptkiddies. Terminate. */
return false;
}
if(!request_handlers[reqno](mesh, c, request)) {
/* Something went wrong. Probably scriptkiddies. Terminate. */
- logger(mesh, MESHLINK_ERROR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
+ logger(mesh, MESHLINK_ERROR, "Error while processing %s from %s", request_name[reqno], c->name);
- logger(mesh, MESHLINK_ERROR, "Bogus data received from %s (%s)", c->name, c->hostname);
+ logger(mesh, MESHLINK_ERROR, "Bogus data received from %s", c->name);
meshlink_handle_t *mesh = loop->data;
int left = 0, deleted = 0;
for splay_each(past_request_t, p, mesh->past_request_tree) {
meshlink_handle_t *mesh = loop->data;
int left = 0, deleted = 0;
for splay_each(past_request_t, p, mesh->past_request_tree) {
logger(mesh, MESHLINK_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
logger(mesh, MESHLINK_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
- timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval){10, rand() % 100000});
+ timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval) {
+ 10, rand() % 100000
+ });
if(splay_search(mesh->past_request_tree, &p)) {
logger(mesh, MESHLINK_DEBUG, "Already seen request");
return true;
} else {
if(splay_search(mesh->past_request_tree, &p)) {
logger(mesh, MESHLINK_DEBUG, "Already seen request");
return true;
} else {
new->request = xstrdup(request);
new->firstseen = mesh->loop.now.tv_sec;
splay_insert(mesh->past_request_tree, new);
new->request = xstrdup(request);
new->firstseen = mesh->loop.now.tv_sec;
splay_insert(mesh->past_request_tree, new);
- timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
+ timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timeval) {
+ 10, rand() % 100000
+ });
mesh->past_request_tree = NULL;
timeout_del(&mesh->loop, &mesh->past_request_timeout);
mesh->past_request_tree = NULL;
timeout_del(&mesh->loop, &mesh->past_request_timeout);