projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-fix #2378
[oweals/gnunet.git]
/
src
/
fs
/
test_fs_namespace_list_updateable.c
diff --git
a/src/fs/test_fs_namespace_list_updateable.c
b/src/fs/test_fs_namespace_list_updateable.c
index dc8673e21fd02f949ee388a86da8cf18bf70891d..2cec67ddc91246e6b9134aa048ff135542b6a765 100644
(file)
--- a/
src/fs/test_fs_namespace_list_updateable.c
+++ b/
src/fs/test_fs_namespace_list_updateable.c
@@
-70,12
+70,13
@@
setup_peer (struct PeerContext *p, const char *cfgname)
{
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
{
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
- p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
+ p->arm_proc =
+ GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
#if VERBOSE
#if VERBOSE
-
"-L", "DEBUG",
+ "-L", "DEBUG",
#endif
#endif
-
"-c", cfgname, NULL);
+ "-c", cfgname, NULL);
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
}
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
}
@@
-91,10
+92,9
@@
stop_arm (struct PeerContext *p)
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ARM process %u stopped\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n",
GNUNET_OS_process_get_pid (p->arm_proc));
GNUNET_OS_process_get_pid (p->arm_proc));
- GNUNET_OS_process_
close
(p->arm_proc);
+ GNUNET_OS_process_
destroy
(p->arm_proc);
p->arm_proc = NULL;
}
#endif
p->arm_proc = NULL;
}
#endif
@@
-112,8
+112,7
@@
stop_arm (struct PeerContext *p)
static void
static void
-check_next (void *cls,
- const char *last_id,
+check_next (void *cls, const char *last_id,
const struct GNUNET_FS_Uri *last_uri,
const struct GNUNET_CONTAINER_MetaData *last_meta,
const char *next_id)
const struct GNUNET_FS_Uri *last_uri,
const struct GNUNET_CONTAINER_MetaData *last_meta,
const char *next_id)
@@
-125,8
+124,7
@@
check_next (void *cls,
static void
static void
-check_this_next (void *cls,
- const char *last_id,
+check_this_next (void *cls, const char *last_id,
const struct GNUNET_FS_Uri *last_uri,
const struct GNUNET_CONTAINER_MetaData *last_meta,
const char *next_id)
const struct GNUNET_FS_Uri *last_uri,
const struct GNUNET_CONTAINER_MetaData *last_meta,
const char *next_id)
@@
-150,8
+148,7
@@
sks_cont_next (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
static void
static void
-check_this (void *cls,
- const char *last_id,
+check_this (void *cls, const char *last_id,
const struct GNUNET_FS_Uri *last_uri,
const struct GNUNET_CONTAINER_MetaData *last_meta,
const char *next_id)
const struct GNUNET_FS_Uri *last_uri,
const struct GNUNET_CONTAINER_MetaData *last_meta,
const char *next_id)
@@
-169,13
+166,7
@@
sks_cont_this (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
GNUNET_assert (NULL == emsg);
err = 1;
GNUNET_FS_namespace_list_updateable (ns, NULL, &check_this, NULL);
GNUNET_assert (NULL == emsg);
err = 1;
GNUNET_FS_namespace_list_updateable (ns, NULL, &check_this, NULL);
- GNUNET_FS_publish_sks (fs,
- ns,
- "next",
- "future",
- meta,
- uri_next,
- &bo,
+ GNUNET_FS_publish_sks (fs, ns, "next", "future", meta, uri_next, &bo,
GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont_next, NULL);
}
GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont_next, NULL);
}
@@
-209,15
+200,12
@@
testNamespace ()
static void
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
setup_peer (&p1, "test_fs_namespace_data.conf");
{
setup_peer (&p1, "test_fs_namespace_data.conf");
- fs = GNUNET_FS_start (cfg,
- "test-fs-namespace",
- &progress_cb,
- NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
+ fs = GNUNET_FS_start (cfg, "test-fs-namespace", &progress_cb, NULL,
+ GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
testNamespace ();
}
testNamespace ();
}
@@
-245,9
+233,8
@@
main (int argc, char *argv[])
"WARNING",
#endif
NULL);
"WARNING",
#endif
NULL);
- GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
- argvx, "test-fs-namespace",
- "nohelp", options, &run, NULL);
+ GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx,
+ "test-fs-namespace", "nohelp", options, &run, NULL);
stop_arm (&p1);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-namespace/");
return err;
stop_arm (&p1);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-namespace/");
return err;