Merge remote-tracking branch 'origin/identity_abe' into identity_oidc

[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 603e13e1a3f2e201d4c9b20b0ab0b462b618bbcc..48c7365c714192d351f3a40d9f8476312853619e 100644 (file)
--- a/src/transport/plugin_transport_udp.h
+++ b/src/transport/plugin_transport_udp.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     Copyright (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
@@ -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"
@@ -145,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;
 
@@ -164,11 +163,6 @@ struct Plugin
    */
   struct GNUNET_SCHEDULER_Task *select_task_v6;
 
-  /**
-   * Tokenizer for inbound messages.
-   */
-  struct GNUNET_SERVER_MessageStreamTokenizer *mst;
-
   /**
    * Bandwidth tracker to limit global UDP traffic.
    */
@@ -189,6 +183,11 @@ struct Plugin
    */
   struct GNUNET_NAT_Handle *nat;
 
+  /**
+   * Handle to NAT traversal support.
+   */
+  struct GNUNET_NAT_STUN_Handle *stun;
+
   /**
    * The read socket for IPv4
    */
@@ -199,11 +198,6 @@ struct Plugin
    */
   struct GNUNET_NETWORK_Handle *sockv6;
 
-  /**
-   * Tokenizer for inbound messages.
-   */
-  struct GNUNET_SERVER_MessageStreamTokenizer *broadcast_mst;
-
   /**
    * Head of DLL of broadcast addresses
    */