#include "gnunet_getopt_lib.h"
#include "gnunet_program_lib.h"
#include "gnunet-vpn-packet.h"
-#include "gnunet-vpn-pretty-print.h"
#include "gnunet_common.h"
#include "gnunet_protocols.h"
#include <gnunet_mesh_service.h>
const struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_MESH_Handle *mesh_handle;
struct GNUNET_CONTAINER_MultiHashMap* hashmap;
+static struct GNUNET_CONTAINER_Heap *heap;
+
+/**
+ * If there are at least this many address-mappings, old ones will be removed
+ */
+static long long unsigned int max_mappings = 200;
/**
* Final status code.
}
}
+static void
+collect_mappings(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tc) {
+ if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ return;
+
+ struct map_entry* me = GNUNET_CONTAINER_heap_remove_root(heap);
+
+ /* This is free()ed memory! */
+ me->heap_node = NULL;
+
+ /* FIXME! GNUNET_MESH_close_tunnel(state->tunnel); */
+
+ GNUNET_CONTAINER_multihashmap_remove(hashmap, &me->hash, me);
+
+ GNUNET_free(me);
+}
+
void
send_icmp_response(void* cls, const struct GNUNET_SCHEDULER_TaskContext *tc) {
struct ip6_icmp* request = cls;
/**
* cls is the pointer to a GNUNET_MessageHeader that is
- * followed by the service-descriptor and the udp-packet that should be sent;
+ * followed by the service-descriptor and the packet that should be sent;
*/
static size_t
-send_udp_to_peer_notify_callback (void *cls, size_t size, void *buf)
+send_pkt_to_peer_notify_callback (void *cls, size_t size, void *buf)
{
struct GNUNET_MESH_Tunnel **tunnel = cls;
struct GNUNET_MessageHeader *hdr =
(struct GNUNET_MessageHeader *) (tunnel + 1);
- GNUNET_HashCode *hc = (GNUNET_HashCode *) (hdr + 1);
- struct udp_pkt *udp = (struct udp_pkt *) (hc + 1);
- hdr->size = htons (sizeof (struct GNUNET_MessageHeader) +
- sizeof (GNUNET_HashCode) + ntohs (udp->len));
- hdr->type = ntohs (GNUNET_MESSAGE_TYPE_SERVICE_UDP);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "send_udp_to_peer_notify_callback: buf = %x; size = %u;\n", buf, size);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "send_pkt_to_peer_notify_callback: buf = %x; size = %u;\n", buf, size);
GNUNET_assert (size >= ntohs (hdr->size));
memcpy (buf, hdr, ntohs (hdr->size));
size = ntohs(hdr->size);
}
void
-send_udp_to_peer (void *cls,
+send_pkt_to_peer (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
struct GNUNET_MESH_Tunnel **tunnel = cls;
struct GNUNET_MessageHeader *hdr =
(struct GNUNET_MessageHeader *) (tunnel + 1);
- GNUNET_HashCode *hc = (GNUNET_HashCode *) (hdr + 1);
- struct udp_pkt *udp = (struct udp_pkt *) (hc + 1);
+
+ GNUNET_assert(NULL != tunnel);
+ GNUNET_assert(NULL != *tunnel);
+
GNUNET_MESH_notify_transmit_ready (*tunnel,
GNUNET_NO,
42,
GNUNET_TIME_relative_divide(GNUNET_CONSTANTS_MAX_CORK_DELAY, 2),
- htons (sizeof
- (struct GNUNET_MessageHeader) +
- sizeof (GNUNET_HashCode) +
- ntohs (udp->len)),
- send_udp_to_peer_notify_callback,
+ (const struct GNUNET_PeerIdentity *)NULL,
+ ntohs(hdr->size),
+ send_pkt_to_peer_notify_callback,
cls);
}
}
/*}}}*/
+char
+max (char a, char b)
+{
+ return a > b ? a : b;
+}
+
+/**
+ * Create a new Address from an answer-packet
+ */
+void
+new_ip6addr_remote (unsigned char *buf, unsigned char *addr, char addrlen)
+{ /* {{{ */
+ char *ipv6addr;
+ unsigned long long ipv6prefix;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "vpn",
+ "IPV6ADDR",
+ &ipv6addr));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (cfg, "vpn",
+ "IPV6PREFIX",
+ &ipv6prefix));
+ GNUNET_assert (ipv6prefix < 127);
+ ipv6prefix = (ipv6prefix + 7) / 8;
+
+ inet_pton (AF_INET6, ipv6addr, buf);
+ GNUNET_free (ipv6addr);
+
+ int local_length = 16 - ipv6prefix;
+
+ memcpy (buf + ipv6prefix, addr, max (addrlen, local_length));
+}
+/*}}}*/
+
/**
* This gets scheduled with cls pointing to an answer_packet and does everything
* needed in order to send it to the helper.
* It contains an almost complete DNS-Response, we have to fill in the ip
* at the offset pkt->addroffset
*/
- //FIXME htons?
if (pkt->subtype == GNUNET_DNS_ANSWER_TYPE_SERVICE)
{
pkt->subtype = GNUNET_DNS_ANSWER_TYPE_IP;
memcpy(&value->desc, &pkt->service_descr, sizeof(struct GNUNET_vpn_service_descriptor));
- value->additional_ports = 0;
+ memset(value->additional_ports, 0, 8192);
- if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(hashmap,
- &key,
- value,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not store to hashmap\n");
- GNUNET_free(value);
- }
+ memcpy(&value->hash, &key, sizeof(GNUNET_HashCode));
+
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_multihashmap_contains (hashmap, &key))
+ {
+ GNUNET_CONTAINER_multihashmap_put (hashmap, &key, value,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+
+ value->heap_node = GNUNET_CONTAINER_heap_insert (heap, value,
+ GNUNET_TIME_absolute_get ().abs_value);
+ if (GNUNET_CONTAINER_heap_get_size(heap) > max_mappings)
+ GNUNET_SCHEDULER_add_now(collect_mappings, NULL);
+ }
+ else
+ GNUNET_free(value);
list = GNUNET_malloc(htons(pkt->hdr.size) + 2*sizeof(struct answer_packet_list*));
}
struct map_entry* map_entry = GNUNET_CONTAINER_multihashmap_get(hashmap, &key);
+ GNUNET_CONTAINER_heap_update_cost (heap, map_entry->heap_node,
+ GNUNET_TIME_absolute_get ().abs_value);
+
uint16_t offset = ntohs(pkt->addroffset);
if (map_entry == NULL)
else if (pkt->subtype == GNUNET_DNS_ANSWER_TYPE_IP)
{
list = GNUNET_malloc(htons(pkt->hdr.size) + 2*sizeof(struct answer_packet_list*));
+ memcpy(&list->pkt, pkt, htons(pkt->hdr.size));
+ }
+ else if (pkt->subtype == GNUNET_DNS_ANSWER_TYPE_REMOTE)
+ {
+ pkt->subtype = GNUNET_DNS_ANSWER_TYPE_IP;
+
+ GNUNET_HashCode key;
+ memset(&key, 0, sizeof(GNUNET_HashCode));
+
+ unsigned char* c = ((unsigned char*)pkt)+ntohs(pkt->addroffset);
+ new_ip6addr_remote(c, pkt->addr, pkt->addrsize);
+ unsigned char* k = (unsigned char*)&key;
+ /*
+ * Copy the newly generated ip-address to the key backwards (as only the first part is used in the hash-table)
+ */
+ unsigned int i;
+ for (i = 0; i < 16; i++)
+ k[15-i] = c[i];
+
+ uint16_t namelen = strlen((char*)pkt->data+12)+1;
+
+ struct map_entry* value = GNUNET_malloc(sizeof(struct map_entry) + namelen);
+ char* name = (char*)(value +1);
+
+ value->namelen = namelen;
+ memcpy(name, pkt->data+12, namelen);
+
+ value->addrlen = pkt->addrsize;
+ memcpy(&value->addr, &pkt->addr, pkt->addrsize);
+ memset(value->additional_ports, 0, 8192);
+
+ memcpy(&value->hash, &key, sizeof(GNUNET_HashCode));
+
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_multihashmap_contains (hashmap, &key))
+ {
+ GNUNET_CONTAINER_multihashmap_put (hashmap, &key, value,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ value->heap_node = GNUNET_CONTAINER_heap_insert (heap, value,
+ GNUNET_TIME_absolute_get ().abs_value);
+ if (GNUNET_CONTAINER_heap_get_size(heap) > max_mappings)
+ GNUNET_SCHEDULER_add_now(collect_mappings, NULL);
+ }
+ else
+ GNUNET_free(value);
+
+ list = GNUNET_malloc(htons(pkt->hdr.size) + 2*sizeof(struct answer_packet_list*));
+
memcpy(&list->pkt, pkt, htons(pkt->hdr.size));
}
else
return;
}
+/**
+ * Sets a bit active in a bitArray.
+ *
+ * @param bitArray memory area to set the bit in
+ * @param bitIdx which bit to set
+ */
+void
+setBit (char *bitArray, unsigned int bitIdx)
+{
+ size_t arraySlot;
+ unsigned int targetBit;
+
+ arraySlot = bitIdx / 8;
+ targetBit = (1L << (bitIdx % 8));
+ bitArray[arraySlot] |= targetBit;
+}
+
+/**
+ * Clears a bit from bitArray.
+ *
+ * @param bitArray memory area to set the bit in
+ * @param bitIdx which bit to unset
+ */
+void
+clearBit (char *bitArray, unsigned int bitIdx)
+{
+ size_t slot;
+ unsigned int targetBit;
+
+ slot = bitIdx / 8;
+ targetBit = (1L << (bitIdx % 8));
+ bitArray[slot] = bitArray[slot] & (~targetBit);
+}
+
+/**
+ * Checks if a bit is active in the bitArray
+ *
+ * @param bitArray memory area to set the bit in
+ * @param bitIdx which bit to test
+ * @return GNUNET_YES if the bit is set, GNUNET_NO if not.
+ */
+int
+testBit (char *bitArray, unsigned int bitIdx)
+{
+ size_t slot;
+ unsigned int targetBit;
+
+ slot = bitIdx / 8;
+ targetBit = (1L << (bitIdx % 8));
+ if (bitArray[slot] & targetBit)
+ return GNUNET_YES;
+ else
+ return GNUNET_NO;
+}
+
+/**
+ * @brief Add the port to the list of additional ports in the map_entry
+ *
+ * @param me the map_entry
+ * @param port the port in host-byte-order
+ */
static void
add_additional_port (struct map_entry *me, uint16_t port)
{
- uint16_t *ps = (uint16_t *) & me->additional_ports;
- unsigned int i;
- for (i = 0; i < 4; i++)
- {
- if (ps[i] == 0)
- {
- ps[i] = port;
- break;
- }
- }
+ setBit(me->additional_ports, port);
}
static int
receive_udp_back (void *cls, struct GNUNET_MESH_Tunnel* tunnel,
void **tunnel_ctx,
+ const struct GNUNET_PeerIdentity *sender,
const struct GNUNET_MessageHeader *message,
const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
GNUNET_assert (key != NULL);
struct map_entry *me = GNUNET_CONTAINER_multihashmap_get(hashmap, key);
+ GNUNET_CONTAINER_heap_update_cost (heap, me->heap_node,
+ GNUNET_TIME_absolute_get ().abs_value);
GNUNET_free(key);
GNUNET_assert (me != NULL);
GNUNET_assert (me->desc.service_type & htonl(GNUNET_DNS_SERVICE_TYPE_UDP));
if (!port_in_ports(me->desc.ports, pkt6->udp_hdr.spt) &&
- !port_in_ports(me->additional_ports, pkt6->udp_hdr.spt)) {
- add_additional_port(me, pkt6->udp_hdr.spt);
+ !testBit(me->additional_ports, ntohs(pkt6->udp_hdr.spt))) {
+ add_additional_port(me, ntohs(pkt6->udp_hdr.spt));
}
pkt6->udp_hdr.crc = 0;
return GNUNET_OK;
}
-void init_mesh (void* cls, struct GNUNET_MESH_Handle* server, const struct GNUNET_PeerIdentity* my_identity, const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey) {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connected to MESH, I am %x\n", *((unsigned long*)my_identity));
-}
+static int
+receive_tcp_back (void *cls, struct GNUNET_MESH_Tunnel* tunnel,
+ void **tunnel_ctx,
+ const struct GNUNET_PeerIdentity *sender,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+ GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
+ struct tcp_pkt *pkt = (struct tcp_pkt *) (desc + 1);
+ const struct GNUNET_PeerIdentity* other = GNUNET_MESH_get_peer(tunnel);
+
+ size_t pktlen = ntohs(message->size) - sizeof(struct GNUNET_MessageHeader) - sizeof(GNUNET_HashCode);
+ size_t size = pktlen + sizeof(struct ip6_tcp) - 1;
+
+ struct ip6_tcp* pkt6 = alloca(size);
+
+ GNUNET_assert(pkt6 != NULL);
+
+ new_ip6addr(pkt6->ip6_hdr.sadr, &other->hashPubKey, desc);
+
+ pkt6->shdr.type = htons(GNUNET_MESSAGE_TYPE_VPN_HELPER);
+ pkt6->shdr.size = htons(size);
+
+ pkt6->tun.flags = 0;
+ pkt6->tun.type = htons(0x86dd);
+
+ pkt6->ip6_hdr.version = 6;
+ pkt6->ip6_hdr.tclass_h = 0;
+ pkt6->ip6_hdr.tclass_l = 0;
+ pkt6->ip6_hdr.flowlbl = 0;
+ pkt6->ip6_hdr.paylgth = htons(pktlen);
+ pkt6->ip6_hdr.nxthdr = 0x06;
+ pkt6->ip6_hdr.hoplmt = 0xff;
+
+ {
+ char* ipv6addr;
+ GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "vpn", "IPV6ADDR", &ipv6addr));
+ inet_pton (AF_INET6, ipv6addr, pkt6->ip6_hdr.dadr);
+ GNUNET_free(ipv6addr);
+ }
+ memcpy(&pkt6->tcp_hdr, pkt, pktlen);
+
+ GNUNET_HashCode* key = address_mapping_exists(pkt6->ip6_hdr.sadr);
+ GNUNET_assert (key != NULL);
+
+ struct map_entry *me = GNUNET_CONTAINER_multihashmap_get(hashmap, key);
+ GNUNET_CONTAINER_heap_update_cost (heap, me->heap_node,
+ GNUNET_TIME_absolute_get ().abs_value);
+
+ GNUNET_free(key);
+
+ GNUNET_assert (me != NULL);
+ GNUNET_assert (me->desc.service_type & htonl(GNUNET_DNS_SERVICE_TYPE_TCP));
+
+ pkt6->tcp_hdr.crc = 0;
+ uint32_t sum = 0;
+ uint32_t tmp;
+ sum =
+ calculate_checksum_update (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16);
+ sum =
+ calculate_checksum_update (sum, (uint16_t *) & pkt6->ip6_hdr.dadr, 16);
+ tmp = htonl(pktlen);
+ sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4);
+ tmp = htonl (((pkt6->ip6_hdr.nxthdr & 0x000000ff)));
+ sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4);
+
+ sum =
+ calculate_checksum_update (sum, (uint16_t *) & pkt6->tcp_hdr,
+ ntohs (pkt6->ip6_hdr.paylgth));
+ pkt6->tcp_hdr.crc = calculate_checksum_end (sum);
+
+ write_to_helper(pkt6, size);
-void connect_mesh (void* cls, const struct GNUNET_PeerIdentity* peer, const struct GNUNET_TRANSPORT_ATS_Information *atsi) {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %x\n", *((unsigned long*)peer));
+ return GNUNET_OK;
}
/**
{
const static struct GNUNET_MESH_MessageHandler handlers[] = {
{receive_udp_back, GNUNET_MESSAGE_TYPE_SERVICE_UDP_BACK, 0},
+ {receive_tcp_back, GNUNET_MESSAGE_TYPE_SERVICE_TCP_BACK, 0},
{NULL, 0, 0}
};
mesh_handle = GNUNET_MESH_connect(cfg_,
NULL,
NULL,
- handlers);
+ handlers,
+ NULL);
cfg = cfg_;
restart_hijack = 0;
hashmap = GNUNET_CONTAINER_multihashmap_create(65536);
+ heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
+ GNUNET_CONFIGURATION_get_value_number (cfg, "vpn", "MAX_MAPPINGg",
+ &max_mappings);
udp_connections = GNUNET_CONTAINER_multihashmap_create(65536);
- GNUNET_SCHEDULER_add_now (connect_to_service_dns, NULL);
- GNUNET_SCHEDULER_add_now (start_helper_and_schedule, NULL);
+ GNUNET_SCHEDULER_TaskIdentifier conn_task = GNUNET_SCHEDULER_add_now (connect_to_service_dns, NULL);
+ GNUNET_SCHEDULER_add_after (conn_task, start_helper_and_schedule, NULL);
GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
}
projects / oweals / gnunet.git / blobdiff