diff options
author | t3sserakt <t3ss@posteo.de> | 2024-05-24 10:19:54 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2024-05-24 10:19:54 +0200 |
commit | fb970e5f2390011e76fc37f15df977f323311ec4 (patch) | |
tree | 85936826c5c1bf8da32020bf798b3d260d370b84 | |
parent | 361f1d528a40a139da64e3796c2e9721ae9d8c1d (diff) | |
download | gnunet-fb970e5f2390011e76fc37f15df977f323311ec4.tar.gz gnunet-fb970e5f2390011e76fc37f15df977f323311ec4.zip |
Testing: Make compile again.
-rw-r--r-- | src/lib/testing/testing_api_topology.c | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/src/lib/testing/testing_api_topology.c b/src/lib/testing/testing_api_topology.c index c400b3c1b..b83d7ba10 100644 --- a/src/lib/testing/testing_api_topology.c +++ b/src/lib/testing/testing_api_topology.c | |||
@@ -634,7 +634,8 @@ free_value_cb (void *cls, | |||
634 | (void) cls; | 634 | (void) cls; |
635 | 635 | ||
636 | GNUNET_free (value); | 636 | GNUNET_free (value); |
637 | 637 | } | |
638 | |||
638 | /** | 639 | /** |
639 | * Deallocate memory of the struct GNUNET_TESTING_NetjailTopology. | 640 | * Deallocate memory of the struct GNUNET_TESTING_NetjailTopology. |
640 | * | 641 | * |
@@ -646,9 +647,9 @@ GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology) | |||
646 | GNUNET_CONTAINER_multishortmap_iterate (topology->backbone_peers, | 647 | GNUNET_CONTAINER_multishortmap_iterate (topology->backbone_peers, |
647 | &free_value_cb, | 648 | &free_value_cb, |
648 | NULL); | 649 | NULL); |
649 | GNUNET_CONTAINER_multishortmap_iterate (topology->carriers, | 650 | /*GNUNET_CONTAINER_multishortmap_iterate (topology->carriers, |
650 | &free_carriers_cb, | 651 | &free_carriers_cb, |
651 | NULL); | 652 | NULL);*/ |
652 | GNUNET_free (topology->plugin); | 653 | GNUNET_free (topology->plugin); |
653 | GNUNET_free (topology); | 654 | GNUNET_free (topology); |
654 | } | 655 | } |
@@ -791,38 +792,6 @@ GNUNET_TESTING_get_additional_connects (unsigned int num, | |||
791 | return node->additional_connects; | 792 | return node->additional_connects; |
792 | } | 793 | } |
793 | 794 | ||
794 | |||
795 | static void | ||
796 | parse_ac (struct GNUNET_TESTING_NetjailNode *p_node, const char *token) | ||
797 | { | ||
798 | char *ac_value; | ||
799 | int ret; | ||
800 | |||
801 | ac_value = get_value ("AC", token); | ||
802 | if (NULL != ac_value) | ||
803 | { | ||
804 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
805 | "ac value: %s\n", | ||
806 | ac_value); | ||
807 | errno = 0; | ||
808 | ret = sscanf (ac_value, "%u", &p_node->additional_connects); | ||
809 | if (errno != 0) | ||
810 | { | ||
811 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf"); | ||
812 | } | ||
813 | GNUNET_assert (0 < ret); | ||
814 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
815 | "AC %u\n", | ||
816 | p_node->additional_connects); | ||
817 | } | ||
818 | else | ||
819 | { | ||
820 | p_node->additional_connects = 0; | ||
821 | } | ||
822 | GNUNET_free (ac_value); | ||
823 | } | ||
824 | |||
825 | |||
826 | char * | 795 | char * |
827 | GNUNET_TESTING_get_plugin_from_topo ( | 796 | GNUNET_TESTING_get_plugin_from_topo ( |
828 | struct GNUNET_TESTING_NetjailTopology *njt, | 797 | struct GNUNET_TESTING_NetjailTopology *njt, |
@@ -1328,7 +1297,7 @@ GNUNET_TESTING_get_topo_from_string_ (const char *input) | |||
1328 | GNUNET_free (key); | 1297 | GNUNET_free (key); |
1329 | GNUNET_free (data); | 1298 | GNUNET_free (data); |
1330 | return topo; | 1299 | return topo; |
1331 | }*/ | 1300 | }*/ |
1332 | 1301 | ||
1333 | 1302 | ||
1334 | GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS ( | 1303 | GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS ( |