[GNUnet-SVN] r20103 - in gnunet/src: dv include

[gnunet]

Author: grothoff
Date: 2012-02-28 10:50:23 +0100 (Tue, 28 Feb 2012)
New Revision: 20103

Modified:
   gnunet/src/dv/plugin_transport_dv.c
   gnunet/src/include/Makefile.am
   gnunet/src/include/gnunet_transport_plugin.h
Log:
-fix

Modified: gnunet/src/dv/plugin_transport_dv.c
===================================================================
--- gnunet/src/dv/plugin_transport_dv.c 2012-02-28 09:49:44 UTC (rev 20102)
+++ gnunet/src/dv/plugin_transport_dv.c 2012-02-28 09:50:23 UTC (rev 20103)
@@ -197,18 +197,11 @@
  * 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
@@ -219,18 +212,21 @@
  *         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;
 }
 
@@ -382,7 +378,27 @@
 }
 
 
+
 /**
+ * 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 target the neighbour id
+ * @param addr pointer to the address
+ * @param addrlen length of addr
+ * @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.
  */
 void *
@@ -411,6 +427,7 @@
   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;
 }
 
@@ -432,4 +449,4 @@
   return NULL;
 }
 
-/* end of plugin_transport_template.c */
+/* end of plugin_transport_dv.c */

Modified: gnunet/src/include/Makefile.am
===================================================================
--- gnunet/src/include/Makefile.am      2012-02-28 09:49:44 UTC (rev 20102)
+++ gnunet/src/include/Makefile.am      2012-02-28 09:50:23 UTC (rev 20103)
@@ -17,6 +17,7 @@
   plibc.h \
   $(WINPROC) \
   block_dns.h \
+  block_gns.h \
   block_fs.h \
   gnunet_applications.h \
   gnunet_arm_service.h \
@@ -46,6 +47,7 @@
   gnunet_fragmentation_lib.h \
   gnunet_fs_service.h \
   gnunet_getopt_lib.h \
+  gnunet_gns_service.h \
   gnunet_hello_lib.h \
   gnunet_helper_lib.h \
   gnunet_load_lib.h \
@@ -69,6 +71,7 @@
   gnunet_signal_lib.h \
   gnunet_signatures.h \
   gnunet_statistics_service.h \
+  gnunet_stream_lib.h \
   gnunet_strings_lib.h \
   gnunet_testing_lib.h \
   gnunet_time_lib.h \

Modified: gnunet/src/include/gnunet_transport_plugin.h
===================================================================
--- gnunet/src/include/gnunet_transport_plugin.h        2012-02-28 09:49:44 UTC 
(rev 20102)
+++ gnunet/src/include/gnunet_transport_plugin.h        2012-02-28 09:50:23 UTC 
(rev 20103)
@@ -290,7 +290,7 @@
  * a fresh connection to another peer.
  *
  * @param cls closure
- * @param target who should receive this message
+ * @param session which session must be used
  * @param msgbuf the message to transmit
  * @param msgbuf_size number of bytes in 'msgbuf'
  * @param priority how important is the message (most plugins will
@@ -299,15 +299,6 @@
  *                require plugins to discard the message after the timeout,
  *                just advisory for the desired delay; most plugins will ignore
  *                this as well)
- * @param session which session must be used (or NULL for "any")
- * @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,
- *                GNUNET_NO means the plugin may use any other address and
- *                GNUNET_SYSERR means that only reliable existing
- *                bi-directional connections should be used (regardless
- *                of address)
  * @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