[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27998 - in gnunet/src: dv include
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r27998 - in gnunet/src: dv include |
|
Date: |
Sat, 13 Jul 2013 17:36:16 +0200 |
Author: grothoff
Date: 2013-07-13 17:36:16 +0200 (Sat, 13 Jul 2013)
New Revision: 27998
Added:
gnunet/src/include/gnunet_dv_service.h
Removed:
gnunet/src/dv/gnunet_dv_service.h
Modified:
gnunet/src/dv/Makefile.am
gnunet/src/include/Makefile.am
Log:
-move dv API header to where it would typically belong
Modified: gnunet/src/dv/Makefile.am
===================================================================
--- gnunet/src/dv/Makefile.am 2013-07-13 15:34:40 UTC (rev 27997)
+++ gnunet/src/dv/Makefile.am 2013-07-13 15:36:16 UTC (rev 27998)
@@ -23,7 +23,7 @@
plugin_LTLIBRARIES = libgnunet_plugin_transport_dv.la
libgnunetdv_la_SOURCES = \
- dv_api.c dv.h gnunet_dv_service.h
+ dv_api.c dv.h
libgnunetdv_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL) $(XLIB)
Deleted: gnunet/src/dv/gnunet_dv_service.h
===================================================================
--- gnunet/src/dv/gnunet_dv_service.h 2013-07-13 15:34:40 UTC (rev 27997)
+++ gnunet/src/dv/gnunet_dv_service.h 2013-07-13 15:36:16 UTC (rev 27998)
@@ -1,165 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2013 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.
-*/
-
-/**
- * @author Christian Grothoff
- * @file dv/gnunet_dv_service.h
- * @brief DV service API (should only be used by the DV plugin)
- */
-#ifndef GNUNET_SERVICE_DV_H
-#define GNUNET_SERVICE_DV_H
-
-#include "gnunet_util_lib.h"
-
-
-/**
- * Signature of a function to be called if DV
- * starts to be able to talk to a peer.
- *
- * @param cls closure
- * @param peer newly connected peer
- * @param distance distance to the peer
- */
-typedef void (*GNUNET_DV_ConnectCallback)(void *cls,
- const struct GNUNET_PeerIdentity
*peer,
- uint32_t distance);
-
-
-/**
- * Signature of a function to be called if DV
- * distance to a peer is changed.
- *
- * @param cls closure
- * @param peer connected peer
- * @param distance new distance to the peer
- */
-typedef void (*GNUNET_DV_DistanceChangedCallback)(void *cls,
- const struct
GNUNET_PeerIdentity *peer,
- uint32_t distance);
-
-
-/**
- * Signature of a function to be called if DV
- * is no longer able to talk to a peer.
- *
- * @param cls closure
- * @param peer peer that disconnected
- */
-typedef void (*GNUNET_DV_DisconnectCallback)(void *cls,
- const struct GNUNET_PeerIdentity
*peer);
-
-
-/**
- * Signature of a function to be called if DV
- * receives a message for this peer.
- *
- * @param cls closure
- * @param sender sender of the message
- * @param distance how far did the message travel
- * @param msg actual message payload
- */
-typedef void (*GNUNET_DV_MessageReceivedCallback)(void *cls,
- const struct
GNUNET_PeerIdentity *sender,
- uint32_t distance,
- const struct
GNUNET_MessageHeader *msg);
-
-
-/**
- * Signature of a function called once the delivery of a
- * message has been successful.
- *
- * @param cls closure
- * @param ok GNUNET_OK on success, GNUNET_SYSERR on error
- */
-typedef void (*GNUNET_DV_MessageSentCallback)(void *cls,
- int ok);
-
-
-/**
- * Handle to the DV service.
- */
-struct GNUNET_DV_ServiceHandle;
-
-
-/**
- * Connect to the DV service.
- *
- * @param cfg configuration
- * @param cls closure for callbacks
- * @param connect_cb function to call on connects
- * @param distance_cb function to call if distances change
- * @param disconnect_cb function to call on disconnects
- * @param message_cb function to call if we receive messages
- * @return handle to access the service
- */
-struct GNUNET_DV_ServiceHandle *
-GNUNET_DV_service_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
- void *cls,
- GNUNET_DV_ConnectCallback connect_cb,
- GNUNET_DV_DistanceChangedCallback distance_cb,
- GNUNET_DV_DisconnectCallback disconnect_cb,
- GNUNET_DV_MessageReceivedCallback message_cb);
-
-
-/**
- * Disconnect from DV service.
- *
- * @param sh service handle
- */
-void
-GNUNET_DV_service_disconnect (struct GNUNET_DV_ServiceHandle *sh);
-
-
-/**
- * Handle for a send operation.
- */
-struct GNUNET_DV_TransmitHandle;
-
-
-/**
- * Send a message via DV service.
- *
- * @param sh service handle
- * @param target intended recpient
- * @param msg message payload
- * @param cb function to invoke when done
- * @param cb_cls closure for 'cb'
- * @return handle to cancel the operation
- */
-struct GNUNET_DV_TransmitHandle *
-GNUNET_DV_send (struct GNUNET_DV_ServiceHandle *sh,
- const struct GNUNET_PeerIdentity *target,
- const struct GNUNET_MessageHeader *msg,
- GNUNET_DV_MessageSentCallback cb,
- void *cb_cls);
-
-
-/**
- * Abort send operation (naturally, the message may have
- * already been transmitted; this only stops the 'cb'
- * from being called again).
- *
- * @param th send operation to cancel
- */
-void
-GNUNET_DV_send_cancel (struct GNUNET_DV_TransmitHandle *th);
-
-
-#endif
Modified: gnunet/src/include/Makefile.am
===================================================================
--- gnunet/src/include/Makefile.am 2013-07-13 15:34:40 UTC (rev 27997)
+++ gnunet/src/include/Makefile.am 2013-07-13 15:36:16 UTC (rev 27998)
@@ -45,6 +45,7 @@
gnunet_dnsparser_lib.h \
gnunet_dnsstub_lib.h \
gnunet_dns_service.h \
+ gnunet_dv_service.h \
gnunet_fragmentation_lib.h \
gnunet_fs_service.h \
gnunet_getopt_lib.h \
Copied: gnunet/src/include/gnunet_dv_service.h (from rev 27995,
gnunet/src/dv/gnunet_dv_service.h)
===================================================================
--- gnunet/src/include/gnunet_dv_service.h (rev 0)
+++ gnunet/src/include/gnunet_dv_service.h 2013-07-13 15:36:16 UTC (rev
27998)
@@ -0,0 +1,165 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.
+*/
+
+/**
+ * @author Christian Grothoff
+ * @file include/gnunet_dv_service.h
+ * @brief DV service API (should only be used by the DV plugin)
+ */
+#ifndef GNUNET_SERVICE_DV_H
+#define GNUNET_SERVICE_DV_H
+
+#include "gnunet_util_lib.h"
+
+
+/**
+ * Signature of a function to be called if DV
+ * starts to be able to talk to a peer.
+ *
+ * @param cls closure
+ * @param peer newly connected peer
+ * @param distance distance to the peer
+ */
+typedef void (*GNUNET_DV_ConnectCallback)(void *cls,
+ const struct GNUNET_PeerIdentity
*peer,
+ uint32_t distance);
+
+
+/**
+ * Signature of a function to be called if DV
+ * distance to a peer is changed.
+ *
+ * @param cls closure
+ * @param peer connected peer
+ * @param distance new distance to the peer
+ */
+typedef void (*GNUNET_DV_DistanceChangedCallback)(void *cls,
+ const struct
GNUNET_PeerIdentity *peer,
+ uint32_t distance);
+
+
+/**
+ * Signature of a function to be called if DV
+ * is no longer able to talk to a peer.
+ *
+ * @param cls closure
+ * @param peer peer that disconnected
+ */
+typedef void (*GNUNET_DV_DisconnectCallback)(void *cls,
+ const struct GNUNET_PeerIdentity
*peer);
+
+
+/**
+ * Signature of a function to be called if DV
+ * receives a message for this peer.
+ *
+ * @param cls closure
+ * @param sender sender of the message
+ * @param distance how far did the message travel
+ * @param msg actual message payload
+ */
+typedef void (*GNUNET_DV_MessageReceivedCallback)(void *cls,
+ const struct
GNUNET_PeerIdentity *sender,
+ uint32_t distance,
+ const struct
GNUNET_MessageHeader *msg);
+
+
+/**
+ * Signature of a function called once the delivery of a
+ * message has been successful.
+ *
+ * @param cls closure
+ * @param ok GNUNET_OK on success, GNUNET_SYSERR on error
+ */
+typedef void (*GNUNET_DV_MessageSentCallback)(void *cls,
+ int ok);
+
+
+/**
+ * Handle to the DV service.
+ */
+struct GNUNET_DV_ServiceHandle;
+
+
+/**
+ * Connect to the DV service.
+ *
+ * @param cfg configuration
+ * @param cls closure for callbacks
+ * @param connect_cb function to call on connects
+ * @param distance_cb function to call if distances change
+ * @param disconnect_cb function to call on disconnects
+ * @param message_cb function to call if we receive messages
+ * @return handle to access the service
+ */
+struct GNUNET_DV_ServiceHandle *
+GNUNET_DV_service_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ void *cls,
+ GNUNET_DV_ConnectCallback connect_cb,
+ GNUNET_DV_DistanceChangedCallback distance_cb,
+ GNUNET_DV_DisconnectCallback disconnect_cb,
+ GNUNET_DV_MessageReceivedCallback message_cb);
+
+
+/**
+ * Disconnect from DV service.
+ *
+ * @param sh service handle
+ */
+void
+GNUNET_DV_service_disconnect (struct GNUNET_DV_ServiceHandle *sh);
+
+
+/**
+ * Handle for a send operation.
+ */
+struct GNUNET_DV_TransmitHandle;
+
+
+/**
+ * Send a message via DV service.
+ *
+ * @param sh service handle
+ * @param target intended recpient
+ * @param msg message payload
+ * @param cb function to invoke when done
+ * @param cb_cls closure for 'cb'
+ * @return handle to cancel the operation
+ */
+struct GNUNET_DV_TransmitHandle *
+GNUNET_DV_send (struct GNUNET_DV_ServiceHandle *sh,
+ const struct GNUNET_PeerIdentity *target,
+ const struct GNUNET_MessageHeader *msg,
+ GNUNET_DV_MessageSentCallback cb,
+ void *cb_cls);
+
+
+/**
+ * Abort send operation (naturally, the message may have
+ * already been transmitted; this only stops the 'cb'
+ * from being called again).
+ *
+ * @param th send operation to cancel
+ */
+void
+GNUNET_DV_send_cancel (struct GNUNET_DV_TransmitHandle *th);
+
+
+#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27998 - in gnunet/src: dv include,
gnunet <=