new operation queue for limiting overlay connects

[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 8ec47fe4c4f08d28fc34e0bd7384590c25fa87f8..1ac2f985940416862fa89604b8f960b4b3b36559 100644 (file)
--- a/src/transport/plugin_transport_http.h
+++ b/src/transport/plugin_transport_http.h
@@ -96,27 +96,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
@@ -225,6 +239,11 @@ struct Plugin
    */
   GNUNET_SCHEDULER_TaskIdentifier server_v4_task;
 
+  /**
+   * The IPv4 server is scheduled to run asap
+   */
+  int server_v4_immediately;
+
   /**
    * MHD IPv6 daemon
    */
@@ -235,6 +254,12 @@ struct Plugin
    */
   GNUNET_SCHEDULER_TaskIdentifier server_v6_task;
 
+  /**
+   * The IPv6 server is scheduled to run asap
+   */
+
+  int server_v6_immediately;
+
   /**
    * IPv4 server socket to bind to
    */
@@ -272,6 +297,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
  */
@@ -305,11 +346,33 @@ struct IPv6HttpAddress
 };
 GNUNET_NETWORK_STRUCT_END
 
+
+struct ServerConnection
+{
+  /* _RECV or _SEND */
+  int direction;
+
+  /* Should this connection get disconnected? GNUNET_YES/NO  */
+  int disconnect;
+
+  /* The session this server connection belongs to */
+  struct Session *session;
+
+  /* The MHD connection */
+  struct MHD_Connection *mhd_conn;
+};
+
+
+
 /**
  * Session handle for connections.
  */
 struct Session
 {
+  /**
+   * To whom are we talking to
+   */
+  struct GNUNET_PeerIdentity target;
 
   /**
    * Stored in a linked list.
@@ -341,11 +404,6 @@ struct Session
    */
   uint32_t ats_address_network_type;
 
-  /**
-   * To whom are we talking to
-   */
-  struct GNUNET_PeerIdentity target;
-
   /**
    * next pointer for double linked list
    */
@@ -417,12 +475,12 @@ struct Session
   /**
    * Client send handle
    */
-  void *server_recv;
+  struct ServerConnection *server_recv;
 
   /**
    * Client send handle
    */
-  void *server_send;
+  struct ServerConnection *server_send;
 };
 
 /**