summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-05-15Merge branch 'master' of github.com:borkmann/netsniff-ngDaniel Borkmann11-47/+50
Conflicts resolved by hand: bpfc.8 ifpps.8 netsniff-ng.8 Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-15man: improvements to language and markup for netsniff-ng.8Stephen Wadeley1-192/+199
Signed-off-by: Stephen Wadeley <swadeley@redhat.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-15man: trafgen: Minor fixesTobias Klauser10-49/+50
Replace "on default" by "by default", make it a bit more clear what the seed in the -E/--seed option is for and mention exit after display of information on --version and --help. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-15man: trafgen: Complete documentation for option -p/--cppTobias Klauser1-1/+3
Add complete description of the commandline option -p/--cpp to the manpage. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-15man: netsniff-ng: Minor fixesTobias Klauser1-9/+9
Fix wording in some places, make some sentences a bit shorter and replace "on default" by "by default". Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-15man: improvements to language and markup for ifpps.8Stephen Wadeley1-41/+40
Signed-off-by: Stephen Wadeley <swadeley@redhat.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-15man: improvements to curvetun.8, inconsistent use of `` and ''Stephen Wadeley1-5/+5
Signed-off-by: Stephen Wadeley <swadeley@redhat.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-15man: improvements to bpfc.8, inconsistent use of `` and ''Stephen Wadeley1-2/+2
Signed-off-by: Stephen Wadeley <swadeley@redhat.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-15man: improvements to language and markup for curvetun.8Stephen Wadeley1-73/+73
Signed-off-by: Stephen Wadeley <swadeley@redhat.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-15man: improvements to language and markup for bpfc.8Stephen Wadeley1-98/+98
Signed-off-by: Stephen Wadeley <swadeley@redhat.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-14man: edits to ifpps man pagejonschipp1-22/+22
Some edits to the ifpps man page. Signed-off-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-14man: add mausezahn man-pageDaniel Borkmann1-0/+256
Add the mausezahn man-page that is modified on top of the original man-page by Herbert Haas. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-14build: install man pagesDaniel Borkmann1-1/+6
Now that we have some man-pages, let them be installed via normal ``make install'' call. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-14docs: add note about zsh and vim filesDaniel Borkmann1-1/+6
At least mention their existance in the INSTALL file. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-14build: remove some unused stuff and clean up a bitDaniel Borkmann1-13/+11
Remove some variables that are unused, but set. Also reorder and comment some other sections. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-14man: minor fixups in flowtop's man pageJon Schipp1-16/+16
Some fixups in flowtop's man page. Signed-off-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-13docs: update install document to current repo statusDaniel Borkmann1-6/+7
mausezahn dependencies and build options were not yet documented. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-13staging: add mausezahn staging directoryDaniel Borkmann66-12/+28728
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>
2013-05-13zsh: add netsniff-ng zsh auto completion supportDaniel Borkmann8-0/+279
Hideo Hattori wrote a set of auto completion scripts for zsh that support netsniff-ng tools. Big thanks for that! Follow-up commits still need to address updated command-line options. Signed-off-by: Hideo Hattori <hhatto.jp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-13ring: break out timestamping since not directly relatedDaniel Borkmann4-35/+56
Break out the timestamping part of the ring.h file, since it's not directly related to the {t,r}x_ring. Also inlining doesn't make sense here. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-13trafgen: lexer: return original string if no shellcodeDaniel Borkmann1-3/+3
When do not detect any shellcode, make sure we return the original string only. Reported-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-13vim: add bpf syntax highlighting fileDaniel Borkmann1-0/+45
This is a revised, simple syntax highlighting file for the bpf language. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-12xutils: Make set_nonblocking() voidTobias Klauser2-4/+2
The return values is always 0 and it is never checked anyhow, so make the function void. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-12dissector: igmp: Fix erroneous null pointer checkTobias Klauser1-1/+1
We need to break if we get NULL from pkt_pull() but the actual check was inverted. This was discovered by the coverity scanner. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-12xmalloc: Make xfree a two part macro/inlineTobias Klauser1-6/+11
This way the coverity scanner will no longer complain about dereference before NULL checks right before xfree(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-12geoip: Don't leak file/socket descriptor in error caseTobias Klauser1-4/+10
In certain error cases, the file/socket descriptors are not closed in geoip_get_database(). This was discovered by the coverity scanner. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-12dissector: lldp: NULL check before dereferenceTobias Klauser1-2/+10
Check return value of pkt_pull before dereferencing it (even though we check the packet length before and pkt_pull _should_ never return NULL). This was discovered by the coverity scanner. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-12flowtop: Use size of destination buffer in memcpyTobias Klauser1-1/+1
The coverity scanner found the macro used as argument to sizeof suspicious. Use sizeof the destination buffer instead. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-12dissector: ip_ipv6_mobility_hdr: NULL check before dereferenceTobias Klauser1-4/+8
Check return value of pkt_pull before dereferencing it. This was discovered by the coverity scanner. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-12dissector: ip_authentication_hdr: Remove trailing whitespacesTobias Klauser1-2/+2
Remove two trailing whitespaces on emtpy lines. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-10make: allow to overwrite CFLAGS, CCACHEDaniel Borkmann3-43/+47
Allow to define custom compile flags, e.g. ... make CFLAGS="-O2 -Wall" ... and also allow to overwrite ccache variable: make CCACHE= all Also do some minor fixes when built with -O2 -Wall. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-10docs: minor: fix mentioning of Documentation/Daniel Borkmann3-3/+3
The Documentation/ folder no longer exists. Either everything important can be found in the man pages or other documentation files. Fix the mentioning of Documentation/. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-10man: trafgen: update documentation for hex, bin formsDaniel Borkmann1-2/+2
Also update examples for the man-page. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-10trafgen: lexer: also allow short forms for hex and binaryDaniel Borkmann1-4/+6
Also allow for ... - hex: 0xff, xff - binary: 0b11110000, b11110000 Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-10pcap_io: minor: fix some quirksDaniel Borkmann1-3/+3
We can just replace int with uin32_t, that's no problem. Also fix one case where we moved to uint16_t. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-10man: add description about different pcap formatsDaniel Borkmann1-0/+30
Add a more detailled description of netsniff-ng's -D option into the man-page. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-10pcap: let netsniff-ng also record pkt timestamp sourceDaniel Borkmann1-3/+26
With commit [1] in the kernel, we can also store the timestamp source in the pcap packet header for later analysis. We do this by splitting the netsniff-ng's u32 ifindex into u16 tsource and u16 ifindex. Older kernel do not support the timestamp source in PF_PACKET, so it will stay 0 and is compatible with older netsniff-ng binaries. [1] http://thread.gmane.org/gmane.linux.network/266878/ Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-10make: force to overwrite symlinkDaniel Borkmann1-1/+1
When doing to successive ``make install'' ln will throw an error that the symlink already exist, so simply force it to overwrite. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-06docs: install: mention recommended toolsDaniel Borkmann1-2/+2
Mention pkg-config and gpg as optional tools for verifying tags resp. getting build flags. If they are not wanted / present, then relative Makefiles need to be edited by hand. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-06man: finish astraceroute man pageDaniel Borkmann1-2/+65
Finish writing up the remaining section of the astraceroute man page. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-05man: start man page of astracerouteDaniel Borkmann1-0/+140
Here's at least a start that needs some more details to be filled out during the next week. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-05bpf_comp: minor: fix linebreakDaniel Borkmann1-2/+2
Add a newline after this long one. Also, after opening braces there should be no newline. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-05make: rename trafgen stddef.h fileDaniel Borkmann2-1/+2
Rename it to not confuse the build with header inclusions. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-05oui: minor: rename update fileDaniel Borkmann1-0/+0
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-05misc: move file to source rootDaniel Borkmann15-4/+4
Only have Makefile specific folders in the project root where the binaries are stored, the rest should be part of the repository root. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-04-30man: trafgen: finish trafgen manpageDaniel Borkmann1-1/+40
Finish the last part, which is usage examples. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-04-30man: trafgen: finish syntax sectionDaniel Borkmann1-1/+4
Counter description was missing. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-04-30man: trafgen: configuration syntax sectionDaniel Borkmann1-4/+160
This adds the packet configuration syntax section for trafgen's man page. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-04-30man: trafgen: finish options sectionDaniel Borkmann1-3/+15
There are still 3 sections on todo, but for now we can already push out the option section that is ready. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-04-30man: trafgen: add initial versionDaniel Borkmann1-0/+235
Add an initial version of the trafgen man-page. There are still a couple of TODO marked section that need to be addressed in follow-up commits. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>