diff options
Diffstat (limited to 'src/testing/testing_api_cmd_netjail_start_testsystem_v2.c')
-rw-r--r-- | src/testing/testing_api_cmd_netjail_start_testsystem_v2.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/testing/testing_api_cmd_netjail_start_testsystem_v2.c b/src/testing/testing_api_cmd_netjail_start_testsystem_v2.c index e5d4221ec..ccb3f5ae8 100644 --- a/src/testing/testing_api_cmd_netjail_start_testsystem_v2.c +++ b/src/testing/testing_api_cmd_netjail_start_testsystem_v2.c | |||
@@ -422,8 +422,8 @@ start_helper (struct NetJailState *ns, struct | |||
422 | struct GNUNET_TESTING_NetjailNamespace *namespace; | 422 | struct GNUNET_TESTING_NetjailNamespace *namespace; |
423 | 423 | ||
424 | 424 | ||
425 | if (0 == m) | 425 | if (0 == n) |
426 | script_num = n - 1; | 426 | script_num = m - 1; |
427 | else | 427 | else |
428 | script_num = n - 1 + (n - 1) * ns->local_m + m + ns->known; | 428 | script_num = n - 1 + (n - 1) * ns->local_m + m + ns->known; |
429 | pid = getpid (); | 429 | pid = getpid (); |
@@ -455,8 +455,8 @@ start_helper (struct NetJailState *ns, struct | |||
455 | 455 | ||
456 | tbc = GNUNET_new (struct TestingSystemCount); | 456 | tbc = GNUNET_new (struct TestingSystemCount); |
457 | tbc->ns = ns; | 457 | tbc->ns = ns; |
458 | if (0 == m) | 458 | if (0 == n) |
459 | tbc->count = n; | 459 | tbc->count = m; |
460 | else | 460 | else |
461 | tbc->count = (n - 1) * ns->local_m + m + ns->known; | 461 | tbc->count = (n - 1) * ns->local_m + m + ns->known; |
462 | 462 | ||
@@ -491,7 +491,7 @@ start_helper (struct NetJailState *ns, struct | |||
491 | 491 | ||
492 | hkey = GNUNET_new (struct GNUNET_ShortHashCode); | 492 | hkey = GNUNET_new (struct GNUNET_ShortHashCode); |
493 | 493 | ||
494 | plugin = ns->plugin_name; | 494 | plugin = topology->plugin; |
495 | 495 | ||
496 | if (0 == m) | 496 | if (0 == m) |
497 | { | 497 | { |
@@ -505,7 +505,8 @@ start_helper (struct NetJailState *ns, struct | |||
505 | { | 505 | { |
506 | node = GNUNET_CONTAINER_multishortmap_get (topology->map_globals, | 506 | node = GNUNET_CONTAINER_multishortmap_get (topology->map_globals, |
507 | hkey); | 507 | hkey); |
508 | plugin = node->plugin; | 508 | if (NULL != node->plugin) |
509 | plugin = node->plugin; | ||
509 | } | 510 | } |
510 | 511 | ||
511 | } | 512 | } |
@@ -529,7 +530,8 @@ start_helper (struct NetJailState *ns, struct | |||
529 | { | 530 | { |
530 | node = GNUNET_CONTAINER_multishortmap_get (namespace->nodes, | 531 | node = GNUNET_CONTAINER_multishortmap_get (namespace->nodes, |
531 | hkey); | 532 | hkey); |
532 | plugin = node->plugin; | 533 | if (NULL != node->plugin) |
534 | plugin = node->plugin; | ||
533 | } | 535 | } |
534 | } | 536 | } |
535 | 537 | ||