X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/203e1b1f8b5ce6f7b78ed8e03b376dea2d56d0ed..01c2190311b3eab8e861014d57ddca6160998e69:/server/tests.at diff --git a/server/tests.at b/server/tests.at index c490ff2b..ab64c538 100644 --- a/server/tests.at +++ b/server/tests.at @@ -38,6 +38,8 @@ m4_define([TRIPE], $abs_top_builddir/server/tripe -F -d. -aadmin -p0 -b127.0.0.1 -talice]) m4_define([TRIPECTL], [$abs_top_builddir/client/tripectl -d. -aadmin]) m4_define([USLIP], [$abs_top_builddir/uslip/tripe-uslip]) +m4_define([PKSTREAM], + [$abs_top_builddir/pkstream/pkstream -b127.0.0.1 -p127.0.0.1]) ## Sequences. (These are used for testing the replay protection machinery.) m4_define([R32], [ 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 dnl @@ -228,13 +230,15 @@ m4_define([AWAIT_KXDONE], [ TRIPECTL -d$4 WARN test POP ]) -## ESTABLISH(adir, aname, aopts, bdir, bname, bopts) +## ESTABLISH(adir, aname, aopts, bdir, bname, bopts, [aport], [bport]) m4_define([ESTABLISH], [ ## Set up the establishment. AWAIT_KXDONE([$1], [$2], [$4], [$5], [ - AT_CHECK([TRIPECTL -d$1 ADD -cork $6 $5 INET 127.0.0.1 $(cat $4/port)]) - AT_CHECK([TRIPECTL -d$4 ADD $3 $2 INET 127.0.0.1 $(cat $1/port)]) + AT_CHECK([TRIPECTL -d$1 ADD -cork $6 $5 INET 127.0.0.1 \ + m4_if([$8], [], [$(cat $4/port)], [$8])]) + AT_CHECK([TRIPECTL -d$4 ADD $3 $2 INET 127.0.0.1 \ + m4_if([$7], [], [$(cat $1/port)], [$7])]) ]) ## Check transport pinging. @@ -354,6 +358,71 @@ WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [ AT_CLEANUP +###-------------------------------------------------------------------------- +### Mobile peer tracking. + +AT_SETUP([peer tracking]) +AT_KEYWORDS([mobile]) +export TRIPE_SLIPIF=USLIP + +for p in alice bob carol; do (mkdir $p; cd $p; SETUPDIR([alpha])); done + +## WITH_PKSTREAM(adir, aport, bdir, bport, body) +m4_define([WITH_PKSTREAM], [ + echo >&2 "pkstream: $1 <--> :$2 <-pkstream-> :$4 <--> $3" + PKSTREAM -l$4 127.0.0.1:$4 127.0.0.1:$(cat $3/port)& pkstream_$3_$1=$! + sleep 1 + PKSTREAM -c127.0.0.1:$4 127.0.0.1:$2 127.0.0.1:$(cat $1/port)& + pkstream_$1_$3=$! + set +x + $5 + kill $pkstream_$3_$1 $pkstream_$1_$3 +]) + +WITH_3TRIPES([alice], [bob], [carol], [-nslip], + [-talice], [-tbob], [-tcarol], [ + + ## We need an indirection layer between the two peers so that we can + ## simulate the effects of NAT remapping. The nearest thing we have to + ## this is pkstream, so we may as well use that. + ## + ## alice <--> :5311 <-pkstream-> :5312 <--> bob + ## alice <--> :5321 <-pkstream-> :5322 <--> carol + + WITH_PKSTREAM([alice], [5311], [bob], [5312], [ + ESTABLISH([alice], [alice], [], [bob], [bob], [-mobile], [5312], [5311]) + ]) + + WITH_PKSTREAM([alice], [5319], [bob], [5312], [ + COMMS_EPING([bob], [bob], [alice], [alice]) + COMMS_SLIP([bob], [bob], [alice], [alice]) + ]) + + WITH_PKSTREAM([alice], [5321], [carol], [5322], [ + ESTABLISH([alice], [alice], [], [carol], [carol], [-mobile], + [5322], [5321]) + ]) + + WITH_PKSTREAM([alice], [5311], [bob], [5312], [ + WITH_PKSTREAM([alice], [5321], [carol], [5322], [ + COMMS_EPING([bob], [bob], [alice], [alice]) + COMMS_EPING([carol], [carol], [alice], [alice]) + COMMS_SLIP([bob], [bob], [alice], [alice]) + COMMS_SLIP([carol], [carol], [alice], [alice]) + ])]) + + WITH_PKSTREAM([alice], [5321], [bob], [5312], [ + WITH_PKSTREAM([alice], [5311], [carol], [5322], [ + COMMS_EPING([bob], [bob], [alice], [alice]) + COMMS_EPING([carol], [carol], [alice], [alice]) + COMMS_SLIP([bob], [bob], [alice], [alice]) + COMMS_SLIP([carol], [carol], [alice], [alice]) + ])]) + wait +]) + +AT_CLEANUP + ###-------------------------------------------------------------------------- ### Services.