[GNUnet-SVN] r16692 - gnunet/src/include

[gnunet]

Author: grothoff
Date: 2011-09-02 16:44:08 +0200 (Fri, 02 Sep 2011)
New Revision: 16692

Modified:
   gnunet/src/include/gnunet_common.h
   gnunet/src/include/gnunet_connection_lib.h
   gnunet/src/include/gnunet_mesh_service_new.h
   gnunet/src/include/gnunet_resolver_service.h
Log:
breaking stuff

Modified: gnunet/src/include/gnunet_common.h
===================================================================
--- gnunet/src/include/gnunet_common.h  2011-09-02 13:10:08 UTC (rev 16691)
+++ gnunet/src/include/gnunet_common.h  2011-09-02 14:44:08 UTC (rev 16692)
@@ -428,7 +428,7 @@
  * @param length of the string to duplicate
  * @return a partial copy of the string including zero-termination
  */
-#define GNUNET_strndup(a,b) GNUNET_xstrndup_(a,b,__FILE__,__LINE__)
+#define GNUNET_strndup(a,length) GNUNET_xstrndup_(a,length,__FILE__,__LINE__)
 
 /**
  * Grow a well-typed (!) array.  This is a convenience
@@ -577,8 +577,9 @@
 
 /**
  * Dup partially a string. Don't call GNUNET_xstrndup_ directly. Use the 
GNUNET_strndup macro.
+ *
  * @param str string to duplicate
- * @param len lenght of the string to duplicate
+ * @param len length of the string to duplicate
  * @param filename where is this call being made (for debugging)
  * @param linenumber line where this call is being made (for debugging)
  * @return the duplicated string

Modified: gnunet/src/include/gnunet_connection_lib.h
===================================================================
--- gnunet/src/include/gnunet_connection_lib.h  2011-09-02 13:10:08 UTC (rev 
16691)
+++ gnunet/src/include/gnunet_connection_lib.h  2011-09-02 14:44:08 UTC (rev 
16692)
@@ -341,12 +341,12 @@
  * Cancel the specified transmission-ready
  * notification.
  *
- * @param h handle for notification to cancel
+ * @param th handle for notification to cancel
  */
 void
 GNUNET_CONNECTION_notify_transmit_ready_cancel (struct
                                                 
GNUNET_CONNECTION_TransmitHandle
-                                                *h);
+                                                *th);
 
 
 /**

Modified: gnunet/src/include/gnunet_mesh_service_new.h
===================================================================
--- gnunet/src/include/gnunet_mesh_service_new.h        2011-09-02 13:10:08 UTC 
(rev 16691)
+++ gnunet/src/include/gnunet_mesh_service_new.h        2011-09-02 14:44:08 UTC 
(rev 16692)
@@ -56,8 +56,7 @@
 
 /**
  * Functions with this signature are called whenever a message is
- * received or transmitted.
- * FIXME: transmitted???
+ * received.
  *
  * @param cls closure (set from GNUNET_MESH_connect)
  * @param tunnel connection to the other end
@@ -127,6 +126,26 @@
 
 
 /**
+ * Method called whenever another peer has added us to a tunnel
+ * the other peer initiated.
+ *
+ * @param cls closure
+ * @param tunnel new handle to the tunnel
+ * @param initiator peer that started the tunnel
+ * @param atsi performance information for the tunnel
+ * @return initial tunnel context for the tunnel (can be NULL -- that's not an 
error)
+ */
+typedef void* (*GNUNET_MESH_InboundTunnelNotificationHandler) (void *cls,
+                                                              struct 
GNUNET_MESH_Tunnel * tunnel,
+                                                              const struct
+                                                              
GNUNET_PeerIdentity *
+                                                              initiator,
+                                                              const struct
+                                                              
GNUNET_TRANSPORT_ATS_Information *
+                                                              atsi);
+
+
+/**
  * Connect to the mesh service.
  *
  * @param cfg configuration to use
@@ -194,12 +213,14 @@
  * and to broadcast).
  *
  * @param h mesh handle
+ * @param tunnel_ctx client's tunnel context to associate with the tunnel
  * @param connect_handler function to call when peers are actually connected
  * @param disconnect_handler function to call when peers are disconnected
  * @param handler_cls closure for connect/disconnect handlers
  */
 struct GNUNET_MESH_Tunnel *
 GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h,
+                          void *tunnel_ctx,
                            GNUNET_MESH_TunnelConnectHandler connect_handler,
                            GNUNET_MESH_TunnelDisconnectHandler
                            disconnect_handler, void *handler_cls);

Modified: gnunet/src/include/gnunet_resolver_service.h
===================================================================
--- gnunet/src/include/gnunet_resolver_service.h        2011-09-02 13:10:08 UTC 
(rev 16691)
+++ gnunet/src/include/gnunet_resolver_service.h        2011-09-02 14:44:08 UTC 
(rev 16692)
@@ -64,7 +64,7 @@
  * @param cfg configuration to use
  */
 void
-GNUNET_RESOLVER_connect (const struct GNUNET_CONFIGURATION_Handle *c);
+GNUNET_RESOLVER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**