1 files changed, 69 insertions, 68 deletions
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index eba4e112d..8d2ed144f 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -36,7 +36,7 @@
 /**
 * How long until we give up on the download?
 */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 300)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 #define NUM_DAEMONS 2
@@ -54,110 +54,111 @@ static struct GNUNET_TIME_Absolute start_time;
 static void
-do_stop(void *cls)
+do_stop (void *cls)
 {
  char *fn = cls;
  struct GNUNET_TIME_Relative del;
  char *fancy;
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
  if (0 ==
-      GNUNET_TIME_absolute_get_remaining(GNUNET_TIME_absolute_add(start_time,
+      GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add (start_time,
-                                                                  TIMEOUT)).rel_value_us)
+                                                                    TIMEOUT)).
-    {
+      rel_value_us)
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+  {
-                 "Timeout during download, shutting down with error\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-      ok = 1;
+                "Timeout during download, shutting down with error\n");
-    }
+    ok = 1;
+  }
  else
-    {
+  {
-      del = GNUNET_TIME_absolute_get_duration(start_time);
+    del = GNUNET_TIME_absolute_get_duration (start_time);
-      if (0 == del.rel_value_us)
+    if (0 == del.rel_value_us)
-        del.rel_value_us = 1;
+      del.rel_value_us = 1;
-      fancy =
+    fancy =
-        GNUNET_STRINGS_byte_size_fancy(((unsigned long long)FILESIZE) *
+      GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE)
-                                       1000000LL / del.rel_value_us);
+                                      * 1000000LL / del.rel_value_us);
-      fprintf(stdout,
+    fprintf (stdout,
-              "Download speed was %s/s\n",
+             "Download speed was %s/s\n",
-              fancy);
+             fancy);
-      GNUNET_free(fancy);
+    GNUNET_free (fancy);
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Finished download, shutting down\n");
+                "Finished download, shutting down\n");
-    }
+  }
  if (NULL != fn)
-    {
+  {
-      GNUNET_DISK_directory_remove(fn);
+    GNUNET_DISK_directory_remove (fn);
-      GNUNET_free(fn);
+    GNUNET_free (fn);
-    }
+  }
 }
 static void
-do_download(void *cls, const struct GNUNET_FS_Uri *uri,
+do_download (void *cls, const struct GNUNET_FS_Uri *uri,
-            const char *fn)
+             const char *fn)
 {
  if (NULL == uri)
-    {
+  {
-      GNUNET_SCHEDULER_shutdown();
+    GNUNET_SCHEDULER_shutdown ();
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Timeout during upload attempt, shutting down with error\n");
+                "Timeout during upload attempt, shutting down with error\n");
-      ok = 1;
+    ok = 1;
-      return;
+    return;
-    }
+  }
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",
-             (unsigned long long)FILESIZE);
+              (unsigned long long) FILESIZE);
-  start_time = GNUNET_TIME_absolute_get();
+  start_time = GNUNET_TIME_absolute_get ();
-  GNUNET_FS_TEST_download(daemons[0], TIMEOUT,
+  GNUNET_FS_TEST_download (daemons[0], TIMEOUT,
-                          anonymity_level, SEED, uri,
+                           anonymity_level, SEED, uri,
-                          VERBOSE, &do_stop,
+                           VERBOSE, &do_stop,
-                          (NULL == fn)
+                           (NULL == fn)
-                          ? NULL
+                           ? NULL
-                          : GNUNET_strdup(fn));
+                           : GNUNET_strdup (fn));
 }
 static void
-do_publish(void *cls,
+do_publish (void *cls,
-           struct GNUNET_TESTBED_RunHandle *h,
+            struct GNUNET_TESTBED_RunHandle *h,
-           unsigned int num_peers,
+            unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers,
+            struct GNUNET_TESTBED_Peer **peers,
-           unsigned int links_succeeded,
+            unsigned int links_succeeded,
-           unsigned int links_failed)
+            unsigned int links_failed)
 {
  unsigned int i;
-  if (NULL != strstr(progname, "cadet"))
+  if (NULL != strstr (progname, "cadet"))
    anonymity_level = 0;
  else
    anonymity_level = 1;
-  GNUNET_assert(NUM_DAEMONS == num_peers);
+  GNUNET_assert (NUM_DAEMONS == num_peers);
  for (i = 0; i < num_peers; i++)
    daemons[i] = peers[i];
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
-             (unsigned long long)FILESIZE);
+              (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_publish(daemons[1], TIMEOUT,
+  GNUNET_FS_TEST_publish (daemons[1], TIMEOUT,
-                         anonymity_level, GNUNET_NO,
+                          anonymity_level, GNUNET_NO,
-                         FILESIZE, SEED,
+                          FILESIZE, SEED,
-                         VERBOSE, &do_download, NULL);
+                          VERBOSE, &do_download, NULL);
 }
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
  const char *config;
  progname = argv[0];
