multicast, psyc, psycstore, client_manager fixes

[oweals/gnunet.git] / src / include / gnunet_arm_service.h

diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index 44e47affce1a5a47959a55ade007fdb9922728c2..6b1682710f42aafe489c60cb545de0c2e56cf4a0 100644 (file)
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2009 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2009 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
@@ -14,8 +14,8 @@
 
       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.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.
  */
 
 /**
@@ -35,10 +35,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_configuration_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 
 /**
  * Version of the arm API.
@@ -112,6 +109,7 @@ enum GNUNET_ARM_ServiceStatus
   GNUNET_ARM_SERVICE_STOPPING = 3
 };
 
+
 /**
  * Replies to ARM requests
  */
@@ -182,7 +180,7 @@ struct GNUNET_ARM_Handle;
  * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected,
  *                  GNUNET_SYSERR if there was an error.
  */
-typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls, 
+typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls,
                                                     int connected);
 
 
@@ -197,9 +195,9 @@ typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls,
  * @param service service name
  * @param result result of the operation
  */
-typedef void (*GNUNET_ARM_ResultCallback) (void *cls, 
-                                          enum GNUNET_ARM_RequestStatus rs, 
-                                          const char *service, 
+typedef void (*GNUNET_ARM_ResultCallback) (void *cls,
+                                          enum GNUNET_ARM_RequestStatus rs,
+                                          const char *service,
                                           enum GNUNET_ARM_Result result);
 
 
@@ -214,9 +212,9 @@ typedef void (*GNUNET_ARM_ResultCallback) (void *cls,
  * @param count number of strings in the list
  * @param list list of running services
  */
-typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls, 
-                                               enum GNUNET_ARM_RequestStatus rs, 
-                                               unsigned int count, 
+typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls,
+                                               enum GNUNET_ARM_RequestStatus rs,
+                                               unsigned int count,
                                                const char *const*list);
 
 
@@ -233,7 +231,7 @@ typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls,
  */
 struct GNUNET_ARM_Handle *
 GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                   GNUNET_ARM_ConnectionStatusCallback conn_status, 
+                   GNUNET_ARM_ConnectionStatusCallback conn_status,
                    void *cls);
 
 
@@ -276,7 +274,7 @@ GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
  */
 void
 GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
-                                const char *service_name, 
+                                const char *service_name,
                                 struct GNUNET_TIME_Relative timeout,
                                 GNUNET_ARM_ResultCallback cont, void *cont_cls);
 
@@ -293,9 +291,11 @@ GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
  */
 void
 GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
-    const char *service_name, enum GNUNET_OS_InheritStdioFlags std_inheritance,
-    struct GNUNET_TIME_Relative timeout, GNUNET_ARM_ResultCallback cont,
-    void *cont_cls);
+                                 const char *service_name,
+                                 enum GNUNET_OS_InheritStdioFlags std_inheritance,
+                                 struct GNUNET_TIME_Relative timeout,
+                                 GNUNET_ARM_ResultCallback cont,
+                                 void *cont_cls);
 
 
 /**
@@ -312,8 +312,8 @@ struct GNUNET_ARM_MonitorHandle;
  * @param service service name
  * @param status status of the service
  */
-typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls, 
-                                                 const char *service, 
+typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls,
+                                                 const char *service,
                                                  enum GNUNET_ARM_ServiceStatus status);
 
 
@@ -330,7 +330,7 @@ typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls,
  */
 struct GNUNET_ARM_MonitorHandle *
 GNUNET_ARM_monitor (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                   GNUNET_ARM_ServiceStatusCallback cont, 
+                   GNUNET_ARM_ServiceStatusCallback cont,
                    void *cont_cls);