Commit Graph

1312 Commits (master)

Author SHA1 Message Date
Nicholas Brown 9e4576527b perform an install during travis build 2017-12-14 16:34:17 +00:00
Nicholas Brown 5b9a7830cf Install correctly named README.md 2017-12-14 16:34:10 +00:00
Oliver Gasser d2e9670b16
Merge pull request #90 from nickbroon/UDP_CONNECT_BREAKAGE
DISABLE_UDP_CONNECT breaks example_code_2 test
2017-12-14 15:47:13 +01:00
Nicholas Brown 33652589bf DISABLE_UDP_CONNECT breaks example_code_2 test
A default MTU of 0 is meaningless and creating a collector will fail
as a result.
2017-12-14 14:35:35 +00:00
Oliver Gasser 087635e3f6
Merge pull request #89 from nickbroon/unused_variables
Remove unused variables
2017-12-13 16:28:53 +01:00
Nicholas Brown 8ba0c4db63 Remove unused variables 2017-12-13 15:21:51 +00:00
Oliver Gasser cc5d08948f
Merge pull request #87 from nickbroon/openssl_conditional
Fix building with SUPPORT_DTLS=OFF and libssl-dev not installed
2017-12-13 15:46:28 +01:00
Nicholas Brown 17b357d068 only packages needed
Make use of YAML references to only include packages needed for each
matrix entry.
2017-12-13 14:39:17 +00:00
Oliver Gasser d1020e7cb5
Merge pull request #86 from nickbroon/more_specific_cmake
More specific cmake version restriction
2017-12-13 15:21:22 +01:00
Oliver Gasser 329e904d46
Merge pull request #81 from tumi8/fix_remaining_warnings
solved the additional clang warnings
2017-12-13 14:53:13 +01:00
Emanuel Vintila fa651579e3 updates after review 2017-12-13 13:33:54 +01:00
Nicholas Brown 67628fe881 Fix building with SUPPORT_DTLS=OFF and libssl-dev not installed
There was still some code that was unconditionally using dtls code,
which requires ssl. This has now been made conditional.

I suspect this is indicative of code smell here, and that perhaps
better encapsulation is needed around this. But that come later as
more attempts are made to modularise the code.

