Skip to content

increased submodules revision #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cejkato2 merged 2 commits into from
Apr 12, 2019
Merged

increased submodules revision #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae468e7
increased submodules revision
cejkato2 Apr 12, 2019
ef68538
build: fixed modules&detectors submodules
cejkato2 Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion detectors
Open in desktop
Submodule detectors updated 115 files
2 changes: 1 addition & 1 deletion modules
Open in desktop
Submodule modules updated 205 files
2 changes: 1 addition & 1 deletion nemea-framework
Open in desktop
Submodule nemea-framework updated 70 files
+8 −24 common/ChangeLog
+24 −4 common/NEWS
+3 −3 common/configurator/configurator-internal.h
+2 −2 common/configure.ac
+7 −6 common/include/b_plus_tree.h
+1 −1 common/nemea-common.spec.in
+103 −479 libtrap/ChangeLog
+513 −64 libtrap/NEWS
+3 −3 libtrap/README
+1 −1 libtrap/README.ifcspec.md
+1 −1 libtrap/configure.ac
+42 −7 libtrap/include/libtrap/trap.h
+8 −0 libtrap/src/ifc_dummy.c
+8 −1 libtrap/src/ifc_file.c
+106 −40 libtrap/src/ifc_tcpip.c
+3 −0 libtrap/src/ifc_tcpip_internal.h
+138 −63 libtrap/src/ifc_tls.c
+3 −0 libtrap/src/ifc_tls_internal.h
+333 −419 libtrap/src/trap.c
+34 −24 libtrap/src/trap_error.h
+15 −6 libtrap/src/trap_ifc.h
+23 −27 libtrap/src/trap_internal.h
+5 −5 libtrap/tests/basic_test.c
+1 −1 libtrap/tests/out-buf.c
+1 −1 libtrap/tests/test_blackhole.c
+2 −2 libtrap/tests/test_fileifc.c
+2 −2 libtrap/tests/test_finalize.c
+100 −7 libtrap/tools/trap_stats.c
+2 −1 pycommon/MANIFEST.in
+1 −1 pycommon/Makefile.am
+5 −1 pycommon/nemea-pycommon.spec
+131 −26 pycommon/report2idea.py
+29 −8 pycommon/reporter_config/Config.py
+17 −3 pycommon/reporter_config/Parser.py
+51 −26 pycommon/reporter_config/actions/Email.py
+4 −1 pycommon/reporter_config/actions/File.py
+1 −1 pycommon/reporter_config/actions/Mark.py
+15 −0 pycommon/reporter_config/default.html
+84 −58 pycommon/reporter_config/example.yaml
+2 −2 pycommon/setup.py
+7 −0 pycommon/test/doctests.py
+5 −3 pycommon/test/rc_01_basic.py
+13 −7 pycommon/test/rc_01_empty.py
+3 −2 pycommon/test/rc_02_tautology.py
+3 −2 pycommon/test/rc_11_drop.py
+3 −5 pycommon/test/rc_12_mark.py
+5 −3 pycommon/test/rc_14_mongo.py
+5 −3 pycommon/test/rc_15_file.py
+5 −3 pycommon/test/rc_22_addressgroup.py
+34 −0 pycommon/test/rc_23_testreporter.py
+11 −0 pycommon/test/rc_config/stdout.yaml
+48 −0 pycommon/test/test2idea.py
+7 −0 pycommon/test/test_data.csv
+ − pycommon/test/test_data.trapcap
+1 −1 pytrap/nemea-pytrap.spec
+2 −2 pytrap/setup.py
+3 −3 pytrap/src/pytrapmodule.c
+631 −0 pytrap/src/unirecmacaddr.c
+25 −0 pytrap/src/unirecmacaddr.h
+64 −4 pytrap/src/unirecmodule.c
+205 −44 pytrap/test/unirectemplate_unittest.py
+15 −46 unirec/ChangeLog
+6 −0 unirec/Makefile.am
+71 −9 unirec/NEWS
+1 −1 unirec/configure.ac
+16 −10 unirec/macaddr.h
+182 −16 unirec/tests/test_time.c
+23 −7 unirec/unirec.c
+46 −11 unirec/unirec.h
+94 −14 unirec/ur_time.h
2 changes: 1 addition & 1 deletion nemea-supervisor
Open in desktop
Submodule nemea-supervisor updated 47 files
+43 −0 .gitignore
+16 −0 ChangeLog
+3 −4 Makefile.am
+33 −0 NEWS
+353 −145 README.md
+27 −0 check_nemea_loaded_module_config.in
+108 −0 check_nemea_modules_connected.in
+3 −5 configs/Makefile.am
+1 −0 configs/blacklistfilter.mkdir
+4 −4 configs/config_example.xml
+102 −0 configs/detectors/blacklistfilter.sup
+172 −0 configs/detectors/blacklistfilter_with_af.sup
+0 −18 configs/detectors/ipblacklistfilter.sup
+23 −0 configs/detectors/smtp_spam_detector.sup
+0 −1 configs/ipblacklistfilter.mkdir
+0 −13 configs/loggers/ipblacklistfilter_logger.sup
+2 −4 configs/set_default_nic.sh
+1 −0 configs/smtp_spam_detector.mkdir
+21 −4 configure.ac
+1 −0 nagios/Makefile.am
+10 −0 nagios/README.md
+17 −0 nagios/nagios-client/Makefile.am
+11 −0 nagios/nagios-client/README.md
+18 −0 nagios/nagios-client/conf/nemea_modules_list
+10 −0 nagios/nagios-client/conf/nrpe-part.conf
+34 −0 nagios/nagios-client/scripts/check_free_memory.sh
+55 −0 nagios/nagios-client/scripts/check_ipfixcol_trapoutifc.sh
+58 −0 nagios/nagios-client/scripts/check_link_traffic.sh
+35 −0 nagios/nagios-client/scripts/check_nemea_dropped.sh
+39 −0 nagios/nagios-client/scripts/check_nemea_modules.py
+36 −0 nagios/nagios-client/scripts/check_nemea_sent.sh
+32 −0 nagios/nagios-client/scripts/check_network_interface.sh
+13 −0 nagios/nagios-client/scripts/check_supervisor.sh
+41 −0 nagios/nagios-client/scripts/check_swap_memory.sh
+38 −0 nagios/nagios-client/scripts/nemea_common.sh
+111 −0 nagios/nagios-client/scripts/utils.sh
+5 −0 nagios/nagios-server/Makefile.am
+13 −0 nagios/nagios-server/README.md
+12 −0 nagios/nagios-server/conf/nemea-hosts.cfg
+56 −0 nagios/nagios-server/conf/nemea.cfg
+9 −0 nagios/nagios-server/conf/nrpe.cfg
+14 −0 nagios/selinux/Makefile.am
+41 −0 nagios/selinux/nemea_nrpe.te
+103 −0 nemea-modulesinfo.in
+49 −1 nemea-supervisor.spec.in
+10 −25 supervisor.c
+4 −3 supervisor.h