ats

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 417fdef5aec1beec8f5f556dee76bad3fbb89dbf..5d0e4043999e8dd28b4c82a021af3fd0e2b8068f 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -153,6 +153,7 @@ gnunet_service_transport_LDADD = \
 
 gnunet_service_transport_new_SOURCES = \
  gnunet-service-transport-new.c gnunet-service-transport.h \
+ gnunet-service-transport_ats-new.h gnunet-service-transport_ats-new.c \
  gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \
  gnunet-service-transport_clients.h gnunet-service-transport_clients.c \
  gnunet-service-transport_hello.h gnunet-service-transport_hello.c \

diff --git a/src/transport/gnunet-service-transport_ats-new.c b/src/transport/gnunet-service-transport_ats-new.c
new file mode 100644 (file)
index 0000000..c731ec9
--- /dev/null
+++ b/src/transport/gnunet-service-transport_ats-new.c
@@ -0,0 +1,145 @@
+/*
+     This file is part of GNUnet.
+     (C) 2010,2011 Christian Grothoff (and other contributing authors)
+
+     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 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.
+
+     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.
+*/
+/**
+ * @file transport/gnunet-service-transport_ats-new.c
+ * @brief automatic transport selection API
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+ */
+#include "platform.h"
+#include "gnunet-service-transport_ats-new.h"
+
+
+/**
+ * Handle to the ATS subsystem.
+ */
+struct GST_AtsHandle
+{
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  GNUNET_TRANSPORT_ATS_AllocationNotification alloc_cb;
+
+  void *alloc_cb_cls;
+};
+
+
+/**
+ * Initialize the ATS subsystem.
+ *
+ * @param cfg configuration to use
+ * @param alloc_cb notification to call whenever the allocation changed
+ * @param alloc_cb_cls closure for 'alloc_cb'
+ * @return ats context
+ */
+struct GST_AtsHandle *
+GST_ats_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
+             GNUNET_TRANSPORT_ATS_AllocationNotification alloc_cb,
+             void *alloc_cb_cls)
+{
+  struct GST_AtsHandle *atc;
+
+  atc = GNUNET_malloc (sizeof (struct GST_AtsHandle));
+  atc->cfg = cfg;
+  atc->alloc_cb = alloc_cb;
+  atc->alloc_cb_cls = alloc_cb_cls;
+  return atc;
+}
+
+
+/**
+ * Shutdown the ATS subsystem.
+ *
+ * @param atc handle
+ */
+void
+GST_ats_shutdown (struct GST_AtsHandle *atc)
+{
+  GNUNET_free (atc);
+}
+
+
+/**
+ * We established a new connection with a peer (for example, because
+ * core asked for it or because the other peer connected to us).
+ * Calculate bandwidth assignments including the new peer.
+ *
+ * @param atc handle
+ * @param peer identity of the new peer
+ * @param plugin_name name of the currently used transport plugin
+ * @param plugin_addr address in use
+ * @param plugin_addr_len number of bytes in plugin_addr
+ * @param ats performance data for the connection
+ * @param ats_count number of performance records in 'ats'
+ */
+void
+GST_ats_peer_connect (struct GST_AtsHandle *atc,
+                     const struct GNUNET_PeerIdentity *peer,
+                     const char *plugin_name,
+                     const void *plugin_addr,
+                     size_t plugin_addr_len,
+                     const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                     uint32_t ats_count)
+{
+}
+
+
+/**
+ * We disconnected from the given peer (for example, because ats, core
+ * or blacklist asked for it or because the other peer disconnected).
+ * Calculate bandwidth assignments without the peer.
+ *
+ * @param atc handle
+ * @param peer identity of the new peer
+ */
+void
+GST_ats_peer_disconnect (struct GST_AtsHandle *atc,
+                        const struct GNUNET_PeerIdentity *peer)
+{
+}
+
+
+/**
+ * We have updated performance statistics for a given address.  Note
+ * that this function can be called for addresses that are currently
+ * in use as well as addresses that are valid but not actively in use.
+ * Furthermore, the peer may not even be connected to us right now (in
+ * which case the call may be ignored or the information may be stored
+ * for later use).  Update bandwidth assignments.
+ *
+ * @param atc handle
+ * @param peer identity of the new peer
+ * @param plugin_name name of the transport plugin
+ * @param plugin_addr address 
+ * @param plugin_addr_len number of bytes in plugin_addr
+ * @param ats performance data for the address
+ * @param ats_count number of performance records in 'ats'
+ */
+void
+GST_ats_address_update (struct GST_AtsHandle *atc,
+                       const struct GNUNET_PeerIdentity *peer,
+                       const char *plugin_name,
+                       const void *plugin_addr,
+                       size_t plugin_addr_len,
+                       const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                       uint32_t ats_count)
+{
+}
+
+/* end of file gnunet-service-transport_ats.c */

diff --git a/src/transport/gnunet-service-transport_ats-new.h b/src/transport/gnunet-service-transport_ats-new.h
index ebb8d9da56623f0fa2661826f06f719ce4d4b2e8..360674bb9d55dea375fcb3e4d425176f6a3c04d5 100644 (file)
--- a/src/transport/gnunet-service-transport_ats-new.h
+++ b/src/transport/gnunet-service-transport_ats-new.h
@@ -28,6 +28,7 @@
 
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_transport_service.h"
 
 
 /**
@@ -55,7 +56,7 @@ typedef void (*GNUNET_TRANSPORT_ATS_AllocationNotification)(void *cls,
                                                            const char *plugin_name,
                                                            const void *plugin_addr,
                                                            size_t plugin_addr_len,
-                                                           GNUNET_BANDWIDTH_Value32NBO bandwidth);
+                                                           struct GNUNET_BANDWIDTH_Value32NBO bandwidth);
 
 
 /**
@@ -68,14 +69,16 @@ typedef void (*GNUNET_TRANSPORT_ATS_AllocationNotification)(void *cls,
  */
 struct GST_AtsHandle *
 GST_ats_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
-             GNUNET_TRANSPORT_ATS_AddressNotification alloc_cb,
+             GNUNET_TRANSPORT_ATS_AllocationNotification alloc_cb,
              void *alloc_cb_cls);
 
 /**
  * Shutdown the ATS subsystem.
+ *
+ * @param atc handle
  */
 void
-GST_ats_shutdown (struct GST_AtsHandle *ats);
+GST_ats_shutdown (struct GST_AtsHandle *atc);
 
 
 /**