Fixes #85
2017-12-13 12:30:35 +00:00
Nicholas Brown 6ea5efedd6 More specific cmake version restriction
The latest OLD behaviour of CMP0017 CMP0003 CMP0002 was changed after
2.8.4. No need to be as strict as 3.1
2017-12-13 12:02:39 +00:00
Oliver Gasser a1565d84a1
Merge pull request #69 from nickbroon/remove_data_templates
Remove data templates
2017-12-11 13:35:11 +01:00
Oliver Gasser ff2d37059a
Merge pull request #84 from nickbroon/random_fixes
Couple of small fixes
2017-12-11 13:30:43 +01:00
Oliver Gasser 7d7097568d
Merge pull request #83 from tumi8/fix_remaining_warnings_DTLS_ON
fixed clang warnings for DTLS ON
2017-12-11 13:24:11 +01:00
Nicholas Brown 6437d2a23a Removed unused moduleId 2017-12-11 12:10:14 +00:00
Nicholas Brown c0c8d02ab4 Use recent CMake and avoid old policy warnings 2017-12-11 12:08:34 +00:00
Emanuel Vintila 545cdb965b fixed clang warnings for DTLS ON 2017-12-11 08:27:15 +01:00
Oliver Gasser 3745000cae
Merge pull request #82 from bluca/travis_zmq
Travis: container infra, GCC, ZMQ builds
2017-12-10 22:27:13 +01:00
Luca Boccassi 556280d91b Travis: test-build ZMQ support
Pull packages from OBS as they are not availablein Ubuntu 14.04
2017-12-10 19:53:53 +00:00
Luca Boccassi b553cd8fb3 Travis: set sudo: false to use container infrastructure
Container-based builds are scheduled faster than VM-based ones, with
the only difference being not being able to use sudo commands
2017-12-10 19:52:56 +00:00
Luca Boccassi c3a2bd6199 Travis: add GCC build to increase coverage 2017-12-10 19:52:42 +00:00
Emanuel Vintila 1dd173d670 solved the additional clang warnings 2017-12-10 19:59:02 +01:00
Oliver Gasser 692eec5887
Merge pull request #79 from tumi8/fix_deprecated_dynamic_expection_specifications
removed deprecated dynamic exception specification from Cfg
2017-12-10 19:04:23 +01:00
Oliver Gasser 65e4ac9b6b
Merge pull request #80 from tumi8/fix_hidden_overloaded_virtual_functions
fixed hiding of overloaded virtual functions
2017-12-10 19:04:17 +01:00
Emanuel Vintila fa2a56480f fixed hiding of overloaded virtual functions 2017-12-10 18:27:32 +01:00
Emanuel Vintila 56c9762d2b removed deprecated dynamic exception specification from Cfg 2017-12-10 16:45:59 +01:00
Oliver Gasser cf749462de
Merge pull request #78 from nickbroon/simplifiy_travis
Simplify the matrix of jobs, without having to explicitly use matrix
2017-12-08 21:19:20 +01:00
Nicholas Brown dfc96632bb Simplify the matrix of jobs, without having to explicitly use matrix
It's fine to include the package even when not used, as the
compilation is explicitly controlled.
2017-12-08 18:18:24 +00:00
Nicholas Brown 9b738db1ea Rmove Data Template support as RFC draft long dead 2017-12-08 15:46:39 +00:00
Nicholas Brown 58cbcd8181 Remove unused rule creation from a file 2017-12-08 15:46:39 +00:00
Oliver Gasser e1145d70b2
Merge pull request #75 from nickbroon/solve_clang_warnings
Solve clang warnings
2017-12-08 16:33:21 +01:00
Oliver Gasser 5f390ea50b
Merge pull request #76 from tumi8/travis_dtls_build
Build with and without DTLS support on travis
2017-12-08 15:58:47 +01:00
Oliver Gasser 75713babb5 Build with and without DTLS support on travis 2017-12-08 15:47:21 +01:00
Oliver Gasser e1078c7611
Merge pull request #64 from nickbroon/refactor
ipfixlolib DTLS code in own file
2017-12-08 15:09:00 +01:00
Emanuel Vintila 081294a26a fixed indentation 2017-12-08 12:54:42 +01:00
Emanuel Vintila 4a50b16b91 updated after review 2017-12-08 12:47:50 +01:00
Nicholas Brown e2fd03b9fd example_2 can be executed as a test 2017-12-08 11:42:13 +00:00
Nicholas Brown e77f883c56 vermont is not compatible with openssl 1.1.0
openssl 1.1.0 is not API backward compatible with 1.0.0, and vermont
will not compile with the newer version.

The cmake find_package macro has no way to specify a maximum version
so check it explicitly.
2017-12-08 11:42:13 +00:00
Nicholas Brown 454ea8d8a4 ipfixlolib DTLS code in own file
Start to break down the massive ipfixlolib.c into smaller modular
parts so that it's easier to understand.

No functional changes with this commit.

Still quite a lot of conditional compilation for SUPPORT_DLTS in
ipfixlolib.c but it's start.

ipfixlolib_private.h is for declarations that shared between files
within ipfixlolib but not part of the public interface to the rest of
Vermont.
I suspect there is more stuff in ipfixlolib.h that could be moved
private headers.
2017-12-08 11:21:33 +00:00
Oliver Gasser 3d7d7f2554
Merge pull request #71 from bluca/fix_cmake_header_check
Fix CMake check for linux/if.h
2017-12-05 13:37:21 +01:00
Emanuel Vintila 1082d3f8de pass the address of my_exported, instead of its value, to ipfix_deinit_exporter 2017-12-05 11:09:03 +00:00
Emanuel Vintila 0bf905ed89 removed unused private field moduleId 2017-12-05 11:09:03 +00:00
Emanuel Vintila d42cf824e2 removed unused private field observationDomainId 2017-12-05 11:09:03 +00:00
Emanuel Vintila 795d3b47a8 removed unused private field ipfixCollector 2017-12-05 11:09:03 +00:00
Emanuel Vintila 8f5634748b removed unused private field fh 2017-12-05 11:09:03 +00:00
Emanuel Vintila a6bb9a48ae removed unused private field moduleId 2017-12-05 11:09:03 +00:00
Emanuel Vintila 453a2bd718 removed unused private field moduleId 2017-12-05 11:09:03 +00:00
Emanuel Vintila 7cb7a5eeda removed unused private field maximumFilesize 2017-12-05 11:09:03 +00:00