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;
}
/*}}}*/
+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.
memset(value->additional_ports, 0, 8192);
- /* FIXME save this to heap, too */
+ 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);
+ {
+ 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);
k[i] += 16*(c2 - 87);
}
- /* FIXME: update costs in heap */
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
GNUNET_HashCode* key = address_mapping_exists(pkt6->ip6_hdr.sadr);
GNUNET_assert (key != NULL);
- /* FIXME: update costs in heap */
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_HashCode* key = address_mapping_exists(pkt6->ip6_hdr.sadr);
GNUNET_assert (key != NULL);
- /* FIXME: update costs in heap */
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);
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));
-}
-
-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));
-}
-
/**
* Main function that will be run by the scheduler.
*
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_TaskIdentifier conn_task = GNUNET_SCHEDULER_add_now (connect_to_service_dns, NULL);
GNUNET_SCHEDULER_add_after (conn_task, start_helper_and_schedule, NULL);
projects / oweals / gnunet.git / blobdiff