Commit Graph

1312 Commits (master)

Author SHA1 Message Date
Lothar Braun 3f68e618ca
Merge pull request #145 from constcast/fix-ipfix-printer-transoctets
Bugfix: Initialize transoctected in IpfixPrinter
2020-05-27 21:09:21 +02:00
Lothar Braun 57a4c99178 Bugfix: Initialize transoctected in IpfixPrinter
Uninitialized values for srcTransOctets and dstTransOctets lead to
incorrectly printed values in table output of IpfixPrinter if no
transport octets are delivered in the flow
2020-05-27 21:07:52 +02:00
Lothar Braun 2e01fc015e
Merge pull request #130 from nickbroon/logging_config_option
Add a logging attribute to the ipfix config element
2020-05-27 21:07:08 +02:00
Lothar Braun 3cebe7d64d
Merge branch 'master' into logging_config_option 2020-05-27 20:31:37 +02:00
Lothar Braun 0078dcf7a4
Merge pull request #144 from nickbroon/compilers
Add gcc9 and gcc10 to travis build
2020-05-27 20:28:15 +02:00
Lothar Braun afc3666a7e
Merge pull request #143 from nickbroon/out_src_build_in_travis
Out of source tree build
2020-05-27 20:27:39 +02:00
Nicholas Brown 4c1b3f365f Fix a stringop-truncation warning reported by gcc 10
In function ‘strncpy’,
    inlined from ‘add_classid_to_signatureclass’ at /home/travis/build/nickbroon/vermont/src/modules/analysis/fpsigmatcher/Signature.c:204:2:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 50 equals destination size [-Werror=stringop-truncation]
  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2020-05-27 16:16:13 +01:00
Nicholas Brown e2cddc47c6 Add gcc-9 and gcc-10 to the travis builds 2020-05-27 16:16:13 +01:00
Nicholas Brown add88c487b Don't hard code test_configs in test binary
This support out of source tree builds, as CMAKE test
can pass the path to the test_config in the src tree.

Fixes: #142
2020-05-27 14:07:11 +01:00
Nicholas Brown 75f1e67c03 use out of source tree build for travis builds
This is recommended way to use cmake
2020-05-27 11:43:34 +01:00
Nicholas Brown b2ce0ef9d5 Add a logging attribute to the ipfix config element
This allows the logging level to set as part of configuration, instead
of having to use the `-l` CLI option. This mean it can also be changed
dynamically when the config file is re-read for changes.
2020-05-27 10:57:25 +01:00
Lothar Braun 973ec2fb9e
Merge pull request #141 from constcast/ipfix-sampler-crash
Bugfix: Wrong values for flowRate in ipfixSampler lead to crashes
2020-05-27 08:52:58 +02:00
Lothar Braun 2e45f1b9e2
Merge pull request #140 from constcast/hoststatistics-crash
Bugfix: Error out on invalid subnet in HostStatistics
2020-05-27 08:51:56 +02:00
Lothar Braun 8759614581 Bugfix: Error out on invalid subnet in HostStatistics 2020-05-26 23:30:47 +02:00
Lothar Braun d396c68d15 Bugfix: Wrong values for flowRate in ipfixSampler lead to crashes
Too small or low values in the configuration of ipfixSampler can
lead to floating point exceptions during runtime.
2020-05-26 22:31:48 +02:00
Lothar Braun 65a3034df9
Merge pull request #139 from constcast/trwportscan-bad-alloc
TRWPortScanDetector: Provide better error messages on bad_alloc
2020-05-26 22:24:25 +02:00
Lothar Braun 4635607aa6
Merge pull request #138 from constcast/travis-compile-db-support
Travis compile db support
2020-05-26 22:23:46 +02:00
Lothar Braun dd804c52ee TRWPortScanDetector: Provide better error messages on bad_alloc 2020-05-26 21:27:35 +02:00
Lothar Braun 73534e72dc libmysqlclient depends on libssl-dev, so disable mysql for DTLS=OFF 2020-05-26 21:06:12 +02:00
Lothar Braun 4ee444f8c0 Remove unused variables MAX_COL_COUNT to avoid clang-build errors 2020-05-14 23:49:32 +02:00
Lothar Braun 90ed1f7eef Compile fix for SQL module in debug mode 2020-05-14 23:29:29 +02:00
Lothar Braun 45bb98d3e8 Enable build of mysql and postgresql support in travis 2020-05-14 23:00:39 +02:00
Lothar Braun 082ea973c6
Merge pull request #137 from Sebb767/dbexporter-fix
Fixed compile error when using the IpfixDbWriter
2020-05-14 22:51:27 +02:00
Sebastian 1a801a924e
Added default values for some variables in the IpfixDbWriter
This commit adds default values for two variables, ipfixId and
enterpriseId, in the IpfixDbWriterSQL. Usually, these variables will
always be set or an exception will be thrown, but gcc (tested with
gcc 8.3.0 on debian) doesn't see this and will fail to compile due
to -Werror. This commit fixes the issue by setting both variables to
zero at initialization.
2020-05-11 02:06:01 +02:00
Lothar Braun db27ad3ef5 Throw exception on missing "id" field in configuration
The debug build asserts on the id field, but the release does
not have a check for an missing ID field in the configuration.
This commit introduces a check that is also performed in the
release build to avoid a null ptr dereference in broken config
files.
2020-04-30 14:15:09 +02:00
Lothar Braun 8cc87025ff
Merge pull request #136 from constcast/fuzz-target
CMake option to gracefully shutdown in case of exceptions
2020-04-27 10:22:31 +02:00
Lothar Braun 4f8d79f3a2 Introduce a new cmake option that allows graceful shutdown in case of options 2020-04-27 10:21:39 +02:00
Lothar Braun 9ff81ed021
Merge pull request #135 from constcast/fix-match-proto-parsing
Fix for parseProtoInformation
2020-04-27 10:14:47 +02:00
Lothar Braun e6924a8fb0 Added mtutest to regularly run tests 2020-04-27 10:02:29 +02:00
Lothar Braun b9d6ea35d9 Provide errors on invalid values for protocolIdentifier in aggregators 2020-04-25 15:40:07 +02:00
Lothar Braun c947c7c8e1 Reenable ConfigTester in vermonttest. Added test for parseProtoPattern 2020-04-25 15:39:11 +02:00
Philipp Urlbauer 5b2cf7bbe2 Fix logic bug found by clang10
proto can never be <0 and >255
2020-04-25 14:50:34 +02:00
Lothar Braun 6c1a175511
Merge pull request #133 from constcast/travis-bionic
Switch travis build system to Ubuntu 18.04 (Bionic)
2020-04-25 13:27:20 +02:00
Lothar Braun d36ddd6364 Fix DTLS MTU calculation for OpenSSL 1.1.0 2020-04-22 22:35:34 +02:00
Nicholas Brown e59a8a8e71 Better Boost detection in CMAKE 2020-04-12 12:39:30 +02:00
Lothar Braun d4c84e1576 Travis: Switch build container from xenial to bionic 2020-04-12 12:36:29 +02:00
Lothar Braun dc8608d5d0 Support openssl > 1.1.0 (older versions not supported) 2020-04-12 12:24:48 +02:00
Lothar Braun 3e22a8f5e9
Merge pull request #132 from nickbroon/fix_wiki_submodule
Use a wiki remote that exists
2020-04-12 11:29:53 +02:00
Nick Brown 845f5c8040 Use a wiki remote that exists
Looks like constcast repo has fallen off the internet :

