Changeset 5765044

Timestamp:

09/15/15 11:35:38 (5 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

2d8a045

Parents:

aafdc55

Message:

Remove old traceanon encryption code

Renamed the single threaded traceanon.c to old_traceanon.c, just in case
we need it for something.

Updated traceanon man-page.

Location:

tools/traceanon

Files:

• ipenc.c (deleted)
• ipenc.h (deleted)
• old_traceanon.c (moved) (moved from tools/traceanon/traceanon.c)
• panon.c (deleted)
• panon.h (deleted)
• rijndael.c (deleted)
• rijndael.h (deleted)
• traceanon.1 (modified) (4 diffs)

tools/traceanon/traceanon.1

@@ -12 +12 @@
 [ \-z level | \-\^\-compress-level=level ]
 [ \-Z method | \-\^\-compress-type=method ]
+[ \-t threadcount | \-\^\-threads=threadcount ]
+
 sourceuri
 desturi
 .SH DESCRPTION
 traceanon anonymises a trace by replacing IP addresses found in the IP header,
-and any embedded packets inside an ICMP packet.  It also fixes the checksums
-inside TCP and UDP headers.
+and any embedded packets inside an ICMP packet.  It also replaces the checksums
+inside TCP, UDP and ICMPv6 headers with zeroes.
 
 Two anonymisation schemes are supported, the first replaces a prefix with
 another prefix.  This can be used for instance to replace a /16 with the
 equivilent prefix from RFC1918.  The other scheme is cryptopan which is a
-prefix preserving encryption scheme based on AES.
+prefix preserving encryption scheme based on AES (traceanon must be built
+with libcrypto support to be able to use the cryptopan scheme).
 .TP
 .PD 0
@@ -45 +48 @@
 .PD
 .BI \-\^\-prefix=prefix
-substitute the high bits of the IP addresses with the provided prefix.
+substitute the high bits of the IP addresses with the provided IPv4 prefix. 
+This method will only anonymise IPv4 addresses; IPv6 packets will be untouched.
 
 .TP
@@ -99 +103 @@
 algorithms are "gzip", "bzip2", "lzo", "xz" and "none". Default is "none".
 
+.TP
+.PD 0
+.BI \-t
+.TP
+.PD
+.BI \-\^\-threads=threadcount
+use the specified number of threads to anonymise packets. The default number
+of threads is 4.
+
 .SH EXAMPLES
 .nf
@@ -127 +140 @@
 .SH AUTHORS
 Perry Lorier <perry@cs.waikato.ac.nz>
+Shane Alcock <salcock@waikato.ac.nz>
+Richard Sanger <rjs51@students.waikato.ac.nz>