summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-05-23bpfc: allow bpf programs to be passed to cppDaniel Borkmann4-8/+48
This patch allows bpf programs to be passed to the C preprocessor before handing over to bpfc. Example: #define ETH_P_IP 0x800 ldh [12] jne #ETH_P_IP, drop ldb [23] jneq #6, drop ldh [20] jset #0x1fff, drop ldxb 4 * ([14] & 0xf) ldh [x + 14] jeq #0x16, pass ldh [x + 16] jne #0x16, drop pass: ret #-1 drop: ret #0 Compile with: bpfc -i foo -p Suggested-by: John Lange <JLange@trendium.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-22man: astraceroute: minor edits all overJon Schipp1-19/+18
Some minor edits all over the place. Signed-off-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-22docs: minor: say it's staging area, not a branchDaniel Borkmann1-2/+1
The extra branch is history for a while now, it's an internal staging area instead. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-22man: netsniff-ng: edits to the netsniff-ng man pageJon Schipp1-19/+20
Various edits all over. Signed-off-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-22docs: minor: Add missing word 'it'Jon Schipp1-1/+1
Signed-off-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-21curvetun: use free instead of xfreeDaniel Borkmann1-8/+4
Only use xfree where it makes sense, here not really. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-21man: curvetun: finish up initial draft of curvetunDaniel Borkmann1-8/+105
Initial draft of curvetun manpage. Follow-up commits may come to fix formating errors and the like. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-21man: curvetun: add option and usage example sectionDaniel Borkmann1-3/+81
This patch implements the option and usage examples of curvetun. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-21man: mausezahn: minor updates all overDaniel Borkmann1-11/+14
This patch escapes all '\' chars so that they get recognized. Also, we add a short note at the end of the NOTE section to point to the netsniff-ng(8) man page regarding tuning hints. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-21man: mausezahn: add howto for interactive modeDaniel Borkmann1-0/+871
It is quite useful to have an initial walkthrough for the interactive mode documented, so add a first version of this [1] into the man page. [1] original here: http://pub.netsniff-ng.org/docs/Mausezahn Formatting still needs to be fixed up in follow-up commits. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-21mausezahn: do not show version in promptDaniel Borkmann2-3/+1
Do not show the old mausezahn version in the prompt, since we use a different versioning scheme. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-21tprintf: Rename parameter to avoid shadowing global declarationTobias Klauser1-2/+2
The tprintf module already uses a static variable named 'buffer', thus rename the parameter to avoid a name clash. Found by compiling with -Wshadow. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-21trafgen: Remove unnecessary reinitialization of icmp packetTobias Klauser1-2/+0
The entire packet is zeroed using memset() three lines above, thus there is no need to set icmp->code and icmp->checksum to 0 explicitely again. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-21mac802.11: only wait for nl ack if unfinishedDaniel Borkmann1-7/+37
Jon reported that the setup via netlink of a raw 802.11 mon device fails with: root~/gencfg# trafgen --in beacon.cfg --rfraw --out wlan0 Waiting for netlink ack failed! Let us only wait for it, if really needed. Reported-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-21misc: Ignore files generated by cscope/ctagsTobias Klauser1-0/+4
Add the index files generated by cscope and ctags to .gitignore. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-17trafgen: Add __noreturn attribute previously missedTobias Klauser1-1/+1
The version() function was missed in the previous commit 785fe152 ("trafgen: Add __noreturn attribute to exiting functions"), so add __noreturn to it now. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-17ifpps: Add __noreturn attribute to exiting functionsTobias Klauser1-2/+2
Add the __noreturn attribute to all functions which wont return but call die() themselves to exit(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-17curvetun: Add __noreturn attribute to exiting functionsTobias Klauser1-2/+2
Add the __noreturn attribute to all functions which wont return but call die() themselves to exit(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-17bpfc: Add __noreturn attribute to exiting functionsTobias Klauser1-2/+2
Add the __noreturn attribute to all functions which wont return but call die() themselves to exit(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-17astraceroute: Add __noreturn attribute to exiting functionsTobias Klauser1-2/+2
Add the __noreturn attribute to all functions which wont return but call die() themselves to exit(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-17trafgen: Add __noreturn attribute to exiting functionsTobias Klauser1-2/+2
Add the __noreturn attribute to all functions which wont return but call die() themselves to exit(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-17netsniff-ng: Add __noreturn attribute to exiting functionsTobias Klauser1-2/+2
Add the __noreturn attribute to all functions which wont return but call die() themselves to exit(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-17die.h: Add __noreturn attribute to exiting functionsTobias Klauser1-4/+4
Add the __noreturn attribute to all functions which wont return but call exit() (or die() respectively) themselves. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-17built_in: Add __noreturn markerTobias Klauser1-0/+4
This can be used to mark functions which will call exit() by themselves. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-16dissector: igmp: Fix another 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 and missed in commit b76adfd1 ("dissector: igmp: Fix erroneous null pointer check"). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-16curvetun: Mention exit after printing information in built-in helpTobias Klauser1-2/+2
Mention the fact that curvetun exits after printing either the help of the version information. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-16astraceroute: Mention exit after printing information in built-in helpTobias Klauser1-2/+2
Mention the fact that astraceroute exits after printing either the help of the version information. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-16man: flowtop: Make wording in description for --version consistentTobias Klauser1-1/+1
Make the wording consistent with the other man pages. This was probably messed up by my previous commit which was not properly split. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-16man: astraceroute: Make wording in description for --version consistentTobias Klauser1-1/+1
Make the wording consistent with the other man pages. This was probably messed up by my previous commit which was not properly split. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-05-15docs: authors: add Stephen Wadeley for his man page patchesDaniel Borkmann1-0/+1
Add Stephen Wadeley for his man page contributions. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
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>