*/
enum SetupState
{
- /**
- * The initial state
- */
- INIT,
-
/**
* Get the identity of peer 1
*/
case PEER1_WRITE_SHUTDOWN:
GNUNET_assert (&peer2 == peer);
GNUNET_assert (NULL == peer->io_read_handle);
+ peer2.test_ok = GNUNET_YES;
transition (); /* to PEER1_HALFCLOSE_READ */
break;
default:
}
break;
case PEER1_WRITE_SHUTDOWN:
- GNUNET_assert (GNUNET_STREAM_SHUTDOWN == status);
- peer2.test_ok = GNUNET_YES;
+ GNUNET_assert (0); /* This callback will not be called when stream
+ is shutdown */
break;
case PEER1_HALFCLOSE_WRITE_FAIL:
case PEER1_READ_SHUTDOWN:
{
switch (event->type)
{
- case GNUNET_TESTBED_ET_CONNECT:
- GNUNET_assert (INIT == setup_state);
- GNUNET_TESTBED_operation_done (op);
- op = GNUNET_TESTBED_peer_get_information (peer1.peer,
- GNUNET_TESTBED_PIT_IDENTITY,
- &peerinfo_cb, NULL);
- setup_state = PEER1_GET_IDENTITY;
- break;
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
switch (setup_state)
{
GNUNET_assert (NULL != peers[1]);
peer1.peer = peers[0];
peer2.peer = peers[1];
- op = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL, peer2.peer, peer1.peer);
- setup_state = INIT;
+ op = GNUNET_TESTBED_peer_get_information (peer1.peer,
+ GNUNET_TESTBED_PIT_IDENTITY,
+ &peerinfo_cb, NULL);
+ setup_state = PEER1_GET_IDENTITY;
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 40), &do_abort,
+ (GNUNET_TIME_UNIT_SECONDS, 1000), &do_abort,
NULL);
}
result = GNUNET_NO;
event_mask = 0;
- event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
- GNUNET_TESTBED_test_run ("test_stream_2peers_halfclose",
- "test_stream_local.conf", NUM_PEERS, event_mask,
- &controller_event_cb, NULL, &test_master, NULL);
+ (void) GNUNET_TESTBED_test_run ("test_stream_2peers_halfclose",
+ "test_stream_local.conf", NUM_PEERS,
+ event_mask,
+ &controller_event_cb, NULL, &test_master,
+ NULL);
if (GNUNET_SYSERR == result)
return 1;
return 0;