/*
This file is part of GNUnet
- (C) 2010-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2014 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
#include "gnunet_hello_lib.h"
#include "gnunet_util_lib.h"
#include "gnunet_fragmentation_lib.h"
-#include "gnunet_nat_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_resolver_service.h"
#include "gnunet_signatures.h"
/**
- * UDP Message-Packet header (after defragmentation).
+ * Information we track for each message in the queue.
*/
-struct UDPMessage
-{
- /**
- * Message header.
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * Always zero for now.
- */
- uint32_t reserved;
-
- /**
- * What is the identity of the sender
- */
- struct GNUNET_PeerIdentity sender;
-
-};
-
struct UDP_MessageWrapper;
+
+/**
+ * Closure for #append_port().
+ */
struct PrettyPrinterContext;
/**
* Session of peers with whom we are currently connected,
- * map of peer identity to `struct Session *`.
+ * map of peer identity to `struct GNUNET_ATS_Session *`.
*/
struct GNUNET_CONTAINER_MultiPeerMap *sessions;
/**
* ID of select task for IPv4
*/
- struct GNUNET_SCHEDULER_Task *select_task;
+ struct GNUNET_SCHEDULER_Task *select_task_v4;
/**
* ID of select task for IPv6
*/
struct GNUNET_SCHEDULER_Task *select_task_v6;
- /**
- * Tokenizer for inbound messages.
- */
- struct GNUNET_SERVER_MessageStreamTokenizer *mst;
-
/**
* Bandwidth tracker to limit global UDP traffic.
*/
struct GNUNET_NAT_Handle *nat;
/**
- * FD Read set
- */
- struct GNUNET_NETWORK_FDSet *rs_v4;
-
- /**
- * FD Write set
+ * Handle to NAT traversal support.
*/
- struct GNUNET_NETWORK_FDSet *ws_v4;
+ struct GNUNET_NAT_STUN_Handle *stun;
/**
* The read socket for IPv4
*/
struct GNUNET_NETWORK_Handle *sockv4;
- /**
- * FD Read set
- */
- struct GNUNET_NETWORK_FDSet *rs_v6;
-
- /**
- * FD Write set
- */
- struct GNUNET_NETWORK_FDSet *ws_v6;
-
/**
* The read socket for IPv6
*/
struct GNUNET_NETWORK_Handle *sockv6;
- /**
- * Tokenizer for inbound messages.
- */
- struct GNUNET_SERVER_MessageStreamTokenizer *broadcast_mst;
-
/**
* Head of DLL of broadcast addresses
*/
};
+/**
+ * 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
+ * @param addr binary address (a `union UdpAddress`)
+ * @param addrlen length of the @a addr
+ * @return string representing the same address
+ */
const char *
udp_address_to_string (void *cls,
const void *addr,