-## 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=$!
+## WITH_MITM(adir, aport, bdir, bport, body)
+m4_define([WITH_MITM], [
+ echo >&2 "mitm: $1 <--> :$2 <-mitm-> :$4 <--> $3"
+ MITM -k$1/keyring.pub \
+ peer:$1:$2:127.0.0.1:$(cat $1/port) \
+ peer:$3:$4:127.0.0.1:$(cat $3/port) \
+ filt:send& mitmpid_$1_$3=$!
+ trap 'kill $mitmpid_$1_$3; exit 127' EXIT INT QUIT TERM HUP