/*
This file is part of GNUnet
- (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
* @file transport/plugin_transport_tcp.c
* @brief Implementation of the TCP transport service
* @author Christian Grothoff
*/
-
#include "platform.h"
#include "gnunet_hello_lib.h"
#include "gnunet_connection_lib.h"
+#include "gnunet_container_lib.h"
#include "gnunet_os_lib.h"
-#include "gnunet_peerinfo_service.h"
#include "gnunet_protocols.h"
#include "gnunet_resolver_service.h"
#include "gnunet_server_lib.h"
#include "transport.h"
#define DEBUG_TCP GNUNET_NO
-
-/**
- * After how long do we expire an address that we
- * learned from another peer if it is not reconfirmed
- * by anyone?
- */
-#define LEARNED_ADDRESS_EXPIRATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 6)
-
-/**
- * How long until we give up on transmitting the welcome message?
- */
-#define WELCOME_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define DEBUG_TCP_NAT GNUNET_NO
/**
* How long until we give up on transmitting the welcome message?
*/
#define HOSTNAME_RESOLVE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
/**
- * For how many messages back to we keep transmission times?
+ * Initial handshake message for a session.
*/
-#define ACK_LOG_SIZE 32
+struct WelcomeMessage
+{
+ /**
+ * Type is GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME.
+ */
+ struct GNUNET_MessageHeader header;
+ /**
+ * Identity of the node connecting (TCP client)
+ */
+ struct GNUNET_PeerIdentity clientIdentity;
+};
/**
- * Message used to ask a peer to validate receipt (to check an address
- * from a HELLO). Followed by the address used. Note that the
- * recipients response does not affirm that he has this address,
- * only that he got the challenge message.
+ * Basically a WELCOME message, but with the purpose
+ * of giving the waiting peer a client handle to use
*/
-struct ValidationChallengeMessage
+struct TCP_NAT_ProbeMessage
{
-
/**
- * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_PING
+ * Type is GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE.
*/
struct GNUNET_MessageHeader header;
/**
- * Random challenge number (in network byte order).
- */
- uint32_t challenge GNUNET_PACKED;
-
- /**
- * Who is the intended recipient?
+ * Identity of the sender of the message.
*/
- struct GNUNET_PeerIdentity target;
+ struct GNUNET_PeerIdentity clientIdentity;
};
-
/**
- * Message used to validate a HELLO. The challenge is included in the
- * confirmation to make matching of replies to requests possible. The
- * signature signs the original challenge number, our public key, the
- * sender's address (so that the sender can check that the address we
- * saw is plausible for him and possibly detect a MiM attack) and a
- * timestamp (to limit replay).<p>
- *
- * This message is followed by the address of the
- * client that we are observing (which is part of what
- * is being signed).
+ * Context for sending a NAT probe via TCP.
*/
-struct ValidationChallengeResponse
+struct TCPProbeContext
{
-
/**
- * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_PONG
+ * Probe connection.
*/
- struct GNUNET_MessageHeader header;
+ struct GNUNET_CONNECTION_Handle *sock;
/**
- * For padding, always zero.
+ * Message to be sent.
*/
- uint32_t reserved GNUNET_PACKED;
+ struct TCP_NAT_ProbeMessage message;
/**
- * Signature.
+ * Handle to the transmission.
*/
- struct GNUNET_CRYPTO_RsaSignature signature;
+ struct GNUNET_CONNECTION_TransmitHandle *transmit_handle;
/**
- * What are we signing and why?
+ * Transport plugin handle.
*/
- struct GNUNET_CRYPTO_RsaSignaturePurpose purpose;
+ struct Plugin *plugin;
+};
+
+/**
+ * Network format for IPv4 addresses.
+ */
+struct IPv4TcpAddress
+{
/**
- * Random challenge number (in network byte order).
+ * IPv4 address, in network byte order.
*/
- uint32_t challenge GNUNET_PACKED;
+ uint32_t ipv4_addr GNUNET_PACKED;
/**
- * Who signed this message?
+ * Port number, in network byte order.
*/
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded signer;
+ uint16_t t_port GNUNET_PACKED;
};
-
/**
- * Initial handshake message for a session. This header
- * is followed by the address that the other peer used to
- * connect to us (so that we may learn it) or the address
- * that the other peer got from the accept call.
+ * Network format for IPv6 addresses.
*/
-struct WelcomeMessage
+struct IPv6TcpAddress
{
- struct GNUNET_MessageHeader header;
+ /**
+ * IPv6 address.
+ */
+ struct in6_addr ipv6_addr GNUNET_PACKED;
/**
- * Identity of the node connecting (TCP client)
+ * Port number, in network byte order.
*/
- struct GNUNET_PeerIdentity clientIdentity;
+ uint16_t t6_port GNUNET_PACKED;
};
+/**
+ * Encapsulation of all of the state of the plugin.
+ */
+struct Plugin;
+
/**
- * Encapsulation for normal TCP traffic.
+ * Local network addresses (actual IP address follows this struct).
+ * PORT is NOT included!
*/
-struct DataMessage
+struct LocalAddrList
{
- struct GNUNET_MessageHeader header;
-
- /**
- * For alignment.
- */
- uint32_t reserved GNUNET_PACKED;
/**
- * Number of the last message that was received from the other peer.
+ * This is a doubly linked list.
*/
- uint64_t ack_in GNUNET_PACKED;
+ struct LocalAddrList *next;
/**
- * Number of this outgoing message.
+ * This is a doubly linked list.
*/
- uint64_t ack_out GNUNET_PACKED;
+ struct LocalAddrList *prev;
/**
- * How long was sending this ack delayed by the other peer
- * (estimate). The receiver of this message can use the delay
- * between sending his message number 'ack' and receiving this ack
- * minus the delay as an estimate of the round-trip time.
+ * Number of bytes of the address that follow
*/
- struct GNUNET_TIME_RelativeNBO delay;
+ size_t size;
};
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin;
-
-
/**
* Information kept for each message that is yet to
* be transmitted.
{
/**
- * This is a linked list.
+ * This is a doubly-linked list.
*/
struct PendingMessage *next;
/**
- * The pending message, pointer to the end
- * of this struct, do not free!
+ * This is a doubly-linked list.
+ */
+ struct PendingMessage *prev;
+
+ /**
+ * The pending message
*/
- struct GNUNET_MessageHeader *msg;
+ const char *msg;
/**
* Continuation function to call once the message
- * has been sent. Can be NULL if there is no
+ * has been sent. Can be NULL if there is no
* continuation to call.
*/
GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
struct GNUNET_TIME_Absolute timeout;
/**
- * GNUNET_YES if this is a welcome message;
- * otherwise this should be a DATA message.
+ * So that the gnunet-service-transport can group messages together,
+ * these pending messages need to accept a message buffer and size
+ * instead of just a GNUNET_MessageHeader.
*/
- int is_welcome;
+ size_t message_size;
};
struct Session
{
+ /**
+ * API requirement.
+ */
+ struct SessionHeader header;
+
/**
* Stored in a linked list.
*/
struct GNUNET_SERVER_Client *client;
/**
- * gnunet-service-transport context for this connection.
+ * Messages currently pending for transmission
+ * to this peer, if any.
*/
- struct ReadyList *service_context;
+ struct PendingMessage *pending_messages_head;
/**
* Messages currently pending for transmission
* to this peer, if any.
*/
- struct PendingMessage *pending_messages;
+ struct PendingMessage *pending_messages_tail;
/**
* Handle for pending transmission request.
struct GNUNET_PeerIdentity target;
/**
- * At what time did we reset last_received last?
+ * ID of task used to delay receiving more to throttle sender.
*/
- struct GNUNET_TIME_Absolute last_quota_update;
+ GNUNET_SCHEDULER_TaskIdentifier receive_delay_task;
/**
- * Address of the other peer if WE initiated the connection
- * (and hence can be sure what it is), otherwise NULL.
+ * Address of the other peer (either based on our 'connect'
+ * call or on our 'accept' call).
*/
void *connect_addr;
/**
- * How many bytes have we received since the "last_quota_update"
- * timestamp?
- */
- uint64_t last_received;
-
- /**
- * Our current latency estimate (in ms).
- */
- double latency_estimate;
-
- /**
- * Time when we generated the last ACK_LOG_SIZE acks.
- * (the "last" refers to the "out_msg_counter" here)
- */
- struct GNUNET_TIME_Absolute gen_time[ACK_LOG_SIZE];
-
- /**
- * Our current sequence number.
+ * Last activity on this connection. Used to select preferred
+ * connection.
*/
- uint64_t out_msg_counter;
+ struct GNUNET_TIME_Absolute last_activity;
/**
- * Highest received incoming sequence number.
+ * Length of connect_addr.
*/
- uint64_t max_in_msg_counter;
+ size_t connect_alen;
/**
- * Number of bytes per ms that this peer is allowed
- * to send to us.
+ * Are we still expecting the welcome message? (GNUNET_YES/GNUNET_NO)
*/
- uint32_t quota_in;
+ int expecting_welcome;
/**
- * Length of connect_addr, can be 0.
+ * Was this a connection that was inbound (we accepted)? (GNUNET_YES/GNUNET_NO)
*/
- size_t connect_alen;
+ int inbound;
/**
- * Are we still expecting the welcome message? (GNUNET_YES/GNUNET_NO)
- * GNUNET_SYSERR is used to mark non-welcoming connections (HELLO
- * validation only).
+ * Was this session created using NAT traversal?
*/
- int expecting_welcome;
+ int is_nat;
};
struct GNUNET_CONNECTION_Handle *lsock;
/**
- * List of open TCP sessions.
+ * stdout pipe handle for the gnunet-nat-server process
*/
- struct Session *sessions;
+ struct GNUNET_DISK_PipeHandle *server_stdout;
+
+ /**
+ * stdout file handle (for reading) for the gnunet-nat-server process
+ */
+ const struct GNUNET_DISK_FileHandle *server_stdout_handle;
+
+ /**
+ * ID of select gnunet-nat-server stdout read task
+ */
+ GNUNET_SCHEDULER_TaskIdentifier server_read_task;
+
+ /**
+ * The process id of the server process (if behind NAT)
+ */
+ pid_t server_pid;
/**
- * Handle for the statistics service.
+ * List of open TCP sessions.
*/
- struct GNUNET_STATISTICS_Handle *statistics;
+ struct Session *sessions;
/**
* Handle to the network service.
*/
struct GNUNET_SERVER_MessageHandler *handlers;
+ /**
+ * Handle for request of hostname resolution, non-NULL if pending.
+ */
+ struct GNUNET_RESOLVER_RequestHandle *hostname_dns;
+
+ /**
+ * Map of peers we have tried to contact behind a NAT
+ */
+ struct GNUNET_CONTAINER_MultiHashMap *nat_wait_conns;
+
+ /**
+ * The external address given to us by the user. Must be actual
+ * outside visible address for NAT punching to work.
+ */
+ char *external_address;
+
+ /**
+ * The internal address given to us by the user (or discovered).
+ */
+ char *internal_address;
+
+ /**
+ * Address given for us to bind to (ONLY).
+ */
+ char *bind_address;
+
+ /**
+ * List of our IP addresses.
+ */
+ struct LocalAddrList *lal_head;
+
+ /**
+ * Tail of our IP address list.
+ */
+ struct LocalAddrList *lal_tail;
+
/**
* ID of task used to update our addresses when one expires.
*/
*/
uint16_t adv_port;
+ /**
+ * Is this transport configured to be behind a NAT?
+ */
+ int behind_nat;
+
+ /**
+ * Is this transport configured to allow connections to NAT'd peers?
+ */
+ int allow_nat;
+
+ /**
+ * Should this transport advertise only NAT addresses (port set to 0)?
+ * If not, all addresses will be duplicated for NAT punching and regular
+ * ports.
+ */
+ int only_nat_addresses;
+
};
+static void
+add_to_address_list (struct Plugin *plugin,
+ const void *arg,
+ size_t arg_size)
+{
+ struct LocalAddrList *lal;
-/**
- * Handle for request of hostname resolution, non-NULL if pending.
- */
-static struct GNUNET_RESOLVER_RequestHandle *hostname_dns;
+ lal = plugin->lal_head;
+ while (NULL != lal)
+ {
+ if ( (lal->size == arg_size) &&
+ (0 == memcmp (&lal[1], arg, arg_size)) )
+ return;
+ lal = lal->next;
+ }
+ lal = GNUNET_malloc (sizeof (struct LocalAddrList) + arg_size);
+ lal->size = arg_size;
+ memcpy (&lal[1], arg, arg_size);
+ GNUNET_CONTAINER_DLL_insert (plugin->lal_head,
+ plugin->lal_tail,
+ lal);
+}
+
+
+static int
+check_local_addr (struct Plugin *plugin,
+ const void *arg,
+ size_t arg_size)
+{
+ struct LocalAddrList *lal;
+
+ lal = plugin->lal_head;
+ while (NULL != lal)
+ {
+ if ( (lal->size == arg_size) &&
+ (0 == memcmp (&lal[1], arg, arg_size)) )
+ return GNUNET_OK;
+ lal = lal->next;
+ }
+ return GNUNET_SYSERR;
+}
/**
- * Find the session handle for the given peer.
+ * Function called for a quick conversion of the binary address to
+ * a numeric address. Note that the caller must not free the
+ * address and that the next call to this function is allowed
+ * to override the address again.
+ *
+ * @param cls closure ('struct Plugin*')
+ * @param addr binary address
+ * @param addrlen length of the address
+ * @return string representing the same address
*/
-static struct Session *
-find_session_by_target (struct Plugin *plugin,
- const struct GNUNET_PeerIdentity *target)
+static const char*
+tcp_address_to_string (void *cls,
+ const void *addr,
+ size_t addrlen)
{
- struct Session *ret;
+ static char rbuf[INET6_ADDRSTRLEN + 12];
+ char buf[INET6_ADDRSTRLEN];
+ const void *sb;
+ struct in_addr a4;
+ struct in6_addr a6;
+ const struct IPv4TcpAddress *t4;
+ const struct IPv6TcpAddress *t6;
+ int af;
+ uint16_t port;
- ret = plugin->sessions;
- while ((ret != NULL) &&
- ( (GNUNET_SYSERR == ret->expecting_welcome) ||
- (0 != memcmp (target,
- &ret->target, sizeof (struct GNUNET_PeerIdentity)))))
- ret = ret->next;
- return ret;
+ if (addrlen == sizeof (struct IPv6TcpAddress))
+ {
+ t6 = addr;
+ af = AF_INET6;
+ port = ntohs (t6->t6_port);
+ memcpy (&a6, &t6->ipv6_addr, sizeof (a6));
+ sb = &a6;
+ }
+ else if (addrlen == sizeof (struct IPv4TcpAddress))
+ {
+ t4 = addr;
+ af = AF_INET;
+ port = ntohs (t4->t_port);
+ memcpy (&a4, &t4->ipv4_addr, sizeof (a4));
+ sb = &a4;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Unexpected address length: %u\n"),
+ addrlen);
+ GNUNET_break (0);
+ return NULL;
+ }
+ if (NULL == inet_ntop (af, sb, buf, INET6_ADDRSTRLEN))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
+ return NULL;
+ }
+ GNUNET_snprintf (rbuf,
+ sizeof (rbuf),
+ (af == AF_INET6) ? "[%s]:%u" : "%s:%u",
+ buf,
+ port);
+ return rbuf;
}
/**
- * Find the session handle for the given peer.
+ * Find the session handle for the given client.
+ *
+ * @return NULL if no matching session exists
*/
static struct Session *
find_session_by_client (struct Plugin *plugin,
return ret;
}
-
-/**
- * Create a welcome message.
- */
-static struct PendingMessage *
-create_welcome (size_t addrlen, const void *addr, struct Plugin *plugin)
-{
- struct PendingMessage *pm;
- struct WelcomeMessage *welcome;
-
- pm = GNUNET_malloc (sizeof (struct PendingMessage) +
- sizeof (struct WelcomeMessage) + addrlen);
- pm->msg = (struct GNUNET_MessageHeader *) &pm[1];
- welcome = (struct WelcomeMessage *) &pm[1];
- welcome->header.size = htons (sizeof (struct WelcomeMessage) + addrlen);
- welcome->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME);
- GNUNET_CRYPTO_hash (plugin->env->my_public_key,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &welcome->clientIdentity.hashPubKey);
- memcpy (&welcome[1], addr, addrlen);
- pm->timeout = GNUNET_TIME_relative_to_absolute (WELCOME_TIMEOUT);
- pm->is_welcome = GNUNET_YES;
- return pm;
-}
-
-
/**
- * Create a new session using the specified address
- * for the welcome message.
+ * Create a new session. Also queues a welcome message.
*
* @param plugin us
* @param target peer to connect to
* @param client client to use
- * @param addrlen IPv4 or IPv6
- * @param addr either struct sockaddr_in or struct sockaddr_in6
- * @return NULL connection failed / invalid address
+ * @param is_nat this a NAT session, we should wait for a client to
+ * connect to us from an address, then assign that to
+ * the session
+ * @return new session object
*/
static struct Session *
create_session (struct Plugin *plugin,
const struct GNUNET_PeerIdentity *target,
- struct GNUNET_SERVER_Client *client,
- const void *addr, size_t addrlen)
+ struct GNUNET_SERVER_Client *client, int is_nat)
{
struct Session *ret;
+ struct PendingMessage *pm;
+ struct WelcomeMessage welcome;
+
+ if (is_nat != GNUNET_YES)
+ GNUNET_assert (client != NULL);
+ else
+ GNUNET_assert (client == NULL);
+#if DEBUG_TCP
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Creating new session for peer `%4s'\n",
+ GNUNET_i2s (target));
+#endif
ret = GNUNET_malloc (sizeof (struct Session));
+ ret->last_activity = GNUNET_TIME_absolute_get ();
ret->plugin = plugin;
- ret->next = plugin->sessions;
- plugin->sessions = ret;
+ ret->is_nat = is_nat;
+ if (is_nat != GNUNET_YES) /* If not a NAT WAIT conn, add it to global list */
+ {
+ ret->next = plugin->sessions;
+ plugin->sessions = ret;
+ }
ret->client = client;
ret->target = *target;
- ret->last_quota_update = GNUNET_TIME_absolute_get ();
- ret->quota_in = plugin->env->default_quota_in;
ret->expecting_welcome = GNUNET_YES;
- ret->pending_messages = create_welcome (addrlen, addr, plugin);
+ pm = GNUNET_malloc (sizeof (struct PendingMessage) + sizeof (struct WelcomeMessage));
+ pm->msg = (const char*) &pm[1];
+ pm->message_size = sizeof (struct WelcomeMessage);
+ welcome.header.size = htons (sizeof (struct WelcomeMessage));
+ welcome.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME);
+ welcome.clientIdentity = *plugin->env->my_identity;
+ memcpy (&pm[1], &welcome, sizeof (welcome));
+ pm->timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes currently in TCP buffers"),
+ pm->message_size,
+ GNUNET_NO);
+ GNUNET_CONTAINER_DLL_insert (ret->pending_messages_head,
+ ret->pending_messages_tail,
+ pm);
+ if (is_nat != GNUNET_YES)
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# TCP sessions active"),
+ 1,
+ GNUNET_NO);
return ret;
}
/**
* Function called to notify a client about the socket
- * begin ready to queue more data. "buf" will be
+ * being ready to queue more data. "buf" will be
* NULL and "size" zero if the socket was closed for
* writing in the meantime.
*
do_transmit (void *cls, size_t size, void *buf)
{
struct Session *session = cls;
- struct PendingMessage *pm;
+ struct GNUNET_PeerIdentity pid;
+ struct Plugin *plugin;
+ struct PendingMessage *pos;
+ struct PendingMessage *hd;
+ struct PendingMessage *tl;
+ struct GNUNET_TIME_Absolute now;
char *cbuf;
- uint16_t msize;
size_t ret;
- struct DataMessage *dm;
session->transmit_handle = NULL;
+ plugin = session->plugin;
if (buf == NULL)
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Timeout trying to transmit to peer `%4s', discarding message queue.\n",
- GNUNET_i2s(&session->target));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout trying to transmit to peer `%4s', discarding message queue.\n",
+ GNUNET_i2s (&session->target));
#endif
- /* timeout */
- while (NULL != (pm = session->pending_messages))
- {
- session->pending_messages = pm->next;
+ /* timeout; cancel all messages that have already expired */
+ hd = NULL;
+ tl = NULL;
+ ret = 0;
+ now = GNUNET_TIME_absolute_get ();
+ while ( (NULL != (pos = session->pending_messages_head)) &&
+ (pos->timeout.value <= now.value) )
+ {
+ GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
+ session->pending_messages_tail,
+ pos);
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Failed to transmit message of type %u to `%4s'.\n",
- ntohs(pm->msg->type),
- GNUNET_i2s(&session->target));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to transmit %u byte message to `%4s'.\n",
+ pos->message_size,
+ GNUNET_i2s (&session->target));
#endif
- if (pm->transmit_cont != NULL)
- pm->transmit_cont (pm->transmit_cont_cls,
- session->service_context,
- &session->target, GNUNET_SYSERR);
- GNUNET_free (pm);
+ ret += pos->message_size;
+ GNUNET_CONTAINER_DLL_insert_after (hd, tl, tl, pos);
}
+ /* do this call before callbacks (so that if callbacks destroy
+ session, they have a chance to cancel actions done by this
+ call) */
+ process_pending_messages (session);
+ pid = session->target;
+ /* no do callbacks and do not use session again since
+ the callbacks may abort the session */
+ while (NULL != (pos = hd))
+ {
+ GNUNET_CONTAINER_DLL_remove (hd, tl, pos);
+ if (pos->transmit_cont != NULL)
+ pos->transmit_cont (pos->transmit_cont_cls,
+ &pid, GNUNET_SYSERR);
+ GNUNET_free (pos);
+ }
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes currently in TCP buffers"),
+ - (int64_t) ret,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes discarded by TCP (timeout)"),
+ ret,
+ GNUNET_NO);
return 0;
}
+ /* copy all pending messages that would fit */
ret = 0;
cbuf = buf;
- while (NULL != (pm = session->pending_messages))
+ hd = NULL;
+ tl = NULL;
+ while (NULL != (pos = session->pending_messages_head))
{
- if (pm->is_welcome)
- {
- if (size < (msize = htons (pm->msg->size)))
- break;
- memcpy (cbuf, pm->msg, msize);
- cbuf += msize;
- ret += msize;
- size -= msize;
- }
- else
- {
- if (size <
- sizeof (struct DataMessage) + (msize = htons (pm->msg->size)))
- break;
- dm = (struct DataMessage *) cbuf;
- dm->header.size = htons (sizeof (struct DataMessage) + msize);
- dm->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_DATA);
- dm->ack_out = GNUNET_htonll (++session->out_msg_counter);
- dm->ack_in = GNUNET_htonll (session->max_in_msg_counter);
- cbuf += sizeof (struct DataMessage);
- ret += sizeof (struct DataMessage);
- size -= sizeof (struct DataMessage);
- memcpy (cbuf, pm->msg, msize);
- cbuf += msize;
- ret += msize;
- size -= msize;
- }
- session->pending_messages = pm->next;
- if (pm->transmit_cont != NULL)
- pm->transmit_cont (pm->transmit_cont_cls,
- session->service_context,
- &session->target, GNUNET_OK);
- GNUNET_free (pm);
- session->gen_time[session->out_msg_counter % ACK_LOG_SIZE]
- = GNUNET_TIME_absolute_get ();
+ if (ret + pos->message_size > size)
+ break;
+ GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
+ session->pending_messages_tail,
+ pos);
+ GNUNET_assert (size >= pos->message_size);
+ /* FIXME: this memcpy can be up to 7% of our total runtime */
+ memcpy (cbuf, pos->msg, pos->message_size);
+ cbuf += pos->message_size;
+ ret += pos->message_size;
+ size -= pos->message_size;
+ GNUNET_CONTAINER_DLL_insert_after (hd, tl, tl, pos);
}
+ /* schedule 'continuation' before callbacks so that callbacks that
+ cancel everything don't cause us to use a session that no longer
+ exists... */
process_pending_messages (session);
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp", "Transmitting %u bytes\n", ret);
+ session->last_activity = GNUNET_TIME_absolute_get ();
+ pid = session->target;
+ /* we'll now call callbacks that may cancel the session; hence
+ we should not use 'session' after this point */
+ while (NULL != (pos = hd))
+ {
+ GNUNET_CONTAINER_DLL_remove (hd, tl, pos);
+ if (pos->transmit_cont != NULL)
+ pos->transmit_cont (pos->transmit_cont_cls,
+ &pid, GNUNET_OK);
+ GNUNET_free (pos);
+ }
+ GNUNET_assert (hd == NULL);
+ GNUNET_assert (tl == NULL);
+#if DEBUG_TCP > 1
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting %u bytes\n", ret);
#endif
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes currently in TCP buffers"),
+ - (int64_t) ret,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes transmitted via TCP"),
+ ret,
+ GNUNET_NO);
return ret;
}
static void
process_pending_messages (struct Session *session)
{
+ struct PendingMessage *pm;
+
GNUNET_assert (session->client != NULL);
- if (session->pending_messages == NULL)
- return;
if (session->transmit_handle != NULL)
return;
+ if (NULL == (pm = session->pending_messages_head))
+ return;
+
session->transmit_handle
= GNUNET_SERVER_notify_transmit_ready (session->client,
- htons (session->
- pending_messages->msg->
- size) +
- (session->
- pending_messages->is_welcome ? 0 :
- sizeof (struct DataMessage)),
+ pm->message_size,
GNUNET_TIME_absolute_get_remaining
- (session->
- pending_messages[0].timeout),
+ (pm->timeout),
&do_transmit, session);
}
-
-/**
- * Create a new session connecting to the specified
- * target at the specified address. The session will
- * be used to verify an address in a HELLO and should
- * not expect to receive a WELCOME.
- *
- * @param plugin us
- * @param target peer to connect to
- * @param addrlen IPv4 or IPv6
- * @param addr either struct sockaddr_in or struct sockaddr_in6
- * @return NULL connection failed / invalid address
- */
-static struct Session *
-connect_and_create_validation_session (struct Plugin *plugin,
- const struct GNUNET_PeerIdentity *target,
- const void *addr, size_t addrlen)
-{
- struct GNUNET_SERVER_Client *client;
- struct GNUNET_CONNECTION_Handle *conn;
- struct Session *session;
- int af;
-
- if (addrlen == sizeof (struct sockaddr_in))
- af = AF_INET;
- else if (addrlen == sizeof (struct sockaddr_in6))
- af = AF_INET6;
- else
- {
- GNUNET_break_op (0);
- return NULL; /* invalid address */
- }
- conn = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched,
- af,
- addr,
- addrlen,
- GNUNET_SERVER_MAX_MESSAGE_SIZE);
- if (conn == NULL)
- {
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Failed to create connection to peer at `%s'.\n",
- GNUNET_a2s(addr, addrlen));
-#endif
- return NULL;
- }
- client = GNUNET_SERVER_connect_socket (plugin->server, conn);
- GNUNET_assert (client != NULL);
- session = create_session (plugin, target, client, addr, addrlen);
- /* kill welcome */
- GNUNET_free (session->pending_messages);
- session->pending_messages = NULL;
- session->connect_alen = addrlen;
- session->connect_addr = GNUNET_malloc (addrlen);
- session->expecting_welcome = GNUNET_SYSERR;
- memcpy (session->connect_addr, addr, addrlen);
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Creating new session %p with `%s' for `%4s' based on `%s' request.\n",
- session,
- GNUNET_a2s (addr, addrlen),
- GNUNET_i2s (&session->target),
- "VALIDATE");
-#endif
- return session;
-}
-
-
-/**
- * Function that can be used by the transport service to validate that
- * another peer is reachable at a particular address (even if we
- * already have a connection to this peer, this function is required
- * to establish a new one).
- *
- * @param cls closure
- * @param target who should receive this message
- * @param challenge challenge code to use
- * @param addrlen length of the address
- * @param addr the address
- * @param timeout how long should we try to transmit these?
- * @return GNUNET_OK if the transmission has been scheduled
- */
-static int
-tcp_plugin_validate (void *cls,
- const struct GNUNET_PeerIdentity *target,
- uint32_t challenge,
- struct GNUNET_TIME_Relative timeout,
- const void *addr, size_t addrlen)
-{
- struct Plugin *plugin = cls;
- struct Session *session;
- struct PendingMessage *pm;
- struct ValidationChallengeMessage *vcm;
-
- session = connect_and_create_validation_session (plugin, target, addr, addrlen);
- if (session == NULL)
- {
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp", "Failed to create fresh session.\n");
-#endif
- return GNUNET_SYSERR;
- }
- pm = GNUNET_malloc (sizeof (struct PendingMessage) +
- sizeof (struct ValidationChallengeMessage) + addrlen);
- pm->msg = (struct GNUNET_MessageHeader *) &pm[1];
- pm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
- pm->is_welcome = GNUNET_YES;
- vcm = (struct ValidationChallengeMessage*) &pm[1];
- vcm->header.size =
- htons (sizeof (struct ValidationChallengeMessage) + addrlen);
- vcm->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_PING);
- vcm->challenge = htonl(challenge);
- vcm->target = *target;
- memcpy (&vcm[1], addr, addrlen);
- GNUNET_assert (session->pending_messages == NULL);
- session->pending_messages = pm;
- process_pending_messages (session);
- return GNUNET_OK;
-}
-
-
/**
* Functions with this signature are called whenever we need
* to close a session due to a disconnect or failure to
struct PendingMessage *pm;
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Disconnecting from `%4s' at %s (session %p).\n",
- GNUNET_i2s(&session->target),
- (session->connect_addr != NULL) ?
- GNUNET_a2s(session->connect_addr,
- session->connect_alen) : "*",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting from `%4s' at %s (session %p).\n",
+ GNUNET_i2s (&session->target),
+ (session->connect_addr != NULL) ?
+ tcp_address_to_string (session->plugin,
+ session->connect_addr,
+ session->connect_alen) : "*",
session);
#endif
/* remove from session list */
session->plugin->sessions = session->next;
else
prev->next = session->next;
+ session->plugin->env->session_end (session->plugin->env->cls,
+ &session->target,
+ session);
/* clean up state */
if (session->transmit_handle != NULL)
{
- GNUNET_CONNECTION_notify_transmit_ready_cancel (session->transmit_handle);
+ GNUNET_CONNECTION_notify_transmit_ready_cancel
+ (session->transmit_handle);
session->transmit_handle = NULL;
}
- while (NULL != (pm = session->pending_messages))
+ while (NULL != (pm = session->pending_messages_head))
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- pm->transmit_cont != NULL
- ? "Could not deliver message of type %u to `%4s'.\n"
- : "Could not deliver message of type %u to `%4s', notifying.\n",
- ntohs(pm->msg->type),
- GNUNET_i2s(&session->target));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+
+ pm->transmit_cont != NULL
+ ? "Could not deliver message to `%4s'.\n"
+ :
+ "Could not deliver message to `%4s', notifying.\n",
+ GNUNET_i2s (&session->target));
#endif
- session->pending_messages = pm->next;
+ GNUNET_STATISTICS_update (session->plugin->env->stats,
+ gettext_noop ("# bytes currently in TCP buffers"),
+ - (int64_t) pm->message_size,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (session->plugin->env->stats,
+ gettext_noop ("# bytes discarded by TCP (disconnect)"),
+ pm->message_size,
+ GNUNET_NO);
+ GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
+ session->pending_messages_tail,
+ pm);
if (NULL != pm->transmit_cont)
pm->transmit_cont (pm->transmit_cont_cls,
- session->service_context,
&session->target, GNUNET_SYSERR);
GNUNET_free (pm);
}
- if (GNUNET_NO == session->expecting_welcome)
- {
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Notifying transport service about loss of data connection with `%4s'.\n",
- GNUNET_i2s(&session->target));
-#endif
- /* Data session that actually went past the
- initial handshake; transport service may
- know about this one, so we need to
- notify transport service about disconnect */
- session->plugin->env->receive (session->plugin->env->cls,
- session,
- session->service_context,
- GNUNET_TIME_UNIT_ZERO,
- &session->target, NULL);
- }
- if (session->client != NULL)
+ GNUNET_break (session->client != NULL);
+ if (session->receive_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SERVER_client_drop (session->client);
- session->client = NULL;
+ GNUNET_SCHEDULER_cancel (session->plugin->env->sched,
+ session->receive_delay_task);
+ if (session->client != NULL)
+ GNUNET_SERVER_receive_done (session->client,
+ GNUNET_SYSERR);
}
+ if (session->client != NULL)
+ GNUNET_SERVER_client_drop (session->client);
+ GNUNET_STATISTICS_update (session->plugin->env->stats,
+ gettext_noop ("# TCP sessions active"),
+ -1,
+ GNUNET_NO);
GNUNET_free_non_null (session->connect_addr);
GNUNET_free (session);
}
/**
- * Iterator callback to go over all addresses. If we get
- * a TCP address, increment the counter
+ * Given two otherwise equivalent sessions, pick the better one.
*
- * @param cls closure, points to the counter
- * @param tname name of the transport
- * @param expiration expiration time
- * @param addr the address
- * @param addrlen length of the address
- * @return GNUNET_OK to keep the address,
- * GNUNET_NO to delete it from the HELLO
- * GNUNET_SYSERR to stop iterating (but keep current address)
+ * @param s1 one session (also default)
+ * @param s2 other session
+ * @return "better" session (more active)
*/
-static int
-count_tcp_addresses (void *cls,
- const char *tname,
- struct GNUNET_TIME_Absolute expiration,
- const void *addr, size_t addrlen)
+static struct Session *
+select_better_session (struct Session *s1,
+ struct Session *s2)
{
- unsigned int *counter = cls;
-
- if (0 != strcmp (tname, "tcp"))
- return GNUNET_OK; /* not one of ours */
- (*counter)++;
- return GNUNET_OK; /* failed to connect */
+ if (s1 == NULL)
+ return s2;
+ if (s2 == NULL)
+ return s1;
+ if ( (s1->expecting_welcome == GNUNET_NO) &&
+ (s2->expecting_welcome == GNUNET_YES) )
+ return s1;
+ if ( (s1->expecting_welcome == GNUNET_YES) &&
+ (s2->expecting_welcome == GNUNET_NO) )
+ return s2;
+ if (s1->last_activity.value < s2->last_activity.value)
+ return s2;
+ if (s1->last_activity.value > s2->last_activity.value)
+ return s1;
+ if ( (GNUNET_YES == s1->inbound) &&
+ (GNUNET_NO == s2->inbound) )
+ return s1;
+ if ( (GNUNET_NO == s1->inbound) &&
+ (GNUNET_YES == s2->inbound) )
+ return s2;
+ return s1;
}
-struct ConnectContext
-{
- struct Plugin *plugin;
-
- struct GNUNET_CONNECTION_Handle *sa;
-
- struct PendingMessage *welcome;
-
- unsigned int pos;
-};
-
-
/**
- * Iterator callback to go over all addresses. If we get
- * the "pos" TCP address, try to connect to it.
+ * We learned about a peer (possibly behind NAT) so run the
+ * gnunet-nat-client to send dummy ICMP responses
*
- * @param cls closure
- * @param tname name of the transport
- * @param expiration expiration time
- * @param addrlen length of the address
- * @param addr the address
- * @return GNUNET_OK to keep the address,
- * GNUNET_NO to delete it from the HELLO
- * GNUNET_SYSERR to stop iterating (but keep current address)
+ * @param plugin the plugin for this transport
+ * @param addr the address of the peer
+ * @param addrlen the length of the address
*/
-static int
-try_connect_to_address (void *cls,
- const char *tname,
- struct GNUNET_TIME_Absolute expiration,
- const void *addr, size_t addrlen)
+void
+run_gnunet_nat_client (struct Plugin *plugin, const char *addr, size_t addrlen)
{
- struct ConnectContext *cc = cls;
- int af;
+ char inet4[INET_ADDRSTRLEN];
+ char *address_as_string;
+ char *port_as_string;
+ pid_t pid;
+ const struct sockaddr *sa = (const struct sockaddr *)addr;
- if (0 != strcmp (tname, "tcp"))
- return GNUNET_OK; /* not one of ours */
- if (sizeof (struct sockaddr_in) == addrlen)
- af = AF_INET;
- else if (sizeof (struct sockaddr_in6) == addrlen)
- af = AF_INET6;
- else
- {
- /* not a valid address */
- GNUNET_break (0);
- return GNUNET_NO;
- }
- if (0 == cc->pos--)
- {
- cc->welcome = create_welcome (addrlen, addr, cc->plugin);
- cc->sa =
- GNUNET_CONNECTION_create_from_sockaddr (cc->plugin->env->sched,
- af, addr, addrlen,
- GNUNET_SERVER_MAX_MESSAGE_SIZE);
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Connecting using address %s.\n",
- GNUNET_a2s(addr, addrlen));
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("called run_gnunet_nat_client addrlen %d others are %d and %d\n"), addrlen, sizeof (struct sockaddr), sizeof (struct sockaddr_in));
#endif
- return GNUNET_SYSERR;
- }
- return GNUNET_OK; /* failed to connect */
-}
-
-/**
- * Type of an iterator over the hosts. Note that each
- * host will be called with each available protocol.
- *
- * @param cls closure
- * @param peer id of the peer, NULL for last call
- * @param hello hello message for the peer (can be NULL)
- * @param trust amount of trust we have in the peer
- */
-static void
-session_try_connect (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Message *hello, uint32_t trust)
-{
- struct Session *session = cls;
- unsigned int count;
- struct ConnectContext cctx;
- struct PendingMessage *pm;
+ if (addrlen < sizeof (struct sockaddr))
+ return;
- if (peer == NULL)
- {
- /* last call, destroy session if we are still not
- connected */
- if (session->client != NULL)
- {
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Now connected to `%4s', now processing messages.\n",
- GNUNET_i2s(&session->target));
-#endif
- process_pending_messages (session);
- }
- else
- {
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Failed to connect to `%4s' (no working `%s'), closing session.\n",
- GNUNET_i2s(&session->target),
- "HELLO");
-#endif
- disconnect_session (session);
- }
- return;
- }
- if ((hello == NULL) || (session->client != NULL))
+ switch (sa->sa_family)
{
- GNUNET_break (0); /* should this ever happen!? */
+ case AF_INET:
+ if (addrlen != sizeof (struct sockaddr_in))
+ return;
+ if (NULL == inet_ntop (AF_INET,
+ &((struct sockaddr_in *) sa)->sin_addr,
+ inet4, INET_ADDRSTRLEN))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
+ return;
+ }
+ address_as_string = GNUNET_strdup (inet4);
+ break;
+ case AF_INET6:
+ default:
return;
}
- count = 0;
- GNUNET_HELLO_iterate_addresses (hello,
- GNUNET_NO, &count_tcp_addresses, &count);
- if (count == 0)
- {
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Asked to connect to `%4s', but have no addresses to try.\n",
- GNUNET_i2s(&session->target));
-#endif
- return;
- }
- cctx.plugin = session->plugin;
- cctx.sa = NULL;
- cctx.welcome = NULL;
- cctx.pos = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, count);
- GNUNET_HELLO_iterate_addresses (hello,
- GNUNET_NO, &try_connect_to_address, &cctx);
- if (cctx.sa == NULL)
- {
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Asked to connect, but all addresses failed.\n");
-#endif
- GNUNET_free_non_null (cctx.welcome);
- return;
- }
- session->client = GNUNET_SERVER_connect_socket (session->plugin->server,
- cctx.sa);
-#if DEBUG_TCP
+
+ GNUNET_asprintf(&port_as_string, "%d", plugin->adv_port);
+#if DEBUG_TCP_NAT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connected to `%4s' for session %p\n",
- GNUNET_i2s(&session->target),
- session->client);
-#endif
- if (session->client == NULL)
- {
- GNUNET_break (0); /* how could this happen? */
- GNUNET_free_non_null (cctx.welcome);
- return;
- }
- pm = cctx.welcome;
- /* prepend (!) */
- pm->next = session->pending_messages;
- session->pending_messages = pm;
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Connected to `%4s', now sending `%s' message.\n",
- GNUNET_i2s(&session->target),
- "WELCOME");
+ _("Running gnunet-nat-client with arguments: %s %s %d\n"), plugin->external_address, address_as_string, plugin->adv_port);
#endif
+
+ /* Start the client process */
+ pid = GNUNET_OS_start_process(NULL, NULL, "gnunet-nat-client", "gnunet-nat-client", plugin->external_address, address_as_string, port_as_string, NULL);
+ GNUNET_free(address_as_string);
+ GNUNET_free(port_as_string);
+ GNUNET_OS_process_wait (pid);
}
/**
* Function that can be used by the transport service to transmit
- * a message using the plugin.
+ * a message using the plugin. Note that in the case of a
+ * peer disconnecting, the continuation MUST be called
+ * prior to the disconnect notification itself. This function
+ * will be called with this peer's HELLO message to initiate
+ * a fresh connection to another peer.
*
* @param cls closure
- * @param plugin_context value we were asked to pass to this plugin
- * to respond to the given peer (use is optional,
- * but may speed up processing), can be NULL
- * @param service_context value passed to the transport-service
- * to identify the neighbour
* @param target who should receive this message
- * @param priority how important is the message
* @param msg the message to transmit
- * @param timeout when should we time out (give up) if we can not transmit?
+ * @param msgbuf_size number of bytes in 'msg'
+ * @param priority how important is the message (most plugins will
+ * ignore message priority and just FIFO)
+ * @param timeout how long to wait at most for the transmission (does not
+ * require plugins to discard the message after the timeout,
+ * just advisory for the desired delay; most plugins will ignore
+ * this as well)
+ * @param session which session must be used (or NULL for "any")
+ * @param addr the address to use (can be NULL if the plugin
+ * is "on its own" (i.e. re-use existing TCP connection))
+ * @param addrlen length of the address in bytes
+ * @param force_address GNUNET_YES if the plugin MUST use the given address,
+ * GNUNET_NO means the plugin may use any other address and
+ * GNUNET_SYSERR means that only reliable existing
+ * bi-directional connections should be used (regardless
+ * of address)
* @param cont continuation to call once the message has
* been transmitted (or if the transport is ready
* for the next transmission call; or if the
- * peer disconnected...)
+ * peer disconnected...); can be NULL
* @param cont_cls closure for cont
- * @return plugin_context that should be used next time for
- * sending messages to the specified peer
+ * @return number of bytes used (on the physical network, with overheads);
+ * -1 on hard errors (i.e. address invalid); 0 is a legal value
+ * and does NOT mean that the message was not transmitted (DV and NAT)
*/
-static void *
+static ssize_t
tcp_plugin_send (void *cls,
- void *plugin_context,
- struct ReadyList *service_context,
- const struct GNUNET_PeerIdentity *target,
- unsigned int priority,
- const struct GNUNET_MessageHeader *msg,
+ const struct GNUNET_PeerIdentity *target,
+ const char *msg,
+ size_t msgbuf_size,
+ uint32_t priority,
struct GNUNET_TIME_Relative timeout,
+ struct Session *session,
+ const void *addr,
+ size_t addrlen,
+ int force_address,
GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
{
struct Plugin *plugin = cls;
- struct Session *session = plugin_context;
+ struct Session *cand_session;
+ struct Session *next;
struct PendingMessage *pm;
- struct PendingMessage *pme;
-
+ struct GNUNET_CONNECTION_Handle *sa;
+ int af;
+ const void *sb;
+ size_t sbs;
+ struct sockaddr_in a4;
+ struct sockaddr_in6 a6;
+ const struct IPv4TcpAddress *t4;
+ const struct IPv6TcpAddress *t6;
+ unsigned int is_natd;
+
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes TCP was asked to transmit"),
+ msgbuf_size,
+ GNUNET_NO);
+ /* FIXME: we could do this cheaper with a hash table
+ where we could restrict the iteration to entries that match
+ the target peer... */
+ is_natd = GNUNET_NO;
if (session == NULL)
- session = find_session_by_target (plugin, target);
- pm = GNUNET_malloc (sizeof (struct PendingMessage) + ntohs (msg->size));
- pm->msg = (struct GNUNET_MessageHeader *) &pm[1];
- memcpy (pm->msg, msg, ntohs (msg->size));
- pm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
- pm->transmit_cont = cont;
- pm->transmit_cont_cls = cont_cls;
+ {
+ cand_session = NULL;
+ next = plugin->sessions;
+ while (NULL != (session = next))
+ {
+ next = session->next;
+ GNUNET_assert (session->client != NULL);
+ if (0 != memcmp (target,
+ &session->target,
+ sizeof (struct GNUNET_PeerIdentity)))
+ continue;
+ if ( ( (GNUNET_SYSERR == force_address) &&
+ (session->expecting_welcome == GNUNET_NO) ) ||
+ (GNUNET_NO == force_address) )
+ {
+ cand_session = select_better_session (cand_session,
+ session);
+ continue;
+ }
+ if (GNUNET_SYSERR == force_address)
+ continue;
+ GNUNET_break (GNUNET_YES == force_address);
+ if (addr == NULL)
+ {
+ GNUNET_break (0);
+ break;
+ }
+ if (session->inbound == GNUNET_YES)
+ continue;
+ if ((addrlen != session->connect_alen) && (session->is_nat == GNUNET_NO))
+ continue;
+ if ((0 != memcmp (session->connect_addr,
+ addr,
+ addrlen)) && (session->is_nat == GNUNET_NO))
+ continue;
+ cand_session = select_better_session (cand_session,
+ session);
+ }
+ session = cand_session;
+ }
+ if ( (session == NULL) &&
+ (addr == NULL) )
+ {
+#if DEBUG_TCP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to transmit to `%4s' without address and I have no existing connection (failing).\n",
+ GNUNET_i2s (target));
+#endif
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes discarded by TCP (no address and no connection)"),
+ msgbuf_size,
+ GNUNET_NO);
+ return -1;
+ }
if (session == NULL)
{
- session = GNUNET_malloc (sizeof (struct Session));
+ if (addrlen == sizeof (struct IPv6TcpAddress))
+ {
+ t6 = addr;
+ af = AF_INET6;
+ memset (&a6, 0, sizeof (a6));
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ a6.sin6_len = sizeof (a6);
+#endif
+ a6.sin6_family = AF_INET6;
+ a6.sin6_port = t6->t6_port;
+ if (t6->t6_port == 0)
+ is_natd = GNUNET_YES;
+ memcpy (&a6.sin6_addr,
+ &t6->ipv6_addr,
+ sizeof (struct in6_addr));
+ sb = &a6;
+ sbs = sizeof (a6);
+ }
+ else if (addrlen == sizeof (struct IPv4TcpAddress))
+ {
+ t4 = addr;
+ af = AF_INET;
+ memset (&a4, 0, sizeof (a4));
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ a4.sin_len = sizeof (a4);
+#endif
+ a4.sin_family = AF_INET;
+ a4.sin_port = t4->t_port;
+ if (t4->t_port == 0)
+ is_natd = GNUNET_YES;
+ a4.sin_addr.s_addr = t4->ipv4_addr;
+ sb = &a4;
+ sbs = sizeof (a4);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Address of unexpected length: %u\n"),
+ addrlen);
+ GNUNET_break (0);
+ return -1;
+ }
+
+ if ((is_natd == GNUNET_YES) && (addrlen == sizeof (struct IPv6TcpAddress)))
+ return -1; /* NAT client only works with IPv4 addresses */
+
+
+ if ((plugin->allow_nat == GNUNET_YES) && (is_natd == GNUNET_YES) &&
+ (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(plugin->nat_wait_conns, &target->hashPubKey)))
+ {
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Found valid IPv4 NAT address (creating session)!\n"));
+#endif
+ session = create_session (plugin,
+ target,
+ NULL, is_natd);
+
+ /* create new message entry */
+ pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size);
+ /* FIXME: the memset of this malloc can be up to 2% of our total runtime */
+ pm->msg = (const char*) &pm[1];
+ memcpy (&pm[1], msg, msgbuf_size);
+ /* FIXME: this memcpy can be up to 7% of our total run-time
+ (for transport service) */
+ pm->message_size = msgbuf_size;
+ pm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
+ pm->transmit_cont = cont;
+ pm->transmit_cont_cls = cont_cls;
+
+ /* append pm to pending_messages list */
+ GNUNET_CONTAINER_DLL_insert_after (session->pending_messages_head,
+ session->pending_messages_tail,
+ session->pending_messages_tail,
+ pm);
+
+ GNUNET_assert(GNUNET_CONTAINER_multihashmap_put(plugin->nat_wait_conns, &target->hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY) == GNUNET_OK);
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Created NAT WAIT connection to `%4s' at `%s'\n",
+ GNUNET_i2s (target),
+ GNUNET_a2s (sb, sbs));
+#endif
+ run_gnunet_nat_client (plugin, sb, sbs);
+ return 0;
+ }
+ else if ((plugin->allow_nat == GNUNET_YES) && (is_natd == GNUNET_YES) && (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains(plugin->nat_wait_conns, &target->hashPubKey)))
+ {
+ /* Only do one NAT punch attempt per peer identity */
+ return -1;
+ }
+ sa = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched,
+ af, sb, sbs);
+ if (sa == NULL)
+ {
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Asked to transmit, creating fresh session %p.\n",
- session);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to create connection to `%4s' at `%s'\n",
+ GNUNET_i2s (target),
+ GNUNET_a2s (sb, sbs));
#endif
- session->next = plugin->sessions;
- plugin->sessions = session;
- session->plugin = plugin;
- session->target = *target;
- session->last_quota_update = GNUNET_TIME_absolute_get ();
- session->quota_in = plugin->env->default_quota_in;
- session->expecting_welcome = GNUNET_YES;
- session->pending_messages = pm;
- session->service_context = service_context;
- GNUNET_PEERINFO_for_all (plugin->env->cfg,
- plugin->env->sched,
- target,
- 0, timeout, &session_try_connect, session);
- return session;
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes discarded by TCP (failed to connect)"),
+ msgbuf_size,
+ GNUNET_NO);
+ return -1;
+ }
+#if DEBUG_TCP
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Asked to transmit to `%4s', creating fresh session using address `%s'.\n",
+ GNUNET_i2s (target),
+ GNUNET_a2s (sb, sbs));
+#endif
+ session = create_session (plugin,
+ target,
+ GNUNET_SERVER_connect_socket (plugin->server,
+ sa), is_natd);
+ session->connect_addr = GNUNET_malloc (addrlen);
+ memcpy (session->connect_addr,
+ addr,
+ addrlen);
+ session->connect_alen = addrlen;
}
GNUNET_assert (session != NULL);
GNUNET_assert (session->client != NULL);
- session->service_context = service_context;
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes currently in TCP buffers"),
+ msgbuf_size,
+ GNUNET_NO);
+ /* create new message entry */
+ pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size);
+ pm->msg = (const char*) &pm[1];
+ memcpy (&pm[1], msg, msgbuf_size);
+ pm->message_size = msgbuf_size;
+ pm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
+ pm->transmit_cont = cont;
+ pm->transmit_cont_cls = cont_cls;
+
/* append pm to pending_messages list */
- pme = session->pending_messages;
- if (pme == NULL)
- {
- session->pending_messages = pm;
- }
- else
- {
- while (NULL != pme->next)
- pme = pme->next;
- pme->next = pm;
- }
+ GNUNET_CONTAINER_DLL_insert_after (session->pending_messages_head,
+ session->pending_messages_tail,
+ session->pending_messages_tail,
+ pm);
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp", "Asked to transmit, added message to list.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to transmit %u bytes to `%s', added message to list.\n",
+ msgbuf_size,
+ GNUNET_i2s (target));
#endif
process_pending_messages (session);
- return session;
+ return msgbuf_size;
}
-
/**
* Function that can be called to force a disconnect from the
* specified neighbour. This should also cancel all previously
* closed after a getting this call.
*
* @param cls closure
- * @param plugin_context value we were asked to pass to this plugin
- * to respond to the given peer (use is optional,
- * but may speed up processing), can be NULL (if
- * NULL was returned from the transmit function); note
- * that use of NULL is dangerous since then this call may
- * cancel any session with the target peer (including
- * HELLO validation sessions), which is likely not what
- * is intended.
- * @param service_context must correspond to the service context
- * of the corresponding Transmit call; the plugin should
- * not cancel a send call made with a different service
- * context pointer! Never NULL.
* @param target peer for which the last transmission is
* to be cancelled
*/
static void
-tcp_plugin_cancel (void *cls,
- void *plugin_context,
- struct ReadyList *service_context,
- const struct GNUNET_PeerIdentity *target)
+tcp_plugin_disconnect (void *cls,
+ const struct GNUNET_PeerIdentity *target)
{
struct Plugin *plugin = cls;
- struct Session *session = plugin_context;
+ struct Session *session;
+ struct Session *next;
struct PendingMessage *pm;
-
- if (session == NULL)
- {
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
- "tcp",
- "Asked to cancel with `%4s' without specification of specifics; will try to find an applicable session\n",
- GNUNET_i2s(target));
-#endif
- session = find_session_by_target (plugin, target);
- }
- if (session == NULL)
- {
- GNUNET_break (0);
- return;
- }
+
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Asked to cancel session %p with `%4s'\n",
- plugin_context,
- GNUNET_i2s(target));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to cancel session with `%4s'\n",
+ GNUNET_i2s (target));
#endif
- pm = session->pending_messages;
- while (pm != NULL)
- {
- pm->transmit_cont = NULL;
- pm->transmit_cont_cls = NULL;
- pm = pm->next;
- }
- session->service_context = NULL;
- if (session->client != NULL)
+ next = plugin->sessions;
+ while (NULL != (session = next))
{
- GNUNET_SERVER_client_drop (session->client);
- session->client = NULL;
+ next = session->next;
+ if (0 != memcmp (target,
+ &session->target,
+ sizeof (struct GNUNET_PeerIdentity)))
+ continue;
+ pm = session->pending_messages_head;
+ while (pm != NULL)
+ {
+ pm->transmit_cont = NULL;
+ pm->transmit_cont_cls = NULL;
+ pm = pm->next;
+ }
+ disconnect_session (session);
}
- /* rest of the clean-up of the session will be done as part of
- disconnect_notify which should be triggered any time now
- (or which may be triggering this call in the first place) */
}
+/**
+ * Context for address to string conversion.
+ */
struct PrettyPrinterContext
{
+ /**
+ * Function to call with the result.
+ */
GNUNET_TRANSPORT_AddressStringCallback asc;
+
+ /**
+ * Clsoure for 'asc'.
+ */
void *asc_cls;
+
+ /**
+ * Port to add after the IP address.
+ */
uint16_t port;
};
/**
* Append our port and forward the result.
+ *
+ * @param cls the 'struct PrettyPrinterContext*'
+ * @param hostname hostname part of the address
*/
static void
append_port (void *cls, const char *hostname)
void *asc_cls)
{
struct Plugin *plugin = cls;
- const struct sockaddr_in *v4;
- const struct sockaddr_in6 *v6;
struct PrettyPrinterContext *ppc;
+ const void *sb;
+ size_t sbs;
+ struct sockaddr_in a4;
+ struct sockaddr_in6 a6;
+ const struct IPv4TcpAddress *t4;
+ const struct IPv6TcpAddress *t6;
+ uint16_t port;
- if ((addrlen != sizeof (struct sockaddr_in)) &&
- (addrlen != sizeof (struct sockaddr_in6)))
+ if (addrlen == sizeof (struct IPv6TcpAddress))
+ {
+ t6 = addr;
+ memset (&a6, 0, sizeof (a6));
+ a6.sin6_family = AF_INET6;
+ a6.sin6_port = t6->t6_port;
+ memcpy (&a6.sin6_addr,
+ &t6->ipv6_addr,
+ sizeof (struct in6_addr));
+ port = ntohs (t6->t6_port);
+ sb = &a6;
+ sbs = sizeof (a6);
+ }
+ else if (addrlen == sizeof (struct IPv4TcpAddress))
+ {
+ t4 = addr;
+ memset (&a4, 0, sizeof (a4));
+ a4.sin_family = AF_INET;
+ a4.sin_port = t4->t_port;
+ a4.sin_addr.s_addr = t4->ipv4_addr;
+ port = ntohs (t4->t_port);
+ sb = &a4;
+ sbs = sizeof (a4);
+ }
+ else
{
/* invalid address */
GNUNET_break_op (0);
ppc = GNUNET_malloc (sizeof (struct PrettyPrinterContext));
ppc->asc = asc;
ppc->asc_cls = asc_cls;
- if (addrlen == sizeof (struct sockaddr_in))
- {
- v4 = (const struct sockaddr_in *) addr;
- ppc->port = ntohs (v4->sin_port);
- }
- else
- {
- v6 = (const struct sockaddr_in6 *) addr;
- ppc->port = ntohs (v6->sin6_port);
-
- }
+ ppc->port = port;
GNUNET_RESOLVER_hostname_get (plugin->env->sched,
plugin->env->cfg,
- addr,
- addrlen,
+ sb,
+ sbs,
!numeric, timeout, &append_port, ppc);
}
-/**
- * Update the last-received and bandwidth quota values
- * for this session.
- *
- * @param session session to update
- * @param force set to GNUNET_YES if we should update even
- * though the minimum refresh time has not yet expired
- */
-static void
-update_quota (struct Session *session, int force)
-{
- struct GNUNET_TIME_Absolute now;
- unsigned long long delta;
- unsigned long long total_allowed;
- unsigned long long total_remaining;
-
- now = GNUNET_TIME_absolute_get ();
- delta = now.value - session->last_quota_update.value;
- if ((delta < MIN_QUOTA_REFRESH_TIME) && (!force))
- return; /* too early, not enough data */
-
- total_allowed = session->quota_in * delta;
- if (total_allowed > session->last_received)
- {
- /* got less than acceptable */
- total_remaining = total_allowed - session->last_received;
- session->last_received = 0;
- delta = total_remaining / session->quota_in; /* bonus seconds */
- if (delta > MAX_BANDWIDTH_CARRY)
- delta = MAX_BANDWIDTH_CARRY; /* limit amount of carry-over */
- }
- else
- {
- /* got more than acceptable */
- session->last_received -= total_allowed;
- delta = 0;
- }
- session->last_quota_update.value = now.value - delta;
-}
-
-
-/**
- * Set a quota for receiving data from the given peer; this is a
- * per-transport limit. The transport should limit its read/select
- * calls to stay below the quota (in terms of incoming data).
- *
- * @param cls closure
- * @param target the peer for whom the quota is given
- * @param quota_in quota for receiving/sending data in bytes per ms
- */
-static void
-tcp_plugin_set_receive_quota (void *cls,
- const struct GNUNET_PeerIdentity *target,
- uint32_t quota_in)
-{
- struct Plugin *plugin = cls;
- struct Session *session;
-
- session = find_session_by_target (plugin, target);
- if (session == NULL)
- return; /* peer must have disconnected, ignore */
- if (session->quota_in != quota_in)
- {
- update_quota (session, GNUNET_YES);
- if (session->quota_in > quota_in)
- session->last_quota_update = GNUNET_TIME_absolute_get ();
- session->quota_in = quota_in;
- }
-}
-
-
/**
* Check if the given port is plausible (must be either
* our listen port or our advertised port). If it is
- * neither, we return one of these two ports at random.
+ * neither, we return GNUNET_SYSERR.
*
- * @return either in_port or a more plausible port
+ * @param plugin global variables
+ * @param in_port port number to check
+ * @return GNUNET_OK if port is either open_port or adv_port
*/
-static uint16_t
+static int
check_port (struct Plugin *plugin, uint16_t in_port)
{
+ if ( (plugin->behind_nat == GNUNET_YES) && (in_port == 0) )
+ return GNUNET_OK;
+ if ( (plugin->only_nat_addresses == GNUNET_YES) &&
+ (plugin->behind_nat == GNUNET_YES) )
+ {
+ return GNUNET_SYSERR; /* odd case... */
+ }
if ((in_port == plugin->adv_port) || (in_port == plugin->open_port))
- return in_port;
- return (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- 2) == 0)
- ? plugin->open_port : plugin->adv_port;
+ return GNUNET_OK;
+ return GNUNET_SYSERR;
}
/**
- * Another peer has suggested an address for this
- * peer and transport plugin. Check that this could be a valid
- * address. If so, consider adding it to the list
- * of addresses.
+ * Function that will be called to check if a binary address for this
+ * plugin is well-formed and corresponds to an address for THIS peer
+ * (as per our configuration). Naturally, if absolutely necessary,
+ * plugins can be a bit conservative in their answer, but in general
+ * plugins should make sure that the address does not redirect
+ * traffic to a 3rd party that might try to man-in-the-middle our
+ * traffic.
*
- * @param cls closure
+ * @param cls closure, our 'struct Plugin*'
* @param addr pointer to the address
* @param addrlen length of addr
* @return GNUNET_OK if this is a plausible address for this peer
- * and transport
+ * and transport, GNUNET_SYSERR if not
*/
static int
-tcp_plugin_address_suggested (void *cls, const void *addr, size_t addrlen)
+tcp_plugin_check_address (void *cls,
+ const void *addr,
+ size_t addrlen)
{
struct Plugin *plugin = cls;
- char buf[sizeof (struct sockaddr_in6)];
- struct sockaddr_in *v4;
- struct sockaddr_in6 *v6;
+ struct IPv4TcpAddress *v4;
+ struct IPv6TcpAddress *v6;
- if ((addrlen != sizeof (struct sockaddr_in)) &&
- (addrlen != sizeof (struct sockaddr_in6)))
+ if ((addrlen != sizeof (struct IPv4TcpAddress)) &&
+ (addrlen != sizeof (struct IPv6TcpAddress)))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
- memcpy (buf, addr, sizeof (struct sockaddr_in6));
- if (addrlen == sizeof (struct sockaddr_in))
+ if (addrlen == sizeof (struct IPv4TcpAddress))
{
- v4 = (struct sockaddr_in *) buf;
- v4->sin_port = htons (check_port (plugin, ntohs (v4->sin_port)));
+ v4 = (struct IPv4TcpAddress *) addr;
+ if (GNUNET_OK !=
+ check_port (plugin, ntohs (v4->t_port)))
+ return GNUNET_SYSERR;
+ if (GNUNET_OK !=
+ check_local_addr (plugin, &v4->ipv4_addr, sizeof (uint32_t)))
+ {
+ return GNUNET_SYSERR;
+ }
}
else
{
- v6 = (struct sockaddr_in6 *) buf;
- v6->sin6_port = htons (check_port (plugin, ntohs (v6->sin6_port)));
+ v6 = (struct IPv6TcpAddress *) addr;
+ if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ if (GNUNET_OK !=
+ check_port (plugin, ntohs (v6->t6_port)))
+ return GNUNET_SYSERR;
+ if (GNUNET_OK !=
+ check_local_addr (plugin, &v6->ipv6_addr, sizeof (struct in6_addr)))
+ {
+ return GNUNET_SYSERR;
+ }
}
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Informing transport service about my address `%s'.\n",
- GNUNET_a2s(addr, addrlen));
-#endif
- plugin->env->notify_address (plugin->env->cls,
- "tcp",
- buf, addrlen, LEARNED_ADDRESS_EXPIRATION);
return GNUNET_OK;
}
-
-/**
- * Send a validation challenge response.
- */
-static size_t
-send_vcr (void *cls,
- size_t size,
- void *buf)
-{
- struct ValidationChallengeResponse *vcr = cls;
- uint16_t msize;
-
- if (NULL == buf)
- {
- GNUNET_free (vcr);
- return 0;
- }
- msize = ntohs(vcr->header.size);
- GNUNET_assert (size >= msize);
- memcpy (buf, vcr, msize);
- GNUNET_free (vcr);
- return msize;
-}
-
-
/**
- * We've received a PING from this peer via TCP.
- * Send back our PONG.
+ * We've received a nat probe from this peer via TCP. Finish
+ * creating the client session and resume sending of queued
+ * messages.
*
* @param cls closure
* @param client identification of the client
* @param message the actual message
*/
static void
-handle_tcp_ping (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_tcp_nat_probe (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
struct Plugin *plugin = cls;
- const struct ValidationChallengeMessage *vcm;
- struct ValidationChallengeResponse *vcr;
- uint16_t msize;
- size_t addrlen;
- void *addr;
-
-#if DEBUG_TRANSPORT
- if (GNUNET_OK ==
- GNUNET_SERVER_client_get_address (client,
- (void **) &addr,
- &addrlen))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "Processing `%s' from `%s'\n",
- "PING",
- GNUNET_a2s (addr, addrlen));
- GNUNET_free (addr);
- }
+ struct Session *session;
+ struct TCP_NAT_ProbeMessage *tcp_nat_probe;
+ size_t alen;
+ void *vaddr;
+ struct IPv4TcpAddress *t4;
+ struct IPv6TcpAddress *t6;
+ const struct sockaddr_in *s4;
+ const struct sockaddr_in6 *s6;
+
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "received tcp NAT probe\n");
#endif
- msize = ntohs (message->size);
- if (msize < sizeof (struct ValidationChallengeMessage))
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- vcm = (const struct ValidationChallengeMessage *) message;
- if (0 != memcmp (&vcm->target,
- plugin->env->my_identity, sizeof (struct GNUNET_PeerIdentity)))
+ /* We have received a TCP NAT probe, meaning we (hopefully) initiated
+ * a connection to this peer by running gnunet-nat-client. This peer
+ * received the punch message and now wants us to use the new connection
+ * as the default for that peer. Do so and then send a WELCOME message
+ * so we can really be connected!
+ */
+ if (ntohs(message->size) != sizeof(struct TCP_NAT_ProbeMessage))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Received `%s' message not destined for me!\n"), "PING");
- /* TODO: call statistics */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Bad size for tcp NAT probe, expected %d got %d.\n", sizeof(struct TCP_NAT_ProbeMessage), ntohs(message->size));
+#endif
+ GNUNET_break_op(0);
return;
}
- msize -= sizeof (struct ValidationChallengeMessage);
- if (GNUNET_OK !=
- tcp_plugin_address_suggested (plugin, &vcm[1], msize))
+ tcp_nat_probe = (struct TCP_NAT_ProbeMessage *)message;
+
+ if (GNUNET_CONTAINER_multihashmap_contains(plugin->nat_wait_conns, &tcp_nat_probe->clientIdentity.hashPubKey) == GNUNET_YES)
{
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found session for NAT probe!\n");
+#endif
+ session = GNUNET_CONTAINER_multihashmap_get(plugin->nat_wait_conns, &tcp_nat_probe->clientIdentity.hashPubKey);
+ GNUNET_assert(session != NULL);
+ GNUNET_assert(GNUNET_CONTAINER_multihashmap_remove(plugin->nat_wait_conns, &tcp_nat_probe->clientIdentity.hashPubKey, session) == GNUNET_YES);
+ GNUNET_SERVER_client_keep (client);
+ session->client = client;
+ session->last_activity = GNUNET_TIME_absolute_get ();
+ session->inbound = GNUNET_NO;
+
+ if (GNUNET_OK ==
+ GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
+ {
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Found address `%s' for incoming connection %p\n",
+ GNUNET_a2s (vaddr, alen),
+ client);
+#endif
+ if (((const struct sockaddr *)vaddr)->sa_family == AF_INET)
+ {
+ s4 = vaddr;
+ t4 = GNUNET_malloc (sizeof (struct IPv4TcpAddress));
+ t4->t_port = s4->sin_port;
+ t4->ipv4_addr = s4->sin_addr.s_addr;
+ session->connect_addr = t4;
+ session->connect_alen = sizeof (struct IPv4TcpAddress);
+ }
+ else if (((const struct sockaddr *)vaddr)->sa_family == AF_INET6)
+ {
+ s6 = vaddr;
+ t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress));
+ t6->t6_port = s6->sin6_port;
+ memcpy (&t6->ipv6_addr,
+ &s6->sin6_addr,
+ sizeof (struct in6_addr));
+ session->connect_addr = t6;
+ session->connect_alen = sizeof (struct IPv6TcpAddress);
+ }
+ else
+ {
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Bad address for incoming connection!\n");
+#endif
+ }
+ GNUNET_free (vaddr);
+ }
+
+ session->next = plugin->sessions;
+ plugin->sessions = session;
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# TCP sessions active"),
+ 1,
+ GNUNET_NO);
+ process_pending_messages (session);
}
- if (GNUNET_OK !=
- GNUNET_SERVER_client_get_address (client,
- &addr,
- &addrlen))
+ else
{
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- vcr = GNUNET_malloc (sizeof (struct ValidationChallengeResponse) + addrlen);
- vcr->header.size = htons (sizeof (struct ValidationChallengeResponse) + addrlen);
- vcr->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_PONG);
- vcr->purpose.size =
- htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) +
- sizeof (uint32_t) +
- sizeof ( struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
- addrlen);
- vcr->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_TCP_PING);
- vcr->challenge = vcm->challenge;
- vcr->signer = *plugin->env->my_public_key;
- memcpy (&vcr[1],
- addr,
- addrlen);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_rsa_sign (plugin->env->my_private_key,
- &vcr->purpose,
- &vcr->signature));
-#if EXTRA_CHECKS
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_rsa_verify
- (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_TCP_PING,
- &vcr->purpose,
- &vcr->signature,
- plugin->env->my_public_key));
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Did NOT find session for NAT probe!\n");
#endif
- GNUNET_free (addr);
- if (NULL ==
- GNUNET_SERVER_notify_transmit_ready (client,
- sizeof (struct ValidationChallengeResponse) + addrlen,
- GNUNET_TIME_UNIT_SECONDS,
- &send_vcr,
- vcr))
- {
- GNUNET_break (0);
- GNUNET_free (vcr);
}
- /* after a PING, we always close the connection */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-}
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
/**
- * Handle PONG-message.
+ * We've received a welcome from this peer via TCP. Possibly create a
+ * fresh client record and send back our welcome.
*
- * @param cls handle for this plugin
- * @param client from where did we receive the PONG
+ * @param cls closure
+ * @param client identification of the client
* @param message the actual message
*/
static void
-handle_tcp_pong (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_tcp_welcome (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
struct Plugin *plugin = cls;
- const struct ValidationChallengeResponse *vcr;
- struct GNUNET_PeerIdentity peer;
- char *sender_addr;
- size_t addrlen;
- const struct sockaddr *addr;
- struct sockaddr_in v4;
- struct sockaddr_in6 v6;
-
-#if DEBUG_TRANSPORT
- struct sockaddr *claddr;
-
- if (GNUNET_OK ==
- GNUNET_SERVER_client_get_address (client,
- (void**) &claddr,
- &addrlen))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "Processing `%s' from `%s'\n",
- "PONG",
- GNUNET_a2s (claddr, addrlen));
- GNUNET_free (claddr);
- }
+ const struct WelcomeMessage *wm = (const struct WelcomeMessage *) message;
+ struct Session *session;
+ size_t alen;
+ void *vaddr;
+ struct IPv4TcpAddress *t4;
+ struct IPv6TcpAddress *t6;
+ const struct sockaddr_in *s4;
+ const struct sockaddr_in6 *s6;
+
+#if DEBUG_TCP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %s message from a `%4s/%p'.\n",
+ "WELCOME",
+ GNUNET_i2s (&wm->clientIdentity), client);
#endif
- if (ntohs(message->size) < sizeof(struct ValidationChallengeResponse))
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- addrlen = ntohs(message->size) - sizeof(struct ValidationChallengeResponse);
- vcr = (const struct ValidationChallengeResponse *) message;
- if ( (ntohl(vcr->purpose.size) !=
- sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) +
- sizeof (uint32_t) +
- sizeof ( struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
- addrlen))
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- if (GNUNET_OK !=
- GNUNET_CRYPTO_rsa_verify
- (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_TCP_PING,
- &vcr->purpose,
- &vcr->signature,
- &vcr->signer))
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# TCP WELCOME messages received"),
+ 1,
+ GNUNET_NO);
+ session = find_session_by_client (plugin, client);
+ if (session == NULL)
{
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- GNUNET_CRYPTO_hash (&vcr->signer,
- sizeof( struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &peer.hashPubKey);
- addr = (const struct sockaddr*) &vcr[1];
- if (addrlen == sizeof (struct sockaddr_in))
- {
- memcpy (&v4, addr, sizeof (struct sockaddr_in));
- v4.sin_port = htons(check_port (plugin, ntohs (v4.sin_port)));
- sender_addr = GNUNET_strdup (GNUNET_a2s((const struct sockaddr*) &v4,
- addrlen));
- }
- else if (addrlen == sizeof (struct sockaddr_in6))
- {
- memcpy (&v6, addr, sizeof (struct sockaddr_in6));
- v6.sin6_port = htons(check_port (plugin, ntohs (v6.sin6_port)));
- sender_addr = GNUNET_strdup (GNUNET_a2s((const struct sockaddr*) &v6,
- addrlen));
- }
- else
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- plugin->env->notify_validation (plugin->env->cls,
- "tcp",
- &peer,
- ntohl(vcr->challenge),
- sender_addr);
- GNUNET_free (sender_addr);
- /* after a PONG, we always close the connection */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-}
-
-
-/**
- * We've received a welcome from this peer via TCP.
- * Possibly create a fresh client record and send back
- * our welcome.
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-handle_tcp_welcome (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- struct Plugin *plugin = cls;
- struct Session *session_c;
- const struct WelcomeMessage *wm;
- uint16_t msize;
- uint32_t addrlen;
- size_t alen;
- void *vaddr;
- const struct sockaddr *addr;
-
- msize = ntohs (message->size);
- if (msize < sizeof (struct WelcomeMessage))
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- wm = (const struct WelcomeMessage *) message;
+ GNUNET_SERVER_client_keep (client);
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Received %s message from a `%4s/%p', creating session\n",
+ "WELCOME",
+ GNUNET_i2s (&wm->clientIdentity), client);
+#endif
+ session = create_session (plugin,
+ &wm->clientIdentity, client, GNUNET_NO);
+ session->inbound = GNUNET_YES;
+ if (GNUNET_OK ==
+ GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
+ {
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Received `%s' message from `%4s/%p'.\n", "WELCOME",
- GNUNET_i2s(&wm->clientIdentity),
- client);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found address `%s' for incoming connection %p\n",
+ GNUNET_a2s (vaddr, alen),
+ client);
#endif
- session_c = find_session_by_client (plugin, client);
- if (session_c == NULL)
- {
- vaddr = NULL;
- GNUNET_SERVER_client_get_address (client, &vaddr, &alen);
- GNUNET_SERVER_client_keep (client);
- session_c = create_session (plugin,
- &wm->clientIdentity, client, vaddr, alen);
+ if (alen == sizeof (struct sockaddr_in))
+ {
+ s4 = vaddr;
+ t4 = GNUNET_malloc (sizeof (struct IPv4TcpAddress));
+ t4->t_port = s4->sin_port;
+ t4->ipv4_addr = s4->sin_addr.s_addr;
+ session->connect_addr = t4;
+ session->connect_alen = sizeof (struct IPv4TcpAddress);
+ }
+ else if (alen == sizeof (struct sockaddr_in6))
+ {
+ s6 = vaddr;
+ t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress));
+ t6->t6_port = s6->sin6_port;
+ memcpy (&t6->ipv6_addr,
+ &s6->sin6_addr,
+ sizeof (struct in6_addr));
+ session->connect_addr = t6;
+ session->connect_alen = sizeof (struct IPv6TcpAddress);
+ }
+ GNUNET_free (vaddr);
+ }
+ else
+ {
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Creating new session %p for incoming `%s' message.\n",
- session_c, "WELCOME");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Did not obtain TCP socket address for incoming connection\n");
#endif
- GNUNET_free_non_null (vaddr);
- process_pending_messages (session_c);
+ }
+#if DEBUG_TCP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating new session %p for connection %p\n",
+ session, client);
+#endif
+ process_pending_messages (session);
}
- if (session_c->expecting_welcome != GNUNET_YES)
+ if (session->expecting_welcome != GNUNET_YES)
{
GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- session_c->expecting_welcome = GNUNET_NO;
- if (0 < (addrlen = msize - sizeof (struct WelcomeMessage)))
- {
- addr = (const struct sockaddr *) &wm[1];
- tcp_plugin_address_suggested (plugin, addr, addrlen);
- }
+ session->last_activity = GNUNET_TIME_absolute_get ();
+ session->expecting_welcome = GNUNET_NO;
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
-/**
- * Calculate how long we should delay reading from the TCP socket to
- * ensure that we stay within our bandwidth limits (push back).
- *
- * @param session for which client should this be calculated
- */
-static struct GNUNET_TIME_Relative
-calculate_throttle_delay (struct Session *session)
-{
- struct GNUNET_TIME_Relative ret;
- struct GNUNET_TIME_Absolute now;
- uint64_t del;
- uint64_t avail;
- uint64_t excess;
-
- now = GNUNET_TIME_absolute_get ();
- del = now.value - session->last_quota_update.value;
- if (del > MAX_BANDWIDTH_CARRY)
- {
- update_quota (session, GNUNET_YES);
- del = now.value - session->last_quota_update.value;
- GNUNET_assert (del <= MAX_BANDWIDTH_CARRY);
- }
- if (session->quota_in == 0)
- session->quota_in = 1; /* avoid divison by zero */
- avail = del * session->quota_in;
- if (avail > session->last_received)
- return GNUNET_TIME_UNIT_ZERO; /* can receive right now */
- excess = session->last_received - avail;
- ret.value = excess / session->quota_in;
- return ret;
-}
-
-
/**
* Task to signal the server that we can continue
* receiving from the TCP client now.
+ *
+ * @param cls the 'struct Session*'
+ * @param tc task context (unused)
*/
static void
delayed_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Session *session = cls;
- GNUNET_SERVER_receive_done (session->client, GNUNET_OK);
+ struct GNUNET_TIME_Relative delay;
+
+ session->receive_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ delay = session->plugin->env->receive (session->plugin->env->cls,
+ &session->target,
+ NULL, 0,
+ session,
+ NULL, 0);
+ if (delay.value == 0)
+ GNUNET_SERVER_receive_done (session->client, GNUNET_OK);
+ else
+ session->receive_delay_task =
+ GNUNET_SCHEDULER_add_delayed (session->plugin->env->sched,
+ delay, &delayed_done, session);
}
{
struct Plugin *plugin = cls;
struct Session *session;
- const struct DataMessage *dm;
- uint16_t msize;
- const struct GNUNET_MessageHeader *msg;
- struct GNUNET_TIME_Relative latency;
- struct GNUNET_TIME_Absolute ttime;
- struct GNUNET_TIME_Absolute now;
struct GNUNET_TIME_Relative delay;
- uint64_t ack_in;
- msize = ntohs (message->size);
- if ((msize <
- sizeof (struct DataMessage) + sizeof (struct GNUNET_MessageHeader)))
+ if ((GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME == ntohs(message->type)) || (ntohs(message->type) == GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE))
{
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ /* We don't want to propagate WELCOME and NAT Probe messages up! */
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
session = find_session_by_client (plugin, client);
- if ((NULL == session) || (GNUNET_NO != session->expecting_welcome))
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
-#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp", "Receiving %u bytes from `%4s'.\n",
- msize,
- GNUNET_i2s(&session->target));
-#endif
- dm = (const struct DataMessage *) message;
- session->max_in_msg_counter = GNUNET_MAX (session->max_in_msg_counter,
- GNUNET_ntohll (dm->ack_out));
- msg = (const struct GNUNET_MessageHeader *) &dm[1];
- if (msize != sizeof (struct DataMessage) + ntohs (msg->size))
+ if ( (NULL == session) || (GNUNET_YES == session->expecting_welcome))
{
- GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- /* estimate latency */
- ack_in = GNUNET_ntohll (dm->ack_in);
- if ((ack_in <= session->out_msg_counter) &&
- (session->out_msg_counter - ack_in < ACK_LOG_SIZE))
- {
- delay = GNUNET_TIME_relative_ntoh (dm->delay);
- ttime = session->gen_time[ack_in % ACK_LOG_SIZE];
- now = GNUNET_TIME_absolute_get ();
- if (delay.value > now.value - ttime.value)
- delay.value = 0; /* not plausible */
- /* update (round-trip) latency using ageing; we
- use 7:1 so that we can reasonably quickly react
- to changes, but not so fast that latency is largely
- jitter... */
- session->latency_estimate
- = ((7 * session->latency_estimate) +
- (now.value - ttime.value - delay.value)) / 8;
- }
- latency.value = (uint64_t) session->latency_estimate;
- /* deliver on */
+ session->last_activity = GNUNET_TIME_absolute_get ();
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Forwarding data of type %u to transport service.\n",
- ntohs (msg->type));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Passing %u bytes of type %u from `%4s' to transport service.\n",
+ (unsigned int) ntohs (message->size),
+ (unsigned int) ntohs (message->type),
+ GNUNET_i2s (&session->target));
#endif
- session->service_context
- = plugin->env->receive (plugin->env->cls,
- session,
- session->service_context,
- latency, &session->target, msg);
- /* update bandwidth used */
- session->last_received += msize;
- update_quota (session, GNUNET_NO);
-
- delay = calculate_throttle_delay (session);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# bytes received via TCP"),
+ ntohs (message->size),
+ GNUNET_NO);
+ delay = plugin->env->receive (plugin->env->cls, &session->target, message, 1,
+ session,
+ (GNUNET_YES == session->inbound) ? NULL : session->connect_addr,
+ (GNUNET_YES == session->inbound) ? 0 : session->connect_alen);
if (delay.value == 0)
GNUNET_SERVER_receive_done (client, GNUNET_OK);
else
- GNUNET_SCHEDULER_add_delayed (session->plugin->env->sched,
- delay, &delayed_done, session);
-}
-
-
-/**
- * Handlers for the various TCP messages.
- */
-static struct GNUNET_SERVER_MessageHandler my_handlers[] = {
- {&handle_tcp_ping, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_PING, 0},
- {&handle_tcp_pong, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_PONG, 0},
- {&handle_tcp_welcome, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME, 0},
- {&handle_tcp_data, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_DATA, 0},
- {NULL, NULL, 0, 0}
-};
-
-
-static void
-create_tcp_handlers (struct Plugin *plugin)
-{
- unsigned int i;
- plugin->handlers = GNUNET_malloc (sizeof (my_handlers));
- memcpy (plugin->handlers, my_handlers, sizeof (my_handlers));
- for (i = 0;
- i <
- sizeof (my_handlers) / sizeof (struct GNUNET_SERVER_MessageHandler);
- i++)
- plugin->handlers[i].callback_cls = plugin;
- GNUNET_SERVER_add_handlers (plugin->server, plugin->handlers);
+ session->receive_delay_task =
+ GNUNET_SCHEDULER_add_delayed (session->plugin->env->sched,
+ delay, &delayed_done, session);
}
* @param client identification of the client
*/
static void
-disconnect_notify (void *cls, struct GNUNET_SERVER_Client *client)
+disconnect_notify (void *cls,
+ struct GNUNET_SERVER_Client *client)
{
struct Plugin *plugin = cls;
struct Session *session;
+ if (client == NULL)
+ return;
session = find_session_by_client (plugin, client);
if (session == NULL)
return; /* unknown, nothing to do */
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Destroying session of `%4s' with %s (%p) due to network-level disconnect.\n",
- GNUNET_i2s(&session->target),
- (session->connect_addr != NULL) ?
- GNUNET_a2s(session->connect_addr,
- session->connect_alen) : "*",
- client);
+ GNUNET_i2s (&session->target),
+ (session->connect_addr != NULL) ?
+ tcp_address_to_string (session->plugin,
+ session->connect_addr,
+ session->connect_alen) : "*",
+ client);
#endif
disconnect_session (session);
}
/**
* Add the IP of our network interface to the list of
* our external IP addresses.
+ *
+ * @param cls the 'struct Plugin*'
+ * @param name name of the interface
+ * @param isDefault do we think this may be our default interface
+ * @param addr address of the interface
+ * @param addrlen number of bytes in addr
+ * @return GNUNET_OK to continue iterating
*/
static int
process_interfaces (void *cls,
{
struct Plugin *plugin = cls;
int af;
- struct sockaddr_in *v4;
- struct sockaddr_in6 *v6;
+ struct IPv4TcpAddress t4;
+ struct IPv6TcpAddress t6;
+ struct IPv4TcpAddress t4_nat;
+ struct IPv6TcpAddress t6_nat;
+ void *arg;
+ uint16_t args;
+ void *arg_nat;
+ char buf[INET_ADDRSTRLEN];
af = addr->sa_family;
+ arg_nat = NULL;
if (af == AF_INET)
{
- v4 = (struct sockaddr_in *) addr;
- v4->sin_port = htons (plugin->adv_port);
+ t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
+ GNUNET_assert(NULL != inet_ntop(AF_INET, &t4.ipv4_addr, &buf[0], INET_ADDRSTRLEN));
+ if ((plugin->bind_address != NULL) && (0 != strcmp(buf, plugin->bind_address)))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Not notifying transport of address %s\n", "TCP", GNUNET_a2s (addr, addrlen));
+ return GNUNET_OK;
+ }
+ add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t));
+ if ((plugin->behind_nat == GNUNET_YES) && (plugin->only_nat_addresses == GNUNET_YES))
+ t4.t_port = htons(0);
+ else if (plugin->behind_nat == GNUNET_YES) /* We are behind NAT, but will advertise NAT and normal addresses */
+ {
+ t4_nat.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
+ t4_nat.t_port = htons(plugin->adv_port);
+ arg_nat = &t4_nat;
+ }
+ else
+ t4.t_port = htons (plugin->adv_port);
+ arg = &t4;
+ args = sizeof (t4);
+ }
+ else if (af == AF_INET6)
+ {
+ if ((IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr)) || (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno(plugin->env->cfg, "transport-tcp", "disablev6")))
+ {
+ /* skip link local addresses */
+ return GNUNET_OK;
+ }
+ memcpy (&t6.ipv6_addr,
+ &((struct sockaddr_in6 *) addr)->sin6_addr,
+ sizeof (struct in6_addr));
+ add_to_address_list (plugin, &t6.ipv6_addr, sizeof (struct in6_addr));
+ if ((plugin->behind_nat == GNUNET_YES) && (plugin->only_nat_addresses == GNUNET_YES))
+ t6.t6_port = htons(0);
+ else if (plugin->behind_nat == GNUNET_YES) /* We are behind NAT, but will advertise NAT and normal addresses */
+ {
+ memcpy (&t6_nat.ipv6_addr,
+ &((struct sockaddr_in6 *) addr)->sin6_addr,
+ sizeof (struct in6_addr));
+ t6_nat.t6_port = htons(plugin->adv_port);
+ arg_nat = &t6;
+ }
+ else
+ t6.t6_port = htons (plugin->adv_port);
+ arg = &t6;
+ args = sizeof (t6);
}
else
{
- GNUNET_assert (af == AF_INET6);
- v6 = (struct sockaddr_in6 *) addr;
- v6->sin6_port = htons (plugin->adv_port);
+ GNUNET_break (0);
+ return GNUNET_OK;
}
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO |
- GNUNET_ERROR_TYPE_BULK,
- "tcp", _("Found address `%s' (%s)\n"),
- GNUNET_a2s(addr, addrlen), name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Found address `%s' (%s) len %d\n"),
+ GNUNET_a2s (addr, addrlen), name, args);
+
plugin->env->notify_address (plugin->env->cls,
"tcp",
- addr, addrlen, GNUNET_TIME_UNIT_FOREVER_REL);
+ arg, args, GNUNET_TIME_UNIT_FOREVER_REL);
+
+ if (arg_nat != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Found address `%s' (%s) len %d\n"),
+ GNUNET_a2s (addr, addrlen), name, args);
+ plugin->env->notify_address (plugin->env->cls,
+ "tcp",
+ arg_nat, args, GNUNET_TIME_UNIT_FOREVER_REL);
+ }
+
return GNUNET_OK;
}
if (addr == NULL)
{
- hostname_dns = NULL;
+ plugin->hostname_dns = NULL;
return;
}
- process_interfaces (plugin,
- "<hostname>",
- GNUNET_YES,
- addr,
- addrlen);
+ /* FIXME: Can we figure out our external address here so it doesn't need to be user specified? */
+ process_interfaces (plugin, "<hostname>", GNUNET_YES, addr, addrlen);
}
+/**
+ * We can now send a probe message, copy into buffer to really send.
+ *
+ * @param cls closure, a struct TCPProbeContext
+ * @param size max size to copy
+ * @param buf buffer to copy message to
+ */
+static size_t notify_send_probe (void *cls,
+ size_t size, void *buf)
+{
+ struct TCPProbeContext *tcp_probe_ctx = cls;
+
+ if (buf == NULL)
+ {
+ return 0;
+ }
+
+ GNUNET_assert(size >= sizeof(tcp_probe_ctx->message));
+ memcpy(buf, &tcp_probe_ctx->message, sizeof(tcp_probe_ctx->message));
+ GNUNET_SERVER_connect_socket (tcp_probe_ctx->plugin->server,
+ tcp_probe_ctx->sock);
+
+ GNUNET_free(tcp_probe_ctx);
+ return sizeof(tcp_probe_ctx->message);
+}
+
+/*
+ * @param cls the plugin handle
+ * @param tc the scheduling context (for rescheduling this function again)
+ *
+ * We have been notified that gnunet-nat-server has written something to stdout.
+ * Handle the output, then reschedule this function to be called again once
+ * more is available.
+ *
+ */
+static void
+tcp_plugin_server_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct Plugin *plugin = cls;
+ char mybuf[40];
+ ssize_t bytes;
+ memset(&mybuf, 0, sizeof(mybuf));
+ int i;
+ int port;
+ char *port_start;
+ struct sockaddr_in in_addr;
+ struct TCPProbeContext *tcp_probe_ctx;
+ struct GNUNET_CONNECTION_Handle *sock;
+
+ if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ return;
+
+ bytes = GNUNET_DISK_file_read(plugin->server_stdout_handle, &mybuf, sizeof(mybuf));
+
+ if (bytes < 1)
+ {
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Finished reading from server stdout with code: %d\n"), bytes);
+#endif
+ return;
+ }
+
+ port_start = NULL;
+ for (i = 0; i < sizeof(mybuf); i++)
+ {
+ if (mybuf[i] == '\n')
+ mybuf[i] = '\0';
+
+ if ((mybuf[i] == ':') && (i + 1 < sizeof(mybuf)))
+ {
+ mybuf[i] = '\0';
+ port_start = &mybuf[i + 1];
+ }
+ }
+
+ if (port_start != NULL)
+ port = atoi(port_start);
+ else
+ {
+ plugin->server_read_task =
+ GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->server_stdout_handle, &tcp_plugin_server_read, plugin);
+ return;
+ }
+
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("nat-server-read read: %s port %d\n"), &mybuf, port);
+#endif
+
+
+ if (inet_pton(AF_INET, &mybuf[0], &in_addr.sin_addr) != 1)
+ {
+
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("nat-server-read malformed address\n"), &mybuf, port);
+
+ plugin->server_read_task =
+ GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->server_stdout_handle, &tcp_plugin_server_read, plugin);
+ return;
+ }
+
+ in_addr.sin_family = AF_INET;
+ in_addr.sin_port = htons(port);
+ /**
+ * We have received an ICMP response, ostensibly from a non-NAT'd peer
+ * that wants to connect to us! Send a message to establish a connection.
+ */
+ sock = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched, AF_INET, (struct sockaddr *)&in_addr,
+ sizeof(in_addr));
+
+
+ if (sock == NULL)
+ {
+ plugin->server_read_task =
+ GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->server_stdout_handle, &tcp_plugin_server_read, plugin);
+ return;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Sending TCP probe message!\n"), &mybuf, port);
+
+ tcp_probe_ctx = GNUNET_malloc(sizeof(struct TCPProbeContext));
+ tcp_probe_ctx->message.header.size = htons(sizeof(struct TCP_NAT_ProbeMessage));
+ tcp_probe_ctx->message.header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE);
+ memcpy(&tcp_probe_ctx->message.clientIdentity, plugin->env->my_identity, sizeof(struct GNUNET_PeerIdentity));
+ tcp_probe_ctx->plugin = plugin;
+ tcp_probe_ctx->sock = sock;
+ tcp_probe_ctx->transmit_handle = GNUNET_CONNECTION_notify_transmit_ready (sock,
+ ntohs(tcp_probe_ctx->message.header.size),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ ¬ify_send_probe, tcp_probe_ctx);
+
+ }
+
+ /*GNUNET_SERVER_connect_socket(plugin->server, sock);*/
+ plugin->server_read_task =
+ GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->server_stdout_handle, &tcp_plugin_server_read, plugin);
+}
+
+/**
+ * Start the gnunet-nat-server process for users behind NAT.
+ *
+ * @param plugin the transport plugin
+ *
+ * @return GNUNET_YES if process was started, GNUNET_SYSERR on error
+ */
+static int
+tcp_transport_start_nat_server(struct Plugin *plugin)
+{
+
+ plugin->server_stdout = GNUNET_DISK_pipe(GNUNET_YES);
+ if (plugin->server_stdout == NULL)
+ return GNUNET_SYSERR;
+
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting gnunet-nat-server process cmd: %s %s\n", "gnunet-nat-server", plugin->internal_address);
+#endif
+ /* Start the server process */
+ plugin->server_pid = GNUNET_OS_start_process(NULL, plugin->server_stdout, "gnunet-nat-server", "gnunet-nat-server", plugin->internal_address, NULL);
+ if (plugin->server_pid == GNUNET_SYSERR)
+ {
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to start gnunet-nat-server process\n");
+#endif
+ return GNUNET_SYSERR;
+ }
+ /* Close the write end of the read pipe */
+ GNUNET_DISK_pipe_close_end(plugin->server_stdout, GNUNET_DISK_PIPE_END_WRITE);
+
+ plugin->server_stdout_handle = GNUNET_DISK_pipe_handle(plugin->server_stdout, GNUNET_DISK_PIPE_END_READ);
+ plugin->server_read_task =
+ GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->server_stdout_handle, &tcp_plugin_server_read, plugin);
+ return GNUNET_YES;
+}
+
+/**
+ * Return the actual path to a file found in the current
+ * PATH environment variable.
+ *
+ * @param binary the name of the file to find
+ */
+static char *
+get_path_from_PATH (char *binary)
+{
+ char *path;
+ char *pos;
+ char *end;
+ char *buf;
+ const char *p;
+
+ p = getenv ("PATH");
+ if (p == NULL)
+ return NULL;
+ path = GNUNET_strdup (p); /* because we write on it */
+ buf = GNUNET_malloc (strlen (path) + 20);
+ pos = path;
+
+ while (NULL != (end = strchr (pos, ':')))
+ {
+ *end = '\0';
+ sprintf (buf, "%s/%s", pos, binary);
+ if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
+ {
+ GNUNET_free (path);
+ return buf;
+ }
+ pos = end + 1;
+ }
+ sprintf (buf, "%s/%s", pos, binary);
+ if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
+ {
+ GNUNET_free (path);
+ return buf;
+ }
+ GNUNET_free (buf);
+ GNUNET_free (path);
+ return NULL;
+}
+
+/**
+ * Check whether the suid bit is set on a file.
+ * Attempts to find the file using the current
+ * PATH environment variable as a search path.
+ *
+ * @param binary the name of the file to check
+ */
+static int
+check_gnunet_nat_binary(char *binary)
+{
+ struct stat statbuf;
+ char *p;
+
+ p = get_path_from_PATH (binary);
+ if (p == NULL)
+ return GNUNET_NO;
+ if (0 != STAT (p, &statbuf))
+ {
+ GNUNET_free (p);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_free (p);
+ if ( (0 != (statbuf.st_mode & S_ISUID)) &&
+ (statbuf.st_uid == 0) )
+ return GNUNET_YES;
+ return GNUNET_NO;
+}
/**
* Entry point for the plugin.
+ *
+ * @param cls closure, the 'struct GNUNET_TRANSPORT_PluginEnvironment*'
+ * @return the 'struct GNUNET_TRANSPORT_PluginFunctions*' or NULL on error
*/
void *
libgnunet_plugin_transport_tcp_init (void *cls)
{
+ static const struct GNUNET_SERVER_MessageHandler my_handlers[] = {
+ {&handle_tcp_welcome, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME,
+ sizeof (struct WelcomeMessage)},
+ {&handle_tcp_nat_probe, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE, sizeof (struct TCP_NAT_ProbeMessage)},
+ {&handle_tcp_data, NULL, GNUNET_MESSAGE_TYPE_ALL, 0},
+ {NULL, NULL, 0, 0}
+ };
struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
struct GNUNET_TRANSPORT_PluginFunctions *api;
struct Plugin *plugin;
struct GNUNET_SERVICE_Context *service;
unsigned long long aport;
unsigned long long bport;
+ unsigned int i;
+ int behind_nat;
+ int allow_nat;
+ int only_nat_addresses;
+ char *internal_address;
+ char *external_address;
+ struct sockaddr_in in_addr;
+ struct IPv4TcpAddress t4;
service = GNUNET_SERVICE_start ("transport-tcp", env->sched, env->cfg);
if (service == NULL)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to start service for `%s' transport plugin.\n"),
+ "tcp");
+ return NULL;
+ }
+
+ if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "transport-tcp",
+ "BEHIND_NAT"))
+ {
+ /* We are behind nat (according to the user) */
+ if (check_gnunet_nat_binary("gnunet-nat-server") == GNUNET_YES)
+ {
+ behind_nat = GNUNET_YES;
+ }
+ else
+ {
+ behind_nat = GNUNET_NO;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Configuration specified you are behind a NAT, but gnunet-nat-server is not installed properly (suid bit not set)!\n");
+ }
+ }
+ else
+ behind_nat = GNUNET_NO; /* We are not behind nat! */
+
+ if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "transport-tcp",
+ "ALLOW_NAT"))
+ {
+ if (check_gnunet_nat_binary("gnunet-nat-client") == GNUNET_YES)
+ allow_nat = GNUNET_YES; /* We will try to connect to NAT'd peers */
+ else
+ {
+ allow_nat = GNUNET_NO;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Configuration specified you want to connect to NAT'd peers, but gnunet-nat-client is not installed properly (suid bit not set)!\n");
+ }
+ }
+ else
+ allow_nat = GNUNET_NO; /* We don't want to try to help NAT'd peers */
+
+
+ if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "transport-tcp",
+ "ONLY_NAT_ADDRESSES"))
+ only_nat_addresses = GNUNET_YES; /* We will only report our addresses as NAT'd */
+ else
+ only_nat_addresses = GNUNET_NO; /* We will report our addresses as NAT'd and non-NAT'd */
+
+ external_address = NULL;
+ if (((GNUNET_YES == behind_nat) || (GNUNET_YES == allow_nat)) && (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (env->cfg,
+ "transport-tcp",
+ "EXTERNAL_ADDRESS",
+ &external_address)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
- ("Failed to start service for `%s' transport plugin.\n"),
- "tcp");
+ ("Require EXTERNAL_ADDRESS for service `%s' in configuration (either BEHIND_NAT or ALLOW_NAT set to YES)!\n"),
+ "transport-tcp");
+ GNUNET_SERVICE_stop (service);
+ return NULL;
+ }
+
+ if ((external_address != NULL) && (inet_pton(AF_INET, external_address, &in_addr.sin_addr) != 1))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Malformed EXTERNAL_ADDRESS %s given in configuration!\n", external_address);
+ }
+
+ internal_address = NULL;
+ if ((GNUNET_YES == behind_nat) && (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (env->cfg,
+ "transport-tcp",
+ "INTERNAL_ADDRESS",
+ &internal_address)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"),
+ "transport-tcp");
+ GNUNET_SERVICE_stop (service);
+ GNUNET_free_non_null(external_address);
return NULL;
}
+
+ if ((internal_address != NULL) && (inet_pton(AF_INET, internal_address, &in_addr.sin_addr) != 1))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Malformed INTERNAL_ADDRESS %s given in configuration!\n", internal_address);
+ }
+
aport = 0;
if ((GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (env->cfg,
"ADVERTISED-PORT",
&aport)) && (aport > 65535)))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Require valid port number for service `%s' in configuration!\n"),
"transport-tcp");
+ GNUNET_free_non_null(external_address);
+ GNUNET_free_non_null(internal_address);
GNUNET_SERVICE_stop (service);
return NULL;
}
+
if (aport == 0)
aport = bport;
plugin = GNUNET_malloc (sizeof (struct Plugin));
plugin->open_port = bport;
plugin->adv_port = aport;
+ plugin->external_address = external_address;
+ plugin->internal_address = internal_address;
+ plugin->behind_nat = behind_nat;
+ plugin->allow_nat = allow_nat;
+ plugin->only_nat_addresses = only_nat_addresses;
plugin->env = env;
plugin->lsock = NULL;
- plugin->statistics = NULL;
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = plugin;
- api->validate = &tcp_plugin_validate;
api->send = &tcp_plugin_send;
- api->cancel = &tcp_plugin_cancel;
+ api->disconnect = &tcp_plugin_disconnect;
api->address_pretty_printer = &tcp_plugin_address_pretty_printer;
- api->set_receive_quota = &tcp_plugin_set_receive_quota;
- api->address_suggested = &tcp_plugin_address_suggested;
- api->cost_estimate = 42; /* TODO: ATS */
+ api->check_address = &tcp_plugin_check_address;
+ api->address_to_string = &tcp_address_to_string;
plugin->service = service;
plugin->server = GNUNET_SERVICE_get_server (service);
- create_tcp_handlers (plugin);
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
- "tcp", _("TCP transport listening on port %llu\n"), bport);
+ plugin->handlers = GNUNET_malloc (sizeof (my_handlers));
+ memcpy (plugin->handlers, my_handlers, sizeof (my_handlers));
+ for (i = 0;
+ i <
+ sizeof (my_handlers) / sizeof (struct GNUNET_SERVER_MessageHandler);
+ i++)
+ plugin->handlers[i].callback_cls = plugin;
+ GNUNET_SERVER_add_handlers (plugin->server, plugin->handlers);
+
+ if (plugin->behind_nat == GNUNET_YES)
+ {
+ if (GNUNET_YES != tcp_transport_start_nat_server(plugin))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+
+ _
+ ("Failed to start %s required for NAT in %s!\n"),
+ "gnunet-nat-server"
+ "transport-tcp");
+ GNUNET_free_non_null(external_address);
+ GNUNET_free_non_null(internal_address);
+ GNUNET_SERVICE_stop (service);
+ GNUNET_free (api);
+ return NULL;
+ }
+ }
+
+ if (allow_nat == GNUNET_YES)
+ {
+ plugin->nat_wait_conns = GNUNET_CONTAINER_multihashmap_create(100);
+ GNUNET_assert(plugin->nat_wait_conns != NULL);
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("TCP transport listening on port %llu\n"), bport);
if (aport != bport)
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
- "tcp",
- _
- ("TCP transport advertises itself as being on port %llu\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("TCP transport advertises itself as being on port %llu\n"),
aport);
- GNUNET_SERVER_disconnect_notify (plugin->server, &disconnect_notify,
+ GNUNET_SERVER_disconnect_notify (plugin->server,
+ &disconnect_notify,
plugin);
- GNUNET_OS_network_interfaces_list (&process_interfaces, plugin);
- hostname_dns = GNUNET_RESOLVER_hostname_resolve (env->sched,
- env->cfg,
- AF_UNSPEC,
- HOSTNAME_RESOLVE_TIMEOUT,
- &process_hostname_ips, plugin);
+ GNUNET_CONFIGURATION_get_value_string(env->cfg, "transport-tcp", "BINDTO", &plugin->bind_address);
+
+ if (plugin->behind_nat == GNUNET_NO)
+ {
+ GNUNET_OS_network_interfaces_list (&process_interfaces, plugin);
+ }
+
+ plugin->hostname_dns = GNUNET_RESOLVER_hostname_resolve (env->sched,
+ env->cfg,
+ AF_UNSPEC,
+ HOSTNAME_RESOLVE_TIMEOUT,
+ &process_hostname_ips,
+ plugin);
+
+ if ((plugin->behind_nat == GNUNET_YES) && (inet_pton(AF_INET, plugin->external_address, &t4.ipv4_addr) == 1))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notifying transport of address %s:0\n", plugin->external_address);
+ t4.t_port = htons(0);
+ add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t));
+ plugin->env->notify_address (plugin->env->cls,
+ "tcp",
+ &t4, sizeof(t4), GNUNET_TIME_UNIT_FOREVER_REL);
+ }
+ else if ((plugin->external_address != NULL) && (inet_pton(AF_INET, plugin->external_address, &t4.ipv4_addr) == 1))
+ {
+ t4.t_port = htons(plugin->adv_port);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notifying transport of address %s:%d\n", plugin->external_address, plugin->adv_port);
+ add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t));
+ plugin->env->notify_address (plugin->env->cls,
+ "tcp",
+ &t4, sizeof(t4), GNUNET_TIME_UNIT_FOREVER_REL);
+ }
+
return api;
}
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
struct Session *session;
+ struct LocalAddrList *lal;
while (NULL != (session = plugin->sessions))
- disconnect_session (session);
- if (NULL != hostname_dns)
+ disconnect_session (session);
+ if (NULL != plugin->hostname_dns)
{
- GNUNET_RESOLVER_request_cancel (hostname_dns);
- hostname_dns = NULL;
+ GNUNET_RESOLVER_request_cancel (plugin->hostname_dns);
+ plugin->hostname_dns = NULL;
}
GNUNET_SERVICE_stop (plugin->service);
GNUNET_free (plugin->handlers);
+ while (NULL != (lal = plugin->lal_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (plugin->lal_head,
+ plugin->lal_tail,
+ lal);
+ GNUNET_free (lal);
+ }
+
+ if (plugin->behind_nat == GNUNET_YES)
+ {
+ if (0 != PLIBC_KILL (plugin->server_pid, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ GNUNET_OS_process_wait (plugin->server_pid);
+ }
+ GNUNET_free_non_null(plugin->bind_address);
GNUNET_free (plugin);
GNUNET_free (api);
return NULL;