pid_t helper_pid;
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
+
struct query_packet_list *head;
struct query_packet_list *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);
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;
}
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->udp_dns.udp_hdr.crc = 0; /* Optional for IPv4 */
memcpy(&pkt->udp_dns.data, ans->pkt.data, data_len);
-
- /* GNUNET_MessageHeader
- * pkt_tun
- * ip_hdr
- * udp_dns
- * udp_pkt
- !!data!!
- */
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);
- /* TODO: if still in dll, reschedule */
+ 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)
memcpy(buf, &query->pkt.hdr, len);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sent %d bytes.\n", len);
-
GNUNET_CONTAINER_DLL_remove (mycls.head, mycls.tail, query);
GNUNET_free(query);
GNUNET_CONTAINER_DLL_insert_after(mycls.head, mycls.tail, mycls.tail, query);
- struct GNUNET_CLIENT_TransmitHandle* th = GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, len, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL);
- if (th != NULL)
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Queued sending of %d bytes.\n", len);
- else
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Already queued for %d bytes.\n", len);
+ 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);
}
}
}
-void dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg) {
- if (msg == NULL) return;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Got an answer!\n");
-
- if (msg->type != htons(GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS)) goto out;
-
- 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);
+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);
+}
-out:
- GNUNET_CLIENT_receive(mycls.dns_connection, &dns_answer_handler, NULL, GNUNET_TIME_UNIT_FOREVER_REL);
+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);
}
/**
{
mycls.sched = sched;
mycls.mst = GNUNET_SERVER_mst_create(&message_token, NULL);
-
- mycls.dns_connection = GNUNET_CLIENT_connect (sched, "dns", cfg);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connection: %x\n", mycls.dns_connection);
-
- GNUNET_CLIENT_receive(mycls.dns_connection, &dns_answer_handler, NULL, GNUNET_TIME_UNIT_FOREVER_REL);
-
+ 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