Commit Graph

37 Commits (master)

Author SHA1 Message Date
Nicholas Brown e59a8a8e71 Better Boost detection in CMAKE 2020-04-12 12:39:30 +02:00
Nicholas Brown ca8539500a Just use LOG_* instead of MSG_*
Just a used grep/sed to replace them.
The order of MSG_ levels was just weird.
2018-02-12 22:27:24 +00:00
Oliver Gasser 5bfd299917 add semantic names to ipfix IANA parser 2017-12-15 17:37:47 +01:00
Oliver Gasser ad207fc983 Add IANA structured data semantic parsing to script 2017-12-15 17:37:47 +01:00
Luca Boccassi 0c492767bf Syslog and journald support
Add new CLI options to support logging to Syslog and journald.
journald support is also behind a new CMake flag, SUPPORT_JOURNALD,
since it adds a dependency on libsystemd-journal.
Add --quiet, which will disable output to STDOUT/STDERR. Useful
when logging directly to the above mentioned loggers.
Add --log-level, to allow for mix and match log levels, for example
only warning and critical can be enabled together.

New usage output:

VERsatile MONitoring Tool - VERMONT
 MANDATORY OPTIONS:
 -f, --config-file FILE     Use configuration file

 OTHER OPTIONS:
 -h, --help                 Display this help and exit
 -d, --debug                Log verbosity: -d NOTICE, -dd INFO,
                                -ddd DEBUG
 -l, --log-level LEVEL      Log level. Can be specified multiple
                                times and mix-matched.
                                In increasing order:

                                    debug
                                    info
                                    notice
                                    warning
                                    error
                                    critical

                                Default: critical, warning, error
 -q, --quiet                Do not write output to console
 -b, --daemon               Run in daemon mode (implies -q)
 -p, --pid-file FILE        Set process id filename (use with -d)
 -u, --user USER            Change user to USER (use with -d)
 -g, --group GROUP          Change group to GROUP (use with -d)
 -s, --syslog               Log to syslog
 -j, --journald             Log to journald
2017-06-08 18:49:34 +01:00
Oliver Gasser 3fe69ef322 Add script to extract IPFIX IEs from IANA
Add script to parse IANA's registered IPFIX information elements and
data types and output as #define for header files.

Output IEs, data types and IE lengths.
2014-09-16 17:54:50 +02:00
Lothar Braun 625f09591f testCollector: new cmd line switch
New command line switch (-m, --mode) allows to change the
output format (tree or line)
2014-03-05 11:45:24 +01:00
Lothar Braun fa821ede54 More fixes for compilation on FreeBSD 2013-10-01 21:54:10 +02:00
Lothar Braun a1b29e84d6 Make injectUDPToCollector compile on OS X/FreeBSD 2013-09-29 16:37:29 +02:00
Lothar Braun 802f25d555 Buildfix: tools/injectUDPToCollector
injectUDPToCollector dependencies (pcap) has been specified
with simply "pcap". This fails on systems that have libpcap
not in their standard linking directory. Use macro
${PCAP_LIBRARY} instead.
2012-07-31 15:18:05 +02:00
Luca Bruno e82afe755b tools: injectUDPToCollector to easily replay a pcap NetFlow capture
Add a simple tool to help debugging the collector.
injectUDPToCollector reads from a pcap capture file and can replay
the Netflow payload to a specified collector

Signed-off-by: Luca Bruno <lucab@debian.org>
2012-07-22 21:08:11 +02:00
Lothar Braun 8fcfae43af link tools and tests against boost-system-mt 2011-03-07 16:04:10 +01:00
Lothar Braun 6963818241 - call msg_init in testcollector
- print stringed error message in msg subsystem
2011-03-07 15:40:56 +01:00
danielmentz daa2989362 improved command line parsing error message
git-svn-id: file:///Users/braun/svn/vermont/branches/vermont/dtls-merge@2435 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2010-06-21 15:18:06 +00:00
danielmentz 46f10287be merged DTLS support
git-svn-id: file:///Users/braun/svn/vermont/branches/vermont/dtls-merge@2394 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2010-05-27 15:44:33 +00:00
limmer 15ddbeee9e removed unnecessary ipfixlolib tools
git-svn-id: file:///Users/braun/svn/vermont/branches/vermont/new-template@2376 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2010-05-20 12:23:51 +00:00
limmer 8fdc798cc3 cleaned up ipfixlolib IPFIX typeid lookup (what a mess)
git-svn-id: file:///Users/braun/svn/vermont/branches/vermont/new-template@2365 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2010-05-20 12:23:12 +00:00
muenz 760627bbe2 TemplateInfo bugfix: avoid that static mutex and uniqueIdUseCount members are destructed too early
git-svn-id: file:///Users/braun/svn/vermont/branches/vermont/new-template@2213 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2009-12-10 14:02:48 +00:00
limmer 78ba659249 copied branch vermont-dynamic-config@r2113 to trunk
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@2115 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2009-06-23 17:09:49 +00:00
lothar 01c4bfc652 - merge changes from /branches/vermont/bloomfilter into /trunk
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@1729 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2008-06-16 09:23:54 +00:00
lothar 1ba93f9792 listen on lport insteed of 4711
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@1646 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2008-04-15 16:18:26 +00:00
muenz 60a07c36b1 merged branches/vermont-sctp-final-merge into trunk (SCTP support)
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@1544 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2008-01-31 15:44:13 +00:00
muenz 083776869d The IpfixParser was very carelessly reading beyond the end of message boundary.
* Tried to find and improve all places where reading beyond set and message bounderies could happen
* Tested the new parser with some forged testpackets, and it seems to work correctly
Note: The handling of variable length fields is still not threat-proof (see FIXMEs in IpfixParser.cpp)


