Check that you are not present in trail twice

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

diff --git a/src/transport/plugin_transport_http.h b/src/transport/plugin_transport_http.h
index dc0f8bb01a0af6bc0ccd389e07e5dd6305c689c3..ae0c784eef230b7311bf1fd87ee564f12a15bbe3 100644 (file)
--- a/src/transport/plugin_transport_http.h
+++ b/src/transport/plugin_transport_http.h
@@ -23,6 +23,8 @@
  * @brief http transport service plugin
  * @author Matthias Wachs
  */
+#ifndef PLUGIN_TRANSPORT_HTTP_H
+#define PLUGIN_TRANSPORT_HTTP_H
 
 #include "platform.h"
 #include "gnunet_common.h"
@@ -96,27 +98,41 @@ struct Plugin
   /**
    * IPv4 addresses DLL head
    */
-  struct IPv4HttpAddressWrapper *ipv4_addr_head;
+  struct HttpAddressWrapper *addr_head;
 
   /**
    * IPv4 addresses DLL tail
    */
-  struct IPv4HttpAddressWrapper *ipv4_addr_tail;
+  struct HttpAddressWrapper *addr_tail;
+
 
   /**
-   * IPv6 addresses DLL head
+   * Plugin configuration
+   * --------------------
    */
-  struct IPv6HttpAddressWrapper *ipv6_addr_head;
 
   /**
-   * IPv6 addresses DLL tail
+   * External hostname the plugin can be connected to, can be different to
+   * the host's FQDN, used e.g. for reverse proxying
    */
-  struct IPv6HttpAddressWrapper *ipv6_addr_tail;
+  char *external_hostname;
 
   /**
-   * Plugin configuration
-   * --------------------
+   * External hostname the plugin can be connected to, can be different to
+   * the host's FQDN, used e.g. for reverse proxying
+   */
+  struct HttpAddress *ext_addr;
+
+  /**
+   * External address length
+   */
+  size_t ext_addr_len;
+
+  /**
+   * Task calling transport service about external address
    */
+  GNUNET_SCHEDULER_TaskIdentifier notify_ext_task;
+
 
   /**
    * Plugin name
@@ -283,6 +299,22 @@ struct Plugin
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
+/**
+ * HTTP addresses including a full URI
+ */
+struct HttpAddress
+{
+  /**
+   * Length of the address following in NBO
+   */
+  uint32_t addr_len GNUNET_PACKED;
+
+  /**
+   * Address following
+   */
+  void *addr GNUNET_PACKED;
+};
+
 /**
  * IPv4 addresses
  */
@@ -317,7 +349,7 @@ struct IPv6HttpAddress
 GNUNET_NETWORK_STRUCT_END
 
 
-struct ServerConnection
+struct ServerRequest
 {
   /* _RECV or _SEND */
   int direction;
@@ -445,12 +477,12 @@ struct Session
   /**
    * Client send handle
    */
-  struct ServerConnection *server_recv;
+  struct ServerRequest *server_recv;
 
   /**
    * Client send handle
    */
-  struct ServerConnection *server_send;
+  struct ServerRequest *server_send;
 };
 
 /**
@@ -549,4 +581,6 @@ void
 notify_session_end (void *cls, const struct GNUNET_PeerIdentity *peer,
                     struct Session *s);
 
+/*#ifndef PLUGIN_TRANSPORT_HTTP_H*/
+#endif
 /* end of plugin_transport_http.h */