@@ -312,24 +312,12 @@ private Scmp.TracerouteMessage findFastestTRasync(List<Path> paths, Ref<Path> re
312
312
new ScmpSenderAsync .ResponseHandler () {
313
313
@ Override
314
314
public void onResponse (Scmp .TimedMessage msg ) {
315
- System .out .println (
316
- "Received response for "
317
- + ScionUtil .toStringIA (msg .getIdentifier ())
318
- + " "
319
- + msg .getSequenceNumber ());
320
315
barrier .countDown ();
321
316
messages .put (msg .getIdentifier (), msg );
322
317
}
323
318
324
319
@ Override
325
320
public void onTimeout (Scmp .TimedMessage msg ) {
326
- System .out .println (
327
- "Timeout for "
328
- + ScionUtil .toStringIA (msg .getIdentifier ())
329
- + " "
330
- + msg .getSequenceNumber ()
331
- + " "
332
- + msg .getPath ().getRemoteAddress ());
333
321
barrier .countDown ();
334
322
messages .put (msg .getIdentifier (), msg );
335
323
}
@@ -351,21 +339,18 @@ public void onException(Throwable t) {
351
339
try (ScionProvider .Async sender = service .getAsync (handler )) {
352
340
for (Path path : paths ) {
353
341
summary .incPathTried ();
354
- int x = sender .sendTracerouteLast (path );
355
- System .out .println ("Sending " + x + " " + ScionUtil .toStringPath (path .getRawPath ()) + " to " + path .getRemoteAddress ());
342
+ sender .sendTracerouteLast (path );
356
343
}
357
- } catch (IOException e ) {
358
- println ("ERROR: " + e .getMessage ());
359
- summary .incAsError ();
360
- return null ;
361
- }
362
344
363
- // Wait for all messages to be received
364
- try {
345
+ // Wait for all messages to be received, BEFORE closing the "sender".
365
346
if (!barrier .await (1100 , TimeUnit .MILLISECONDS )) {
366
347
throw new IllegalStateException (
367
348
"Missing messages: " + barrier .getCount () + "/" + paths .size ());
368
349
}
350
+ } catch (IOException e ) {
351
+ println ("ERROR: " + e .getMessage ());
352
+ summary .incAsError ();
353
+ return null ;
369
354
} catch (InterruptedException e ) {
370
355
Thread .currentThread ().interrupt ();
371
356
throw new IllegalStateException (e );
0 commit comments