[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13505 - gnunet/src/vpn
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13505 - gnunet/src/vpn |
|
Date: |
Tue, 2 Nov 2010 22:40:02 +0100 |
Author: toelke
Date: 2010-11-02 22:40:02 +0100 (Tue, 02 Nov 2010)
New Revision: 13505
Modified:
gnunet/src/vpn/gnunet-daemon-vpn.c
Log:
comment and indent gnunet-daemon-vpn
Modified: gnunet/src/vpn/gnunet-daemon-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.c 2010-11-02 21:40:01 UTC (rev 13504)
+++ gnunet/src/vpn/gnunet-daemon-vpn.c 2010-11-02 21:40:02 UTC (rev 13505)
@@ -119,245 +119,336 @@
*/
static struct answer_packet_list *answer_proc_tail;
-size_t send_query(void* cls, size_t size, void* buf);
+static void helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext*
tsdkctx);
+static void dns_answer_handler(void* cls, const struct GNUNET_MessageHeader
*msg);
-static void cleanup(void* cls, const struct GNUNET_SCHEDULER_TaskContext*
tskctx) {
- GNUNET_assert (0 != (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN));
- PLIBC_KILL(helper_pid, SIGTERM);
- GNUNET_OS_process_wait(helper_pid);
- if (dns_connection != NULL)
- {
- GNUNET_CLIENT_disconnect (dns_connection, GNUNET_NO);
- dns_connection = NULL;
- }
-}
+/**
+ * Callback called by notify_transmit_ready; sends dns-queries or
rehijack-messages
+ * to the service-dns
+ */
+static size_t
+send_query(void* cls, size_t size, void* buf) {
+ size_t len;
+ /*
+ * Send the rehijack-message
+ */
+ if (restart_hijack == 1)
+ {
+ restart_hijack = 0;
+ /*
+ * The message is just a header
+ */
+ GNUNET_assert(sizeof(struct GNUNET_MessageHeader) >= size);
+ struct GNUNET_MessageHeader* hdr = buf;
+ len = sizeof(struct GNUNET_MessageHeader);
+ hdr->size = htons(len);
+ hdr->type = htons(GNUNET_MESSAGE_TYPE_REHIJACK);
+ }
+ else
+ {
+ struct query_packet_list* query = head;
+ len = ntohs(query->pkt.hdr.size);
-static void helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext*
tsdkctx);
+ GNUNET_assert(len <= size);
-static void start_helper_and_schedule(void *cls,
- const struct GNUNET_SCHEDULER_TaskContext
*tc) {
+ memcpy(buf, &query->pkt.hdr, len);
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
+ GNUNET_CONTAINER_DLL_remove (head, tail, query);
- helper_in = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO);
- helper_out = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_NO, GNUNET_YES);
+ GNUNET_free(query);
+ }
- if (helper_in == NULL || helper_out == NULL) return;
+ /*
+ * Check whether more data is to be sent
+ */
+ if (head != NULL || restart_hijack == 1)
+ {
+ GNUNET_CLIENT_notify_transmit_ready(dns_connection,
ntohs(head->pkt.hdr.size), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES,
&send_query, NULL);
+ }
- helper_pid = GNUNET_OS_start_process(helper_in, helper_out,
"gnunet-helper-vpn", "gnunet-helper-vpn", NULL);
+ return len;
+}
- fh_from_helper = GNUNET_DISK_pipe_handle (helper_out,
GNUNET_DISK_PIPE_END_READ);
- fh_to_helper = GNUNET_DISK_pipe_handle (helper_in,
GNUNET_DISK_PIPE_END_WRITE);
+/**
+ * Function scheduled as very last function, cleans up after us
+ */
+static void
+cleanup(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tskctx) {
+ GNUNET_assert (0 != (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN));
- GNUNET_DISK_pipe_close_end(helper_out, GNUNET_DISK_PIPE_END_WRITE);
- GNUNET_DISK_pipe_close_end(helper_in, GNUNET_DISK_PIPE_END_READ);
+ /* stop the helper */
+ PLIBC_KILL(helper_pid, SIGTERM);
+ GNUNET_OS_process_wait(helper_pid);
- GNUNET_SCHEDULER_add_read_file (sched, GNUNET_TIME_UNIT_FOREVER_REL,
fh_from_helper, &helper_read, NULL);
+ /* close the connection to the service-dns */
+ if (dns_connection != NULL)
+ {
+ GNUNET_CLIENT_disconnect (dns_connection, GNUNET_NO);
+ dns_connection = NULL;
+ }
}
+/**
+ * Start the helper-process
+ */
+static void
+start_helper_and_schedule(void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc) {
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ return;
-static void restart_helper(void* cls, const struct
GNUNET_SCHEDULER_TaskContext* tskctx) {
- // Kill the helper
- PLIBC_KILL(helper_pid, SIGKILL);
- GNUNET_OS_process_wait(helper_pid);
+ helper_in = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO);
+ helper_out = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_NO, GNUNET_YES);
- /* Tell the dns-service to rehijack the dns-port
- * The routing-table gets flushed if an interface disappears.
- */
- restart_hijack = 1;
- GNUNET_CLIENT_notify_transmit_ready(dns_connection, sizeof(struct
GNUNET_MessageHeader), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query,
NULL);
+ if (helper_in == NULL || helper_out == NULL) return;
- GNUNET_DISK_pipe_close(helper_in);
- GNUNET_DISK_pipe_close(helper_out);
+ helper_pid = GNUNET_OS_start_process(helper_in, helper_out,
"gnunet-helper-vpn", "gnunet-helper-vpn", NULL);
- // Restart the helper
- GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_UNIT_SECONDS,
start_helper_and_schedule, NULL);
+ fh_from_helper = GNUNET_DISK_pipe_handle (helper_out,
GNUNET_DISK_PIPE_END_READ);
+ fh_to_helper = GNUNET_DISK_pipe_handle (helper_in,
GNUNET_DISK_PIPE_END_WRITE);
+ GNUNET_DISK_pipe_close_end(helper_out, GNUNET_DISK_PIPE_END_WRITE);
+ GNUNET_DISK_pipe_close_end(helper_in, GNUNET_DISK_PIPE_END_READ);
+
+ GNUNET_SCHEDULER_add_read_file (sched, GNUNET_TIME_UNIT_FOREVER_REL,
fh_from_helper, &helper_read, NULL);
}
-static void helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext*
tsdkctx) {
- char buf[65535];
+/**
+ * Restart the helper-process
+ */
+static void
+restart_helper(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tskctx) {
+ // Kill the helper
+ PLIBC_KILL(helper_pid, SIGKILL);
+ GNUNET_OS_process_wait(helper_pid);
- if (tsdkctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)
- return;
+ /* Tell the dns-service to rehijack the dns-port
+ * The routing-table gets flushed if an interface disappears.
+ */
+ restart_hijack = 1;
+ GNUNET_CLIENT_notify_transmit_ready(dns_connection, sizeof(struct
GNUNET_MessageHeader), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query,
NULL);
- int t = GNUNET_DISK_file_read(fh_from_helper, &buf, 65535);
- if (t<=0) {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Read error for header
from vpn-helper: %m\n");
- GNUNET_SCHEDULER_add_now(sched, restart_helper, cls);
- return;
- }
+ GNUNET_DISK_pipe_close(helper_in);
+ GNUNET_DISK_pipe_close(helper_out);
- /* FIXME */ GNUNET_SERVER_mst_receive(mst, NULL, buf, t, 0, 0);
-
- GNUNET_SCHEDULER_add_read_file (sched, GNUNET_TIME_UNIT_FOREVER_REL,
fh_from_helper, &helper_read, NULL);
+ /* Restart the helper */
+ GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_UNIT_SECONDS,
start_helper_and_schedule, 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);
+/**
+ * Read from the helper-process
+ */
+static void
+helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tsdkctx) {
+ /* no message can be bigger then 64k */
+ char buf[65535];
- sum = (sum >> 16) + (sum & 0xFFFF);
+ if (tsdkctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ return;
- return ~sum;
-}
+ int t = GNUNET_DISK_file_read(fh_from_helper, &buf, 65535);
-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 = answer_proc_head;
- size_t len = ntohs(ans->pkt.hdr.size);
+ /* On read-error, restart the helper */
+ if (t<=0) {
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Read error for header from
vpn-helper: %m\n");
+ GNUNET_SCHEDULER_add_now(sched, restart_helper, cls);
+ return;
+ }
- GNUNET_assert(ans->pkt.subtype == GNUNET_DNS_ANSWER_TYPE_IP);
+ /* FIXME */ GNUNET_SERVER_mst_receive(mst, NULL, buf, t, 0, 0);
- 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;
+ GNUNET_SCHEDULER_add_read_file (sched, GNUNET_TIME_UNIT_FOREVER_REL,
fh_from_helper, &helper_read, NULL);
+}
- struct ip_udp_dns* pkt = alloca(pkt_len);
- memset(pkt, 0, pkt_len);
+/**
+ * Calculate the checksum of an IPv4-Header
+ */
+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);
- pkt->shdr.size = htons(pkt_len);
- pkt->shdr.type = htons(GNUNET_MESSAGE_TYPE_VPN_HELPER);
+ sum = (sum >> 16) + (sum & 0xFFFF);
- pkt->tun.flags = 0;
- pkt->tun.type = htons(0x0800);
+ return ~sum;
+}
- 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;
+/**
+ * Send an dns-answer-packet to the helper
+ */
+static void
+helper_write(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tsdkctx) {
+ if (tsdkctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ return;
- pkt->ip_hdr.chks = calculate_ip_checksum((uint16_t*)&pkt->ip_hdr, 5*4);
+ struct answer_packet_list* ans = answer_proc_head;
+ size_t len = ntohs(ans->pkt.hdr.size);
- 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 */
+ GNUNET_assert(ans->pkt.subtype == GNUNET_DNS_ANSWER_TYPE_IP);
- memcpy(&pkt->udp_dns.data, ans->pkt.data, data_len);
-
- GNUNET_CONTAINER_DLL_remove (answer_proc_head, answer_proc_tail, ans);
- GNUNET_free(ans);
+ 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;
- /* FIXME */ GNUNET_DISK_file_write(fh_to_helper, pkt, pkt_len);
+ struct ip_udp_dns* pkt = alloca(pkt_len);
+ memset(pkt, 0, pkt_len);
- if (answer_proc_head != NULL)
- GNUNET_SCHEDULER_add_write_file (sched,
GNUNET_TIME_UNIT_FOREVER_REL, fh_to_helper, &helper_write, NULL);
-}
+ /* set the gnunet-header */
+ pkt->shdr.size = htons(pkt_len);
+ pkt->shdr.type = htons(GNUNET_MESSAGE_TYPE_VPN_HELPER);
-size_t send_query(void* cls, size_t size, void* buf)
-{
- size_t len;
- if (restart_hijack == 1)
- {
- restart_hijack = 0;
- GNUNET_assert(sizeof(struct GNUNET_MessageHeader) >= size);
- struct GNUNET_MessageHeader* hdr = buf;
- len = sizeof(struct GNUNET_MessageHeader);
- hdr->size = htons(len);
- hdr->type = htons(GNUNET_MESSAGE_TYPE_REHIJACK);
- }
- else
- {
- struct query_packet_list* query = head;
- len = ntohs(query->pkt.hdr.size);
+ /* set the tun-header (no flags and ethertype of IPv4) */
+ pkt->tun.flags = 0;
+ pkt->tun.type = htons(0x0800);
- GNUNET_assert(len <= size);
+ /* set the ip-header */
+ 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;
- memcpy(buf, &query->pkt.hdr, len);
+ pkt->ip_hdr.chks = calculate_ip_checksum((uint16_t*)&pkt->ip_hdr, 5*4);
- GNUNET_CONTAINER_DLL_remove (head, tail, query);
+ /* set the udp-header */
+ 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 */
- GNUNET_free(query);
- }
+ memcpy(&pkt->udp_dns.data, ans->pkt.data, data_len);
- if (head != NULL || restart_hijack == 1) {
- GNUNET_CLIENT_notify_transmit_ready(dns_connection,
ntohs(head->pkt.hdr.size), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES,
&send_query, NULL);
- }
+ GNUNET_CONTAINER_DLL_remove (answer_proc_head, answer_proc_tail, ans);
+ GNUNET_free(ans);
- return len;
+ /* FIXME */ GNUNET_DISK_file_write(fh_to_helper, pkt, pkt_len);
+
+ /* if more packets are available, reschedule */
+ if (answer_proc_head != NULL)
+ GNUNET_SCHEDULER_add_write_file (sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ fh_to_helper,
+ &helper_write,
+ NULL);
}
-static void message_token(void *cls, void *client, const struct
GNUNET_MessageHeader *message) {
- if (ntohs(message->type) != GNUNET_MESSAGE_TYPE_VPN_HELPER) return;
+/**
+ * Receive packets from the helper-process
+ */
+static void
+message_token(void *cls,
+ void *client,
+ const struct GNUNET_MessageHeader *message) {
+ GNUNET_assert(ntohs(message->type) == GNUNET_MESSAGE_TYPE_VPN_HELPER);
- struct tun_pkt *pkt_tun = (struct tun_pkt*) message;
+ struct tun_pkt *pkt_tun = (struct tun_pkt*) message;
- if (ntohs(pkt_tun->tun.type) == 0x86dd) {
- struct ip6_pkt *pkt6 = (struct ip6_pkt*) message;
- struct ip6_tcp *pkt6_tcp;
- struct ip6_udp *pkt6_udp;
+ /* ethertype is ipv6 */
+ if (ntohs(pkt_tun->tun.type) == 0x86dd)
+ {
+ struct ip6_pkt *pkt6 = (struct ip6_pkt*) message;
+ struct ip6_tcp *pkt6_tcp;
+ struct ip6_udp *pkt6_udp;
- pkt_printf(pkt6);
- switch(pkt6->ip6_hdr.nxthdr) {
- case 0x06:
- pkt6_tcp = (struct ip6_tcp*)pkt6;
- pkt_printf_ip6tcp(pkt6_tcp);
- break;
- case 0x11:
- pkt6_udp = (struct ip6_udp*)pkt6;
- pkt_printf_ip6udp(pkt6_udp);
- if (ntohs(pkt6_udp->udp_hdr.dpt) == 53) {
- pkt_printf_ip6dns((struct
ip6_udp_dns*)pkt6_udp);
- }
- break;
- }
- } else if (ntohs(pkt_tun->tun.type) == 0x0800) {
- struct ip_pkt *pkt = (struct ip_pkt*) message;
- struct ip_udp *udp = (struct ip_udp*) message;
- 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);
+ pkt_printf(pkt6);
+ switch(pkt6->ip6_hdr.nxthdr)
+ {
+ case 0x06:
+ pkt6_tcp = (struct ip6_tcp*)pkt6;
+ pkt_printf_ip6tcp(pkt6_tcp);
+ break;
+ case 0x11:
+ pkt6_udp = (struct ip6_udp*)pkt6;
+ pkt_printf_ip6udp(pkt6_udp);
+ if (ntohs(pkt6_udp->udp_hdr.dpt) == 53) {
+ pkt_printf_ip6dns((struct ip6_udp_dns*)pkt6_udp);
+ }
+ break;
+ }
+ }
+ /* ethertype is ipv4 */
+ else if (ntohs(pkt_tun->tun.type) == 0x0800)
+ {
+ struct ip_pkt *pkt = (struct ip_pkt*) message;
+ struct ip_udp *udp = (struct ip_udp*) message;
+ GNUNET_assert(pkt->ip_hdr.version == 4);
- GNUNET_CONTAINER_DLL_insert_after(head, tail, tail,
query);
+ /* Send dns-packets to the service-dns */
+ if (pkt->ip_hdr.proto == 0x11 && ntohs(udp->udp_hdr.dpt) == 53 )
+ {
+ /* 9 = 8 for the udp-header + 1 for the unsigned char data[1]; */
+ size_t len = sizeof(struct query_packet) + ntohs(udp->udp_hdr.len)
- 9;
- if (dns_connection != NULL)
- /* struct GNUNET_CLIENT_TransmitHandle* th = */
GNUNET_CLIENT_notify_transmit_ready(dns_connection, len,
GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL);
- }
- }
+ 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(head, tail, tail, query);
+
+ if (dns_connection != NULL)
+ GNUNET_CLIENT_notify_transmit_ready(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);
+/**
+ * Connect to the service-dns
+ */
+static void
+connect_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 to service-dns\n");
+ GNUNET_assert (dns_connection == NULL);
+ dns_connection = GNUNET_CLIENT_connect (sched, "dns", cfg);
+ GNUNET_CLIENT_receive(dns_connection, &dns_answer_handler, NULL,
GNUNET_TIME_UNIT_FOREVER_REL);
-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 (dns_connection == NULL);
- dns_connection = GNUNET_CLIENT_connect (sched, "dns", cfg);
- GNUNET_CLIENT_receive(dns_connection, &dns_answer_handler, NULL,
GNUNET_TIME_UNIT_FOREVER_REL);
- if (head != NULL)
- /* struct GNUNET_CLIENT_TransmitHandle* th = */
GNUNET_CLIENT_notify_transmit_ready(dns_connection, ntohs(head->pkt.hdr.size),
GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL);
+ /* If a packet is already in the list, schedule to send it */
+ if (head != NULL)
+ GNUNET_CLIENT_notify_transmit_ready(dns_connection,
+ ntohs(head->pkt.hdr.size),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_YES,
+ &send_query,
+ NULL);
}
+/**
+ * This gets scheduled with cls pointing to an answer_packet and does
everything
+ * needed in order to send it to the helper.
+ *
+ * At the moment this means "inventing" and IPv6-Address for .gnunet-services
and
+ * doing nothing for "real" services.
+ */
static void
process_answer(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tc) {
struct answer_packet* pkt = cls;
+ /* This answer is about a .gnunet-service
+ *
+ * It contains an almost complete DNS-Response, we have to fill in the ip
+ * at the offset pkt->addroffset
+ */
if (pkt->subtype == GNUNET_DNS_ANSWER_TYPE_SERVICE)
{
unsigned char ip6addr[16];
@@ -378,47 +469,52 @@
*/
}
- struct answer_packet_list* list = GNUNET_malloc(htons(pkt->hdr.size) +
2*sizeof(struct answer_packet_list*));
+ struct answer_packet_list* list = GNUNET_malloc(htons(pkt->hdr.size) +
2*sizeof(struct answer_packet_list*));
- memcpy(&list->pkt, pkt, htons(pkt->hdr.size));
+ memcpy(&list->pkt, pkt, htons(pkt->hdr.size));
- GNUNET_CONTAINER_DLL_insert_after(answer_proc_head, answer_proc_tail,
answer_proc_tail, list);
+ GNUNET_CONTAINER_DLL_insert_after(answer_proc_head, answer_proc_tail,
answer_proc_tail, list);
- GNUNET_SCHEDULER_add_write_file (sched, GNUNET_TIME_UNIT_FOREVER_REL,
fh_to_helper, &helper_write, NULL);
+ GNUNET_SCHEDULER_add_write_file (sched, GNUNET_TIME_UNIT_FOREVER_REL,
fh_to_helper, &helper_write, NULL);
- return;
+ return;
}
+/**
+ * This receives packets from the service-dns and schedules process_answer to
+ * handle it
+ */
static void
-dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg)
-{
- if (msg == NULL)
- {
- GNUNET_CLIENT_disconnect(dns_connection, GNUNET_NO);
- dns_connection = NULL;
- GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_UNIT_SECONDS,
- &reconnect_to_service_dns,
- NULL);
- return;
- }
+dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg) {
+ /* the service disconnected, reconnect after short wait */
+ if (msg == NULL)
+ {
+ GNUNET_CLIENT_disconnect(dns_connection, GNUNET_NO);
+ dns_connection = NULL;
+ GNUNET_SCHEDULER_add_delayed (sched,
+ GNUNET_TIME_UNIT_SECONDS,
+ &connect_to_service_dns,
+ NULL);
+ return;
+ }
- if (msg->type != htons(GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS))
- {
- GNUNET_break (0);
- GNUNET_CLIENT_disconnect(dns_connection, GNUNET_NO);
- dns_connection = NULL;
- GNUNET_SCHEDULER_add_now (sched,
- &reconnect_to_service_dns,
- NULL);
- return;
- }
- void *pkt = GNUNET_malloc(ntohs(msg->size));
+ /* the service did something strange, reconnect immediately */
+ if (msg->type != htons(GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS))
+ {
+ GNUNET_break (0);
+ GNUNET_CLIENT_disconnect(dns_connection, GNUNET_NO);
+ dns_connection = NULL;
+ GNUNET_SCHEDULER_add_now (sched,
+ &connect_to_service_dns,
+ NULL);
+ return;
+ }
+ void *pkt = GNUNET_malloc(ntohs(msg->size));
- memcpy(pkt, msg, ntohs(msg->size));
+ memcpy(pkt, msg, ntohs(msg->size));
- GNUNET_SCHEDULER_add_now(sched, process_answer, pkt);
- GNUNET_CLIENT_receive(dns_connection, &dns_answer_handler, NULL,
GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_SCHEDULER_add_now(sched, process_answer, pkt);
+ GNUNET_CLIENT_receive(dns_connection, &dns_answer_handler, NULL,
GNUNET_TIME_UNIT_FOREVER_REL);
}
/**
@@ -435,18 +531,16 @@
struct GNUNET_SCHEDULER_Handle *sched_,
char *const *args,
const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg_)
-{
- sched = sched_;
- mst = GNUNET_SERVER_mst_create(&message_token, NULL);
- cfg = cfg_;
- restart_hijack = 0;
- GNUNET_SCHEDULER_add_now (sched, &reconnect_to_service_dns, NULL);
- GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_UNIT_FOREVER_REL, &cleanup,
cls);
- GNUNET_SCHEDULER_add_now (sched, start_helper_and_schedule, NULL);
+ const struct GNUNET_CONFIGURATION_Handle *cfg_) {
+ sched = sched_;
+ mst = GNUNET_SERVER_mst_create(&message_token, NULL);
+ cfg = cfg_;
+ restart_hijack = 0;
+ GNUNET_SCHEDULER_add_now (sched, connect_to_service_dns, NULL);
+ GNUNET_SCHEDULER_add_now (sched, start_helper_and_schedule, NULL);
+ GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_UNIT_FOREVER_REL,
&cleanup, cls);
}
-
/**
* The main function to obtain template from gnunetd.
*
@@ -455,18 +549,17 @@
* @return 0 ok, 1 on error
*/
int
-main (int argc, char *const *argv)
-{
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
+main (int argc, char *const *argv) {
+ static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc,
- argv,
- "gnunet-daemon-vpn",
- gettext_noop ("help text"),
- options, &run, NULL)) ? ret : 1;
+ return (GNUNET_OK ==
+ GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-daemon-vpn",
+ gettext_noop ("help text"),
+ options, &run, NULL)) ? ret : 1;
}
/* end of gnunet-daemon-vpn.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13505 - gnunet/src/vpn,
gnunet <=