aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2019-07-23 13:38:08 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2019-07-23 13:38:08 +0200
commit2dbe442005401656c73b3432b5798219fa8b5432 (patch)
treed802ed099e05cd9cd851bb62925bda2d77a29ece
parentdbf604ad97fef5f9f1ecb468a174fbc81a2eb694 (diff)
downloadgnunet-2dbe442005401656c73b3432b5798219fa8b5432.tar.gz
gnunet-2dbe442005401656c73b3432b5798219fa8b5432.zip
fix mem corruption, possibly #5581
-rw-r--r--src/testbed/gnunet-service-testbed.c11
-rw-r--r--src/testbed/gnunet-service-testbed.h4
2 files changed, 7 insertions, 8 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 289e17349..8babeeb13 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -11,7 +11,7 @@
11 WITHOUT ANY WARRANTY; without even the implied warranty of 11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details. 13 Affero General Public License for more details.
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
@@ -65,7 +65,7 @@ struct OperationQueue *GST_opq_openfds;
65/** 65/**
66 * Timeout for operations which may take some time 66 * Timeout for operations which may take some time
67 */ 67 */
68const struct GNUNET_TIME_Relative GST_timeout; 68struct GNUNET_TIME_Relative GST_timeout;
69 69
70/** 70/**
71 * The size of the host list 71 * The size of the host list
@@ -860,23 +860,22 @@ testbed_run (void *cls,
860 } 860 }
861 GNUNET_assert (GNUNET_OK == 861 GNUNET_assert (GNUNET_OK ==
862 GNUNET_CONFIGURATION_get_value_number (cfg, 862 GNUNET_CONFIGURATION_get_value_number (cfg,
863 "TESTBED", 863 "testbed",
864 "CACHE_SIZE", 864 "CACHE_SIZE",
865 &num)); 865 &num));
866 GST_cache_init ((unsigned int) num); 866 GST_cache_init ((unsigned int) num);
867 GST_connection_pool_init ((unsigned int) num); 867 GST_connection_pool_init ((unsigned int) num);
868 GNUNET_assert (GNUNET_OK == 868 GNUNET_assert (GNUNET_OK ==
869 GNUNET_CONFIGURATION_get_value_number (cfg, 869 GNUNET_CONFIGURATION_get_value_number (cfg,
870 "TESTBED", 870 "testbed",
871 "MAX_OPEN_FDS", 871 "MAX_OPEN_FDS",
872 &num)); 872 &num));
873 GST_opq_openfds = GNUNET_TESTBED_operation_queue_create_ (OPERATION_QUEUE_TYPE_FIXED, 873 GST_opq_openfds = GNUNET_TESTBED_operation_queue_create_ (OPERATION_QUEUE_TYPE_FIXED,
874 (unsigned int) num); 874 (unsigned int) num);
875 GNUNET_assert (GNUNET_OK == 875 GNUNET_assert (GNUNET_OK ==
876 GNUNET_CONFIGURATION_get_value_time (cfg, 876 GNUNET_CONFIGURATION_get_value_time (cfg,
877 "TESTBED", 877 "testbed",
878 "OPERATION_TIMEOUT", 878 "OPERATION_TIMEOUT",
879 (struct GNUNET_TIME_Relative *)
880 &GST_timeout)); 879 &GST_timeout));
881 GNUNET_assert (GNUNET_OK == 880 GNUNET_assert (GNUNET_OK ==
882 GNUNET_CONFIGURATION_get_value_string (cfg, 881 GNUNET_CONFIGURATION_get_value_string (cfg,
diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h
index 0960e9cc5..5e835392b 100644
--- a/src/testbed/gnunet-service-testbed.h
+++ b/src/testbed/gnunet-service-testbed.h
@@ -11,7 +11,7 @@
11 WITHOUT ANY WARRANTY; without even the implied warranty of 11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details. 13 Affero General Public License for more details.
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
@@ -454,7 +454,7 @@ extern struct OperationQueue *GST_opq_openfds;
454/** 454/**
455 * Timeout for operations which may take some time 455 * Timeout for operations which may take some time
456 */ 456 */
457const extern struct GNUNET_TIME_Relative GST_timeout; 457extern struct GNUNET_TIME_Relative GST_timeout;
458 458
459/** 459/**
460 * The size of the peer list 460 * The size of the peer list