#include "gnunet_server_lib.h"
#include "gnunet-service-dns-p.h"
#include "gnunet_client_lib.h"
+#include "gnunet_container_lib.h"
/**
* Final status code.
struct GNUNET_DISK_PipeHandle* helper_in; // From the helper
struct GNUNET_DISK_PipeHandle* helper_out; // To the helper
const struct GNUNET_DISK_FileHandle* fh_from_helper;
+ const struct GNUNET_DISK_FileHandle* fh_to_helper;
struct GNUNET_SERVER_MessageStreamTokenizer* mst;
struct GNUNET_CLIENT_Connection *dns_connection;
pid_t helper_pid;
+
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+ struct query_packet_list *head;
+ struct query_packet_list *tail;
+
+ struct answer_packet_list *answer_head;
+ struct answer_packet_list *answer_tail;
};
static struct vpn_cls mycls;
static void cleanup(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tskctx) {
- if (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) {
- PLIBC_KILL(mycls.helper_pid, SIGTERM);
- GNUNET_OS_process_wait(mycls.helper_pid);
- }
+ GNUNET_assert (0 != (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN));
+ PLIBC_KILL(mycls.helper_pid, SIGTERM);
+ GNUNET_OS_process_wait(mycls.helper_pid);
+ if (mycls.dns_connection != NULL)
+ {
+ GNUNET_CLIENT_disconnect (mycls.dns_connection, GNUNET_NO);
+ mycls.dns_connection = NULL;
+ }
}
static void helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tsdkctx);
static void start_helper_and_schedule() {
- mycls.helper_in = GNUNET_DISK_pipe(1);
- mycls.helper_out = GNUNET_DISK_pipe(1);
+ mycls.helper_in = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO);;
+ mycls.helper_out = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_NO, GNUNET_YES);
+
+ if (mycls.helper_in == NULL || mycls.helper_out == NULL) return;
mycls.helper_pid = GNUNET_OS_start_process(mycls.helper_in, mycls.helper_out, "gnunet-helper-vpn", "gnunet-helper-vpn", NULL);
mycls.fh_from_helper = GNUNET_DISK_pipe_handle (mycls.helper_out, GNUNET_DISK_PIPE_END_READ);
+ mycls.fh_to_helper = GNUNET_DISK_pipe_handle (mycls.helper_in, GNUNET_DISK_PIPE_END_WRITE);
GNUNET_DISK_pipe_close_end(mycls.helper_out, GNUNET_DISK_PIPE_END_WRITE);
GNUNET_DISK_pipe_close_end(mycls.helper_in, GNUNET_DISK_PIPE_END_READ);
PLIBC_KILL(mycls.helper_pid, SIGKILL);
GNUNET_OS_process_wait(mycls.helper_pid);
+ // FIXME: send msg to service-dns -- the hijacker has to be started again, too, the routing table is flushed if it depends on one interface
+
+ GNUNET_DISK_pipe_close(mycls.helper_in);
+ GNUNET_DISK_pipe_close(mycls.helper_out);
+
// Restart the helper
start_helper_and_schedule(mycls);
int t = GNUNET_DISK_file_read(mycls.fh_from_helper, &buf, 65535);
if (t<=0) {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Read error for header: %m\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Read error for header from vpn-helper: %m\n");
GNUNET_SCHEDULER_add_now(mycls.sched, restart_helper, cls);
return;
}
GNUNET_SCHEDULER_add_read_file (mycls.sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls.fh_from_helper, &helper_read, NULL);
}
+static uint16_t calculate_ip_checksum(uint16_t* hdr, short len) {
+ uint32_t sum = 0;
+ for(; len >= 2; len -= 2)
+ sum += *(hdr++);
+ if (len == 1)
+ sum += *((unsigned char*)hdr);
+
+ sum = (sum >> 16) + (sum & 0xFFFF);
+
+ return ~sum;
+}
+
+static void helper_write(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tsdkctx) {
+ if (tsdkctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ return;
+ struct answer_packet_list* ans = mycls.answer_head;
+ size_t len = ntohs(ans->pkt.hdr.size);
+
+ size_t data_len = len - sizeof(struct answer_packet) + 1;
+ size_t net_len = sizeof(struct ip_hdr) + sizeof(struct udp_dns) + data_len;
+ size_t pkt_len = sizeof(struct GNUNET_MessageHeader) + sizeof(struct pkt_tun) + net_len;
+
+ struct ip_udp_dns* pkt = alloca(pkt_len);
+ memset(pkt, 0, pkt_len);
+
+ pkt->shdr.size = htons(pkt_len);
+ pkt->shdr.type = htons(GNUNET_MESSAGE_TYPE_VPN_HELPER);
+
+ pkt->tun.flags = 0;
+ pkt->tun.type = htons(0x0800);
+
+ pkt->ip_hdr.version = 4;
+ pkt->ip_hdr.hdr_lngth = 5;
+ pkt->ip_hdr.diff_serv = 0;
+ pkt->ip_hdr.tot_lngth = htons(net_len);
+ pkt->ip_hdr.ident = 0;
+ pkt->ip_hdr.flags = 0;
+ pkt->ip_hdr.frag_off = 0;
+ pkt->ip_hdr.ttl = 255;
+ pkt->ip_hdr.proto = 0x11; /* UDP */
+ pkt->ip_hdr.chks = 0; /* Will be calculated later*/
+ pkt->ip_hdr.sadr = ans->pkt.from;
+ pkt->ip_hdr.dadr = ans->pkt.to;
+
+ pkt->ip_hdr.chks = calculate_ip_checksum((uint16_t*)&pkt->ip_hdr, 5*4);
+
+ pkt->udp_dns.udp_hdr.spt = htons(53);
+ pkt->udp_dns.udp_hdr.dpt = ans->pkt.dst_port;
+ pkt->udp_dns.udp_hdr.len = htons(net_len - sizeof(struct ip_hdr));
+ pkt->udp_dns.udp_hdr.crc = 0; /* Optional for IPv4 */
+
+ memcpy(&pkt->udp_dns.data, ans->pkt.data, data_len);
+
+ GNUNET_CONTAINER_DLL_remove (mycls.answer_head, mycls.answer_tail, ans);
+ GNUNET_free(ans);
+
+ /* FIXME */ GNUNET_DISK_file_write(mycls.fh_to_helper, pkt, pkt_len);
+
+ if (mycls.answer_head != NULL)
+ GNUNET_SCHEDULER_add_write_file (mycls.sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls.fh_to_helper, &helper_write, NULL);
+}
+
size_t send_query(void* cls, size_t size, void* buf)
{
- struct query_packet* pkt = cls;
- size_t len = ntohs(pkt->hdr.size);
- memcpy(buf, cls, len);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sent %d bytes.\n", len);
- GNUNET_free(cls);
+ struct query_packet_list* query = mycls.head;
+ size_t len = ntohs(query->pkt.hdr.size);
+
+ GNUNET_assert(len <= size);
+
+ memcpy(buf, &query->pkt.hdr, len);
+
+ GNUNET_CONTAINER_DLL_remove (mycls.head, mycls.tail, query);
+
+ GNUNET_free(query);
+
+ if (mycls.head != NULL) {
+ GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, ntohs(mycls.head->pkt.hdr.size), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL);
+ }
+
return len;
}
} else if (ntohs(pkt_tun->tun.type) == 0x0800) {
struct ip_pkt *pkt = (struct ip_pkt*) message;
struct ip_udp *udp = (struct ip_udp*) message;
- if (pkt->ip_hdr.proto == 0x11 && udp->ip_hdr.dadr == 0x020a0a0a && ntohs(udp->udp_hdr.dpt) == 53 ) {
- size_t len = sizeof(struct query_packet*) + ntohs(udp->udp_hdr.len) - 7; /* 7 = 8 for the udp-header - 1 for the unsigned char data[1]; */
- struct query_packet* query = GNUNET_malloc(len);
- query->hdr.type = htons(GNUNET_MESSAGE_TYPE_LOCAL_QUERY_DNS);
- query->hdr.size = htons(len);
- query->orig_to = pkt->ip_hdr.dadr;
- query->orig_from = pkt->ip_hdr.sadr;
- query->src_port = udp->udp_hdr.spt;
- memcpy(query->data, udp->data, ntohs(udp->udp_hdr.len) - 8);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Queued sending\n");
- GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, len, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, query);
+ GNUNET_assert(pkt->ip_hdr.version == 4);
+ if (pkt->ip_hdr.proto == 0x11 && ntohs(udp->udp_hdr.dpt) == 53 ) {
+ size_t len = sizeof(struct query_packet) + ntohs(udp->udp_hdr.len) - 9; /* 9 = 8 for the udp-header + 1 for the unsigned char data[1]; */
+ struct query_packet_list* query = GNUNET_malloc(len + 2*sizeof(struct query_packet_list*));
+ query->pkt.hdr.type = htons(GNUNET_MESSAGE_TYPE_LOCAL_QUERY_DNS);
+ query->pkt.hdr.size = htons(len);
+ query->pkt.orig_to = pkt->ip_hdr.dadr;
+ query->pkt.orig_from = pkt->ip_hdr.sadr;
+ query->pkt.src_port = udp->udp_hdr.spt;
+ memcpy(query->pkt.data, udp->data, ntohs(udp->udp_hdr.len) - 8);
+
+ GNUNET_CONTAINER_DLL_insert_after(mycls.head, mycls.tail, mycls.tail, query);
+
+ if (mycls.dns_connection != NULL)
+ /* struct GNUNET_CLIENT_TransmitHandle* th = */ GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, len, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL);
}
}
}
+static void
+dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg);
+
+static void
+reconnect_to_service_dns (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc) {
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ return;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connecting\n");
+ GNUNET_assert (mycls.dns_connection == NULL);
+ mycls.dns_connection = GNUNET_CLIENT_connect (mycls.sched, "dns", mycls.cfg);
+ GNUNET_CLIENT_receive(mycls.dns_connection, &dns_answer_handler, NULL, GNUNET_TIME_UNIT_FOREVER_REL);
+ if (mycls.head != NULL)
+ /* struct GNUNET_CLIENT_TransmitHandle* th = */ GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, ntohs(mycls.head->pkt.hdr.size), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL);
+}
+
+static void
+dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg)
+{
+ if (msg == NULL)
+ {
+ GNUNET_CLIENT_disconnect(mycls.dns_connection, GNUNET_NO);
+ mycls.dns_connection = NULL;
+ GNUNET_SCHEDULER_add_delayed (mycls.sched,
+ GNUNET_TIME_UNIT_SECONDS,
+ &reconnect_to_service_dns,
+ NULL);
+ return;
+ }
+
+ if (msg->type != htons(GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS))
+ {
+ GNUNET_break (0);
+ GNUNET_CLIENT_disconnect(mycls.dns_connection, GNUNET_NO);
+ mycls.dns_connection = NULL;
+ GNUNET_SCHEDULER_add_now (mycls.sched,
+ &reconnect_to_service_dns,
+ NULL);
+ return;
+ }
+ struct answer_packet_list* pkt = GNUNET_malloc(ntohs(msg->size) + 2*sizeof(struct answer_packet_list*));
+
+ memcpy(&pkt->pkt, msg, ntohs(msg->size));
+ GNUNET_CONTAINER_DLL_insert_after(mycls.answer_head, mycls.answer_tail, mycls.answer_tail, pkt);
+ GNUNET_SCHEDULER_add_write_file (mycls.sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls.fh_to_helper, &helper_write, NULL);
+ GNUNET_CLIENT_receive(mycls.dns_connection, &dns_answer_handler, NULL, GNUNET_TIME_UNIT_FOREVER_REL);
+}
+
/**
* Main function that will be run by the scheduler.
*
{
mycls.sched = sched;
mycls.mst = GNUNET_SERVER_mst_create(&message_token, NULL);
-
- mycls.dns_connection = GNUNET_CLIENT_connect (sched, "gnunet-service-dns", cfg);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connection: %x\n", mycls.dns_connection);
-
+ mycls.cfg = cfg;
+ GNUNET_SCHEDULER_add_now (sched, &reconnect_to_service_dns, NULL);
GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
start_helper_and_schedule(mycls);
}
projects / oweals / gnunet.git / blobdiff