diff options
author | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-01-05 15:36:57 +0100 |
---|---|---|
committer | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-01-05 15:36:57 +0100 |
commit | ada1ee79ada47e17c970ea9cddebfca1261259a7 (patch) | |
tree | fedaa2464391726807f0d1b42095c5cd2b85ddec | |
parent | 38afd11738315087eecd71b4d4a3d088ce8e3a30 (diff) | |
download | gnunet-ada1ee79ada47e17c970ea9cddebfca1261259a7.tar.gz gnunet-ada1ee79ada47e17c970ea9cddebfca1261259a7.zip |
-fixes
-rw-r--r-- | src/abe/Makefile.am | 3 | ||||
-rw-r--r-- | src/identity-provider/gnunet-service-identity-provider.c | 21 |
2 files changed, 6 insertions, 18 deletions
diff --git a/src/abe/Makefile.am b/src/abe/Makefile.am index 308e6c67c..23a7ae68e 100644 --- a/src/abe/Makefile.am +++ b/src/abe/Makefile.am | |||
@@ -7,9 +7,6 @@ libexecdir= $(pkglibdir)/libexec/ | |||
7 | 7 | ||
8 | pkgcfgdir= $(pkgdatadir)/config.d/ | 8 | pkgcfgdir= $(pkgdatadir)/config.d/ |
9 | 9 | ||
10 | dist_pkgcfg_DATA = \ | ||
11 | abe.conf | ||
12 | |||
13 | if USE_COVERAGE | 10 | if USE_COVERAGE |
14 | AM_CFLAGS = --coverage -O0 | 11 | AM_CFLAGS = --coverage -O0 |
15 | XLIB = -lgcov | 12 | XLIB = -lgcov |
diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/identity-provider/gnunet-service-identity-provider.c index 4e1de36cd..711ae76ce 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/identity-provider/gnunet-service-identity-provider.c | |||
@@ -95,11 +95,6 @@ static struct GNUNET_GNS_Handle *gns_handle; | |||
95 | static struct GNUNET_CREDENTIAL_Handle *credential_handle; | 95 | static struct GNUNET_CREDENTIAL_Handle *credential_handle; |
96 | 96 | ||
97 | /** | 97 | /** |
98 | * Stats handle | ||
99 | */ | ||
100 | static struct GNUNET_STATISTICS_Handle *stats_handle; | ||
101 | |||
102 | /** | ||
103 | * Namestore qe | 98 | * Namestore qe |
104 | */ | 99 | */ |
105 | static struct GNUNET_NAMESTORE_QueueEntry *ns_qe; | 100 | static struct GNUNET_NAMESTORE_QueueEntry *ns_qe; |
@@ -635,8 +630,6 @@ cleanup() | |||
635 | GNUNET_NAMESTORE_cancel (ns_qe); | 630 | GNUNET_NAMESTORE_cancel (ns_qe); |
636 | if (NULL != ns_handle) | 631 | if (NULL != ns_handle) |
637 | GNUNET_NAMESTORE_disconnect (ns_handle); | 632 | GNUNET_NAMESTORE_disconnect (ns_handle); |
638 | if (NULL != stats_handle) | ||
639 | GNUNET_STATISTICS_destroy (stats_handle, GNUNET_NO); | ||
640 | GNUNET_free_non_null (token); | 633 | GNUNET_free_non_null (token); |
641 | GNUNET_free_non_null (label); | 634 | GNUNET_free_non_null (label); |
642 | 635 | ||
@@ -1553,11 +1546,11 @@ process_parallel_lookup2 (void *cls, uint32_t rd_count, | |||
1553 | parallel_lookup); | 1546 | parallel_lookup); |
1554 | GNUNET_free (parallel_lookup->label); | 1547 | GNUNET_free (parallel_lookup->label); |
1555 | 1548 | ||
1556 | GNUNET_STATISTICS_update (stats_handle, | 1549 | GNUNET_STATISTICS_update (stats, |
1557 | "attribute_lookup_time_total", | 1550 | "attribute_lookup_time_total", |
1558 | GNUNET_TIME_absolute_get_duration (parallel_lookup->lookup_start_time).rel_value_us, | 1551 | GNUNET_TIME_absolute_get_duration (parallel_lookup->lookup_start_time).rel_value_us, |
1559 | GNUNET_YES); | 1552 | GNUNET_YES); |
1560 | GNUNET_STATISTICS_update (stats_handle, | 1553 | GNUNET_STATISTICS_update (stats, |
1561 | "attribute_lookups_count", | 1554 | "attribute_lookups_count", |
1562 | 1, | 1555 | 1, |
1563 | GNUNET_YES); | 1556 | GNUNET_YES); |
@@ -1575,11 +1568,11 @@ process_parallel_lookup2 (void *cls, uint32_t rd_count, | |||
1575 | (void**)&data); | 1568 | (void**)&data); |
1576 | if (GNUNET_SYSERR != attr_len) | 1569 | if (GNUNET_SYSERR != attr_len) |
1577 | { | 1570 | { |
1578 | GNUNET_STATISTICS_update (stats_handle, | 1571 | GNUNET_STATISTICS_update (stats, |
1579 | "abe_decrypt_time_total", | 1572 | "abe_decrypt_time_total", |
1580 | GNUNET_TIME_absolute_get_duration (decrypt_duration).rel_value_us, | 1573 | GNUNET_TIME_absolute_get_duration (decrypt_duration).rel_value_us, |
1581 | GNUNET_YES); | 1574 | GNUNET_YES); |
1582 | GNUNET_STATISTICS_update (stats_handle, | 1575 | GNUNET_STATISTICS_update (stats, |
1583 | "abe_decrypt_count", | 1576 | "abe_decrypt_count", |
1584 | 1, | 1577 | 1, |
1585 | GNUNET_YES); | 1578 | GNUNET_YES); |
@@ -1700,11 +1693,11 @@ process_consume_abe_key (void *cls, uint32_t rd_count, | |||
1700 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1693 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1701 | "Decrypted bytes: %zd Expected bytes: %zd\n", | 1694 | "Decrypted bytes: %zd Expected bytes: %zd\n", |
1702 | size, rd->data_size - sizeof (struct GNUNET_CRYPTO_EcdhePublicKey)); | 1695 | size, rd->data_size - sizeof (struct GNUNET_CRYPTO_EcdhePublicKey)); |
1703 | GNUNET_STATISTICS_update (stats_handle, | 1696 | GNUNET_STATISTICS_update (stats, |
1704 | "abe_key_lookup_time_total", | 1697 | "abe_key_lookup_time_total", |
1705 | GNUNET_TIME_absolute_get_duration (handle->lookup_start_time).rel_value_us, | 1698 | GNUNET_TIME_absolute_get_duration (handle->lookup_start_time).rel_value_us, |
1706 | GNUNET_YES); | 1699 | GNUNET_YES); |
1707 | GNUNET_STATISTICS_update (stats_handle, | 1700 | GNUNET_STATISTICS_update (stats, |
1708 | "abe_key_lookups_count", | 1701 | "abe_key_lookups_count", |
1709 | 1, | 1702 | 1, |
1710 | GNUNET_YES); | 1703 | GNUNET_YES); |
@@ -2392,8 +2385,6 @@ run (void *cls, | |||
2392 | identity_handle = GNUNET_IDENTITY_connect (cfg, | 2385 | identity_handle = GNUNET_IDENTITY_connect (cfg, |
2393 | NULL, | 2386 | NULL, |
2394 | NULL); | 2387 | NULL); |
2395 | stats_handle = GNUNET_STATISTICS_create ("identity-provider", | ||
2396 | cfg); | ||
2397 | /* Loading DB plugin */ | 2388 | /* Loading DB plugin */ |
2398 | if (GNUNET_OK != | 2389 | if (GNUNET_OK != |
2399 | GNUNET_CONFIGURATION_get_value_string (cfg, | 2390 | GNUNET_CONFIGURATION_get_value_string (cfg, |