summaryrefslogtreecommitdiff
path: root/INSTALL
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-05-13 13:53:27 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-05-13 15:10:16 +0200
commitd0009856814c13d13770db5aadd7b2fabf947776 (patch)
tree6d18a94439f27f3c2685f05c57435116673f40cc /INSTALL
parent2b100f7515dbd01032967c2d1b81d2f8d63bf9b5 (diff)
staging: add mausezahn staging directory
After some back and forth, we decided that it is easier to maintain mausezahn in a staging directory until it is fully reworked and cleaned up to be ready to be fully integrated. This way, it is better than having it in a separate branch, and we can also accept patches from outside more easily. Also, while at it, fix up some function mismatches with libcli. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'INSTALL')
-rw-r--r--INSTALL13
1 files changed, 3 insertions, 10 deletions
diff --git a/INSTALL b/INSTALL
index 52e0ba1..5fd5c1d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,9 +21,11 @@ What libraries are required?
- libz (astraceroute, flowtop, netsniff-ng)
- libnacl (curvetun)
- libnetfilter-conntrack (flowtop)
- - libpcap (netsniff-ng, for tcpdump-like filters)
+ - libpcap (netsniff-ng [for tcpdump-like filters], mausezahn)
- liburcu (flowtop)
- libnl3 (netsniff-ng, trafgen)
+ - libcli (mausezahn)
+ - libnet (mausezahn)
What additional tools are recommended after the build?
@@ -69,15 +71,6 @@ You can also build only a particular tool, e.g.:
(# make trafgen_distclean)
($ make trafgen_clean)
-Currently mausezahn is experimental and not included in the default repository
-resp. build:
-
- $ git pull git://repo.or.cz/netsniff-ng-old.git with-mausezahn
-
-This means if you want to use mausezahn, you have to execute 'make mausezahn'
-for a build. This will be changed at the time when we have cleaned up and
-fixed the imported code.
-
If you want to build all tools, but curvetun (i.e. because you don't need
the tunneling software and the NaCl build process lasts quite long):