Found on davenant

[vinegar-ip.git] / Makefile

diff --git a/Makefile b/Makefile
index 55a55bf0eb6a06b407e92cdaad9704d3dadce9dd..bc9237396a77116c692c6fc4f909efa77004f6e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@
 #############################################################
 # You should edit the parameters below for your site
 
-SOURCE=                172.18.45.35/0:4:76:1a:92:13
-DEST=          172.18.45.6/0:04:76:1A:8F:C6
+SOURCE=                130.233.5.88/00:0D:60:89:9F:AC
+DEST=          193.201.200.170/00:0B:45:B3:78:40
 
 UNIQUE=
 # set UNIQUE to something random for less observability
@@ -100,11 +100,13 @@ send-%.pcap send-%.why:   ./make-probes.tcl
                --dest $(DEST) \
                 --xseed "$* $(UNIQUE)" >send-$*.why
 
-%.log:         %.pcap lnumber-tcpdump.pl blank-ttl-ipcsum.pl Makefile
-               tcpdump -tnxvvs$$(($(MTU)+500)) -r $< >$@.0.tmp
-               ./blank-ttl-ipcsum.pl <$@.0.tmp >$@.1.tmp
-               ./lnumber-tcpdump.pl <$@.1.tmp >$@.2.tmp
-               @mv -f $@.2.tmp $@
+%.log: %.pcap Makefile \
+       lnumber-tcpdump.pl blank-ttl-ipcsum.pl tcpdump-nomultiline.pl
+               tcpdump -tnxvvs$$(($(MTU)+500)) -r $< >$@.2.tmp
+               ./tcpdump-nomultiline.pl <$@.2.tmp >$@.3.tmp
+               ./blank-ttl-ipcsum.pl <$@.3.tmp >$@.4.tmp
+               ./lnumber-tcpdump.pl <$@.4.tmp >$@.5.tmp
+               @mv -f $@.5.tmp $@
 
 recv-%.diff:   send-%.log recv-%.log
                diff -uI'^[0-9]' $^ >$@ || test $$? == 1
@@ -115,7 +117,7 @@ recv-%.mdiff:       send-%.log recv-%.log
 
 recv-%.summary:        recv-%.mdiff mdiff-summarise.pl
                ./mdiff-summarise.pl <$< >$@.1.tmp
-               sort -t: -n +1 <$@.1.tmp >$@.2.tmp
+               sort -t : +1 <$@.1.tmp >$@.2.tmp
                @mv -f $@.2.tmp $@
 
 %.sh:          %.template Makefile