Skip to content

Commit d3015e2

Browse files
committed
conf: load conf node tree from new yaml loader
Use Rust to parse the Suricata configuration, then transform the parsed YAML document into our Conf tree on the Rust side. This keeps the Conf API as-is, but removes the dependency on libyaml for loading the configuration. The next step would be to remove the Conf node tree and just back it with the Yaml data structure. Breaking changes: - no longer parsed as NULL: Null, nUll, etc. Just null and NULL are parsed as NULL, as this is more YAML compliant - Multiple include keywords at the same level will no longer work. We deprecated this in 7.0, but continued to support it, see https://redmine.openinfosecfoundation.org/issues/5939
1 parent 91a8082 commit d3015e2

5 files changed

Lines changed: 770 additions & 466 deletions

File tree

configure.ac

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -718,40 +718,6 @@
718718
fi
719719
AS_IF([test "x$enable_hyperscan" = "xyes"], [AC_DEFINE([BUILD_HYPERSCAN], [1], [Intel Hyperscan support enabled])])
720720

721-
# libyaml
722-
AC_ARG_WITH(libyaml_includes,
723-
[ --with-libyaml-includes=DIR libyaml include directory],
724-
[with_libyaml_includes="$withval"],[with_libyaml_includes=no])
725-
AC_ARG_WITH(libyaml_libraries,
726-
[ --with-libyaml-libraries=DIR libyaml library directory],
727-
[with_libyaml_libraries="$withval"],[with_libyaml_libraries="no"])
728-
729-
if test "$with_libyaml_includes" != "no"; then
730-
CPPFLAGS="${CPPFLAGS} -I${with_libyaml_includes}"
731-
fi
732-
733-
AC_CHECK_HEADER(yaml.h,,LIBYAML="no")
734-
735-
if test "$with_libyaml_libraries" != "no"; then
736-
LDFLAGS="${LDFLAGS} -L${with_libyaml_libraries}"
737-
fi
738-
739-
LIBYAML=""
740-
AC_CHECK_LIB(yaml,yaml_parser_initialize,,LIBYAML="no")
741-
742-
if test "$LIBYAML" = "no"; then
743-
echo
744-
echo " ERROR! libyaml library not found, go get it"
745-
echo " from http://pyyaml.org/wiki/LibYAML "
746-
echo " or your distribution:"
747-
echo
748-
echo " Ubuntu: apt-get install libyaml-dev"
749-
echo " Fedora: dnf install libyaml-devel"
750-
echo " CentOS/RHEL: yum install libyaml-devel"
751-
echo
752-
exit 1
753-
fi
754-
755721
LIBHWLOC=""
756722
AC_ARG_ENABLE(hwloc,
757723
AS_HELP_STRING([--enable-hwloc], [Enable hwloc support [default=no]]),

0 commit comments

Comments
 (0)