[GNUnet-SVN] r27826 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2013-07-09 14:40:15 +0200 (Tue, 09 Jul 2013)
New Revision: 27826

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/gnunet-service-transport_plugins.c
   gnunet/src/transport/gnunet-service-transport_plugins.h
Log:
new function for plugins to signal inbound session,
have to extend plugins


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2013-07-09 12:36:35 UTC 
(rev 27825)
+++ gnunet/src/transport/gnunet-service-transport.c     2013-07-09 12:40:15 UTC 
(rev 27826)
@@ -449,7 +449,45 @@
   GST_update_ats_metrics (peer, &haddress, session, ats, ats_count);
 }
 
+static void
+plugin_env_session_start (void *cls,
+          const struct GNUNET_PeerIdentity *peer,
+          const char *plugin,
+          const void *address,
+          uint16_t address_len,
+          struct Session *session,
+          const struct GNUNET_ATS_Information *ats,
+          uint32_t ats_count)
+{
+       if (NULL == peer)
+       {
+               GNUNET_break (0);
+               return;
+       }
+       if (NULL == plugin)
+       {
+               GNUNET_break (0);
+               return;
+       }
+       if (NULL == address)
+       {
+               GNUNET_break (0);
+               return;
+       }
+       if (NULL == session)
+       {
+               GNUNET_break (0);
+               return;
+       }
 
+       struct GNUNET_HELLO_Address *addr;
+       addr = GNUNET_HELLO_address_allocate (peer, plugin, address, 
address_len);
+       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding peer `%s' address %s 
session %p\n",
+                       GNUNET_i2s (peer), GST_plugins_a2s(addr), session);
+       GNUNET_ATS_address_add (GST_ats, addr, session, ats, ats_count);
+       GNUNET_free (addr);
+}
+
 /**
  * Function called by ATS to notify the callee that the
  * assigned bandwidth or address for a given peer was changed.  If the
@@ -707,6 +745,7 @@
   GST_manipulation_init (GST_cfg);
   GST_plugins_load (&GST_manipulation_recv,
                     &plugin_env_address_change_notification,
+                    &plugin_env_session_start,
                     &plugin_env_session_end,
                     &plugin_env_address_to_type,
                     &plugin_env_update_metrics);

Modified: gnunet/src/transport/gnunet-service-transport_plugins.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_plugins.c     2013-07-09 
12:36:35 UTC (rev 27825)
+++ gnunet/src/transport/gnunet-service-transport_plugins.c     2013-07-09 
12:40:15 UTC (rev 27826)
@@ -87,6 +87,7 @@
  *
  * @param recv_cb function to call when data is received
  * @param address_cb function to call when our public addresses changed
+ * @param session_start_cb function to call when a session was created
  * @param session_end_cb function to call when a session was terminated
  * @param address_type_cb function to call when a address type is requested
  * @param metric_update_cb function to call when address metrics change
@@ -94,6 +95,7 @@
 void
 GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
                   GNUNET_TRANSPORT_AddressNotification address_cb,
+                  GNUNET_TRANSPORT_SessionStart session_start_cb,
                   GNUNET_TRANSPORT_SessionEnd session_end_cb,
                   GNUNET_TRANSPORT_AddressToType address_type_cb,
                   GNUNET_TRANSPORT_UpdateAddressMetrics metric_update_cb)
@@ -133,6 +135,7 @@
     plug->env.cls = plug->short_name;
     plug->env.receive = recv_cb;
     plug->env.notify_address = address_cb;
+    plug->env.session_start = session_start_cb;
     plug->env.session_end = session_end_cb;
     plug->env.get_address_type = address_type_cb;
     plug->env.update_address_metrics = metric_update_cb;

Modified: gnunet/src/transport/gnunet-service-transport_plugins.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_plugins.h     2013-07-09 
12:36:35 UTC (rev 27825)
+++ gnunet/src/transport/gnunet-service-transport_plugins.h     2013-07-09 
12:40:15 UTC (rev 27826)
@@ -41,6 +41,7 @@
  *
  * @param recv_cb function to call when data is received
  * @param address_cb function to call when our public addresses changed
+ * @param session_start_cb function to call when a session was created
  * @param session_end_cb function to call when a session was terminated
  * @param address_type_cb function to call when a address type is requested
  * @param metric_update_cb function to call when address metrics change
@@ -48,6 +49,7 @@
 void
 GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
                   GNUNET_TRANSPORT_AddressNotification address_cb,
+                  GNUNET_TRANSPORT_SessionStart session_start_cb,
                   GNUNET_TRANSPORT_SessionEnd session_end_cb,
                   GNUNET_TRANSPORT_AddressToType address_type_cb,
                   GNUNET_TRANSPORT_UpdateAddressMetrics metric_update_cb);