* @file vpn/gnunet-service-vpn.c
* @brief service that opens a virtual interface and allows its clients
* to allocate IPs on the virtual interface and to then redirect
- * IP traffic received on those IPs via the GNUnet mesh
+ * IP traffic received on those IPs via the GNUnet mesh
* @author Philipp Toelke
* @author Christian Grothoff
*
* TODO:
* - keep multiple peers/mesh tunnels ready as alternative exits /
- * recover from tunnel-to-exit failure gracefully
+ * detect & recover from tunnel-to-exit failure gracefully
*/
#include "platform.h"
#include "gnunet_util_lib.h"
#define MAX_MESSAGE_QUEUE_SIZE 4
-#define PORT_VPN 42
-
/**
* State we keep for each of our tunnels.
*/
struct TunnelState;
+/**
+ * Information we track for each IP address to determine which tunnel
+ * to send the traffic over to the destination.
+ */
+struct DestinationEntry;
+
+/**
+ * List of tunnels we keep for each destination port for a given
+ * destination entry.
+ */
+struct DestinationTunnel
+{
+
+ /**
+ * Kept in a DLL.
+ */
+ struct DestinationTunnel *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct DestinationTunnel *prev;
+
+ /**
+ * Destination entry list this `struct DestinationTunnel` belongs with.
+ */
+ struct DestinationEntry *destination;
+
+ /**
+ * Pre-allocated tunnel for this destination, or NULL for none.
+ */
+ struct TunnelState *ts;
+
+ /**
+ * Destination port this tunnel state is used for.
+ */
+ uint16_t destination_port;
+
+};
+
/**
* Information we track for each IP address to determine which tunnel
struct GNUNET_HashCode key;
/**
- * Pre-allocated tunnel for this destination, or NULL for none.
+ * Head of DLL of tunnels associated with this destination.
*/
- struct TunnelState *ts;
+ struct DestinationTunnel *dt_head;
+
+ /**
+ * Tail of DLL of tunnels associated with this destination.
+ */
+ struct DestinationTunnel *dt_tail;
/**
* Entry for this entry in the destination_heap.
struct GNUNET_CONTAINER_HeapNode *heap_node;
/**
- * GNUNET_NO if this is a tunnel to an Internet-exit,
- * GNUNET_YES if this tunnel is to a service.
+ * #GNUNET_NO if this is a tunnel to an Internet-exit,
+ * #GNUNET_YES if this tunnel is to a service.
*/
int is_service;
} service_destination;
- struct
+ struct
{
-
+
/**
* Address family used (AF_INET or AF_INET6).
*/
int af;
-
+
/**
* IP address of the ultimate destination (only used for exit tunnels).
*/
} exit_destination;
} details;
-
+
};
* This is a doubly-linked list.
*/
struct TunnelMessageQueueEntry *prev;
-
+
/**
* Number of bytes in 'msg'.
*/
/**
* Tail of list of messages scheduled for transmission.
*/
- struct TunnelMessageQueueEntry *tmq_tail;
-
- /**
- * Client that needs to be notified about the tunnel being
- * up as soon as a peer is connected; NULL for none.
- */
- struct GNUNET_SERVER_Client *client;
+ struct TunnelMessageQueueEntry *tmq_tail;
/**
* Destination entry that has a pointer to this tunnel state;
* NULL if this tunnel state is in the tunnel map.
*/
- struct DestinationEntry *destination_container;
-
- /**
- * ID of the client request that caused us to setup this entry.
- */
- uint64_t request_id;
+ struct DestinationTunnel *destination_container;
/**
* Destination to which this tunnel leads. Note that
*/
struct DestinationEntry destination;
- /**
- * Task scheduled to destroy the tunnel (or NO_TASK).
- */
- GNUNET_SCHEDULER_TaskIdentifier destroy_task;
-
/**
* Addess family used for this tunnel on the local TUN interface.
*/
* Address if af is AF_INET.
*/
struct in_addr v4;
-
+
/**
* Address if af is AF_INET6.
*/
* Address if af is AF_INET.
*/
struct in_addr v4;
-
+
/**
* Address if af is AF_INET6.
*/
break;
}
memcpy (off, &protocol, sizeof (uint8_t));
- off += sizeof (uint8_t);
+ /* off += sizeof (uint8_t); */
}
switch (result_af)
{
case AF_INET:
- rlen = sizeof (struct in_addr);
+ rlen = sizeof (struct in_addr);
break;
case AF_INET6:
rlen = sizeof (struct in6_addr);
GNUNET_REGEX_search_cancel (ts->search);
ts->search = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != ts->destroy_task)
- {
- GNUNET_SCHEDULER_cancel (ts->destroy_task);
- ts->destroy_task = GNUNET_SCHEDULER_NO_TASK;
- }
if (NULL != ts->heap_node)
{
GNUNET_CONTAINER_heap_remove_node (ts->heap_node);
}
-/**
- * Destroy the mesh tunnel.
- *
- * @param cls the 'struct TunnelState' with the tunnel to destroy
- * @param tc scheduler context
- */
-static void
-destroy_tunnel_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct TunnelState *ts = cls;
- struct GNUNET_MESH_Tunnel *tunnel;
-
- ts->destroy_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_assert (NULL != ts->tunnel);
- tunnel = ts->tunnel;
- ts->tunnel = NULL;
- GNUNET_MESH_tunnel_destroy (tunnel);
- free_tunnel_state (ts);
-}
-
-
-/**
- * Method called whenever a peer has disconnected from the tunnel.
- *
- * FIXME merge with inbound_cleaner
- *
- * @param cls closure
- * @param peer peer identity the tunnel stopped working with
- */
-void
-tunnel_peer_disconnect_handler (void *cls,
- const struct
- GNUNET_PeerIdentity * peer)
-{
- struct TunnelState *ts = cls;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %s disconnected from tunnel.\n",
- GNUNET_i2s (peer));
- GNUNET_STATISTICS_update (stats,
- gettext_noop ("# peers connected to mesh tunnels"),
- -1, GNUNET_NO);
- if (NULL != ts->th)
- {
- GNUNET_MESH_notify_transmit_ready_cancel (ts->th);
- ts->th = NULL;
- }
- if (ts->destination.is_service)
- return; /* hope for reconnect eventually */
- /* as we are most likely going to change the exit node now,
- we should just destroy the tunnel entirely... */
- if (GNUNET_SCHEDULER_NO_TASK == ts->destroy_task)
- ts->destroy_task = GNUNET_SCHEDULER_add_now (&destroy_tunnel_task, ts);
-}
-
-
-/**
- * Method called whenever a peer has connected to the tunnel. Notifies
- * the waiting client that the tunnel is now up.
- *
- * FIXME merge with tunnel_create
- *
- * @param cls closure
- * @param peer peer identity the tunnel was created to, NULL on timeout
- * @param atsi performance data for the connection
- */
-void
-tunnel_peer_connect_handler (void *cls,
- const struct GNUNET_PeerIdentity
- * peer,
- const struct
- GNUNET_ATS_Information * atsi)
-{
- struct TunnelState *ts = cls;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %s connected to tunnel.\n",
- GNUNET_i2s (peer));
- GNUNET_STATISTICS_update (stats,
- gettext_noop ("# peers connected to mesh tunnels"),
- 1, GNUNET_NO);
- if (NULL == ts->client)
- return; /* nothing to do */
- send_client_reply (ts->client,
- ts->request_id,
- ts->af,
- &ts->destination_ip);
- ts->client = NULL;
-}
-
-
/**
* Send a message from the message queue via mesh.
*
- * @param cls the 'struct TunnelState' with the message queue
- * @param size number of bytes available in buf
+ * @param cls the `struct TunnelState` with the message queue
+ * @param size number of bytes available in @a buf
* @param buf where to copy the message
- * @return number of bytes copied to buf
+ * @return number of bytes copied to @a buf
*/
static size_t
send_to_peer_notify_callback (void *cls, size_t size, void *buf)
ret = tnq->len;
GNUNET_free (tnq);
if (NULL != (tnq = ts->tmq_head))
- ts->th = GNUNET_MESH_notify_transmit_ready (ts->tunnel,
- GNUNET_NO /* cork */,
+ ts->th = GNUNET_MESH_notify_transmit_ready (ts->tunnel,
+ GNUNET_NO /* cork */,
GNUNET_TIME_UNIT_FOREVER_REL,
tnq->len,
&send_to_peer_notify_callback,
ts->th = NULL;
GNUNET_STATISTICS_update (stats,
gettext_noop ("# Bytes dropped in mesh queue (overflow)"),
- dq->len,
+ dq->len,
GNUNET_NO);
GNUNET_free (dq);
}
if (NULL == ts->th)
- ts->th = GNUNET_MESH_notify_transmit_ready (ts->tunnel,
+ ts->th = GNUNET_MESH_notify_transmit_ready (ts->tunnel,
GNUNET_NO /* cork */,
GNUNET_TIME_UNIT_FOREVER_REL,
tnq->len,
* @param cls the 'struct TunnelState'
* @param id Peer providing a regex that matches the string.
* @param get_path Path of the get request.
- * @param get_path_length Lenght of get_path.
+ * @param get_path_length Lenght of @a get_path.
* @param put_path Path of the put request.
- * @param put_path_length Length of the put_path.
+ * @param put_path_length Length of the @a put_path.
*/
static void
handle_regex_result (void *cls,
unsigned int put_path_length)
{
struct TunnelState *ts = cls;
+ unsigned int apptype;
GNUNET_REGEX_search_cancel (ts->search);
ts->search = NULL;
+ switch (ts->af)
+ {
+ case AF_INET:
+ apptype = GNUNET_APPLICATION_TYPE_IPV4_GATEWAY;
+ break;
+ case AF_INET6:
+ apptype = GNUNET_APPLICATION_TYPE_IPV6_GATEWAY;
+ break;
+ default:
+ GNUNET_break (0);
+ return;
+ }
ts->tunnel = GNUNET_MESH_tunnel_create (mesh_handle,
ts,
id,
- PORT_VPN,
+ apptype,
GNUNET_YES,
GNUNET_NO);
}
/**
* Initialize the given destination entry's mesh tunnel.
*
- * @param de destination entry for which we need to setup a tunnel
- * @param client client to notify on successful tunnel setup, or NULL for none
+ * @param dt destination tunnel for which we need to setup a tunnel
* @param client_af address family of the address returned to the client
- * @param request_id request ID to send in client notification (unused if client is NULL)
* @return tunnel state of the tunnel that was created
*/
static struct TunnelState *
-create_tunnel_to_destination (struct DestinationEntry *de,
- struct GNUNET_SERVER_Client *client,
- int client_af,
- uint64_t request_id)
+create_tunnel_to_destination (struct DestinationTunnel *dt,
+ int client_af)
{
struct TunnelState *ts;
+ unsigned int apptype;
GNUNET_STATISTICS_update (stats,
gettext_noop ("# Mesh tunnels created"),
1, GNUNET_NO);
- GNUNET_assert (NULL == de->ts);
- ts = GNUNET_malloc (sizeof (struct TunnelState));
- ts->af = client_af;
- if (NULL != client)
+ GNUNET_assert (NULL == dt->ts);
+ switch (client_af)
{
- ts->request_id = request_id;
- ts->client = client;
+ case AF_INET:
+ apptype = GNUNET_APPLICATION_TYPE_IPV4_GATEWAY;
+ break;
+ case AF_INET6:
+ apptype = GNUNET_APPLICATION_TYPE_IPV6_GATEWAY;
+ break;
+ default:
+ GNUNET_break (0);
+ return NULL;
}
- ts->destination = *de;
+ ts = GNUNET_new (struct TunnelState);
+ ts->af = client_af;
+ ts->destination = *dt->destination;
ts->destination.heap_node = NULL; /* copy is NOT in destination heap */
- de->ts = ts;
- ts->destination_container = de; /* we are referenced from de */
- if (de->is_service)
+ dt->ts = ts;
+ ts->destination_container = dt; /* we are referenced from dt */
+ if (dt->destination->is_service)
{
ts->tunnel = GNUNET_MESH_tunnel_create (mesh_handle,
ts,
- &de->details.service_destination.target,
- PORT_VPN,
- GNUNET_YES,
- GNUNET_NO);
+ &dt->destination->details.service_destination.target,
+ apptype,
+ GNUNET_YES,
+ GNUNET_NO);
if (NULL == ts->tunnel)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Creating tunnel to peer %s offering service %s\n",
- GNUNET_i2s (&de->details.service_destination.target),
- GNUNET_h2s (&de->details.service_destination.service_descriptor));
+ GNUNET_i2s (&dt->destination->details.service_destination.target),
+ GNUNET_h2s (&dt->destination->details.service_destination.service_descriptor));
}
else
{
char *policy;
- switch (de->details.exit_destination.af)
+ switch (dt->destination->details.exit_destination.af)
{
case AF_INET:
{
char address[GNUNET_TUN_IPV4_REGEXLEN];
- GNUNET_TUN_ipv4toregexsearch (&de->details.exit_destination.ip.v4,
- "255.255.255.255", address);
- GNUNET_asprintf (&policy, "%s%s%s",
+ GNUNET_TUN_ipv4toregexsearch (&dt->destination->details.exit_destination.ip.v4,
+ "255.255.255.255",
+ address);
+ GNUNET_asprintf (&policy, "%s%s%s:%u",
GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
"4",
- address);
+ address,
+ (unsigned int) dt->destination_port);
break;
}
case AF_INET6:
{
char address[GNUNET_TUN_IPV6_REGEXLEN];
-
- GNUNET_TUN_ipv6toregexsearch (&de->details.exit_destination.ip.v6,
- 128, address);
- GNUNET_asprintf (&policy, "%s%s%s",
+
+ GNUNET_TUN_ipv6toregexsearch (&dt->destination->details.exit_destination.ip.v6,
+ 128, address);
+ GNUNET_asprintf (&policy, "%s%s%s:%u",
GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
"6",
- address);
+ address,
+ (unsigned int) dt->destination_port);
break;
}
default:
/**
- * Route a packet via mesh to the given destination.
+ * Route a packet via mesh to the given destination.
*
* @param destination description of the destination
* @param af address family on this end (AF_INET or AF_INET6)
* @param source_ip source IP used by the sender (struct in_addr or struct in6_addr)
* @param destination_ip destination IP used by the sender (struct in_addr or struct in6_addr)
* @param payload payload of the packet after the IP header
- * @param payload_length number of bytes in payload
+ * @param payload_length number of bytes in @a payload
*/
static void
route_packet (struct DestinationEntry *destination,
const struct GNUNET_TUN_UdpHeader *udp;
const struct GNUNET_TUN_TcpHeader *tcp;
const struct GNUNET_TUN_IcmpHeader *icmp;
+ struct DestinationTunnel *dt;
uint16_t source_port;
uint16_t destination_port;
/* blame kernel? */
GNUNET_break (0);
return;
- }
+ }
udp = NULL; /* make compiler happy */
icmp = NULL; /* make compiler happy */
tcp = payload;
&key);
}
break;
- case IPPROTO_ICMP:
- case IPPROTO_ICMPV6:
+ case IPPROTO_ICMP:
+ case IPPROTO_ICMPV6:
{
if ( (AF_INET == af) ^ (protocol == IPPROTO_ICMP) )
{
(unsigned int) protocol);
return;
}
+ alen = 0;
if (! destination->is_service)
- {
+ {
switch (destination->details.exit_destination.af)
{
case AF_INET:
alen = sizeof (struct in6_addr);
break;
default:
- alen = 0;
GNUNET_assert (0);
}
char sbuf[INET6_ADDRSTRLEN];
char dbuf[INET6_ADDRSTRLEN];
char xbuf[INET6_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Routing %s packet from %s:%u -> %s:%u to destination %s:%u\n",
(protocol == IPPROTO_TCP) ? "TCP" : "UDP",
xbuf, sizeof (xbuf)),
destination_port);
}
+ for (dt = destination->dt_head; NULL != dt; dt = dt->next)
+ if (dt->destination_port == destination_port)
+ break;
}
else
{
- /* make compiler happy */
- alen = 0;
{
char sbuf[INET6_ADDRSTRLEN];
char dbuf[INET6_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Routing %s packet from %s:%u -> %s:%u to service %s at peer %s\n",
(protocol == IPPROTO_TCP) ? "TCP" : "UDP",
GNUNET_h2s (&destination->details.service_destination.service_descriptor),
GNUNET_i2s (&destination->details.service_destination.target));
}
-
+ dt = destination->dt_head;
+ }
+ if (NULL == dt)
+ {
+ dt = GNUNET_new (struct DestinationTunnel);
+ dt->destination = destination;
+ GNUNET_CONTAINER_DLL_insert (destination->dt_head,
+ destination->dt_tail,
+ dt);
+ dt->destination_port = destination_port;
}
/* see if we have an existing tunnel for this destination */
/* need to either use the existing tunnel from the destination (if still
available) or create a fresh one */
is_new = GNUNET_YES;
- if (NULL == destination->ts)
- ts = create_tunnel_to_destination (destination, NULL, af, 0);
+ if (NULL == dt->ts)
+ ts = create_tunnel_to_destination (dt, af);
else
- ts = destination->ts;
+ ts = dt->ts;
if (NULL == ts)
return;
- destination->ts = NULL;
+ dt->ts = NULL;
ts->destination_container = NULL; /* no longer 'contained' */
/* now bind existing "unbound" tunnel to our IP/port tuple */
ts->protocol = protocol;
- ts->af = af;
- if (af == AF_INET)
+ ts->af = af;
+ if (AF_INET == af)
{
ts->source_ip.v4 = * (const struct in_addr *) source_ip;
ts->destination_ip.v4 = * (const struct in_addr *) destination_ip;
ts->destination_port = destination_port;
ts->heap_node = GNUNET_CONTAINER_heap_insert (tunnel_heap,
ts,
- GNUNET_TIME_absolute_get ().abs_value);
+ GNUNET_TIME_absolute_get ().abs_value_us);
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_put (tunnel_map,
&key,
ts,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
GNUNET_STATISTICS_update (stats,
gettext_noop ("# Active tunnels"),
1, GNUNET_NO);
else
{
is_new = GNUNET_NO;
- GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
+ GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
ts->heap_node,
- GNUNET_TIME_absolute_get ().abs_value);
+ GNUNET_TIME_absolute_get ().abs_value_us);
}
GNUNET_assert (NULL != ts->tunnel);
-
+
/* send via tunnel */
switch (protocol)
{
{
struct GNUNET_EXIT_UdpServiceMessage *usm;
- mlen = sizeof (struct GNUNET_EXIT_UdpServiceMessage) +
+ mlen = sizeof (struct GNUNET_EXIT_UdpServiceMessage) +
payload_length - sizeof (struct GNUNET_TUN_UdpHeader);
if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
struct in6_addr *ip6dst;
void *payload;
- mlen = sizeof (struct GNUNET_EXIT_UdpInternetMessage) +
+ mlen = sizeof (struct GNUNET_EXIT_UdpInternetMessage) +
alen + payload_length - sizeof (struct GNUNET_TUN_UdpHeader);
if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
- tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) +
- mlen);
+ tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
tnq->len = mlen;
tnq->msg = &tnq[1];
uim = (struct GNUNET_EXIT_UdpInternetMessage *) &tnq[1];
uim->header.size = htons ((uint16_t) mlen);
- uim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_UDP_TO_INTERNET);
+ uim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_UDP_TO_INTERNET);
uim->af = htonl (destination->details.exit_destination.af);
uim->source_port = (ntohs (udp->source_port) < 32000) ? udp->source_port : 0;
uim->destination_port = udp->destination_port;
{
struct GNUNET_EXIT_TcpServiceStartMessage *tsm;
- mlen = sizeof (struct GNUNET_EXIT_TcpServiceStartMessage) +
+ mlen = sizeof (struct GNUNET_EXIT_TcpServiceStartMessage) +
payload_length - sizeof (struct GNUNET_TUN_TcpHeader);
if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
struct in6_addr *ip6dst;
void *payload;
- mlen = sizeof (struct GNUNET_EXIT_TcpInternetStartMessage) +
+ mlen = sizeof (struct GNUNET_EXIT_TcpInternetStartMessage) +
alen + payload_length - sizeof (struct GNUNET_TUN_TcpHeader);
if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
{
struct GNUNET_EXIT_TcpDataMessage *tdm;
- mlen = sizeof (struct GNUNET_EXIT_TcpDataMessage) +
+ mlen = sizeof (struct GNUNET_EXIT_TcpDataMessage) +
payload_length - sizeof (struct GNUNET_TUN_TcpHeader);
if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
{
struct GNUNET_EXIT_IcmpServiceMessage *ism;
- mlen = sizeof (struct GNUNET_EXIT_IcmpServiceMessage) +
+ mlen = sizeof (struct GNUNET_EXIT_IcmpServiceMessage) +
payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
case GNUNET_TUN_ICMPTYPE_SOURCE_QUENCH:
case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:
/* throw away ICMP payload, won't be useful for the other side anyway */
- payload_length = sizeof (struct GNUNET_TUN_IcmpHeader);
+ payload_length = sizeof (struct GNUNET_TUN_IcmpHeader);
break;
default:
GNUNET_STATISTICS_update (stats,
case GNUNET_TUN_ICMPTYPE6_TIME_EXCEEDED:
case GNUNET_TUN_ICMPTYPE6_PARAMETER_PROBLEM:
/* throw away ICMP payload, won't be useful for the other side anyway */
- payload_length = sizeof (struct GNUNET_TUN_IcmpHeader);
+ payload_length = sizeof (struct GNUNET_TUN_IcmpHeader);
break;
case GNUNET_TUN_ICMPTYPE6_ECHO_REQUEST:
case GNUNET_TUN_ICMPTYPE6_ECHO_REPLY:
}
/* update length calculations, as payload_length may have changed */
- mlen = sizeof (struct GNUNET_EXIT_IcmpServiceMessage) +
- alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
+ mlen = sizeof (struct GNUNET_EXIT_IcmpServiceMessage) +
+ alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
tnq->len = mlen;
ism->header.size = htons ((uint16_t) mlen);
/* finally, copy payload (if there is any left...) */
struct in6_addr *ip6dst;
void *payload;
- mlen = sizeof (struct GNUNET_EXIT_IcmpInternetMessage) +
+ mlen = sizeof (struct GNUNET_EXIT_IcmpInternetMessage) +
alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
- tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) +
- mlen);
+ tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
tnq->msg = &tnq[1];
iim = (struct GNUNET_EXIT_IcmpInternetMessage *) &tnq[1];
- iim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_ICMP_TO_INTERNET);
+ iim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_ICMP_TO_INTERNET);
iim->icmp_header = *icmp;
/* Perform ICMP protocol-translation (depending on destination AF and source AF)
and throw away ICMP payload depending on ICMP message type */
case AF_INET:
switch (icmp->type)
{
- case GNUNET_TUN_ICMPTYPE_ECHO_REPLY:
+ case GNUNET_TUN_ICMPTYPE_ECHO_REPLY:
if (destination->details.exit_destination.af == AF_INET6)
iim->icmp_header.type = GNUNET_TUN_ICMPTYPE6_ECHO_REPLY;
break;
- case GNUNET_TUN_ICMPTYPE_ECHO_REQUEST:
+ case GNUNET_TUN_ICMPTYPE_ECHO_REQUEST:
if (destination->details.exit_destination.af == AF_INET6)
iim->icmp_header.type = GNUNET_TUN_ICMPTYPE6_ECHO_REQUEST;
break;
GNUNET_STATISTICS_update (stats,
gettext_noop ("# ICMPv4 packets dropped (type not allowed)"),
1, GNUNET_NO);
- GNUNET_free (tnq);
+ GNUNET_free (tnq);
return;
}
/* end of AF_INET */
GNUNET_STATISTICS_update (stats,
gettext_noop ("# ICMPv6 packets dropped (type not allowed)"),
1, GNUNET_NO);
- GNUNET_free (tnq);
+ GNUNET_free (tnq);
return;
}
/* end of AF_INET6 */
break;
default:
GNUNET_assert (0);
- }
+ }
/* update length calculations, as payload_length may have changed */
- mlen = sizeof (struct GNUNET_EXIT_IcmpInternetMessage) +
- alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
+ mlen = sizeof (struct GNUNET_EXIT_IcmpInternetMessage) +
+ alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
tnq->len = mlen;
iim->header.size = htons ((uint16_t) mlen);
* @param message message we got from the client (VPN tunnel interface)
*/
static int
-message_token (void *cls GNUNET_UNUSED, void *client GNUNET_UNUSED,
+message_token (void *cls,
+ void *client,
const struct GNUNET_MessageHeader *message)
{
const struct GNUNET_TUN_Layer2PacketHeader *tun;
case ETH_P_IPV6:
{
const struct GNUNET_TUN_IPv6Header *pkt6;
-
+
if (mlen < sizeof (struct GNUNET_TUN_IPv6Header))
{
/* blame kernel */
&pkt6->destination_address,
&key);
de = GNUNET_CONTAINER_multihashmap_get (destination_map, &key);
- /* FIXME: do we need to guard against hash collision?
- (if so, we need to also store the local destination IP in the
- destination entry and then compare here; however, the risk
- of collision seems minimal AND the impact is unlikely to be
- super-problematic as well... */
if (NULL == de)
{
char buf[INET6_ADDRSTRLEN];
route_packet (de,
AF_INET6,
pkt6->next_header,
- &pkt6->source_address,
- &pkt6->destination_address,
+ &pkt6->source_address,
+ &pkt6->destination_address,
&pkt6[1],
mlen - sizeof (struct GNUNET_TUN_IPv6Header));
}
&pkt4->destination_address,
&key);
de = GNUNET_CONTAINER_multihashmap_get (destination_map, &key);
- /* FIXME: do we need to guard against hash collision?
- (if so, we need to also store the local destination IP in the
- destination entry and then compare here; however, the risk
- of collision seems minimal AND the impact is unlikely to be
- super-problematic as well... */
if (NULL == de)
{
char buf[INET_ADDRSTRLEN];
if (pkt4->header_length * 4 != sizeof (struct GNUNET_TUN_IPv4Header))
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Received IPv4 packet with options (dropping it)\n"));
+ _("Received IPv4 packet with options (dropping it)\n"));
return GNUNET_OK;
}
route_packet (de,
AF_INET,
pkt4->protocol,
- &pkt4->source_address,
- &pkt4->destination_address,
+ &pkt4->source_address,
+ &pkt4->destination_address,
&pkt4[1],
mlen - sizeof (struct GNUNET_TUN_IPv4Header));
}
* @param tunnel connection to the other end
* @param tunnel_ctx pointer to our 'struct TunnelState *'
* @param message the actual message
- *
- * @return GNUNET_OK to keep the connection open,
- * GNUNET_SYSERR to close it (signal serious error)
- */
+ * @return #GNUNET_OK to keep the connection open,
+ * #GNUNET_SYSERR to close it (signal serious error)
+ */
static int
-receive_icmp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
+receive_icmp_back (void *cls,
+ struct GNUNET_MESH_Tunnel *tunnel,
void **tunnel_ctx,
const struct GNUNET_MessageHeader *message)
{
{
char sbuf[INET6_ADDRSTRLEN];
char dbuf[INET6_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received ICMP packet from mesh, sending %u bytes from %s -> %s via TUN\n",
(unsigned int) mlen,
{
case AF_INET:
{
- size_t size = sizeof (struct GNUNET_TUN_IPv4Header)
- + sizeof (struct GNUNET_TUN_IcmpHeader)
+ size_t size = sizeof (struct GNUNET_TUN_IPv4Header)
+ + sizeof (struct GNUNET_TUN_IcmpHeader)
+ sizeof (struct GNUNET_MessageHeader) +
sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
mlen;
memcpy (&icmp[1],
&i2v[1],
mlen);
- /* For some ICMP types, we need to adjust (make up) the payload here.
- Also, depending on the AF used on the other side, we have to
+ /* For some ICMP types, we need to adjust (make up) the payload here.
+ Also, depending on the AF used on the other side, we have to
do ICMP PT (translate ICMP types) */
switch (ntohl (i2v->af))
{
- case AF_INET:
+ case AF_INET:
switch (icmp->type)
{
case GNUNET_TUN_ICMPTYPE_ECHO_REPLY:
break;
case GNUNET_TUN_ICMPTYPE_DESTINATION_UNREACHABLE:
case GNUNET_TUN_ICMPTYPE_SOURCE_QUENCH:
- case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:
+ case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:
{
struct GNUNET_TUN_IPv4Header *ipp = (struct GNUNET_TUN_IPv4Header *) &icmp[1];
struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-
+
if (mlen != 0)
{
/* sender did not strip ICMP payload? */
{
struct GNUNET_TUN_IPv4Header *ipp = (struct GNUNET_TUN_IPv4Header *) &icmp[1];
struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-
+
if (mlen != 0)
{
/* sender did not strip ICMP payload? */
{
struct GNUNET_TUN_IPv4Header *ipp = (struct GNUNET_TUN_IPv4Header *) &icmp[1];
struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-
+
if (mlen != 0)
{
/* sender did not strip ICMP payload? */
break;
case AF_INET6:
{
- size_t size = sizeof (struct GNUNET_TUN_IPv6Header)
- + sizeof (struct GNUNET_TUN_IcmpHeader)
+ size_t size = sizeof (struct GNUNET_TUN_IPv6Header)
+ + sizeof (struct GNUNET_TUN_IcmpHeader)
+ sizeof (struct GNUNET_MessageHeader) +
sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
mlen;
&i2v[1],
mlen);
- /* For some ICMP types, we need to adjust (make up) the payload here.
- Also, depending on the AF used on the other side, we have to
+ /* For some ICMP types, we need to adjust (make up) the payload here.
+ Also, depending on the AF used on the other side, we have to
do ICMP PT (translate ICMP types) */
switch (ntohl (i2v->af))
{
- case AF_INET:
+ case AF_INET:
/* ICMP PT 4-to-6 and possibly making up payloads */
switch (icmp->type)
{
{
struct GNUNET_TUN_IPv6Header *ipp = (struct GNUNET_TUN_IPv6Header *) &icmp[1];
struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-
+
if (mlen != 0)
{
/* sender did not strip ICMP payload? */
make_up_icmpv6_payload (ts, ipp, udp);
}
break;
- case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:
+ case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:
icmp->type = GNUNET_TUN_ICMPTYPE6_TIME_EXCEEDED;
{
struct GNUNET_TUN_IPv6Header *ipp = (struct GNUNET_TUN_IPv6Header *) &icmp[1];
struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-
+
if (mlen != 0)
{
/* sender did not strip ICMP payload? */
case GNUNET_TUN_ICMPTYPE_SOURCE_QUENCH:
GNUNET_STATISTICS_update (stats,
gettext_noop ("# ICMPv4 packets dropped (impossible PT to v6)"),
- 1, GNUNET_NO);
+ 1, GNUNET_NO);
return GNUNET_OK;
default:
GNUNET_break_op (0);
{
struct GNUNET_TUN_IPv6Header *ipp = (struct GNUNET_TUN_IPv6Header *) &icmp[1];
struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-
+
if (mlen != 0)
{
/* sender did not strip ICMP payload? */
default:
GNUNET_assert (0);
}
- GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
+ GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
ts->heap_node,
- GNUNET_TIME_absolute_get ().abs_value);
+ GNUNET_TIME_absolute_get ().abs_value_us);
return GNUNET_OK;
}
* @param tunnel connection to the other end
* @param tunnel_ctx pointer to our 'struct TunnelState *'
* @param message the actual message
- *
- * @return GNUNET_OK to keep the connection open,
- * GNUNET_SYSERR to close it (signal serious error)
- */
+ * @return #GNUNET_OK to keep the connection open,
+ * #GNUNET_SYSERR to close it (signal serious error)
+ */
static int
-receive_udp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
+receive_udp_back (void *cls,
+ struct GNUNET_MESH_Tunnel *tunnel,
void **tunnel_ctx,
const struct GNUNET_MessageHeader *message)
{
{
char sbuf[INET6_ADDRSTRLEN];
char dbuf[INET6_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received UDP reply from mesh, sending %u bytes from %s:%u -> %s:%u via TUN\n",
(unsigned int) mlen,
{
case AF_INET:
{
- size_t size = sizeof (struct GNUNET_TUN_IPv4Header)
- + sizeof (struct GNUNET_TUN_UdpHeader)
+ size_t size = sizeof (struct GNUNET_TUN_IPv4Header)
+ + sizeof (struct GNUNET_TUN_UdpHeader)
+ sizeof (struct GNUNET_MessageHeader) +
sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
mlen;
break;
case AF_INET6:
{
- size_t size = sizeof (struct GNUNET_TUN_IPv6Header)
- + sizeof (struct GNUNET_TUN_UdpHeader)
+ size_t size = sizeof (struct GNUNET_TUN_IPv6Header)
+ + sizeof (struct GNUNET_TUN_UdpHeader)
+ sizeof (struct GNUNET_MessageHeader) +
sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
mlen;
default:
GNUNET_assert (0);
}
- GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
+ GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
ts->heap_node,
- GNUNET_TIME_absolute_get ().abs_value);
+ GNUNET_TIME_absolute_get ().abs_value_us);
return GNUNET_OK;
}
*
* @param cls closure, NULL
* @param tunnel connection to the other end
- * @param tunnel_ctx pointer to our 'struct TunnelState *'
+ * @param tunnel_ctx pointer to our `struct TunnelState *`
* @param message the actual message
- *
- * @return GNUNET_OK to keep the connection open,
- * GNUNET_SYSERR to close it (signal serious error)
- */
+ * @return #GNUNET_OK to keep the connection open,
+ * #GNUNET_SYSERR to close it (signal serious error)
+ */
static int
-receive_tcp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
+receive_tcp_back (void *cls,
+ struct GNUNET_MESH_Tunnel *tunnel,
void **tunnel_ctx,
const struct GNUNET_MessageHeader *message)
{
{
char sbuf[INET6_ADDRSTRLEN];
char dbuf[INET6_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received TCP reply from mesh, sending %u bytes from %s:%u -> %s:%u via TUN\n",
(unsigned int) mlen,
{
case AF_INET:
{
- size_t size = sizeof (struct GNUNET_TUN_IPv4Header)
- + sizeof (struct GNUNET_TUN_TcpHeader)
+ size_t size = sizeof (struct GNUNET_TUN_IPv4Header)
+ + sizeof (struct GNUNET_TUN_TcpHeader)
+ sizeof (struct GNUNET_MessageHeader) +
sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
mlen;
break;
case AF_INET6:
{
- size_t size = sizeof (struct GNUNET_TUN_IPv6Header)
- + sizeof (struct GNUNET_TUN_TcpHeader)
+ size_t size = sizeof (struct GNUNET_TUN_IPv6Header)
+ + sizeof (struct GNUNET_TUN_TcpHeader)
+ sizeof (struct GNUNET_MessageHeader) +
sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
mlen;
}
break;
}
- GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
+ GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
ts->heap_node,
- GNUNET_TIME_absolute_get ().abs_value);
+ GNUNET_TIME_absolute_get ().abs_value_us);
return GNUNET_OK;
}
* for a new redirection.
*
* @param v4 where to store the address
- * @return GNUNET_OK on success,
- * GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success,
+ * #GNUNET_SYSERR on error
*/
static int
allocate_v4_address (struct in_addr *v4)
unsigned int tries;
GNUNET_assert (1 == inet_pton (AF_INET, ipv4addr, &addr));
- GNUNET_assert (1 == inet_pton (AF_INET, ipv4mask, &mask));
- /* Given 192.168.0.1/255.255.0.0, we want a mask
+ GNUNET_assert (1 == inet_pton (AF_INET, ipv4mask, &mask));
+ /* Given 192.168.0.1/255.255.0.0, we want a mask
of '192.168.255.255', thus: */
- mask.s_addr = addr.s_addr | ~mask.s_addr;
+ mask.s_addr = addr.s_addr | ~mask.s_addr;
tries = 0;
do
{
return GNUNET_SYSERR;
}
/* Pick random IPv4 address within the subnet, except 'addr' or 'mask' itself */
- rnd.s_addr = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ rnd.s_addr = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
UINT32_MAX);
- v4->s_addr = (addr.s_addr | rnd.s_addr) & mask.s_addr;
+ v4->s_addr = (addr.s_addr | rnd.s_addr) & mask.s_addr;
get_destination_key_from_ip (AF_INET,
v4,
&key);
* for a new redirection.
*
* @param v6 where to store the address
- * @return GNUNET_OK on success,
- * GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success,
+ * #GNUNET_SYSERR on error
*/
static int
allocate_v6_address (struct in6_addr *v6)
mask = addr;
for (i=127;i>=ipv6prefix;i--)
mask.s6_addr[i / 8] |= (1 << (i % 8));
-
+
/* Pick random IPv6 address within the subnet, except 'addr' or 'mask' itself */
tries = 0;
do
}
for (i=0;i<16;i++)
{
- rnd.s6_addr[i] = (unsigned char) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ rnd.s6_addr[i] = (unsigned char) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
256);
v6->s6_addr[i]
= (addr.s6_addr[i] | rnd.s6_addr[i]) & mask.s6_addr[i];
static void
free_destination_entry (struct DestinationEntry *de)
{
+ struct DestinationTunnel *dt;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Cleaning up destination entry\n");
GNUNET_STATISTICS_update (stats,
gettext_noop ("# Active destinations"),
-1, GNUNET_NO);
- if (NULL != de->ts)
+ while (NULL != (dt = de->dt_head))
{
- free_tunnel_state (de->ts);
- GNUNET_assert (NULL == de->ts);
+ if (NULL != dt->ts)
+ {
+ free_tunnel_state (dt->ts);
+ GNUNET_assert (NULL == dt->ts);
+ }
+ GNUNET_CONTAINER_DLL_remove (de->dt_head,
+ de->dt_tail,
+ dt);
+ GNUNET_free (dt);
}
if (NULL != de->heap_node)
{
GNUNET_CONTAINER_heap_remove_node (de->heap_node);
- de->heap_node = NULL;
+ de->heap_node = NULL;
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (destination_map,
&de->key,
*
* @param except destination that must NOT be cleaned up, even if it is the oldest
*/
-static void
+static void
expire_destination (struct DestinationEntry *except)
{
struct DestinationEntry *de;
/**
- * Allocate an IP address for the response.
+ * Allocate an IP address for the response.
*
* @param result_af desired address family; set to the actual
* address family; can initially be AF_UNSPEC if there
* is no preference; will be set to AF_UNSPEC if the
* allocation failed
- * @param addr set to either v4 or v6 depending on which
+ * @param addr set to either v4 or v6 depending on which
* storage location was used; set to NULL if allocation failed
* @param v4 storage space for an IPv4 address
* @param v6 storage space for an IPv6 address
- * @return GNUNET_OK normally, GNUNET_SYSERR if '*result_af' was
+ * @return #GNUNET_OK normally, #GNUNET_SYSERR if `* result_af` was
* an unsupported address family (not AF_INET, AF_INET6 or AF_UNSPEC)
*/
static int
return GNUNET_SYSERR;
}
return GNUNET_OK;
-}
+}
/**
- * A client asks us to setup a redirection via some exit
- * node to a particular IP. Setup the redirection and
- * give the client the allocated IP.
+ * A client asks us to setup a redirection via some exit node to a
+ * particular IP. Setup the redirection and give the client the
+ * allocated IP.
*
* @param cls unused
* @param client requesting client
- * @param message redirection request (a 'struct RedirectToIpRequestMessage')
+ * @param message redirection request (a `struct RedirectToIpRequestMessage`)
*/
static void
-service_redirect_to_ip (void *cls GNUNET_UNUSED, struct GNUNET_SERVER_Client *client,
+service_redirect_to_ip (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
size_t mlen;
void *addr;
struct DestinationEntry *de;
struct GNUNET_HashCode key;
- struct TunnelState *ts;
-
+
/* validate and parse request */
mlen = ntohs (message->size);
if (mlen < sizeof (struct RedirectToIpRequestMessage))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return;
}
break;
case AF_INET6:
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return;
}
break;
default:
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return;
}
/* allocate response IP */
&v4, &v6))
{
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- if ( (result_af == AF_UNSPEC) ||
- (GNUNET_NO == ntohl (msg->nac)) )
- {
- /* send reply "instantly" */
- send_client_reply (client,
- msg->request_id,
- result_af,
- addr);
+ return;
}
+ /* send reply with our IP address */
+ send_client_reply (client,
+ msg->request_id,
+ result_af,
+ addr);
if (result_af == AF_UNSPEC)
{
/* failure, we're done */
{
char sbuf[INET6_ADDRSTRLEN];
char dbuf[INET6_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Allocated address %s for redirection via exit to %s\n",
inet_ntop (result_af, addr, sbuf, sizeof (sbuf)),
inet_ntop (addr_af,
&msg[1], dbuf, sizeof (dbuf)));
}
-
+
/* setup destination record */
- de = GNUNET_malloc (sizeof (struct DestinationEntry));
+ de = GNUNET_new (struct DestinationEntry);
de->is_service = GNUNET_NO;
de->details.exit_destination.af = addr_af;
memcpy (&de->details.exit_destination.ip,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
de->heap_node = GNUNET_CONTAINER_heap_insert (destination_heap,
de,
- GNUNET_TIME_absolute_ntoh (msg->expiration_time).abs_value);
+ GNUNET_TIME_absolute_ntoh (msg->expiration_time).abs_value_us);
GNUNET_STATISTICS_update (stats,
gettext_noop ("# Active destinations"),
1, GNUNET_NO);
while (GNUNET_CONTAINER_multihashmap_size (destination_map) > max_destination_mappings)
expire_destination (de);
-
- /* setup tunnel to destination */
- ts = create_tunnel_to_destination (de,
- (GNUNET_NO == ntohl (msg->nac)) ? NULL : client,
- result_af,
- msg->request_id);
- switch (result_af)
- {
- case AF_INET:
- ts->destination_ip.v4 = v4;
- break;
- case AF_INET6:
- ts->destination_ip.v6 = v6;
- break;
- default:
- GNUNET_assert (0);
- }
- /* we're done */
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
*
* @param cls unused
* @param client requesting client
- * @param message redirection request (a 'struct RedirectToPeerRequestMessage')
+ * @param message redirection request (a `struct RedirectToPeerRequestMessage`)
*/
static void
-service_redirect_to_service (void *cls GNUNET_UNUSED, struct GNUNET_SERVER_Client *client,
+service_redirect_to_service (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
const struct RedirectToServiceRequestMessage *msg;
struct DestinationEntry *de;
struct GNUNET_HashCode key;
struct TunnelState *ts;
-
+ struct DestinationTunnel *dt;
+
/* parse request */
msg = (const struct RedirectToServiceRequestMessage *) message;
&v4, &v6))
{
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- if ( (result_af == AF_UNSPEC) ||
- (GNUNET_NO == ntohl (msg->nac)) )
- {
- /* send reply "instantly" */
- send_client_reply (client,
- msg->request_id,
- result_af,
- addr);
+ return;
}
+ send_client_reply (client,
+ msg->request_id,
+ result_af,
+ addr);
if (result_af == AF_UNSPEC)
{
/* failure, we're done */
{
char sbuf[INET6_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Allocated address %s for redirection to service %s on peer %s\n",
inet_ntop (result_af, addr, sbuf, sizeof (sbuf)),
GNUNET_h2s (&msg->service_descriptor),
GNUNET_i2s (&msg->target));
}
-
+
/* setup destination record */
- de = GNUNET_malloc (sizeof (struct DestinationEntry));
+ de = GNUNET_new (struct DestinationEntry);
de->is_service = GNUNET_YES;
de->details.service_destination.service_descriptor = msg->service_descriptor;
de->details.service_destination.target = msg->target;
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
de->heap_node = GNUNET_CONTAINER_heap_insert (destination_heap,
de,
- GNUNET_TIME_absolute_ntoh (msg->expiration_time).abs_value);
+ GNUNET_TIME_absolute_ntoh (msg->expiration_time).abs_value_us);
while (GNUNET_CONTAINER_multihashmap_size (destination_map) > max_destination_mappings)
expire_destination (de);
- ts = create_tunnel_to_destination (de,
- (GNUNET_NO == ntohl (msg->nac)) ? NULL : client,
- result_af,
- msg->request_id);
+
+ dt = GNUNET_new (struct DestinationTunnel);
+ dt->destination = de;
+ GNUNET_CONTAINER_DLL_insert (de->dt_head,
+ de->dt_tail,
+ dt);
+ ts = create_tunnel_to_destination (dt,
+ result_af);
switch (result_af)
{
case AF_INET:
/**
- * Function called whenever an inbound tunnel is destroyed. Should clean up
+ * Function called whenever a tunnel is destroyed. Should clean up
* any associated state.
- *
- * FIXME now its also user for disconnections
*
- * @param cls closure (set from GNUNET_MESH_connect)
+ * @param cls closure (set from #GNUNET_MESH_connect)
* @param tunnel connection to the other end (henceforth invalid)
* @param tunnel_ctx place where local state associated
- * with the tunnel is stored (our 'struct TunnelState')
- */
+ * with the tunnel is stored (our `struct TunnelState`)
+ */
static void
-tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel, void *tunnel_ctx)
+tunnel_cleaner (void *cls,
+ const struct GNUNET_MESH_Tunnel *tunnel,
+ void *tunnel_ctx)
{
- /* we don't have inbound tunnels, so this function should never be called */
- GNUNET_break (0);
+ struct TunnelState *ts = tunnel_ctx;
+
+ ts->tunnel = NULL; /* we must not call GNUNET_MESH_tunnel_destroy() anymore */
+ free_tunnel_state (ts);
}
*
* @param cls unused
* @param key unused
- * @param value a 'struct DestinationEntry *'
- * @return GNUNET_OK (continue to iterate)
+ * @param value a `struct DestinationEntry *`
+ * @return #GNUNET_OK (continue to iterate)
*/
static int
cleanup_destination (void *cls,
*
* @param cls unused
* @param key unused
- * @param value a 'struct TunnelState *'
- * @return GNUNET_OK (continue to iterate)
+ * @param value a `struct TunnelState *`
+ * @return #GNUNET_OK (continue to iterate)
*/
static int
cleanup_tunnel (void *cls,
* @param tc unused
*/
static void
-cleanup (void *cls GNUNET_UNUSED,
+cleanup (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
unsigned int i;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"VPN is shutting down\n");
if (NULL != destination_map)
- {
+ {
GNUNET_CONTAINER_multihashmap_iterate (destination_map,
&cleanup_destination,
NULL);
destination_heap = NULL;
}
if (NULL != tunnel_map)
- {
+ {
GNUNET_CONTAINER_multihashmap_iterate (tunnel_map,
&cleanup_tunnel,
NULL);
GNUNET_SERVER_notification_context_destroy (nc);
nc = NULL;
}
- if (stats != NULL)
+ if (NULL != stats)
{
GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
stats = NULL;
}
-/**
- * A client disconnected, clean up all references to it.
- *
- * @param cls the client that disconnected
- * @param key unused
- * @param value a 'struct TunnelState *'
- * @return GNUNET_OK (continue to iterate)
- */
-static int
-cleanup_tunnel_client (void *cls,
- const struct GNUNET_HashCode *key,
- void *value)
-{
- struct GNUNET_SERVER_Client *client = cls;
- struct TunnelState *ts = value;
-
- if (client == ts->client)
- ts->client = NULL;
- return GNUNET_OK;
-}
-
-
-/**
- * A client disconnected, clean up all references to it.
- *
- * @param cls the client that disconnected
- * @param key unused
- * @param value a 'struct DestinationEntry *'
- * @return GNUNET_OK (continue to iterate)
- */
-static int
-cleanup_destination_client (void *cls,
- const struct GNUNET_HashCode *key,
- void *value)
-{
- struct GNUNET_SERVER_Client *client = cls;
- struct DestinationEntry *de = value;
- struct TunnelState *ts;
-
- if (NULL == (ts = de->ts))
- return GNUNET_OK;
- if (client == ts->client)
- ts->client = NULL;
- return GNUNET_OK;
-}
-
-
-/**
- * A client has disconnected from us. If we are currently building
- * a tunnel for it, cancel the operation.
- *
- * @param cls unused
- * @param client handle to the client that disconnected
- */
-static void
-client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
-{
- if (NULL != tunnel_map)
- GNUNET_CONTAINER_multihashmap_iterate (tunnel_map,
- &cleanup_tunnel_client,
- client);
- if (NULL != destination_map)
- GNUNET_CONTAINER_multihashmap_iterate (destination_map,
- &cleanup_destination_client,
- client);
-}
-
-
/**
* Main function that will be run by the scheduler.
*
static const struct GNUNET_SERVER_MessageHandler service_handlers[] = {
/* callback, cls, type, size */
{ &service_redirect_to_ip, NULL, GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP, 0},
- { &service_redirect_to_service, NULL,
- GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE,
+ { &service_redirect_to_service, NULL,
+ GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE,
sizeof (struct RedirectToServiceRequestMessage) },
{NULL, NULL, 0, 0}
};
cfg = cfg_;
stats = GNUNET_STATISTICS_create ("vpn", cfg);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg, "vpn", "MAX_MAPPING",
+ GNUNET_CONFIGURATION_get_value_number (cfg, "VPN", "MAX_MAPPING",
&max_destination_mappings))
max_destination_mappings = 200;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg, "vpn", "MAX_TUNNELS",
+ GNUNET_CONFIGURATION_get_value_number (cfg, "VPN", "MAX_TUNNELS",
&max_tunnel_mappings))
max_tunnel_mappings = 200;
vpn_argv[0] = GNUNET_strdup ("vpn-gnunet");
if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IFNAME", &ifname))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IFNAME", &ifname))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No entry 'IFNAME' in configuration!\n");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "VPN", "IFNAME");
GNUNET_SCHEDULER_shutdown ();
return;
}
if (GNUNET_OK == GNUNET_NETWORK_test_pf (PF_INET6))
{
if ( (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IPV6ADDR",
+ GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IPV6ADDR",
&ipv6addr) ||
(1 != inet_pton (AF_INET6, ipv6addr, &v6))) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No valid entry 'IPV6ADDR' in configuration!\n");
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6ADDR",
+ _("Must specify valid IPv6 address"));
GNUNET_SCHEDULER_shutdown ();
return;
}
vpn_argv[2] = ipv6addr;
if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IPV6PREFIX",
+ GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IPV6PREFIX",
&ipv6prefix_s))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No entry 'IPV6PREFIX' in configuration!\n");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6PREFIX");
GNUNET_SCHEDULER_shutdown ();
return;
}
vpn_argv[3] = ipv6prefix_s;
if ( (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg, "vpn",
+ GNUNET_CONFIGURATION_get_value_number (cfg, "VPN",
"IPV6PREFIX",
&ipv6prefix)) ||
(ipv6prefix >= 127) )
{
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4MASK",
+ _("Must specify valid IPv6 mask"));
GNUNET_SCHEDULER_shutdown ();
return;
}
&ipv4addr) ||
(1 != inet_pton (AF_INET, ipv4addr, &v4))) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No valid entry for 'IPV4ADDR' in configuration!\n");
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4ADDR",
+ _("Must specify valid IPv4 address"));
GNUNET_SCHEDULER_shutdown ();
return;
}
&ipv4mask) ||
(1 != inet_pton (AF_INET, ipv4mask, &v4))) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No valid entry 'IPV4MASK' in configuration!\n");
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4MASK",
+ _("Must specify valid IPv4 mask"));
GNUNET_SCHEDULER_shutdown ();
return;
}
vpn_argv[6] = NULL;
mesh_handle =
- GNUNET_MESH_connect (cfg_, NULL,
- NULL,
- &tunnel_cleaner,
+ GNUNET_MESH_connect (cfg_, NULL,
+ NULL,
+ &tunnel_cleaner,
mesh_handlers,
NULL);
helper_handle = GNUNET_HELPER_start (GNUNET_NO,
&message_token, NULL, NULL);
nc = GNUNET_SERVER_notification_context_create (server, 1);
GNUNET_SERVER_add_handlers (server, service_handlers);
- GNUNET_SERVER_disconnect_notify (server, &client_disconnect, NULL);
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
}
main (int argc, char *const *argv)
{
return (GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv, "vpn",
+ GNUNET_SERVICE_run (argc, argv, "vpn",
GNUNET_SERVICE_OPTION_NONE,
&run, NULL)) ? global_ret : 1;
}
projects / oweals / gnunet.git / blobdiff