From e44d0f349bd83f1bcded9621ccc9f15d42bc84d2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 12 May 2019 13:35:26 +0200 Subject: [PATCH] last minute fixes for 0.11.4 (test cases adjustments only) --- po/de.po | 2 +- po/es.po | 2 +- po/fr.po | 2 +- po/it.po | 2 +- po/sv.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- src/include/gnunet_identity_service.h | 82 ++++++------ src/revocation/test_revocation.c | 179 ++++++++++++-------------- src/transport/Makefile.am | 3 +- 10 files changed, 127 insertions(+), 151 deletions(-) diff --git a/po/de.po b/po/de.po index 3d3e22638..9b32c7668 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-05-12 08:29+0000\n" +"POT-Creation-Date: 2019-05-12 13:20+0200\n" "PO-Revision-Date: 2015-03-08 16:16+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" diff --git a/po/es.po b/po/es.po index 5d7665695..7a9c16f76 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.9.5a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-05-12 08:29+0000\n" +"POT-Creation-Date: 2019-05-12 13:20+0200\n" "PO-Revision-Date: 2013-02-23 17:50+0100\n" "Last-Translator: Miguel Ángel Arruga Vivas \n" "Language-Team: Spanish \n" diff --git a/po/fr.po b/po/fr.po index cb917741c..dd1f82cb4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-05-12 08:29+0000\n" +"POT-Creation-Date: 2019-05-12 13:20+0200\n" "PO-Revision-Date: 2015-12-24 01:20+0100\n" "Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" diff --git a/po/it.po b/po/it.po index a24bdc66b..fcbc90f0b 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-05-12 08:29+0000\n" +"POT-Creation-Date: 2019-05-12 13:20+0200\n" "PO-Revision-Date: 2019-04-23 20:58+0200\n" "Last-Translator: Sebastiano Pistore \n" "Language-Team: Italian \n" diff --git a/po/sv.po b/po/sv.po index ba1e9df85..139a64fc3 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNUnet 0.7.0b\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-05-12 08:29+0000\n" +"POT-Creation-Date: 2019-05-12 13:20+0200\n" "PO-Revision-Date: 2006-01-21 17:16+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/po/vi.po b/po/vi.po index 4914ded1a..c3a8294bb 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.8.0a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-05-12 08:29+0000\n" +"POT-Creation-Date: 2019-05-12 13:20+0200\n" "PO-Revision-Date: 2008-09-10 22:05+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6676a50f2..0a4189667 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet-0.8.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-05-12 08:29+0000\n" +"POT-Creation-Date: 2019-05-12 13:20+0200\n" "PO-Revision-Date: 2011-07-09 12:12+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h index 043a71770..035b9e227 100644 --- a/src/include/gnunet_identity_service.h +++ b/src/include/gnunet_identity_service.h @@ -11,7 +11,7 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . @@ -43,9 +43,8 @@ #define GNUNET_IDENTITY_SERVICE_H #ifdef __cplusplus -extern "C" -{ -#if 0 /* keep Emacsens' auto-indent happy */ +extern "C" { +#if 0 /* keep Emacsens' auto-indent happy */ } #endif #endif @@ -101,7 +100,7 @@ GNUNET_IDENTITY_ego_get_anonymous (void); */ void GNUNET_IDENTITY_ego_get_public_key (const struct GNUNET_IDENTITY_Ego *ego, - struct GNUNET_CRYPTO_EcdsaPublicKey *pk); + struct GNUNET_CRYPTO_EcdsaPublicKey *pk); /** @@ -138,11 +137,10 @@ GNUNET_IDENTITY_ego_get_public_key (const struct GNUNET_IDENTITY_Ego *ego, * NULL if the user just deleted the ego and it * must thus no longer be used */ -typedef void -(*GNUNET_IDENTITY_Callback)(void *cls, - struct GNUNET_IDENTITY_Ego *ego, - void **ctx, - const char *name); +typedef void (*GNUNET_IDENTITY_Callback) (void *cls, + struct GNUNET_IDENTITY_Ego *ego, + void **ctx, + const char *name); /** @@ -155,8 +153,8 @@ typedef void */ struct GNUNET_IDENTITY_Handle * GNUNET_IDENTITY_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, - GNUNET_IDENTITY_Callback cb, - void *cb_cls); + GNUNET_IDENTITY_Callback cb, + void *cb_cls); /** @@ -170,9 +168,9 @@ GNUNET_IDENTITY_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, */ struct GNUNET_IDENTITY_Operation * GNUNET_IDENTITY_get (struct GNUNET_IDENTITY_Handle *id, - const char *service_name, - GNUNET_IDENTITY_Callback cb, - void *cb_cls); + const char *service_name, + GNUNET_IDENTITY_Callback cb, + void *cb_cls); /** @@ -182,9 +180,7 @@ GNUNET_IDENTITY_get (struct GNUNET_IDENTITY_Handle *id, * @param cls closure * @param emsg NULL on success, otherwise an error message */ -typedef void -(*GNUNET_IDENTITY_Continuation)(void *cls, - const char *emsg); +typedef void (*GNUNET_IDENTITY_Continuation) (void *cls, const char *emsg); /** @@ -199,10 +195,10 @@ typedef void */ struct GNUNET_IDENTITY_Operation * GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *id, - const char *service_name, - struct GNUNET_IDENTITY_Ego *ego, - GNUNET_IDENTITY_Continuation cont, - void *cont_cls); + const char *service_name, + struct GNUNET_IDENTITY_Ego *ego, + GNUNET_IDENTITY_Continuation cont, + void *cont_cls); /** @@ -222,10 +218,10 @@ GNUNET_IDENTITY_disconnect (struct GNUNET_IDENTITY_Handle *h); * @param pk private key, NULL on error * @param emsg error message, NULL on success */ -typedef void -(*GNUNET_IDENTITY_CreateContinuation)(void *cls, - const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk, - const char *emsg); +typedef void (*GNUNET_IDENTITY_CreateContinuation) ( + void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk, + const char *emsg); /** @@ -239,9 +235,9 @@ typedef void */ struct GNUNET_IDENTITY_Operation * GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id, - const char *name, - GNUNET_IDENTITY_CreateContinuation cont, - void *cont_cls); + const char *name, + GNUNET_IDENTITY_CreateContinuation cont, + void *cont_cls); /** @@ -256,10 +252,10 @@ GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id, */ struct GNUNET_IDENTITY_Operation * GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *id, - const char *old_name, - const char *new_name, - GNUNET_IDENTITY_Continuation cb, - void *cb_cls); + const char *old_name, + const char *new_name, + GNUNET_IDENTITY_Continuation cb, + void *cb_cls); /** @@ -273,9 +269,9 @@ GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *id, */ struct GNUNET_IDENTITY_Operation * GNUNET_IDENTITY_delete (struct GNUNET_IDENTITY_Handle *id, - const char *name, - GNUNET_IDENTITY_Continuation cb, - void *cb_cls); + const char *name, + GNUNET_IDENTITY_Continuation cb, + void *cb_cls); /** @@ -298,9 +294,9 @@ GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op); * @param cls closure * @param ego NULL on error / ego not found */ -typedef void -(*GNUNET_IDENTITY_EgoCallback)(void *cls, - const struct GNUNET_IDENTITY_Ego *ego); +typedef void (*GNUNET_IDENTITY_EgoCallback) ( + void *cls, + const struct GNUNET_IDENTITY_Ego *ego); /** * Handle for ego lookup. @@ -319,9 +315,9 @@ struct GNUNET_IDENTITY_EgoLookup; */ struct GNUNET_IDENTITY_EgoLookup * GNUNET_IDENTITY_ego_lookup (const struct GNUNET_CONFIGURATION_Handle *cfg, - const char *name, - GNUNET_IDENTITY_EgoCallback cb, - void *cb_cls); + const char *name, + GNUNET_IDENTITY_EgoCallback cb, + void *cb_cls); /** @@ -333,7 +329,7 @@ void GNUNET_IDENTITY_ego_lookup_cancel (struct GNUNET_IDENTITY_EgoLookup *el); -#if 0 /* keep Emacsens' auto-indent happy */ +#if 0 /* keep Emacsens' auto-indent happy */ { #endif #ifdef __cplusplus diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c index e384d309a..22df26165 100644 --- a/src/revocation/test_revocation.c +++ b/src/revocation/test_revocation.c @@ -11,7 +11,7 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . @@ -95,15 +95,13 @@ check_revocation (void *cls); static void -revocation_remote_cb (void *cls, - int is_valid) +revocation_remote_cb (void *cls, int is_valid) { static int repeat = 0; if (GNUNET_NO == is_valid) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Local revocation successful\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Local revocation successful\n"); ok = 0; GNUNET_SCHEDULER_shutdown (); return; @@ -116,8 +114,7 @@ revocation_remote_cb (void *cls, NULL); return; } - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Flooding of revocation failed\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Flooding of revocation failed\n"); ok = 2; GNUNET_SCHEDULER_shutdown (); } @@ -128,27 +125,25 @@ check_revocation (void *cls) { GNUNET_REVOCATION_query (testpeers[0].cfg, &testpeers[1].pubkey, - &revocation_remote_cb, NULL); + &revocation_remote_cb, + NULL); } static void -revocation_cb (void *cls, - int is_valid) +revocation_cb (void *cls, int is_valid) { testpeers[1].revok_handle = NULL; if (GNUNET_NO == is_valid) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Revocation successful\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Revocation successful\n"); check_revocation (NULL); } } static void -ego_cb (void *cls, - const struct GNUNET_IDENTITY_Ego *ego) +ego_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) { static int completed = 0; @@ -166,38 +161,35 @@ ego_cb (void *cls, GNUNET_IDENTITY_ego_get_public_key (ego, &testpeers[1].pubkey); GNUNET_REVOCATION_sign_revocation (testpeers[1].privkey, &testpeers[1].sig); - GNUNET_log(GNUNET_ERROR_TYPE_INFO, - "Calculating proof of work...\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Calculating proof of work...\n"); testpeers[1].pow = 0; - int res = GNUNET_REVOCATION_check_pow (&testpeers[1].pubkey, - testpeers[1].pow, 5); + int res = + GNUNET_REVOCATION_check_pow (&testpeers[1].pubkey, testpeers[1].pow, 5); while (GNUNET_OK != res) { testpeers[1].pow++; - res = GNUNET_REVOCATION_check_pow (&testpeers[1].pubkey, - testpeers[1].pow, - 5); + res = + GNUNET_REVOCATION_check_pow (&testpeers[1].pubkey, testpeers[1].pow, 5); } - fprintf (stderr, - "Done calculating proof of work\n"); + fprintf (stderr, "Done calculating proof of work\n"); completed++; } if (2 == completed) { - GNUNET_log(GNUNET_ERROR_TYPE_INFO, - "Egos retrieved\n"); - testpeers[1].revok_handle - = GNUNET_REVOCATION_revoke (testpeers[1].cfg, - &testpeers[1].pubkey, - &testpeers[1].sig, - testpeers[1].pow, - &revocation_cb, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Egos retrieved\n"); + testpeers[1].revok_handle = GNUNET_REVOCATION_revoke (testpeers[1].cfg, + &testpeers[1].pubkey, + &testpeers[1].sig, + testpeers[1].pow, + &revocation_cb, + NULL); } } static void identity_create_cb (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk, const char *emsg) { static int completed = 0; @@ -214,8 +206,7 @@ identity_create_cb (void *cls, } if (2 != completed) return; - fprintf (stderr, - "Identities created\n"); + fprintf (stderr, "Identities created\n"); testpeers[0].ego_lookup = GNUNET_IDENTITY_ego_lookup (testpeers[0].cfg, "client", &ego_cb, @@ -238,18 +229,15 @@ identity_completion_cb (void *cls, completed++; if (NUM_TEST_PEERS != completed) return; - fprintf (stderr, - "All peers connected @ IDENTITY ...\n"); - testpeers[0].create_id_op - = GNUNET_IDENTITY_create (testpeers[0].idh, - "client", - &identity_create_cb, - &testpeers[0]); - testpeers[1].create_id_op - = GNUNET_IDENTITY_create (testpeers[1].idh, - "toberevoked", - &identity_create_cb, - &testpeers[1]); + fprintf (stderr, "All peers connected @ IDENTITY ...\n"); + testpeers[0].create_id_op = GNUNET_IDENTITY_create (testpeers[0].idh, + "client", + &identity_create_cb, + &testpeers[0]); + testpeers[1].create_id_op = GNUNET_IDENTITY_create (testpeers[1].idh, + "toberevoked", + &identity_create_cb, + &testpeers[1]); } @@ -262,15 +250,13 @@ identity_connect_adapter (void *cls, me->cfg = cfg; me->idh = GNUNET_IDENTITY_connect (cfg, NULL, NULL); if (NULL == me->idh) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to create IDENTITY handle \n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create IDENTITY handle \n"); return me->idh; } static void -identity_disconnect_adapter (void *cls, - void *op_result) +identity_disconnect_adapter (void *cls, void *op_result) { struct TestPeer *me = cls; GNUNET_IDENTITY_disconnect (me->idh); @@ -281,31 +267,34 @@ identity_disconnect_adapter (void *cls, static void * connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer, - struct GNUNET_MQ_Handle *mq) + struct GNUNET_MQ_Handle *mq) { static int connects = 0; connects++; if (NUM_TEST_PEERS * NUM_TEST_PEERS == connects) { - fprintf (stderr, - "All peers connected @ CORE ...\n"); + fprintf (stderr, "All peers connected @ CORE ...\n"); /* Connect to identity service */ - testpeers[0].identity_op - = GNUNET_TESTBED_service_connect (NULL, - testpeers[0].p, "identity", - &identity_completion_cb, NULL, - &identity_connect_adapter, - &identity_disconnect_adapter, - &testpeers[0]); - testpeers[1].identity_op - = GNUNET_TESTBED_service_connect (NULL, - testpeers[1].p, "identity", - *identity_completion_cb, NULL, - &identity_connect_adapter, - &identity_disconnect_adapter, - &testpeers[1]); + testpeers[0].identity_op = + GNUNET_TESTBED_service_connect (NULL, + testpeers[0].p, + "identity", + &identity_completion_cb, + NULL, + &identity_connect_adapter, + &identity_disconnect_adapter, + &testpeers[0]); + testpeers[1].identity_op = + GNUNET_TESTBED_service_connect (NULL, + testpeers[1].p, + "identity", + *identity_completion_cb, + NULL, + &identity_connect_adapter, + &identity_disconnect_adapter, + &testpeers[1]); } return NULL; } @@ -322,35 +311,26 @@ core_completion_cb (void *cls, completed++; if (NUM_TEST_PEERS == completed) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Connected to CORE\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Connected to CORE\n"); } } static void * -core_connect_adapter (void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg) +core_connect_adapter (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg) { struct TestPeer *me = cls; me->cfg = cfg; - me->ch = GNUNET_CORE_connect (cfg, - me, - NULL, - &connect_cb, - NULL, - NULL); + me->ch = GNUNET_CORE_connect (cfg, me, NULL, &connect_cb, NULL, NULL); if (NULL == me->ch) - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, - "Failed to create CORE handle \n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create CORE handle \n"); return me->ch; } static void -core_disconnect_adapter (void *cls, - void *op_result) +core_disconnect_adapter (void *cls, void *op_result) { struct TestPeer *me = cls; @@ -369,8 +349,7 @@ test_connection (void *cls, { unsigned int c; - GNUNET_SCHEDULER_add_shutdown (&do_shutdown, - NULL); + GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); if (NUM_TEST_PEERS != num_peers) { ok = 4; @@ -381,28 +360,28 @@ test_connection (void *cls, GNUNET_SCHEDULER_shutdown (); return; } - /* We are generating a CLIQUE */ - if (NUM_TEST_PEERS * (NUM_TEST_PEERS -1) == links_succeeded) + /* We are generating a CLIQUE */ + if (NUM_TEST_PEERS * (NUM_TEST_PEERS - 1) == links_succeeded) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Testbed connected peers, initializing test\n"); for (c = 0; c < num_peers; c++) { testpeers[c].p = peers[c]; - testpeers[c].core_op - = GNUNET_TESTBED_service_connect (NULL, - testpeers[c].p, - "core", - &core_completion_cb, NULL, - &core_connect_adapter, - &core_disconnect_adapter, - &testpeers[c]); + testpeers[c].core_op = + GNUNET_TESTBED_service_connect (NULL, + testpeers[c].p, + "core", + &core_completion_cb, + NULL, + &core_connect_adapter, + &core_disconnect_adapter, + &testpeers[c]); } } else { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Testbed failed to connect peers\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testbed failed to connect peers\n"); ok = 5; GNUNET_SCHEDULER_shutdown (); return; @@ -411,16 +390,18 @@ test_connection (void *cls, int -main (int argc, - char *argv[]) +main (int argc, char *argv[]) { ok = 1; /* Connecting initial topology */ (void) GNUNET_TESTBED_test_run ("test-revocation", "test_revocation.conf", - NUM_TEST_PEERS, 0, - NULL, NULL, - &test_connection, NULL); + NUM_TEST_PEERS, + 0, + NULL, + NULL, + &test_connection, + NULL); return ok; } diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index fa85e775c..c076028fe 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -595,8 +595,7 @@ check_PROGRAMS = \ $(HTTP_QUOTA_TEST) \ $(HTTPS_QUOTA_TEST) \ $(WLAN_QUOTA_TEST) \ - $(BT_QUOTA_TEST) \ - test_communicator_unix + $(BT_QUOTA_TEST) if HAVE_GETOPT_BINARY check_PROGRAMS += \ test_transport_api_slow_ats -- 2.25.1