-  if (NULL != strstr(progname, "cadet"))
+  if (NULL != strstr (progname, "cadet"))
    config = "test_gnunet_service_fs_p2p_cadet.conf";
  else
    config = "fs_test_lib_data.conf";
-  (void)GNUNET_TESTBED_test_run("test-gnunet-service-fs-p2p",
+  (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-p2p",
-                                config,
+                                  config,
-                                NUM_DAEMONS,
+                                  NUM_DAEMONS,
-                                0, NULL, NULL,
+                                  0, NULL, NULL,
-                                &do_publish, NULL);
+                                  &do_publish, NULL);
-  GNUNET_DISK_directory_remove("/tmp/gnunet-test-fs-lib/");
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
  return ok;
 }

diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index eba4e112d..8d2ed144f 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -36,7 +36,7 @@
36	/**	36	/**
37	* How long until we give up on the download?	37	* How long until we give up on the download?
38	*/	38	*/
39	#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 300)	39	#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
40		40
41	#define NUM_DAEMONS 2	41	#define NUM_DAEMONS 2
42		42
@@ -54,110 +54,111 @@ static struct GNUNET_TIME_Absolute start_time;
54		54
55		55
56	static void	56	static void
57	do_stop(void *cls)	57	do_stop (void *cls)
58	{	58	{
59	char *fn = cls;	59	char *fn = cls;
60	struct GNUNET_TIME_Relative del;	60	struct GNUNET_TIME_Relative del;
61	char *fancy;	61	char *fancy;
62		62
63	GNUNET_SCHEDULER_shutdown();	63	GNUNET_SCHEDULER_shutdown ();
64	if (0 ==	64	if (0 ==
65	GNUNET_TIME_absolute_get_remaining(GNUNET_TIME_absolute_add(start_time,	65	GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add (start_time,
66	TIMEOUT)).rel_value_us)	66	TIMEOUT)).
67	{	67	rel_value_us)
68	GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,	68	{
69	"Timeout during download, shutting down with error\n");	69	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
70	ok = 1;	70	"Timeout during download, shutting down with error\n");
71	}	71	ok = 1;
		72	}
