summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-08-29ifpps: Use unsigned int to store number of cpusTobias Klauser1-23/+24
The number of CPUs can never be negative and get_number_cpus() returns unsigned int too, so consistently conver all variables holding a CPU number or number of CPUs to type unsigned int. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-23conf: oui: update oui.confTobias Klauser1-131/+325
Update OUI entries using oui-update.py Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-23oui-update: minor: Fix typo in error messageTobias Klauser1-1/+1
s/Eror/Error/ Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-21build: announcement: also add v prefix to checkout commandDaniel Borkmann1-1/+1
We also need to add a v prefix for the version tag to the checkout command, as similarly done for the GPG verification. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-08-21netsniff-ng 0.5.8-rc3v0.5.8-rc3Tobias Klauser1-1/+1
Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-21ring_{rx,tx}: verbose: output version and v3 specific infoDaniel Borkmann2-4/+10
Kevin says: With netsniff-ng 0.5.8-rc2+, when I run the below packet capture session, the output seems to imply that 64K of memory is being allocated per frame, which does not look like what I want since my interface MTU is only 1500. This appears to be severely limiting the number of frames I can fit into my packet capture ring. As TPACKET_V3 is used in capturing to pcap files, frames are written continuously to the ring, thus the above will give a wrong impression to the user. Therefore, output such information in verbose mode differently when TPACKET_V3 is being used, as it works block-wise. Reported-by: Kevin Branch <branchnetconsulting@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-08-21build: minor: Mention proper versioned tag in release announcementTobias Klauser1-1/+1
The tags created by the 'release' target have a 'v' prefix, so add it to the verification command mentioned in the generated release message. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-21configure: minor: Rephrase and reformat some messagesTobias Klauser1-12/+11
Make sure all messages use a max. text width of 70 characters (in order for them to be easily pasteable into an email), remove a trailing whitespace and reword some bits. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-21astraceroute: zsh: add auto-completion entryDaniel Borkmann1-0/+1
Add an auto-completion entry for commit 5e739 ("astraceroute: Support binding to a specific IP address.") Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Cc: Oliver Smith <oliver@zerolag.com>
2013-08-21astraceroute: Support binding to a specific IP address.Oliver Smith2-4/+32
In a situation where the IP that you wish to use as the source address differs from the interface it needs to be sent from, it is now possible to manually specify an address to bind to whilst still being able to specify the physical interface to send from. [Fixed up whitespace, minor coding style and added man-page entry --DB] Signed-off-by: Oliver Smith <oliver@zerolag.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-08-20configure: allow trafgen build when only TPACKET_V2 is availableDaniel Borkmann2-0/+17
On machines like RHEL6 that do not have support for TPACKET_V3, we should still allow at least trafgen to be built for network testing. Thus, do something useful with the TPACKET_V3 configure check and comment out in ring.h relevant structures. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-08-19netsniff-ng: poll: don't panic on EINTRDaniel Borkmann1-4/+8
When signal occurs, don't panic on EINTR, rather gracefully return. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-08-13ifpps: minor: Add parentheses to do {} while in padding_from_num()Tobias Klauser1-2/+3
Even though the loop contains only one statement, add parentheses around it to make it more readable. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-12build: Add Makefile target for Coverity scannerTobias Klauser3-0/+24
Add a Makefile target to build and upload a snapshot of netsniff-ng to the Coverity scanner. The variables COV_EMAIL and COV_PASSWD need to be set accordingly: make coverity COV_EMAIL=tklauser@distanz.ch COV_PASSWD=... Currently the sub-make which is part of the cov-built call issues warnings about undefined variables from the template. This can be ignored, the build works just fine. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-12netsniff-ng: Check return value of poll()Tobias Klauser1-3/+7
The return value of two calls to poll() are never check, despite the (unlikely) possibility of them returning an error, fix it by checking the return value and panic()ing on error. This issue was discovered using the Coverity scanner. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-12trafgen: Fix compiler warningsTobias Klauser1-17/+21
Fix the following compiler warnings that occur when building with "-W -Wall -Wextra": trafgen.c: In function ‘timer_elapsed’: trafgen.c:136:31: warning: unused parameter ‘number’ [-Wunused-parameter] trafgen.c: In function ‘apply_csum16’: trafgen.c:346:36: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c: In function ‘dump_trafgen_snippet’: trafgen.c:415:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c: In function ‘xmit_smoke_probe’: trafgen.c:490:31: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c:506:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c:509:56: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c:512:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c: In function ‘__wait_and_sum_others’: trafgen.c:721:30: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c: In function ‘__correct_global_delta’: trafgen.c:743:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c:761:30: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c: In function ‘xmit_packet_precheck’: trafgen.c:797:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c:816:47: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c: In function ‘main_loop’: trafgen.c:837:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c: In function ‘main’: trafgen.c:1047:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c:1065:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c:1078:43: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] trafgen.c:1090:28: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-12dissector: icmpv6: Fix compiler warningsTobias Klauser1-2/+2
Fix the following compiler warnings that occur when building with "-W -Wall -Wextra": proto_icmpv6.c: In function ‘dissect_icmpv6_mcast_rec’: proto_icmpv6.c:326:30: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] proto_icmpv6.c: In function ‘dissect_neighb_disc_ops_15’: proto_icmpv6.c:537:41: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] proto_icmpv6.c:542:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] proto_icmpv6.c: In function ‘dissect_neighb_disc_ops_16’: proto_icmpv6.c:604:41: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] proto_icmpv6.c: In function ‘dissect_neighb_disc_ops_17’: proto_icmpv6.c:650:40: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-11cpusched: Fix compiler warningsTobias Klauser1-3/+3
Fix the following compiler warnings that occur when building with "-W -Wall -Wextra": cpusched.c: In function ‘get_appropriate_cpu’: cpusched.c:28:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] cpusched.c:29:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-11rnd: Fix compiler warningTobias Klauser1-1/+1
Fix the following compiler warning that occurs when building with "-W -Wall -Wextra": rnd.c: In function ‘randombytes_strong’: rnd.c:50:10: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-11rnd: Change parameter type in randombytes_{weak,strong}Tobias Klauser1-2/+2
Change parameter type for the length to size_t since this is what is passed to them and is expected by read_exact(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-11dissector: proto_80211_mac_hdr: Fix compiler warningsTobias Klauser1-550/+130
Fix two signed/unsigned comparison warnings by changing variable types. Fix warnings about unused parameters by removing all of the unimplemented functions and replacing them with one *_unimplemented() function. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-11dissector: proto_ipv6: Fix compiler warningsTobias Klauser4-5/+7
Mark unused parameters with __maybe_unused in order to prevent -Wunused-parameter compiler warnings. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-11pcap_io: Fix compiler warningTobias Klauser1-1/+1
Fix the following compiler warning that occurs when building with "-W -Wall -Wextra": pcap_io.h: In function ‘pcap_prepare_header’: pcap_io.h:628:255: warning: signed and unsigned type in conditional expression [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-11pcap_mm: Fix compiler warningsTobias Klauser1-2/+2
Fix the following compiler warnings that occur when building with "-W -Wall -Wextra": pcap_mm.c: In function ‘pcap_mm_read’: pcap_mm.c:72:73: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] pcap_mm.c:79:72: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-09pcap_rw: Fix compiler warningsTobias Klauser1-2/+2
Fix the following compiler warnings that occur when building with "-W -Wall -Wextra": pcap_rw.c: In function ‘pcap_rw_write’: pcap_rw.c:30:6: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] pcap_rw.c: In function ‘pcap_rw_read’: pcap_rw.c:50:6: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-09dev: Integrate `promisc' module into `dev' moduleTobias Klauser8-44/+30
Since entering/leaving promiscuous mode also is a device specific function and all users of the `promisc' module also use `dev', integrate it there. Also rename the functions to have a `device_' prefix like the other functions in the module. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-09promisc: Constify `ifname' parameters to {enter,leave}_promiscuous_mode()Tobias Klauser2-4/+4
The parameter `ifname' to {enter,leave}_promiscuous_mode() is never modified inside the functions, thus mark it as const. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-09dissector: ip_auth_hdr: Fix compiler warningTobias Klauser1-3/+2
Fix the following compiler warning that occurs when building with "-W -Wall -Wextra": ip_authentication_hdr.c: In function ‘auth_hdr’: proto_ip_authentication_hdr.c:57:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Also remove an unnecessary check for header length smaller than 0, since it always results from an unsigned type and is now a size_t anyway. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-09netsniff-ng: Fix compiler warningTobias Klauser1-1/+1
Fix the following compiler warning that occurs when building with "-W -Wall -Wextra" by introducing a cast: netsniff-ng.c: In function ‘walk_t3_block’: netsniff-ng.c:841:8: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-09mac80211.c: Remove or mark unused function parametersTobias Klauser4-13/+13
Compiling with "-W -Wall -Wextra" reveals the following warnings in mac80211.c: mac80211.c: In function ‘nl80211_init’: mac80211.c:78:67: warning: unused parameter ‘device’ [-Wunused-parameter] mac80211.c: In function ‘nl80211_wait_handler’: mac80211.c:106:48: warning: unused parameter ‘msg’ [-Wunused-parameter] mac80211.c: In function ‘nl80211_error_handler’: mac80211.c:115:54: warning: unused parameter ‘nla’ [-Wunused-parameter] mac80211.c:117:12: warning: unused parameter ‘arg’ [-Wunused-parameter] mac80211.c: In function ‘nl80211_del_mon_if’: mac80211.c:181:72: warning: unused parameter ‘device’ [-Wunused-parameter] Fix them by either marking them as unused (where we need to conform to library APIs or remove them alltogether (for our own APIs). For the function leave_rfmon_mac80211() the according users (netsniff-ng and trafgen) are also changed. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-08astraceroute: Fix compiler warnings with "-W -Wall -Wextra"Tobias Klauser1-13/+17
Fix the following compiler warnings that occur when building with "-W -Wall -Wextra": astraceroute.c: In function ‘__assemble_data’: astraceroute.c:255:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] astraceroute.c:262:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] astraceroute.c: In function ‘check_ipv4’: astraceroute.c:425:56: warning: unused parameter ‘ttl’ [-Wunused-parameter] astraceroute.c: In function ‘handle_ipv4’: astraceroute.c:451:49: warning: unused parameter ‘len’ [-Wunused-parameter] astraceroute.c: In function ‘check_ipv6’: astraceroute.c:511:49: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] astraceroute.c:491:56: warning: unused parameter ‘ttl’ [-Wunused-parameter] astraceroute.c: In function ‘handle_ipv6’: astraceroute.c:517:49: warning: unused parameter ‘len’ [-Wunused-parameter] astraceroute.c: In function ‘__process_node’: astraceroute.c:690:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] astraceroute.c: In function ‘__process_time’: astraceroute.c:738:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] astraceroute.c:755:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] astraceroute.c:765:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] astraceroute.c: In function ‘__process_ttl’: astraceroute.c:846:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] astraceroute.c: In function ‘main’: astraceroute.c:1060:26: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-08dev: Make device_mtu() return size_tTobias Klauser2-3/+4
We don't return negative values and the MTU is supposed to be the (maximum) length of a packet, thus make it of type size_t. Most of the users in the code store it in size_t already anyway. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-08astraceroute: Use size_t for struct members storing packet lengthsTobias Klauser1-5/+6
Packet lengths are strictly positive and the functions dealing with them (sendto(), recvfrom() etc.) take size_t, thus use size_t. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-05mausezahn: libcli: add sys/time.h for older libcli versionsDaniel Borkmann2-0/+2
Older versions of libcli lack an include in libcli.h. [1] fixed the configure script to not fail in in the test [2], and an include into cli.h was added as well for the main mausezahn build. [1] http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-libcli-test.patch?revision=1.1&view=markup [2] http://b-4.xmw.de/var/log/portage/build/net-analyzer/netsniff-ng-0.5.8_rc2:20130805-055918.log Reported-by: Michael Weber <michael@xmw.de> Suggested-by: Michael Weber <michael@xmw.de> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-08-05build: prevent redefinition of _FORTIFY_SOURCE in gentooDaniel Borkmann1-1/+1
Add a -U_FORTIFY_SOURCE in HARDENING=1 [1] to prevent [2], e.g. as in: x86_64-pc-linux-gnu-gcc -march=native -O2 -pipe -std=gnu99 -pipe -fPIE -pie -Wl,-z,relro,-z,now -fstack-protector-all -Wstack-protector --param=ssp-buffer-size=4 -ftrapv -D_FORTIFY_SOURCE=2 -fexceptions -fomit-frame-pointer -fno-strict-aliasing -fasynchronous-unwind-tables -fno-delete-null-pointer-checks -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DVERSION_STRING=\""0.5.8-rc2"""\" -DVERSION_LONG=\""0.5.8-rc2"" (Ziggomatic)"\" -DPREFIX_STRING=\"\" -Wall -I. -I/usr/include/libnl3 -I/usr/include/libnl3 -DHAVE_DISSECTOR_PROTOS -DNEED_TCPDUMP_LIKE_FILTER -I/usr/include/libnl3 -I/usr/include/libnl3 -DHAVE_DISSECTOR_PROTOS -DNEED_TCPDUMP_LIKE_FILTER -o netsniff-ng/proto_igmp.o -c proto_igmp.c :0:0: warning: "_FORTIFY_SOURCE" redefined [enabled by default] proto_igmp.c:1:0: note: this is the location of the previous definition [1] http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-fortify_source.patch?revision=1.1&view=markup [2] http://b-4.xmw.de/var/log/portage/build/net-analyzer/netsniff-ng-0.5.8_rc2:20130805-070734.log Reported-by: Michael Weber <michael@xmw.de> Suggested-by: Michael Weber <michael@xmw.de> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-08-02built_in: Add min_t() and max_t() macros and use themTobias Klauser4-6/+24
Introduce non-typechecking versions of min_t() and max_t() and use them where a cast would be needed. The macros were taken from the Linux Kernel, release under GPL v2. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-02trafgen: Remove unused local variable in apply_*() functions.Tobias Klauser1-25/+22
The variable `i' in apply_counter(), apply_randomizer() and apply_csum16() is only set once, so use the original parameter `counter_id' instead. Rename `counter_id' to `id' in order to keep it short. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-08-02build: split CFLAGS_DEF and always add CFLAGS_MINDaniel Borkmann1-8/+9
Currently, when doing a custom "make CFLAGS=...", we run into a compile error as several necessary defines are not set. Therefore, use override to always set those. Reported-by: Marco Belmonte <mbelmonte@globalmedia.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-07-31netsniff-ng 0.5.8-rc2v0.5.8-rc2Daniel Borkmann1-1/+1
Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-07-31ioops: Constify `name' parameter to tun_open_or_die()Tobias Klauser2-2/+2
The parameter `name' to tun_open_or_die() is never modified inside the function, thus mark it as const. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-07-31dev: Constify `ifname' parameter to device_up_and_running()Tobias Klauser2-2/+2
The parameter `ifname' to device_up_and_running() is never modified inside the function, thus mark it as const. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-07-30build: Use -n option to head commandTobias Klauser1-2/+2
Make the call to `head' equivalent to the one to `tail'. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-07-30build: reduce Extra contents to bare minimumDaniel Borkmann11-19/+34
Improve the build system, so that configuration files are installed per tool basis. Also, introduce post_install targets, so that config files can be altered in some way, e.g. done by trafgen. Moreover, move custom targets from Extra to tool-specific Makefiles. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-07-30build: Don't uninstall configuration filesTobias Klauser2-13/+0
Several of the tools install/uninstall files from $NCONF_FILES, however if we call the uninstall target for a specific tool (e.g. `make astraceroute_uninstall') but other tools depending on one or more of the config files are still installed, the file is still removed unconditionally. As it would require quite some logic in the Makefile in order to detect installed tools and their dependencies, we just don't uninstall the configuration files anymore. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-07-29build: fix up announce message in announce targetDaniel Borkmann1-7/+8
Bring the announce message in line with the latest released announce message from rc1. So that in future this can be generated automatically. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-07-29build: fix up GIT_PEOPLE and GIT_LOG macrosDaniel Borkmann2-2/+8
Fix them up so that a proper changelog can be generated automatically. Also while at it, add two "hidden" targets that can be used to test their output. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-07-29build: tag: add 'v' prefix for tag nameDaniel Borkmann1-1/+1
We need to add a 'v' prefix to the actual version for the tag name. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-07-29build: use VERSION_SHORT instead of VERSION_STRINGDaniel Borkmann3-12/+13
We have recently changed VERSION_STRING to append CONFIG_RC at the end of the string. Thus, for the build system, change it to VERSION_SHORT where needed, e.g. in release targets where the "+" appendix is not wished. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-07-29man: Align synopsis with other sectionsTobias Klauser8-8/+8
In all the tools' man pages the synopsis line is indented by one space with respect to the text in the sections above and below. Remove the space to have consistent alignment. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2013-07-29flowtop: Fix compiler warningsTobias Klauser1-2/+3
Fix the following compiler warnings that occur when building with "-W -Wall -Wextra": flowtop.c: In function ‘walk_process’: flowtop.c:417:45: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] flowtop.c: In function ‘presenter_screen_update’: flowtop.c:937:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] flowtop.c:938:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>