aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_transport_testing.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport/test_transport_testing.c')
-rw-r--r--src/transport/test_transport_testing.c61
1 files changed, 31 insertions, 30 deletions
diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c
index 514dd2b6e..cd5d7ed2c 100644
--- a/src/transport/test_transport_testing.c
+++ b/src/transport/test_transport_testing.c
@@ -50,8 +50,8 @@
50 50
51GNUNET_SCHEDULER_TaskIdentifier timeout_task; 51GNUNET_SCHEDULER_TaskIdentifier timeout_task;
52 52
53static struct PeerContext * p1; 53static struct PeerContext *p1;
54static struct PeerContext * p2; 54static struct PeerContext *p2;
55 55
56static int connected = GNUNET_NO; 56static int connected = GNUNET_NO;
57 57
@@ -63,10 +63,10 @@ end ()
63 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); 63 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
64 64
65 if (timeout_task != GNUNET_SCHEDULER_NO_TASK) 65 if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
66 GNUNET_SCHEDULER_cancel(timeout_task); 66 GNUNET_SCHEDULER_cancel (timeout_task);
67 67
68 GNUNET_TRANSPORT_TESTING_stop_peer(p1); 68 GNUNET_TRANSPORT_TESTING_stop_peer (p1);
69 GNUNET_TRANSPORT_TESTING_stop_peer(p2); 69 GNUNET_TRANSPORT_TESTING_stop_peer (p2);
70} 70}
71 71
72static void 72static void
@@ -75,21 +75,21 @@ end_badly ()
75 timeout_task = GNUNET_SCHEDULER_NO_TASK; 75 timeout_task = GNUNET_SCHEDULER_NO_TASK;
76 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); 76 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
77 77
78 GNUNET_TRANSPORT_TESTING_stop_peer(p1); 78 GNUNET_TRANSPORT_TESTING_stop_peer (p1);
79 GNUNET_TRANSPORT_TESTING_stop_peer(p2); 79 GNUNET_TRANSPORT_TESTING_stop_peer (p2);
80 80
81 ret = GNUNET_SYSERR; 81 ret = GNUNET_SYSERR;
82} 82}
83 83
84static void 84static void
85testing_connect_cb (struct PeerContext * p1, struct PeerContext * p2, void *cls) 85testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
86{ 86{
87 char * p1_c = strdup (GNUNET_i2s(&p1->id)); 87 char *p1_c = strdup (GNUNET_i2s (&p1->id));
88
88 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers connected: %s <-> %s\n", 89 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers connected: %s <-> %s\n",
89 p1_c, 90 p1_c, GNUNET_i2s (&p2->id));
90 GNUNET_i2s (&p2->id)); 91 GNUNET_free (p1_c);
91 GNUNET_free(p1_c); 92 end ();
92 end();
93} 93}
94 94
95static void 95static void
@@ -99,7 +99,7 @@ notify_connect (void *cls,
99 uint32_t ats_count) 99 uint32_t ats_count)
100{ 100{
101 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected \n", 101 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected \n",
102 GNUNET_i2s (peer)); 102 GNUNET_i2s (peer));
103 connected++; 103 connected++;
104} 104}
105 105
@@ -107,7 +107,7 @@ static void
107notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) 107notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
108{ 108{
109 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' disconnected \n", 109 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' disconnected \n",
110 GNUNET_i2s (peer)); 110 GNUNET_i2s (peer));
111} 111}
112 112
113static void 113static void
@@ -126,38 +126,39 @@ run (void *cls,
126 char *const *args, 126 char *const *args,
127 const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) 127 const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
128{ 128{
129 timeout_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_MINUTES, &end_badly, NULL); 129 timeout_task =
130 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &end_badly, NULL);
130 131
131 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting peer\n"); 132 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting peer\n");
132 p1 = GNUNET_TRANSPORT_TESTING_start_peer("test_transport_api_tcp_peer1.conf", 133 p1 = GNUNET_TRANSPORT_TESTING_start_peer ("test_transport_api_tcp_peer1.conf",
133 &notify_receive, 134 &notify_receive,
134 &notify_connect, 135 &notify_connect,
135 &notify_disconnect, 136 &notify_disconnect, p1);
136 p1); 137
137 138 p2 = GNUNET_TRANSPORT_TESTING_start_peer ("test_transport_api_tcp_peer2.conf",
138 p2 = GNUNET_TRANSPORT_TESTING_start_peer("test_transport_api_tcp_peer2.conf", 139 &notify_receive,
139 &notify_receive, 140 &notify_connect,
140 &notify_connect, 141 &notify_disconnect, p2);
141 &notify_disconnect,
142 p2);
143 142
144 if (p1 != NULL) 143 if (p1 != NULL)
145 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer1 was successfully started\n"); 144 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer1 was successfully started\n");
146 else 145 else
147 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer1 was not started successfully\n"); 146 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
147 "Peer1 was not started successfully\n");
148 GNUNET_assert (p1 != NULL); 148 GNUNET_assert (p1 != NULL);
149 GNUNET_assert (p1->th != NULL); 149 GNUNET_assert (p1->th != NULL);
150 150
151 if (p2 != NULL) 151 if (p2 != NULL)
152 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer2 was successfully started\n"); 152 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer2 was successfully started\n");
153 else 153 else
154 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer2 was not started successfully\n"); 154 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
155 "Peer2 was not started successfully\n");
155 GNUNET_assert (p2 != NULL); 156 GNUNET_assert (p2 != NULL);
156 GNUNET_assert (p2->th != NULL); 157 GNUNET_assert (p2->th != NULL);
157 158
158 159
159 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting peers\n"); 160 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting peers\n");
160 GNUNET_TRANSPORT_TESTING_connect_peers(p1, p2, &testing_connect_cb, NULL); 161 GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL);
161} 162}
162 163
163int 164int