doxy

[oweals/gnunet.git] / src / dv / plugin_transport_dv.c

diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c
index bd73e7e20ad98431841edaaf9e4ac9f6d309f407..3a8bafcefee8dcb7fb4bb819827b516b783e2669 100644 (file)
--- a/src/dv/plugin_transport_dv.c
+++ b/src/dv/plugin_transport_dv.c
@@ -37,7 +37,7 @@
 #include "gnunet_transport_plugin.h"
 #include "dv.h"
 
-#define DEBUG_TEMPLATE GNUNET_NO
+#define DEBUG_TEMPLATE GNUNET_EXTRA_LOGGING
 
 /**
  * Encapsulation of all of the state of the plugin.
@@ -160,19 +160,29 @@ handle_dv_message_received (void *cls, struct GNUNET_PeerIdentity *sender,
                    my_id, GNUNET_i2s (sender),
                    ntohs (((struct GNUNET_MessageHeader *) msg)->type),
                    distance);
+  if (sender_address_len == (2 * sizeof (struct GNUNET_PeerIdentity)))
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "plugin_transport_dv",
+                     "Parsed sender address: %s:%s\n",
+                     GNUNET_i2s ((struct GNUNET_PeerIdentity *) sender_address),
+                     GNUNET_h2s (&
+                                 ((struct GNUNET_PeerIdentity *)
+                                  &sender_address[sizeof
+                                                  (struct
+                                                   GNUNET_PeerIdentity)])->hashPubKey));
+  }
+
   GNUNET_free_non_null (my_id);
 #endif
-  struct GNUNET_TRANSPORT_ATS_Information ats[2];
+  struct GNUNET_ATS_Information ats[1];
 
-  ats[0].type = htonl (GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE);
+  ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
   ats[0].value = htonl (distance);
-  ats[1].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
-  ats[1].value = htonl (0);
 
   plugin->env->receive (plugin->env->cls, sender,
                         (struct GNUNET_MessageHeader *) msg,
-                        (const struct GNUNET_TRANSPORT_ATS_Information *) &ats,
-                        2, NULL, sender_address, sender_address_len);
+                        (const struct GNUNET_ATS_Information *) &ats, 1, NULL,
+                        sender_address, sender_address_len);
 
 }
 
@@ -187,18 +197,11 @@ handle_dv_message_received (void *cls, struct GNUNET_PeerIdentity *sender,
  * a message using the plugin.
  *
  * @param cls closure
- * @param target who should receive this message
+ * @param session the session used
  * @param priority how important is the message
  * @param msgbuf the message to transmit
  * @param msgbuf_size number of bytes in 'msgbuf'
  * @param timeout when should we time out
- * @param session the session used
- * @param addr the address to use (can be NULL if the plugin
- *                is "on its own" (i.e. re-use existing TCP connection))
- * @param addrlen length of the address in bytes
- * @param force_address GNUNET_YES if the plugin MUST use the given address,
- *                otherwise the plugin may use other addresses or
- *                existing connections (if available)
  * @param cont continuation to call once the message has
  *        been transmitted (or if the transport is ready
  *        for the next transmission call; or if the
@@ -209,18 +212,21 @@ handle_dv_message_received (void *cls, struct GNUNET_PeerIdentity *sender,
  *         and does NOT mean that the message was not transmitted (DV)
  */
 static ssize_t
-dv_plugin_send (void *cls, const struct GNUNET_PeerIdentity *target,
+dv_plugin_send (void *cls, 
+               struct Session *session,
                 const char *msgbuf, size_t msgbuf_size, unsigned int priority,
-                struct GNUNET_TIME_Relative timeout, struct Session *session,
-                const void *addr, size_t addrlen, int force_address,
+                struct GNUNET_TIME_Relative timeout, 
                 GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
 {
-  int ret = 0;
+  int ret = -1;
+#if 0
   struct Plugin *plugin = cls;
 
   ret =
-      GNUNET_DV_send (plugin->dv_handle, target, msgbuf, msgbuf_size, priority,
+      GNUNET_DV_send (plugin->dv_handle, &session->sender, 
+                     msgbuf, msgbuf_size, priority,
                       timeout, addr, addrlen, cont, cont_cls);
+#endif
   return ret;
 }
 
@@ -367,10 +373,29 @@ dv_plugin_check_address (void *cls, const void *addr, size_t addrlen)
     }
     return GNUNET_SYSERR;
   }
+
   return GNUNET_OK;
 }
 
 
+
+/**
+ * Create a new session to transmit data to the target
+ * This session will used to send data to this peer and the plugin will
+ * notify us by calling the env->session_end function
+ *
+ * @param cls the plugin
+ * @param address the address
+ * @return the session if the address is valid, NULL otherwise
+ */
+static struct Session * 
+dv_get_session (void *cls,
+               const struct GNUNET_HELLO_Address *address)
+{
+  return NULL;
+}
+
+
 /**
  * Entry point for the plugin.
  */
@@ -400,6 +425,7 @@ libgnunet_plugin_transport_dv_init (void *cls)
   api->address_pretty_printer = &dv_plugin_address_pretty_printer;
   api->check_address = &dv_plugin_check_address;
   api->address_to_string = &address_to_string;
+  api->get_session = dv_get_session;
   return api;
 }
 
@@ -421,4 +447,4 @@ libgnunet_plugin_transport_dv_done (void *cls)
   return NULL;
 }
 
-/* end of plugin_transport_template.c */
+/* end of plugin_transport_dv.c */