* @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
+ * - keep multiple peers/mesh channels ready as alternative exits /
+ * detect & recover from channel-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 channels.
+ */
+struct ChannelState;
+
+/**
+ * Information we track for each IP address to determine which channel
+ * to send the traffic over to the destination.
+ */
+struct DestinationEntry;
/**
- * State we keep for each of our tunnels.
+ * List of channels we keep for each destination port for a given
+ * destination entry.
*/
-struct TunnelState;
+struct DestinationChannel
+{
+
+ /**
+ * Kept in a DLL.
+ */
+ struct DestinationChannel *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct DestinationChannel *prev;
+
+ /**
+ * Destination entry list this `struct DestinationChannel` belongs with.
+ */
+ struct DestinationEntry *destination;
+
+ /**
+ * Pre-allocated channel for this destination, or NULL for none.
+ */
+ struct ChannelState *ts;
+
+ /**
+ * Destination port this channel state is used for.
+ */
+ uint16_t destination_port;
+
+};
/**
- * Information we track for each IP address to determine which tunnel
+ * Information we track for each IP address to determine which channel
* to send the traffic over to the destination.
*/
struct DestinationEntry
struct GNUNET_HashCode key;
/**
- * Pre-allocated tunnel for this destination, or NULL for none.
+ * Head of DLL of channels associated with this destination.
*/
- struct TunnelState *ts;
+ struct DestinationChannel *dt_head;
+
+ /**
+ * Tail of DLL of channels associated with this destination.
+ */
+ struct DestinationChannel *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 channel to an Internet-exit,
+ * #GNUNET_YES if this channel is to a service.
*/
int is_service;
struct
{
/**
- * The description of the service (only used for service tunnels).
+ * The description of the service (only used for service channels).
*/
struct GNUNET_HashCode service_descriptor;
} 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).
+ * IP address of the ultimate destination (only used for exit channels).
*/
union
{
* Address if af is AF_INET.
*/
struct in_addr v4;
-
+
/**
* Address if af is AF_INET6.
*/
} exit_destination;
} details;
-
+
};
/**
- * A messages we have in queue for a particular tunnel.
+ * A messages we have in queue for a particular channel.
*/
-struct TunnelMessageQueueEntry
+struct ChannelMessageQueueEntry
{
/**
* This is a doubly-linked list.
*/
- struct TunnelMessageQueueEntry *next;
+ struct ChannelMessageQueueEntry *next;
/**
* This is a doubly-linked list.
*/
- struct TunnelMessageQueueEntry *prev;
-
+ struct ChannelMessageQueueEntry *prev;
+
/**
* Number of bytes in 'msg'.
*/
/**
- * State we keep for each of our tunnels.
+ * State we keep for each of our channels.
*/
-struct TunnelState
+struct ChannelState
{
/**
- * Information about the tunnel to use, NULL if no tunnel
+ * Information about the channel to use, NULL if no channel
* is available right now.
*/
- struct GNUNET_MESH_Tunnel *tunnel;
+ struct GNUNET_MESH_Channel *channel;
/**
* Active query with REGEX to locate exit.
struct GNUNET_MESH_TransmitHandle *th;
/**
- * Entry for this entry in the tunnel_heap, NULL as long as this
- * tunnel state is not fully bound.
+ * Entry for this entry in the channel_heap, NULL as long as this
+ * channel state is not fully bound.
*/
struct GNUNET_CONTAINER_HeapNode *heap_node;
/**
* Head of list of messages scheduled for transmission.
*/
- struct TunnelMessageQueueEntry *tmq_head;
+ struct ChannelMessageQueueEntry *tmq_head;
/**
* Tail of list of messages scheduled for transmission.
*/
- struct TunnelMessageQueueEntry *tmq_tail;
+ struct ChannelMessageQueueEntry *tmq_tail;
/**
- * Destination entry that has a pointer to this tunnel state;
- * NULL if this tunnel state is in the tunnel map.
+ * Destination entry that has a pointer to this channel state;
+ * NULL if this channel state is in the channel map.
*/
- struct DestinationEntry *destination_container;
+ struct DestinationChannel *destination_container;
/**
- * Destination to which this tunnel leads. Note that
+ * Destination to which this channel leads. Note that
* this struct is NOT in the destination_map (but a
* local copy) and that the 'heap_node' should always
* be NULL.
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.
+ * Addess family used for this channel on the local TUN interface.
*/
int af;
* Address if af is AF_INET.
*/
struct in_addr v4;
-
+
/**
* Address if af is AF_INET6.
*/
/**
* Destination IP address used by the source on our end (this is the IP
- * that we pick freely within the VPN's tunnel IP range).
+ * that we pick freely within the VPN's channel IP range).
*/
union
{
* Address if af is AF_INET.
*/
struct in_addr v4;
-
+
/**
* Address if af is AF_INET6.
*/
/**
* Map from IP address to destination information (possibly with a
- * MESH tunnel handle for fast setup).
+ * MESH channel handle for fast setup).
*/
static struct GNUNET_CONTAINER_MultiHashMap *destination_map;
/**
* Map from source and destination address (IP+port) to connection
- * information (mostly with the respective MESH tunnel handle).
+ * information (mostly with the respective MESH channel handle).
*/
-static struct GNUNET_CONTAINER_MultiHashMap *tunnel_map;
+static struct GNUNET_CONTAINER_MultiHashMap *channel_map;
/**
* Min-Heap sorted by activity time to expire old mappings; values are
- * of type 'struct TunnelState'.
+ * of type 'struct ChannelState'.
*/
-static struct GNUNET_CONTAINER_Heap *tunnel_heap;
+static struct GNUNET_CONTAINER_Heap *channel_heap;
/**
* Statistics.
static unsigned long long max_destination_mappings;
/**
- * If there are more than this number of open tunnels, old ones
+ * If there are more than this number of open channels, old ones
* will be removed
*/
-static unsigned long long max_tunnel_mappings;
+static unsigned long long max_channel_mappings;
/**
/**
* Compute the key under which we would store an entry in the
- * tunnel_map for the given socket address pair.
+ * channel_map for the given socket address pair.
*
* @param af address family (AF_INET or AF_INET6)
* @param protocol IPPROTO_TCP or IPPROTO_UDP
* @param key where to store the key
*/
static void
-get_tunnel_key_from_ips (int af,
+get_channel_key_from_ips (int af,
uint8_t protocol,
const void *source_ip,
uint16_t source_port,
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);
/**
- * Free resources associated with a tunnel state.
+ * Free resources associated with a channel state.
*
* @param ts state to free
*/
static void
-free_tunnel_state (struct TunnelState *ts)
+free_channel_state (struct ChannelState *ts)
{
struct GNUNET_HashCode key;
- struct TunnelMessageQueueEntry *tnq;
- struct GNUNET_MESH_Tunnel *tunnel;
+ struct ChannelMessageQueueEntry *tnq;
+ struct GNUNET_MESH_Channel *channel;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Cleaning up tunnel state\n");
+ "Cleaning up channel state\n");
GNUNET_STATISTICS_update (stats,
- gettext_noop ("# Active tunnels"),
+ gettext_noop ("# Active channels"),
-1, GNUNET_NO);
while (NULL != (tnq = ts->tmq_head))
{
ts->th = NULL;
}
GNUNET_assert (NULL == ts->destination.heap_node);
- if (NULL != (tunnel = ts->tunnel))
+ if (NULL != (channel = ts->channel))
{
- ts->tunnel = NULL;
- GNUNET_MESH_tunnel_destroy (tunnel);
+ ts->channel = NULL;
+ GNUNET_MESH_channel_destroy (channel);
}
if (NULL != ts->search)
{
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);
ts->heap_node = NULL;
- get_tunnel_key_from_ips (ts->af,
+ get_channel_key_from_ips (ts->af,
ts->protocol,
&ts->source_ip,
ts->source_port,
ts->destination_port,
&key);
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (tunnel_map,
+ GNUNET_CONTAINER_multihashmap_remove (channel_map,
&key,
ts));
}
}
-/**
- * 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);
-}
-
-
/**
* Send a message from the message queue via mesh.
*
- * @param cls the `struct TunnelState` with the message queue
+ * @param cls the `struct ChannelState` 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 @a buf
static size_t
send_to_peer_notify_callback (void *cls, size_t size, void *buf)
{
- struct TunnelState *ts = cls;
- struct TunnelMessageQueueEntry *tnq;
+ struct ChannelState *ts = cls;
+ struct ChannelMessageQueueEntry *tnq;
size_t ret;
ts->th = NULL;
GNUNET_assert (NULL != tnq);
GNUNET_assert (size >= tnq->len);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending %u bytes via mesh tunnel\n",
+ "Sending %u bytes via mesh channel\n",
tnq->len);
GNUNET_CONTAINER_DLL_remove (ts->tmq_head,
ts->tmq_tail,
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->channel,
+ GNUNET_NO /* cork */,
GNUNET_TIME_UNIT_FOREVER_REL,
tnq->len,
&send_to_peer_notify_callback,
/**
- * Add the given message to the given tunnel and trigger the
+ * Add the given message to the given channel and trigger the
* transmission process.
*
* @param tnq message to queue
- * @param ts tunnel to queue the message for
+ * @param ts channel to queue the message for
*/
static void
-send_to_tunnel (struct TunnelMessageQueueEntry *tnq,
- struct TunnelState *ts)
+send_to_channel (struct ChannelMessageQueueEntry *tnq,
+ struct ChannelState *ts)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Queueing %u bytes for transmission via mesh tunnel\n",
+ "Queueing %u bytes for transmission via mesh channel\n",
tnq->len);
- GNUNET_assert (NULL != ts->tunnel);
+ GNUNET_assert (NULL != ts->channel);
GNUNET_CONTAINER_DLL_insert_tail (ts->tmq_head,
ts->tmq_tail,
tnq);
ts->tmq_length++;
if (ts->tmq_length > MAX_MESSAGE_QUEUE_SIZE)
{
- struct TunnelMessageQueueEntry *dq;
+ struct ChannelMessageQueueEntry *dq;
dq = ts->tmq_head;
GNUNET_assert (dq != tnq);
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->channel,
GNUNET_NO /* cork */,
GNUNET_TIME_UNIT_FOREVER_REL,
tnq->len,
/**
* Regex has found a potential exit peer for us; consider using it.
*
- * @param cls the 'struct TunnelState'
+ * @param cls the 'struct ChannelState'
* @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,
const struct GNUNET_PeerIdentity *put_path,
unsigned int put_path_length)
{
- struct TunnelState *ts = cls;
+ struct ChannelState *ts = cls;
+ unsigned int apptype;
GNUNET_REGEX_search_cancel (ts->search);
ts->search = NULL;
- ts->tunnel = GNUNET_MESH_tunnel_create (mesh_handle,
+ 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->channel = GNUNET_MESH_channel_create (mesh_handle,
ts,
id,
- PORT_VPN,
- GNUNET_YES,
- GNUNET_NO);
+ apptype,
+ GNUNET_MESH_OPTION_DEFAULT);
}
/**
- * Initialize the given destination entry's mesh tunnel.
+ * Initialize the given destination entry's mesh channel.
*
- * @param de destination entry for which we need to setup a tunnel
+ * @param dt destination channel for which we need to setup a channel
* @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
+ * @return channel state of the channel that was created
*/
-static struct TunnelState *
-create_tunnel_to_destination (struct DestinationEntry *de,
- int client_af,
- uint64_t request_id)
+static struct ChannelState *
+create_channel_to_destination (struct DestinationChannel *dt,
+ int client_af)
{
- struct TunnelState *ts;
+ struct ChannelState *ts;
+ unsigned int apptype;
GNUNET_STATISTICS_update (stats,
- gettext_noop ("# Mesh tunnels created"),
+ gettext_noop ("# Mesh channels created"),
1, GNUNET_NO);
- GNUNET_assert (NULL == de->ts);
- ts = GNUNET_new (struct TunnelState);
+ GNUNET_assert (NULL == dt->ts);
+ switch (client_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 NULL;
+ }
+ ts = GNUNET_new (struct ChannelState);
ts->af = client_af;
- ts->destination = *de;
+ 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->channel = GNUNET_MESH_channel_create (mesh_handle,
ts,
- &de->details.service_destination.target,
- PORT_VPN,
- GNUNET_YES,
- GNUNET_NO);
- if (NULL == ts->tunnel)
+ &dt->destination->details.service_destination.target,
+ apptype,
+ GNUNET_MESH_OPTION_DEFAULT);
+ if (NULL == ts->channel)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to setup mesh tunnel!\n"));
+ _("Failed to setup mesh channel!\n"));
GNUNET_free (ts);
return NULL;
}
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));
+ "Creating channel to peer %s offering service %s\n",
+ 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,
+ dt->destination_port,
+ address);
+ GNUNET_asprintf (&policy, "%s%s",
GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
- "4",
address);
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,
+ dt->destination_port,
+ address);
+ GNUNET_asprintf (&policy, "%s%s",
GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
- "6",
address);
break;
}
/**
- * We have too many active tunnels. Clean up the oldest tunnel.
+ * We have too many active channels. Clean up the oldest channel.
*
- * @param except tunnel that must NOT be cleaned up, even if it is the oldest
+ * @param except channel that must NOT be cleaned up, even if it is the oldest
*/
static void
-expire_tunnel (struct TunnelState *except)
+expire_channel (struct ChannelState *except)
{
- struct TunnelState *ts;
+ struct ChannelState *ts;
- ts = GNUNET_CONTAINER_heap_peek (tunnel_heap);
+ ts = GNUNET_CONTAINER_heap_peek (channel_heap);
GNUNET_assert (NULL != ts);
if (except == ts)
return; /* can't do this */
- free_tunnel_state (ts);
+ free_channel_state (ts);
}
/**
- * 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,
size_t payload_length)
{
struct GNUNET_HashCode key;
- struct TunnelState *ts;
- struct TunnelMessageQueueEntry *tnq;
+ struct ChannelState *ts;
+ struct ChannelMessageQueueEntry *tnq;
size_t alen;
size_t mlen;
int is_new;
const struct GNUNET_TUN_UdpHeader *udp;
const struct GNUNET_TUN_TcpHeader *tcp;
const struct GNUNET_TUN_IcmpHeader *icmp;
+ struct DestinationChannel *dt;
uint16_t source_port;
uint16_t destination_port;
}
source_port = ntohs (udp->source_port);
destination_port = ntohs (udp->destination_port);
- get_tunnel_key_from_ips (af,
+ get_channel_key_from_ips (af,
IPPROTO_UDP,
source_ip,
source_port,
/* blame kernel? */
GNUNET_break (0);
return;
- }
+ }
udp = NULL; /* make compiler happy */
icmp = NULL; /* make compiler happy */
tcp = payload;
}
source_port = ntohs (tcp->source_port);
destination_port = ntohs (tcp->destination_port);
- get_tunnel_key_from_ips (af,
+ get_channel_key_from_ips (af,
IPPROTO_TCP,
source_ip,
source_port,
&key);
}
break;
- case IPPROTO_ICMP:
- case IPPROTO_ICMPV6:
+ case IPPROTO_ICMP:
+ case IPPROTO_ICMPV6:
{
if ( (AF_INET == af) ^ (protocol == IPPROTO_ICMP) )
{
icmp = payload;
source_port = 0;
destination_port = 0;
- get_tunnel_key_from_ips (af,
+ get_channel_key_from_ips (af,
protocol,
source_ip,
0,
}
alen = 0;
if (! destination->is_service)
- {
+ {
switch (destination->details.exit_destination.af)
{
case AF_INET:
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
{
{
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 DestinationChannel);
+ 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 */
- ts = GNUNET_CONTAINER_multihashmap_get (tunnel_map,
+ /* see if we have an existing channel for this destination */
+ ts = GNUNET_CONTAINER_multihashmap_get (channel_map,
&key);
if (NULL == ts)
{
- /* need to either use the existing tunnel from the destination (if still
+ /* need to either use the existing channel 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, af, 0);
+ if (NULL == dt->ts)
+ ts = create_channel_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 */
+ /* now bind existing "unbound" channel 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->source_port = source_port;
ts->destination_port = destination_port;
- ts->heap_node = GNUNET_CONTAINER_heap_insert (tunnel_heap,
+ ts->heap_node = GNUNET_CONTAINER_heap_insert (channel_heap,
ts,
GNUNET_TIME_absolute_get ().abs_value_us);
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_put (tunnel_map,
+ GNUNET_CONTAINER_multihashmap_put (channel_map,
&key,
ts,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
GNUNET_STATISTICS_update (stats,
- gettext_noop ("# Active tunnels"),
+ gettext_noop ("# Active channels"),
1, GNUNET_NO);
- while (GNUNET_CONTAINER_multihashmap_size (tunnel_map) > max_tunnel_mappings)
- expire_tunnel (ts);
+ while (GNUNET_CONTAINER_multihashmap_size (channel_map) > max_channel_mappings)
+ expire_channel (ts);
}
else
{
is_new = GNUNET_NO;
- GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
+ GNUNET_CONTAINER_heap_update_cost (channel_heap,
ts->heap_node,
GNUNET_TIME_absolute_get ().abs_value_us);
}
- GNUNET_assert (NULL != ts->tunnel);
-
- /* send via tunnel */
+ GNUNET_assert (NULL != ts->channel);
+
+ /* send via channel */
switch (protocol)
{
case IPPROTO_UDP:
{
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)
{
GNUNET_break (0);
return;
}
- tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
+ tnq = GNUNET_malloc (sizeof (struct ChannelMessageQueueEntry) + mlen);
tnq->len = mlen;
tnq->msg = &tnq[1];
usm = (struct GNUNET_EXIT_UdpServiceMessage *) &tnq[1];
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 ChannelMessageQueueEntry) + 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)
{
GNUNET_break (0);
return;
}
- tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
+ tnq = GNUNET_malloc (sizeof (struct ChannelMessageQueueEntry) + mlen);
tnq->len = mlen;
tnq->msg = &tnq[1];
tsm = (struct GNUNET_EXIT_TcpServiceStartMessage *) &tnq[1];
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)
{
GNUNET_break (0);
return;
}
- tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
+ tnq = GNUNET_malloc (sizeof (struct ChannelMessageQueueEntry) + mlen);
tnq->len = mlen;
tnq->msg = &tnq[1];
tim = (struct GNUNET_EXIT_TcpInternetStartMessage *) &tnq[1];
tim->header.size = htons ((uint16_t) mlen);
tim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_TCP_TO_INTERNET_START);
- tim->af = htonl (destination->details.exit_destination.af);
+ tim->af = htonl (destination->details.exit_destination.af);
tim->tcp_header = *tcp;
switch (destination->details.exit_destination.af)
{
{
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)
{
GNUNET_break (0);
return;
}
- tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
+ tnq = GNUNET_malloc (sizeof (struct ChannelMessageQueueEntry) + mlen);
tnq->len = mlen;
tnq->msg = &tnq[1];
tdm = (struct GNUNET_EXIT_TcpDataMessage *) &tnq[1];
{
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)
{
GNUNET_break (0);
return;
}
- tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
+ tnq = GNUNET_malloc (sizeof (struct ChannelMessageQueueEntry) + mlen);
tnq->msg = &tnq[1];
ism = (struct GNUNET_EXIT_IcmpServiceMessage *) &tnq[1];
ism->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_ICMP_TO_SERVICE);
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:
gettext_noop ("# ICMPv6 packets dropped (not allowed)"),
1, GNUNET_NO);
return;
- }
+ }
/* end of AF_INET6 */
break;
default:
}
/* 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 ChannelMessageQueueEntry) + 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;
/* throw away IP-payload, exit will have to make it up anyway */
payload_length = sizeof (struct GNUNET_TUN_IcmpHeader);
break;
- case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:
+ case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:
if (destination->details.exit_destination.af == AF_INET6)
iim->icmp_header.type = GNUNET_TUN_ICMPTYPE6_TIME_EXCEEDED;
/* throw away IP-payload, exit will have to make it up anyway */
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);
GNUNET_assert (0);
break;
}
- send_to_tunnel (tnq, ts);
+ send_to_channel (tnq, ts);
}
/**
* Receive packets from the helper-process (someone send to the local
- * virtual tunnel interface). Find the destination mapping, and if it
- * exists, identify the correct MESH tunnel (or possibly create it)
+ * virtual channel interface). Find the destination mapping, and if it
+ * exists, identify the correct MESH channel (or possibly create it)
* and forward the packet.
*
* @param cls closure, NULL
* @param client NULL
- * @param message message we got from the client (VPN tunnel interface)
+ * @param message message we got from the client (VPN channel 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 */
if (NULL == de)
{
char buf[INET6_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Packet received for unmapped destination `%s' (dropping it)\n"),
inet_ntop (AF_INET6,
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));
}
if (NULL == de)
{
char buf[INET_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Packet received for unmapped destination `%s' (dropping it)\n"),
inet_ntop (AF_INET,
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));
}
/**
* Synthesize a plausible ICMP payload for an ICMP error
- * response on the given tunnel.
+ * response on the given channel.
*
- * @param ts tunnel information
+ * @param ts channel information
* @param ipp IPv4 header to fill in (ICMP payload)
* @param udp "UDP" header to fill in (ICMP payload); might actually
* also be the first 8 bytes of the TCP header
*/
static void
-make_up_icmpv4_payload (struct TunnelState *ts,
+make_up_icmpv4_payload (struct ChannelState *ts,
struct GNUNET_TUN_IPv4Header *ipp,
struct GNUNET_TUN_UdpHeader *udp)
{
/**
* Synthesize a plausible ICMP payload for an ICMP error
- * response on the given tunnel.
+ * response on the given channel.
*
- * @param ts tunnel information
+ * @param ts channel information
* @param ipp IPv6 header to fill in (ICMP payload)
* @param udp "UDP" header to fill in (ICMP payload); might actually
* also be the first 8 bytes of the TCP header
*/
static void
-make_up_icmpv6_payload (struct TunnelState *ts,
+make_up_icmpv6_payload (struct ChannelState *ts,
struct GNUNET_TUN_IPv6Header *ipp,
struct GNUNET_TUN_UdpHeader *udp)
{
/**
- * We got an ICMP packet back from the MESH tunnel. Pass it on to the
+ * We got an ICMP packet back from the MESH channel. Pass it on to the
* local virtual interface via the helper.
*
* @param cls closure, NULL
- * @param tunnel connection to the other end
- * @param tunnel_ctx pointer to our 'struct TunnelState *'
+ * @param channel connection to the other end
+ * @param channel_ctx pointer to our 'struct ChannelState *'
* @param message the actual message
* @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,
- void **tunnel_ctx,
+receive_icmp_back (void *cls,
+ struct GNUNET_MESH_Channel *channel,
+ void **channel_ctx,
const struct GNUNET_MessageHeader *message)
{
- struct TunnelState *ts = *tunnel_ctx;
+ struct ChannelState *ts = *channel_ctx;
const struct GNUNET_EXIT_IcmpToVPNMessage *i2v;
size_t mlen;
{
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? */
default:
GNUNET_break_op (0);
return GNUNET_SYSERR;
- }
+ }
msg->size = htons (size);
GNUNET_TUN_calculate_icmp_checksum (icmp,
&i2v[1],
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 (channel_heap,
ts->heap_node,
GNUNET_TIME_absolute_get ().abs_value_us);
return GNUNET_OK;
/**
- * We got a UDP packet back from the MESH tunnel. Pass it on to the
+ * We got a UDP packet back from the MESH channel. Pass it on to the
* local virtual interface via the helper.
*
* @param cls closure, NULL
- * @param tunnel connection to the other end
- * @param tunnel_ctx pointer to our 'struct TunnelState *'
+ * @param channel connection to the other end
+ * @param channel_ctx pointer to our 'struct ChannelState *'
* @param message the actual message
* @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,
- void **tunnel_ctx,
+receive_udp_back (void *cls,
+ struct GNUNET_MESH_Channel *channel,
+ void **channel_ctx,
const struct GNUNET_MessageHeader *message)
{
- struct TunnelState *ts = *tunnel_ctx;
+ struct ChannelState *ts = *channel_ctx;
const struct GNUNET_EXIT_UdpReplyMessage *reply;
size_t mlen;
{
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 (channel_heap,
ts->heap_node,
GNUNET_TIME_absolute_get ().abs_value_us);
return GNUNET_OK;
/**
- * We got a TCP packet back from the MESH tunnel. Pass it on to the
+ * We got a TCP packet back from the MESH channel. Pass it on to the
* local virtual interface via the helper.
*
* @param cls closure, NULL
- * @param tunnel connection to the other end
- * @param tunnel_ctx pointer to our `struct TunnelState *`
+ * @param channel connection to the other end
+ * @param channel_ctx pointer to our `struct ChannelState *`
* @param message the actual message
* @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,
- void **tunnel_ctx,
+receive_tcp_back (void *cls,
+ struct GNUNET_MESH_Channel *channel,
+ void **channel_ctx,
const struct GNUNET_MessageHeader *message)
{
- struct TunnelState *ts = *tunnel_ctx;
+ struct ChannelState *ts = *channel_ctx;
const struct GNUNET_EXIT_TcpDataMessage *data;
size_t mlen;
{
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 (channel_heap,
ts->heap_node,
GNUNET_TIME_absolute_get ().abs_value_us);
return GNUNET_OK;
/**
- * Allocate an IPv4 address from the range of the tunnel
+ * Allocate an IPv4 address from the range of the channel
* for a new redirection.
*
* @param v4 where to store the address
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,
- UINT32_MAX);
- v4->s_addr = (addr.s_addr | rnd.s_addr) & mask.s_addr;
+ 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;
get_destination_key_from_ip (AF_INET,
v4,
&key);
/**
- * Allocate an IPv6 address from the range of the tunnel
+ * Allocate an IPv6 address from the range of the channel
* for a new redirection.
*
* @param v6 where to store the address
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 DestinationChannel *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);
+ GNUNET_CONTAINER_DLL_remove (de->dt_head,
+ de->dt_tail,
+ dt);
+ if (NULL != dt->ts)
+ {
+ free_channel_state (dt->ts);
+ GNUNET_assert (NULL == dt->ts);
+ }
+ 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_SYSERR;
}
return GNUNET_OK;
-}
+}
/**
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;
+ return;
}
/* send reply with our IP address */
send_client_reply (client,
msg->request_id,
result_af,
- addr);
+ 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_new (struct DestinationEntry);
de->is_service = GNUNET_NO;
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,
- 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 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;
void *addr;
struct DestinationEntry *de;
struct GNUNET_HashCode key;
- struct TunnelState *ts;
-
+ struct ChannelState *ts;
+ struct DestinationChannel *dt;
+
/* parse request */
msg = (const struct RedirectToServiceRequestMessage *) message;
&v4, &v6))
{
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return;
}
send_client_reply (client,
msg->request_id,
result_af,
- addr);
+ 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_new (struct DestinationEntry);
de->is_service = GNUNET_YES;
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,
- result_af,
- msg->request_id);
+
+ dt = GNUNET_new (struct DestinationChannel);
+ dt->destination = de;
+ GNUNET_CONTAINER_DLL_insert (de->dt_head,
+ de->dt_tail,
+ dt);
+ ts = create_channel_to_destination (dt,
+ result_af);
switch (result_af)
{
case AF_INET:
/**
- * Function called whenever a tunnel is destroyed. Should clean up
+ * Function called whenever a channel is destroyed. Should clean up
* any associated state.
- *
+ *
* @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`)
- */
+ * @param channel connection to the other end (henceforth invalid)
+ * @param channel_ctx place where local state associated
+ * with the channel is stored (our `struct ChannelState`)
+ */
static void
-tunnel_cleaner (void *cls,
- const struct GNUNET_MESH_Tunnel *tunnel,
- void *tunnel_ctx)
+channel_cleaner (void *cls,
+ const struct GNUNET_MESH_Channel *channel,
+ void *channel_ctx)
{
- struct TunnelState *ts = tunnel_ctx;
+ struct ChannelState *ts = channel_ctx;
- ts->tunnel = NULL; /* we must not call GNUNET_MESH_tunnel_destroy() anymore */
- free_tunnel_state (ts);
+ ts->channel = NULL; /* we must not call GNUNET_MESH_channel_destroy() anymore */
+ free_channel_state (ts);
}
/**
- * Free memory occupied by an entry in the tunnel map.
+ * Free memory occupied by an entry in the channel map.
*
* @param cls unused
* @param key unused
- * @param value a `struct TunnelState *`
+ * @param value a `struct ChannelState *`
* @return #GNUNET_OK (continue to iterate)
*/
static int
-cleanup_tunnel (void *cls,
+cleanup_channel (void *cls,
const struct GNUNET_HashCode *key,
void *value)
{
- struct TunnelState *ts = value;
+ struct ChannelState *ts = value;
- free_tunnel_state (ts);
+ free_channel_state (ts);
return GNUNET_OK;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"VPN is shutting down\n");
if (NULL != destination_map)
- {
+ {
GNUNET_CONTAINER_multihashmap_iterate (destination_map,
&cleanup_destination,
NULL);
GNUNET_CONTAINER_heap_destroy (destination_heap);
destination_heap = NULL;
}
- if (NULL != tunnel_map)
- {
- GNUNET_CONTAINER_multihashmap_iterate (tunnel_map,
- &cleanup_tunnel,
+ if (NULL != channel_map)
+ {
+ GNUNET_CONTAINER_multihashmap_iterate (channel_map,
+ &cleanup_channel,
NULL);
- GNUNET_CONTAINER_multihashmap_destroy (tunnel_map);
- tunnel_map = NULL;
+ GNUNET_CONTAINER_multihashmap_destroy (channel_map);
+ channel_map = NULL;
}
- if (NULL != tunnel_heap)
+ if (NULL != channel_heap)
{
- GNUNET_CONTAINER_heap_destroy (tunnel_heap);
- tunnel_heap = NULL;
+ GNUNET_CONTAINER_heap_destroy (channel_heap);
+ channel_heap = NULL;
}
if (NULL != mesh_handle)
{
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}
};
max_destination_mappings = 200;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg, "VPN", "MAX_TUNNELS",
- &max_tunnel_mappings))
- max_tunnel_mappings = 200;
+ &max_channel_mappings))
+ max_channel_mappings = 200;
destination_map = GNUNET_CONTAINER_multihashmap_create (max_destination_mappings * 2, GNUNET_NO);
destination_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
- tunnel_map = GNUNET_CONTAINER_multihashmap_create (max_tunnel_mappings * 2, GNUNET_NO);
- tunnel_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
+ channel_map = GNUNET_CONTAINER_multihashmap_create (max_channel_mappings * 2, GNUNET_NO);
+ channel_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
vpn_argv[0] = GNUNET_strdup ("vpn-gnunet");
return;
}
vpn_argv[1] = ifname;
+ ipv6addr = NULL;
if (GNUNET_OK == GNUNET_NETWORK_test_pf (PF_INET6))
{
if ( (GNUNET_SYSERR ==
&ipv6addr) ||
(1 != inet_pton (AF_INET6, ipv6addr, &v6))) )
{
- GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6ADDR",
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6ADDR",
_("Must specify valid IPv6 address"));
GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free_non_null (ipv6addr);
return;
}
vpn_argv[2] = ipv6addr;
+ ipv6prefix_s = NULL;
if (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IPV6PREFIX",
&ipv6prefix_s))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6PREFIX");
GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free_non_null (ipv6prefix_s);
return;
}
vpn_argv[3] = ipv6prefix_s;
}
if (GNUNET_OK == GNUNET_NETWORK_test_pf (PF_INET))
{
+ ipv4addr = NULL;
if ( (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IPV4ADDR",
&ipv4addr) ||
(1 != inet_pton (AF_INET, ipv4addr, &v4))) )
{
- GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4ADDR",
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4ADDR",
_("Must specify valid IPv4 address"));
GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free_non_null (ipv4addr);
return;
}
vpn_argv[4] = ipv4addr;
+ ipv4mask = NULL;
if ( (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IPV4MASK",
&ipv4mask) ||
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4MASK",
_("Must specify valid IPv4 mask"));
GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free_non_null (ipv4mask);
return;
}
vpn_argv[5] = ipv4mask;
vpn_argv[6] = NULL;
mesh_handle =
- GNUNET_MESH_connect (cfg_, NULL,
- NULL,
- &tunnel_cleaner,
+ GNUNET_MESH_connect (cfg_, NULL,
+ NULL,
+ &channel_cleaner,
mesh_handlers,
NULL);
helper_handle = GNUNET_HELPER_start (GNUNET_NO,
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