tolerate additional IPv4 address now available for gnunet.org

[oweals/gnunet.git] / src / transport / plugin_transport_udp.h

diff --git a/src/transport/plugin_transport_udp.h b/src/transport/plugin_transport_udp.h
index 88a3a9997b104eaae225c58bc6ff46ae55bda56f..cccb3ceb3717ec9f1908573d4eb3983e1fb09da3 100644 (file)
--- a/src/transport/plugin_transport_udp.h
+++ b/src/transport/plugin_transport_udp.h
@@ -1,21 +1,21 @@
 /*
      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
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-     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.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
@@ -32,7 +32,6 @@
 #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"
@@ -121,29 +120,14 @@ union UdpAddress
 
 
 /**
- * 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;
 
 
@@ -160,7 +144,7 @@ struct Plugin
 
   /**
    * 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;
 
@@ -172,18 +156,13 @@ struct Plugin
   /**
    * 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.
    */
@@ -205,40 +184,20 @@ struct Plugin
   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
    */
@@ -347,6 +306,17 @@ struct Plugin
 };
 
 
+/**
+ * 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,
@@ -370,7 +340,7 @@ udp_broadcast_receive (struct Plugin *plugin,
                        ssize_t size,
                        const union UdpAddress *udp_addr,
                        size_t udp_addr_len,
-                       enum GNUNET_ATS_Network_Type network_type);
+                       enum GNUNET_NetworkType network_type);
 
 
 void