git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@1517 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2008-01-10 22:21:18 +00:00
sommer 64450987ff Merged revision 1144 of /branches/vermont/cmake: Replaces Autoconf/Automake build system with CMake.
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@1145 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-08-31 11:51:34 +00:00
limmer 9bcbb62a7d arg, (once again) Tobi is too stupid to use git, removed changes of last 4 commits
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@1039 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-08-10 13:17:10 +00:00
limmer 3122fa8ed7 Build script fixes for odd library paths and for BSD
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@1038 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-08-10 13:08:58 +00:00
limmer b8b1d27749 Added cmake CMake build scripts
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@1035 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-08-10 13:08:54 +00:00
limmer e5d7521f5e moved non-sampler specific code to new subdirectory /common
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@946 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-06-26 17:13:07 +00:00
limmer bf2f1f05de * limited queues with default maximum length of 1000 entries
(functions which want to add another element are blocked by a semaphore)
* TimeoutSemaphore checks regularly if program has been shut down
  (so it's not a problem to use TimeoutSemaphore::pop any more)
* changes in logging and debugging module:
  * timestamp output
  * thread ids are shown
  * optional parameters in msg.h (PRINT_*) enable output of current filename
    and line number and/or function name
  * logging is threadsafe now!
  * new function DPRINTFL which allows specification of debug level
  * new macro THROWEXCEPTION which logs and throws an error
    (all occurences of throw std::runtime_error have been replaced)
  * msg.c renamed to msg.cc (as c++ code is inside it)
* new configure flag: --enable-pcapmmap
  if this flag is enabled, make will look for libpcap-mmap in
  ../libpcap-mmap/libpcap.a (so the library has to be compiled beforehand)
* Lock renamed into Mutex
* removed bugs:
  * removed small comparison bug in TimeoutSemaphore, which caused Vermont to
    segfault very rarely and converted the color of a few hairs to grey ...
  * removed bug in autoconf config
  * removed bug in HookingFilter
* lots of new debugging output
* removed unused file Semaphore.h
* various tiny improvements
* various additional comments
* various code cleanups




git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@930 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-06-20 15:29:57 +00:00
sommer 033befe69c Made IpfixPacketProcessor an interface instead of a wrapper class
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@898 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-06-04 12:08:53 +00:00
muenz 1a1ea7eacb hard shutdown for testCollector
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@890 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-06-01 20:58:41 +00:00
sommer cc52227171 Observer now uses matched malloc/free and new[]/delete[] calls.
IpfixCollector now uses a ConcurrentQueue.
ConcurrentQueue can now hold non-pointer types.


git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@851 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-04-29 00:34:33 +00:00
sommer 50d55e7b18 Merged r826:843 from /branches/vermont-cpp_concentrator: All IPFIX Concentrator library functions now use C++ interfaces
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@846 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2007-04-27 07:34:29 +00:00
lothar 4ffc786a7d merged changes from /branches/vermont-xml-configuration/ to /trunk/vermont/
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@656 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2006-11-07 12:37:44 +00:00
lothar a407a28c08 merged changes r548:569 from /branches/vermont-merge-concentrator/ into the trunk
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@576 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2006-08-01 13:17:48 +00:00
muenz e282c92328 - concentrator: small bugfix in rcvIpfix
- sampler: payload now exported with variable length fields (no padding)


git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@558 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2006-05-19 18:44:34 +00:00
muenz fd4756aad6 - sampler: support of more field types
- testcollector now part of VERMONT package (thanx to Christoph)


git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@525 aef3b71b-58ee-0310-9ba9-8811b9f0742f
2006-01-24 17:52:41 +00:00