Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 21:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/timw/remove-nbdns-leftovers'

Browse source 
* origin/topic/timw/remove-nbdns-leftovers:
  Reorder includes in Options.cc
  Remove some leftover nb_dns stuff from the DNS_Mgr rework
This commit is contained in:
Tim Wojtulewicz 2022-10-21 10:09:11 -07:00
commit 072158d4b6
5 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
5.2.0-dev.120 | 2022-10-21 10:09:11 -0700
* Reorder includes in Options.cc (Tim Wojtulewicz, Corelight)
* Remove some leftover nb_dns stuff from the DNS_Mgr rework (Tim Wojtulewicz, Corelight)
5.2.0-dev.116 | 2022-10-20 13:03:45 -0700 5.2.0-dev.116 | 2022-10-20 13:03:45 -0700
* Update bifcl, binpac, broker, cmake, gen-zam, and paraglob submodules (Tim Wojtulewicz, Corelight) * Update bifcl, binpac, broker, cmake, gen-zam, and paraglob submodules (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.2.0-dev.116 5.2.0-dev.120

2
src/3rdparty

@ -1 +1 @@
Subproject commit 1c6558d424fdd16d9e19d77485e0a2c5cba6b293 Subproject commit a1e633aaa619473a105ff29fff65b5bcb472714b

5
src/CMakeLists.txt
View file

@ -262,9 +262,6 @@ set(_gen_zeek_script_cpp ${CMAKE_CURRENT_BINARY_DIR}/../CPP-gen.cc)
add_custom_command(OUTPUT ${_gen_zeek_script_cpp} add_custom_command(OUTPUT ${_gen_zeek_script_cpp}
COMMAND ${CMAKE_COMMAND} -E touch ${_gen_zeek_script_cpp}) COMMAND ${CMAKE_COMMAND} -E touch ${_gen_zeek_script_cpp})
set_source_files_properties(3rdparty/nb_dns.c PROPERTIES COMPILE_FLAGS
-fno-strict-aliasing)
set(MAIN_SRCS set(MAIN_SRCS
digest.cc digest.cc
net_util.cc net_util.cc
@ -426,7 +423,6 @@ set(THIRD_PARTY_SRCS
3rdparty/ConvertUTF.c 3rdparty/ConvertUTF.c
3rdparty/in_cksum.cc 3rdparty/in_cksum.cc
3rdparty/modp_numtoa.c 3rdparty/modp_numtoa.c
3rdparty/nb_dns.c
3rdparty/patricia.c 3rdparty/patricia.c
3rdparty/setsignal.c 3rdparty/setsignal.c
3rdparty/sqlite3.c 3rdparty/sqlite3.c
@ -607,7 +603,6 @@ install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zeek_inet_ntop.h ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zeek_inet_ntop.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bsd-getopt-long.h ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bsd-getopt-long.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/modp_numtoa.h ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/modp_numtoa.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/nb_dns.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/patricia.h ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/patricia.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/setsignal.h ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/setsignal.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sqlite3.h ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sqlite3.h

6
src/Options.cc
View file

@ -6,9 +6,6 @@
#include <unistd.h> #include <unistd.h>
#include "zeek/ScriptProfile.h"
#include "zeek/script_opt/ScriptOpt.h"
#ifdef HAVE_GETOPT_H #ifdef HAVE_GETOPT_H
#include <getopt.h> #include <getopt.h>
#endif #endif
@ -18,8 +15,9 @@
#include <cstdlib> #include <cstdlib>
#include <sstream> #include <sstream>
#include "zeek/3rdparty/bsd-getopt-long.h" #include "zeek/ScriptProfile.h"
#include "zeek/logging/writers/ascii/Ascii.h" #include "zeek/logging/writers/ascii/Ascii.h"
#include "zeek/script_opt/ScriptOpt.h"
namespace zeek namespace zeek
{ {