fatal: remote error: access denied or repository not exported: /a/nw/ad/0c/93/1421452/254611723.wiki.git
fatal: clone of 'git://github.com/constcast/vermont.wiki.git' into submodule path '/Users/Nick/Software/vermont/docs/wiki' failed

Probably best to use tumi8 as that's the definitive uptream anyway.
2020-04-12 08:53:04 +01:00
Oliver Gasser 21095fe8f2
Merge pull request #127 from nickbroon/travis_clang_8
Travis clang 8
2019-04-04 13:38:17 +02:00
Oliver Gasser 3d3054d180
Merge pull request #126 from nickbroon/quieter_data_path_logging
Quieter data path logging
2019-04-04 12:59:00 +02:00
Nicholas Brown 654eba2a87 add clang 8 to the travis builds 2019-03-29 12:58:03 +00:00
Nicholas Brown bba706fe8c Removed unused code from Rule.cpp 2019-03-29 12:17:50 +00:00
Nicholas Brown fd82f2d280 Don't log normal behaviour in the aggregator data path 2019-03-29 12:17:50 +00:00
Nicholas Brown 0f98329a02 Don't log in the fast data path
Should not be generating logs per ipfix frame.
Use DPRINT_ functions in the critical datapath so that they disabled
by default and don't impact performance.
LOG_* should be used for interesting state that's not per
packets/frame, and DPRINTF_ used for per packet/frame logging, and
then explicitly enabled and compile time.
2019-03-29 12:17:50 +00:00
Nicholas Brown 30aedc9edf Simplify ConfigManager parsing loop 2019-03-29 12:17:50 +00:00
Oliver Gasser 32e684a36b
Merge pull request #124 from nickbroon/idiomatic_cxx
Idiomatic c++11
2019-01-21 15:23:32 +01:00
Nicholas Brown 6e660ed5ac Debug logging around IpfixReceiverZmq zpoller 2019-01-21 13:47:45 +00:00
Nicholas Brown 3302877136 Use idiomatic C++11
Modern for loop on a containers
Silences several cpp_check warnings
2019-01-21 13:47:45 +00:00
Oliver Gasser e605885030
Merge pull request #122 from nickbroon/clear_collector_stats
Allow clearing collector related stats
2018-11-30 18:06:15 +01:00