Merge branch 'master' into Enhancement_improve_--mbps_option_stabilit…

…y_and_performance Conflicts: src/Makefile.am src/send_packets.c src/sleep.c src/sleep.h src/tcpreplay.c
baigubulu · Dec 2, 2013 · 7513447 · 7513447
2 parents 25e687b + 50080cf
commit 7513447
Show file tree

Hide file tree

Showing 23 changed files with 26,809 additions and 4,695 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,66 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so 
+*.a
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.bz2
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+
+# configure files
+config.status
+*.in
+libtool
+.deps
+autom4te.cache
+src/config.h
+src/defines.h
+src/stamp-h1
+test/config
+
+# Temporary files 
+*.tmp
+.*.swp
+*.tmproj
+
+# Misc files
+tcpreplay.spec
+tcpreplay.pws
+.tm_project.cache
+doxygen.cfg
+TAGS
+.gdb_history
+Makefile
+types_c.vim
diff --git a/INSTALL b/INSTALL
@@ -10,6 +10,10 @@ unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
 
+    ./configure 
+    make
+    sudo make install
+
 Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
@@ -67,6 +71,27 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+Build netmap feature
+====================
+
+This feature will detect netmap capable network drivers on Linux and BSD 
+systems. If detected, the network driver is bypassed for the execution 
+duration of tcpreplay and tcpreplay-edit, and network buffers will be 
+written to directly. This will allow you to achieve full line rates on 
+commodity network adapters, similar to rates achieved by commercial network 
+traffic generators.
+
+Note that bypassing the network driver will disrupt other applications connected
+through the test interface. Don't test on the same interface you ssh'ed into.
+
+Download latest netmap sources from http://info.iet.unipi.it/~luigi/netmap/
+If you extracted netmap into /usr/src/ you can build normally. Otherwise you 
+will have to specify the netmap source directory, for example:
+
+    ./configure --with-netmap=/home/fklassen/git/netmap
+    make
+    sudo make install
+
 Compilers and Options
 =====================
 

diff --git a/README.md b/README.md
@@ -0,0 +1,77 @@
+# Tcpreplay
+
+The new home for Tcpreplay is on Github!
+
+Looking for the stable 3.5 branch?  Go here: https://github.com/appneta/tcpreplay/
+
+## Install
+
+### Simple directions for Unix users:
+
+    ./configure 
+    make
+    sudo make install
+
+## Build netmap feature
+
+This feature will detect netmap capable network drivers on Linux and BSD 
+systems. If detected, the network driver is bypassed for the execution 
+duration of tcpreplay and tcpreplay-edit, and network buffers will be 
+written to directly. This will allow you to achieve full line rates on 
+commodity network adapters, similar to rates achieved by commercial network 
+traffic generators.
+
+Note that bypassing the network driver will disrupt other applications connected
+through the test interface. Don't test on the same interface you ssh'ed into.
+
+Download latest and install netmap from http://info.iet.unipi.it/~luigi/netmap/
+If you extracted netmap into /usr/src/ you can build normally. Otherwise you 
+will have to specify the netmap source directory, for example:
+
+    ./configure --with-netmap=/home/fklassen/git/netmap
+    make
+    sudo make install
+
+## Support
+
+If you have a question or think you are experiancing a bug, it is important
+that you provide enough information for us to help you.  Failure to provide
+enough information will likely cause your email to be ignored or get an
+annoyed reply from the author.
+
+If your problem has to do with COMPILING tcpreplay:
+- Version of tcpreplay you are trying to compile
+- Platform (Red Hat Linux 9 on x86, Solaris 7 on SPARC, OS X on PPC, etc)
+- Contents of config.status
+- Output from 'make'
+- Any additional information you think that would be useful.
+
+If your problem has to do with RUNNING tcpreplay or one of the sub-tools:
+- Version information (output of -V)
+- Command line used (options and arguments)
+- Platform (Red Hat Linux 9 on Intel, Solaris 7 on SPARC, etc)
+- Make & model of the network card(s) and driver(s) version
+- Error message (if available) and/or description of problem
+- If possible, attach the pcap file used (compressed with bzip2 or gzip
+    preferred)
+- The core dump or backtrace if available
+- Detailed description of your problem or what you are trying to accomplish
+
+Note: The author of tcpreplay primarily uses OS X; hence, if you're reporting
+an issue on another platform, it is important that you give very detailed
+information as I may not be able to reproduce your issue.
+
+You are also strongly encouraged to read the extensive documentation (man
+pages, FAQ, documents in /docs and email list archives) BEFORE posting to the
+tcpreplay-users email list:
+
+http://lists.sourceforge.net/lists/listinfo/tcpreplay-users
+
+Lastly, please don't email the author directly with your questions.  Doing so
+prevents others from potentially helping you and your question/answer from
+showing up in the list archives.
+
+## License
+
+Tcpreplay 3.5 is GPLv3 and includes software developed by the University of
+California, Berkeley, Lawrence Berkeley Laboratory and its contributors.