72	else	73	else
73	{	74	{
74	del = GNUNET_TIME_absolute_get_duration(start_time);	75	del = GNUNET_TIME_absolute_get_duration (start_time);
75	if (0 == del.rel_value_us)	76	if (0 == del.rel_value_us)
76	del.rel_value_us = 1;	77	del.rel_value_us = 1;
77	fancy =	78	fancy =
78	GNUNET_STRINGS_byte_size_fancy(((unsigned long long)FILESIZE) *	79	GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE)
79	1000000LL / del.rel_value_us);	80	* 1000000LL / del.rel_value_us);
80	fprintf(stdout,	81	fprintf (stdout,
81	"Download speed was %s/s\n",	82	"Download speed was %s/s\n",
82	fancy);	83	fancy);
83	GNUNET_free(fancy);	84	GNUNET_free (fancy);
84	GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,	85	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
85	"Finished download, shutting down\n");	86	"Finished download, shutting down\n");
86	}	87	}
87	if (NULL != fn)	88	if (NULL != fn)
88	{	89	{
89	GNUNET_DISK_directory_remove(fn);	90	GNUNET_DISK_directory_remove (fn);
90	GNUNET_free(fn);	91	GNUNET_free (fn);
91	}	92	}
92	}	93	}
93		94
94		95
95	static void	96	static void
96	do_download(void cls, const struct GNUNET_FS_Uri uri,	97	do_download (void cls, const struct GNUNET_FS_Uri uri,
97	const char *fn)	98	const char *fn)
98	{	99	{
99	if (NULL == uri)	100	if (NULL == uri)
100	{	101	{
101	GNUNET_SCHEDULER_shutdown();	102	GNUNET_SCHEDULER_shutdown ();
102	GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,	103	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
103	"Timeout during upload attempt, shutting down with error\n");	104	"Timeout during upload attempt, shutting down with error\n");
104	ok = 1;	105	ok = 1;
105	return;	106	return;
106	}	107	}
107	GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",	108	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",
108	(unsigned long long)FILESIZE);	109	(unsigned long long) FILESIZE);
109	start_time = GNUNET_TIME_absolute_get();	110	start_time = GNUNET_TIME_absolute_get ();
110	GNUNET_FS_TEST_download(daemons[0], TIMEOUT,	111	GNUNET_FS_TEST_download (daemons[0], TIMEOUT,
111	anonymity_level, SEED, uri,	112	anonymity_level, SEED, uri,
112	VERBOSE, &do_stop,	113	VERBOSE, &do_stop,
113	(NULL == fn)	114	(NULL == fn)
114	? NULL	115	? NULL
115	: GNUNET_strdup(fn));	116	: GNUNET_strdup (fn));
116	}	117	}
117		118
118		119
119	static void	120	static void
120	do_publish(void *cls,	121	do_publish (void *cls,
121	struct GNUNET_TESTBED_RunHandle *h,	122	struct GNUNET_TESTBED_RunHandle *h,
122	unsigned int num_peers,	123	unsigned int num_peers,
123	struct GNUNET_TESTBED_Peer **peers,	124	struct GNUNET_TESTBED_Peer **peers,
124	unsigned int links_succeeded,	125	unsigned int links_succeeded,
125	unsigned int links_failed)	126	unsigned int links_failed)
126	{	127	{
127	unsigned int i;	128	unsigned int i;
128		129
129	if (NULL != strstr(progname, "cadet"))	130	if (NULL != strstr (progname, "cadet"))
130	anonymity_level = 0;	131	anonymity_level = 0;
131	else	132	else
132	anonymity_level = 1;	133	anonymity_level = 1;
133	GNUNET_assert(NUM_DAEMONS == num_peers);	134	GNUNET_assert (NUM_DAEMONS == num_peers);
134	for (i = 0; i < num_peers; i++)	135	for (i = 0; i < num_peers; i++)
135	daemons[i] = peers[i];	136	daemons[i] = peers[i];
136	GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",	137	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
137	(unsigned long long)FILESIZE);	138	(unsigned long long) FILESIZE);
138	GNUNET_FS_TEST_publish(daemons[1], TIMEOUT,	139	GNUNET_FS_TEST_publish (daemons[1], TIMEOUT,
139	anonymity_level, GNUNET_NO,	140	anonymity_level, GNUNET_NO,
140	FILESIZE, SEED,	141	FILESIZE, SEED,
141	VERBOSE, &do_download, NULL);	142	VERBOSE, &do_download, NULL);
142	}	143	}
143		144
144		145
145	int	146	int
146	main(int argc, char *argv[])	147	main (int argc, char *argv[])
147	{	148	{
148	const char *config;	149	const char *config;
149		150
150	progname = argv[0];	151	progname = argv[0];
151	if (NULL != strstr(progname, "cadet"))	152	if (NULL != strstr (progname, "cadet"))
152	config = "test_gnunet_service_fs_p2p_cadet.conf";	153	config = "test_gnunet_service_fs_p2p_cadet.conf";
153	else	154	else
154	config = "fs_test_lib_data.conf";	155	config = "fs_test_lib_data.conf";
155	(void)GNUNET_TESTBED_test_run("test-gnunet-service-fs-p2p",	156	(void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-p2p",
156	config,	157	config,
157	NUM_DAEMONS,	158	NUM_DAEMONS,
158	0, NULL, NULL,	159	0, NULL, NULL,
159	&do_publish, NULL);	160	&do_publish, NULL);
160	GNUNET_DISK_directory_remove("/tmp/gnunet-test-fs-lib/");	161	GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
161	return ok;	162	return ok;
162	}	163	}
163		164