No OneTemporary
Actions

Size

34 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/configure.ac b/configure.ac
	index 9df68314..30c57f00 100644
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,482 +1,481 @@
	#
	# Copyright (C) 2010-2019 Red Hat, Inc. All rights reserved.
	#
	# Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	# Federico Simoncelli <fsimon@kronosnet.org>
	#
	# This software licensed under GPL-2.0+, LGPL-2.0+
	#

	# -- Autoconf --
	# Process this file with autoconf to produce a configure script.
	#

	AC_PREREQ([2.63])
	AC_INIT([kronosnet],
	m4_esyscmd([build-aux/git-version-gen .tarball-version .gitarchivever]),
	[devel@lists.kronosnet.org])
	# Don't let AC_PROC_CC (invoked by AC_USE_SYSTEM_EXTENSIONS) replace
	# undefined CFLAGS with -g -O2, overriding our special OPT_CFLAGS.
	: ${CFLAGS=""}
	AC_USE_SYSTEM_EXTENSIONS
	AM_INIT_AUTOMAKE([1.13 dist-bzip2 dist-xz color-tests -Wno-portability subdir-objects])

	LT_PREREQ([2.2.6])
	# --enable-new-dtags: Use RUNPATH instead of RPATH.
	# It is necessary to have this done before libtool does linker detection.
	# See also: https://github.com/kronosnet/kronosnet/issues/107
	# --as-needed: Modern systems have builtin ceil() making -lm superfluous but
	# AC_SEARCH_LIBS can't detect this because it tests with a false prototype
	AX_CHECK_LINK_FLAG([-Wl,--enable-new-dtags],
	[AM_LDFLAGS=-Wl,--enable-new-dtags],
	[AC_MSG_ERROR(["Linker support for --enable-new-dtags is required"])])
	AX_CHECK_LINK_FLAG([-Wl,--as-needed], [AM_LDFLAGS="$AM_LDFLAGS -Wl,--as-needed"])

	AC_SUBST([AM_LDFLAGS])
	saved_LDFLAGS="$LDFLAGS"
	LDFLAGS="$AM_LDFLAGS $LDFLAGS"
	LT_INIT
	LDFLAGS="$saved_LDFLAGS"

	AC_CONFIG_MACRO_DIR([m4])
	AC_CONFIG_SRCDIR([kronosnetd/main.c])
	AC_CONFIG_HEADERS([config.h])

	AC_CANONICAL_HOST

	AC_LANG([C])

	systemddir=${prefix}/lib/systemd/system

	if test "$prefix" = "NONE"; then
	prefix="/usr"
	if test "$localstatedir" = "\${prefix}/var"; then
	localstatedir="/var"
	fi
	if test "$sysconfdir" = "\${prefix}/etc"; then
	sysconfdir="/etc"
	fi
	if test "$systemddir" = "NONE/lib/systemd/system"; then
	systemddir=/lib/systemd/system
	fi
	if test "$libdir" = "\${exec_prefix}/lib"; then
	if test -e /usr/lib64; then
	libdir="/usr/lib64"
	else
	libdir="/usr/lib"
	fi
	fi
	fi

	AC_PROG_AWK
	AC_PROG_GREP
	AC_PROG_SED
	AC_PROG_CPP
	AC_PROG_CC
	AC_PROG_CC_C99
	if test "x$ac_cv_prog_cc_c99" = "xno"; then
	AC_MSG_ERROR(["C99 support is required"])
	fi
	AC_PROG_LN_S
	AC_PROG_INSTALL
	AC_PROG_MAKE_SET
	PKG_PROG_PKG_CONFIG

	AC_CHECK_PROGS([VALGRIND_EXEC], [valgrind])
	AM_CONDITIONAL([HAS_VALGRIND], [test x$VALGRIND_EXEC != "x"])

	# KNET_OPTION_DEFINES(stem,type,detection code)
	# stem: enters name of option, Automake conditional and preprocessor define
	# type: compress or crypto, determines where the default comes from
	AC_DEFUN([KNET_OPTION_DEFINES],[
	AC_ARG_ENABLE([$2-$1],[AS_HELP_STRING([--disable-$2-$1],[disable libknet $1 support])],,
	[enable_$2_$1="$enable_$2_all"])
	AM_CONDITIONAL([BUILD_]m4_toupper([$2_$1]),[test "x$enable_$2_$1" = xyes])
	if test "x$enable_$2_$1" = xyes; then
	$3
	fi
	AC_DEFINE_UNQUOTED([WITH_]m4_toupper([$2_$1]), [`test "x$enable_$2_$1" != xyes; echo $?`], $1 $2 [built in])
	])

	AC_ARG_ENABLE([man],
	[AS_HELP_STRING([--disable-man],[disable man page creation])],,
	[ enable_man="yes" ])
	AM_CONDITIONAL([BUILD_MAN], [test x$enable_man = xyes])

	AC_ARG_ENABLE([libknet-sctp],
	[AS_HELP_STRING([--disable-libknet-sctp],[disable libknet SCTP support])],,
	[ enable_libknet_sctp="yes" ])
	AM_CONDITIONAL([BUILD_SCTP], [test x$enable_libknet_sctp = xyes])

	AC_ARG_ENABLE([crypto-all],
	[AS_HELP_STRING([--disable-crypto-all],[disable libknet all crypto modules support])],,
	[ enable_crypto_all="yes" ])

	KNET_OPTION_DEFINES([nss],[crypto],[PKG_CHECK_MODULES([nss], [nss])])
	KNET_OPTION_DEFINES([openssl],[crypto],[
	PKG_CHECK_MODULES([openssl],[libcrypto < 1.1],
	[AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL10], [1], [openssl 1.0 crypto])],
	[PKG_CHECK_MODULES([openssl],[libcrypto >= 1.1],
	[AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])])
	])

	AC_ARG_ENABLE([compress-all],
	[AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,
	[ enable_compress_all="yes" ])

	KNET_OPTION_DEFINES([zlib],[compress],[PKG_CHECK_MODULES([zlib], [zlib])])
	KNET_OPTION_DEFINES([lz4],[compress],[PKG_CHECK_MODULES([liblz4], [liblz4])])
	KNET_OPTION_DEFINES([lzo2],[compress],[
	PKG_CHECK_MODULES([lzo2], [lzo2],
	[# work around broken pkg-config file in v2.10
	AC_SUBST([lzo2_CFLAGS],[`echo $lzo2_CFLAGS \| sed 's,/lzo *, ,'`])],
	[AC_CHECK_HEADERS([lzo/lzo1x.h],
	[AC_CHECK_LIB([lzo2], [lzo1x_decompress_safe],
	[AC_SUBST([lzo2_LIBS], [-llzo2])])],
	[AC_MSG_ERROR(["missing required lzo/lzo1x.h header"])])])
	])
	KNET_OPTION_DEFINES([lzma],[compress],[PKG_CHECK_MODULES([liblzma], [liblzma])])
	KNET_OPTION_DEFINES([bzip2],[compress],[
	PKG_CHECK_MODULES([bzip2], [bzip2],,
	[AC_CHECK_HEADERS([bzlib.h],
	[AC_CHECK_LIB([bz2], [BZ2_bzBuffToBuffCompress],
	[AC_SUBST([bzip2_LIBS], [-lbz2])])],
	[AC_MSG_ERROR(["missing required bzlib.h"])])])
	])

	AC_ARG_ENABLE([install-tests],
	[AS_HELP_STRING([--enable-install-tests],[install tests])],,
	[ enable_install_tests="no" ])
	AM_CONDITIONAL([INSTALL_TESTS], [test x$enable_install_tests = xyes])

	AC_ARG_ENABLE([poc],
	[AS_HELP_STRING([--enable-poc],[enable building poc code])],,
	[ enable_poc="no" ])
	AM_CONDITIONAL([BUILD_POC], [test x$enable_poc = xyes])

	AC_ARG_ENABLE([kronosnetd],
	[AS_HELP_STRING([--enable-kronosnetd],[Kronosnetd support])],,
	[ enable_kronosnetd="no" ])
	AM_CONDITIONAL([BUILD_KRONOSNETD], [test x$enable_kronosnetd = xyes])

	AC_ARG_ENABLE([runautogen],
	[AS_HELP_STRING([--enable-runautogen],[run autogen.sh])],,
	[ enable_runautogen="no" ])
	AM_CONDITIONAL([BUILD_RUNAUTOGEN], [test x$enable_runautogen = xyes])

	override_rpm_debuginfo_option="yes"
	AC_ARG_ENABLE([rpm-debuginfo],
	[AS_HELP_STRING([--enable-rpm-debuginfo],[build debuginfo packages])],,
	[ enable_rpm_debuginfo="no", override_rpm_debuginfo_option="no" ])
	AM_CONDITIONAL([BUILD_RPM_DEBUGINFO], [test x$enable_rpm_debuginfo = xyes])
	AM_CONDITIONAL([OVERRIDE_RPM_DEBUGINFO], [test x$override_rpm_debuginfo_option = xyes])

	AC_ARG_ENABLE([libnozzle],
	[AS_HELP_STRING([--enable-libnozzle],[libnozzle support])],,
	[ enable_libnozzle="yes" ])

	if test "x$enable_kronosnetd" = xyes; then
	enable_libnozzle=yes
	fi
	AM_CONDITIONAL([BUILD_LIBNOZZLE], [test x$enable_libnozzle = xyes])

	# Checks for libraries.
	AX_PTHREAD(,[AC_MSG_ERROR([POSIX threads support is required])])
	saved_LIBS="$LIBS"
	LIBS=
	AC_SEARCH_LIBS([ceil], [m], , [AC_MSG_ERROR([ceil not found])])
	AC_SUBST([m_LIBS], [$LIBS])
	LIBS=
	AC_SEARCH_LIBS([clock_gettime], [rt], , [AC_MSG_ERROR([clock_gettime not found])])
	AC_SUBST([rt_LIBS], [$LIBS])
	LIBS=
	AC_SEARCH_LIBS([dlopen], [dl dld], , [AC_MSG_ERROR([dlopen not found])])
	AC_SUBST([dl_LIBS], [$LIBS])
	LIBS="$saved_LIBS"

	# OS detection

	AC_MSG_CHECKING([for os in ${host_os}])
	case "$host_os" in
	linux)
	AC_DEFINE_UNQUOTED([KNET_LINUX], [1], [Compiling for Linux platform])
	AC_MSG_RESULT([Linux])
	;;
	bsd)
	AC_DEFINE_UNQUOTED([KNET_BSD], [1], [Compiling for BSD platform])
	AC_MSG_RESULT([BSD])
	;;
	*)
	AC_MSG_ERROR([Unsupported OS? hmmmm])
	;;
	esac

	# Checks for header files.
	AC_CHECK_HEADERS([sys/epoll.h])
	AC_CHECK_FUNCS([kevent])
	# if neither sys/epoll.h nor kevent are present, we should fail.

	if test "x$ac_cv_header_sys_epoll_h" = xno && test "x$ac_cv_func_kevent" = xno; then
	AC_MSG_ERROR([Both epoll and kevent unavailable on this OS])
	fi

	if test "x$ac_cv_header_sys_epoll_h" = xyes && test "x$ac_cv_func_kevent" = xyes; then
	AC_MSG_ERROR([Both epoll and kevent available on this OS, please contact the maintainers to fix the code])
	fi

	if test "x$enable_libknet_sctp" = xyes; then
	AC_CHECK_HEADERS([netinet/sctp.h],, [AC_MSG_ERROR(["missing required SCTP headers"])])
	fi

	# Checks for typedefs, structures, and compiler characteristics.
	AC_C_INLINE
	AC_TYPE_PID_T
	AC_TYPE_SIZE_T
	AC_TYPE_SSIZE_T
	AC_TYPE_UINT8_T
	AC_TYPE_UINT16_T
	AC_TYPE_UINT32_T
	AC_TYPE_UINT64_T
	AC_TYPE_INT8_T
	AC_TYPE_INT16_T
	AC_TYPE_INT32_T
	AC_TYPE_INT64_T

	if test "x$enable_man" = "xyes"; then
	AC_ARG_VAR([DOXYGEN], [override doxygen executable])
	AC_CHECK_PROGS([DOXYGEN], [doxygen], [no])
	if test "x$DOXYGEN" = xno; then
	AC_MSG_ERROR(["Doxygen command not found"])
	fi
	# required by doxyxml to build man pages dynamically
	# Don't let AC_PROC_CC (invoked by AX_PROG_CC_FOR_BUILD) replace
	# undefined CFLAGS_FOR_BUILD with -g -O2, overriding our special OPT_CFLAGS.
	: ${CFLAGS_FOR_BUILD=""}
	AX_PROG_CC_FOR_BUILD
	saved_PKG_CONFIG="$PKG_CONFIG"
	saved_ac_cv_path_PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
	unset PKG_CONFIG ac_cv_path_PKG_CONFIG
	AC_PATH_PROG([PKG_CONFIG], [pkg-config])
	PKG_CHECK_MODULES([libqb_BUILD], [libqb])
	PKG_CHECK_MODULES([libxml_BUILD], [libxml-2.0])
	PKG_CONFIG="$saved_PKG_CONFIG"
	ac_cv_path_PKG_CONFIG="$saved_ac_cv_path_PKG_CONFIG"
	fi

	# checks for libnozzle
	if test "x$enable_libnozzle" = xyes; then
	if `echo $host_os \| grep -q linux`; then
	PKG_CHECK_MODULES([libnl], [libnl-3.0])
	PKG_CHECK_MODULES([libnlroute], [libnl-route-3.0 >= 3.3], [],
	[PKG_CHECK_MODULES([libnlroute], [libnl-route-3.0 < 3.3],
	[AC_DEFINE_UNQUOTED([LIBNL3_WORKAROUND], [1], [Enable libnl < 3.3 build workaround])], [])])
	fi
	fi

	# checks for kronosnetd
	if test "x$enable_kronosnetd" = xyes; then
	AC_CHECK_HEADERS([security/pam_appl.h],
	[AC_CHECK_LIB([pam], [pam_start],
	[AC_SUBST([pam_LIBS], [-lpam])],
	[AC_MSG_ERROR([Unable to find LinuxPAM devel files])])])

	AC_CHECK_HEADERS([security/pam_misc.h],
	[AC_CHECK_LIB([pam_misc], [misc_conv],
	[AC_SUBST([pam_misc_LIBS], [-lpam_misc])],
	[AC_MSG_ERROR([Unable to find LinuxPAM MISC devel files])])])

	PKG_CHECK_MODULES([libqb], [libqb])

	AC_CHECK_LIB([qb], [qb_log_thread_priority_set],
	[have_qb_log_thread_priority_set="yes"],
	[have_qb_log_thread_priority_set="no"])
	if test "x${have_qb_log_thread_priority_set}" = xyes; then
	AC_DEFINE_UNQUOTED([HAVE_QB_LOG_THREAD_PRIORITY_SET], [1], [have qb_log_thread_priority_set])
	fi
	fi

	# local options
	AC_ARG_ENABLE([debug],
	[AS_HELP_STRING([--enable-debug],[enable debug build])])

	AC_ARG_WITH([testdir],
	[AS_HELP_STRING([--with-testdir=DIR],[path to /usr/lib../kronosnet/tests/ dir where to install the test suite])],
	[ TESTDIR="$withval" ],
	[ TESTDIR="$libdir/kronosnet/tests" ])

	AC_ARG_WITH([initdefaultdir],
	[AS_HELP_STRING([--with-initdefaultdir=DIR],[path to /etc/sysconfig or /etc/default dir])],
	[ INITDEFAULTDIR="$withval" ],
	[ INITDEFAULTDIR="$sysconfdir/default" ])

	AC_ARG_WITH([initddir],
	[AS_HELP_STRING([--with-initddir=DIR],[path to init script directory])],
	[ INITDDIR="$withval" ],
	[ INITDDIR="$sysconfdir/init.d" ])

	AC_ARG_WITH([systemddir],
	[AS_HELP_STRING([--with-systemddir=DIR],[path to systemd unit files directory])],
	[ SYSTEMDDIR="$withval" ],
	[ SYSTEMDDIR="$systemddir" ])

	AC_ARG_WITH([syslogfacility],
	[AS_HELP_STRING([--with-syslogfacility=FACILITY],[default syslog facility])],
	[ SYSLOGFACILITY="$withval" ],
	[ SYSLOGFACILITY="LOG_DAEMON" ])

	AC_ARG_WITH([sysloglevel],
	[AS_HELP_STRING([--with-sysloglevel=LEVEL],[default syslog level])],
	[ SYSLOGLEVEL="$withval" ],
	[ SYSLOGLEVEL="LOG_INFO" ])

	AC_ARG_WITH([defaultadmgroup],
	[AS_HELP_STRING([--with-defaultadmgroup=GROUP],
	[define PAM group. Users part of this group will be allowed to configure
	kronosnet. Others will only receive read-only rights.])],
	[ DEFAULTADMGROUP="$withval" ],
	[ DEFAULTADMGROUP="kronosnetadm" ])

	## random vars
	LOGDIR=${localstatedir}/log/
	RUNDIR=${localstatedir}/run/
	DEFAULT_CONFIG_DIR=${sysconfdir}/kronosnet

	## do subst

	AC_SUBST([TESTDIR])
	AC_SUBST([DEFAULT_CONFIG_DIR])
	AC_SUBST([INITDEFAULTDIR])
	AC_SUBST([INITDDIR])
	AC_SUBST([SYSTEMDDIR])
	AC_SUBST([LOGDIR])
	AC_SUBST([DEFAULTADMGROUP])

	AC_DEFINE_UNQUOTED([DEFAULT_CONFIG_DIR],
	["$(eval echo ${DEFAULT_CONFIG_DIR})"],
	[Default config directory])

	AC_DEFINE_UNQUOTED([DEFAULT_CONFIG_FILE],
	["$(eval echo ${DEFAULT_CONFIG_DIR}/kronosnetd.conf)"],
	[Default config file])

	AC_DEFINE_UNQUOTED([LOGDIR],
	["$(eval echo ${LOGDIR})"],
	[Default logging directory])

	AC_DEFINE_UNQUOTED([DEFAULT_LOG_FILE],
	["$(eval echo ${LOGDIR}/kronosnetd.log)"],
	[Default log file])

	AC_DEFINE_UNQUOTED([RUNDIR],
	["$(eval echo ${RUNDIR})"],
	[Default run directory])

	AC_DEFINE_UNQUOTED([SYSLOGFACILITY],
	[$(eval echo ${SYSLOGFACILITY})],
	[Default syslog facility])

	AC_DEFINE_UNQUOTED([SYSLOGLEVEL],
	[$(eval echo ${SYSLOGLEVEL})],
	[Default syslog level])

	AC_DEFINE_UNQUOTED([DEFAULTADMGROUP],
	["$(eval echo ${DEFAULTADMGROUP})"],
	[Default admin group])

	# debug build stuff
	if test "x${enable_debug}" = xyes; then
	AC_DEFINE_UNQUOTED([DEBUG], [1], [Compiling Debugging code])
	OPT_CFLAGS="-O0"
	else
	OPT_CFLAGS="-O3"
	fi

	# gdb flags
	if test "x${GCC}" = xyes; then
	GDB_FLAGS="-ggdb3"
	else
	GDB_FLAGS="-g"
	fi

	DEFAULT_CFLAGS="-Werror -Wall -Wextra"

	# manual overrides
	# generates too much noise for stub APIs
	UNWANTED_CFLAGS="-Wno-unused-parameter"

	AC_SUBST([AM_CFLAGS],["$OPT_CFLAGS $GDB_FLAGS $DEFAULT_CFLAGS $UNWANTED_CFLAGS"])

	AX_PROG_DATE
	AS_IF([test "$ax_cv_prog_date_gnu_date:$ax_cv_prog_date_gnu_utc" = yes:yes],
	[UTC_DATE_AT="date -u -d@"],
	[AS_IF([test "x$ax_cv_prog_date_bsd_date" = xyes],
	[UTC_DATE_AT="date -u -r"],
	[AC_MSG_ERROR([date utility unable to convert epoch to UTC])])])
	AC_SUBST([UTC_DATE_AT])

	AC_ARG_VAR([SOURCE_EPOCH],[last modification date of the source])
	AC_MSG_NOTICE([trying to determine source epoch])
	AC_MSG_CHECKING([for source epoch in \$SOURCE_EPOCH])
	AS_IF([test -n "$SOURCE_EPOCH"],
	[AC_MSG_RESULT([yes])],
	[AC_MSG_RESULT([no])
	AC_MSG_CHECKING([for source epoch in source_epoch file])
	AS_IF([test -e "$srcdir/source_epoch"],
	[read SOURCE_EPOCH <"$srcdir/source_epoch"
	AC_MSG_RESULT([yes])],
	[AC_MSG_RESULT([no])
	AC_MSG_CHECKING([for source epoch baked in by gitattributes export-subst])
	SOURCE_EPOCH='$Format:%at$' # template for rewriting by git-archive
	AS_CASE([$SOURCE_EPOCH],
	[?Format:*], # was not rewritten
	[AC_MSG_RESULT([no])
	AC_MSG_CHECKING([for source epoch in \$SOURCE_DATE_EPOCH])
	AS_IF([test "x$SOURCE_DATE_EPOCH" != x],
	[SOURCE_EPOCH="$SOURCE_DATE_EPOCH"
	AC_MSG_RESULT([yes])],
	[AC_MSG_RESULT([no])
	AC_MSG_CHECKING([whether git log can provide a source epoch])
	SOURCE_EPOCH=f${SOURCE_EPOCH#\$F} # convert into git log --pretty format
	SOURCE_EPOCH=$(cd "$srcdir" && git log -1 --pretty=${SOURCE_EPOCH%$} 2>/dev/null)
	AS_IF([test -n "$SOURCE_EPOCH"],
	[AC_MSG_RESULT([yes])],
	[AC_MSG_RESULT([no, using current time and breaking reproducibility])
	SOURCE_EPOCH=$(date +%s)])])],
	[AC_MSG_RESULT([yes])]
	)])
	])
	AC_MSG_NOTICE([using source epoch $($UTC_DATE_AT$SOURCE_EPOCH +'%F %T %Z')])

	AC_CONFIG_FILES([
	Makefile
	init/Makefile
	libnozzle/Makefile
	libnozzle/libnozzle.pc
	libnozzle/tests/Makefile
	kronosnetd/Makefile
	kronosnetd/kronosnetd.logrotate
	libknet/Makefile
	libknet/libknet.pc
	libknet/tests/Makefile
	man/Makefile
	man/Doxyfile-knet
	man/Doxyfile-nozzle
	poc-code/Makefile
	poc-code/iov-hash/Makefile
	- poc-code/access-list/Makefile
	])

	if test "x$VERSION" = "xUNKNOWN"; then
	AC_MSG_ERROR([m4_text_wrap([
	configure was unable to determine the source tree's current version. This
	generally happens when using git archive (or the github download button)
	generated tarball/zip file. In order to workaround this issue, either use git
	clone https://github.com/kronosnet/kronosnet.git or use an official release
	tarball, available at https://kronosnet.org/releases/. Alternatively you
	can add a compatible version in a .tarball-version file at the top of the
	source tree, wipe your autom4te.cache dir and generated configure, and rerun
	autogen.sh.
	], [ ], [ ], [76])])
	fi

	AC_OUTPUT
	diff --git a/libknet/Makefile.am b/libknet/Makefile.am
	index 906fd011..4ea42d9e 100644
	--- a/libknet/Makefile.am
	+++ b/libknet/Makefile.am
	@@ -1,150 +1,152 @@
	#
	# Copyright (C) 2010-2019 Red Hat, Inc. All rights reserved.
	#
	# Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	# Federico Simoncelli <fsimon@kronosnet.org>
	#
	# This software licensed under GPL-2.0+, LGPL-2.0+
	#

	MAINTAINERCLEANFILES = Makefile.in

	include $(top_srcdir)/build-aux/check.mk

	SYMFILE = libknet_exported_syms

	EXTRA_DIST = $(SYMFILE)

	SUBDIRS = . tests

	# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
	libversion = 2:0:1

	# override global LIBS that pulls in lots of craft we don't need here
	LIBS =

	sources = \
	common.c \
	compat.c \
	compress.c \
	crypto.c \
	handle.c \
	host.c \
	links.c \
	+ links_acl.c \
	logging.c \
	netutils.c \
	threads_common.c \
	threads_dsthandler.c \
	threads_heartbeat.c \
	threads_pmtud.c \
	threads_rx.c \
	threads_tx.c \
	transports.c \
	transport_common.c \
	transport_loopback.c \
	transport_udp.c \
	transport_sctp.c

	include_HEADERS = libknet.h

	pkgconfigdir = $(libdir)/pkgconfig

	pkgconfig_DATA = libknet.pc

	noinst_HEADERS = \
	common.h \
	compat.h \
	compress.h \
	compress_model.h \
	crypto.h \
	crypto_model.h \
	host.h \
	internals.h \
	links.h \
	+ links_acl.h \
	logging.h \
	netutils.h \
	onwire.h \
	threads_common.h \
	threads_dsthandler.h \
	threads_heartbeat.h \
	threads_pmtud.h \
	threads_rx.h \
	threads_tx.h \
	transports.h \
	transport_common.h \
	transport_loopback.h \
	transport_udp.h \
	transport_sctp.h

	lib_LTLIBRARIES = libknet.la

	libknet_la_SOURCES = $(sources)

	libknet_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)

	EXTRA_libknet_la_DEPENDENCIES = $(SYMFILE)

	libknet_la_LDFLAGS = $(AM_LDFLAGS) \
	-Wl,--version-script=$(srcdir)/$(SYMFILE) \
	-Wl,-rpath=$(pkglibdir) \
	-version-info $(libversion)

	libknet_la_LIBADD = $(PTHREAD_LIBS) $(dl_LIBS) $(rt_LIBS) $(m_LIBS)

	# Prepare empty value for appending
	pkglib_LTLIBRARIES =

	# MODULE_LDFLAGS would mean a target-specific variable for Automake
	MODULELDFLAGS = $(AM_LDFLAGS) -module -avoid-version -export-dynamic

	if BUILD_COMPRESS_ZLIB
	pkglib_LTLIBRARIES += compress_zlib.la
	compress_zlib_la_LDFLAGS = $(MODULELDFLAGS)
	compress_zlib_la_CFLAGS = $(AM_CFLAGS) $(zlib_CFLAGS)
	compress_zlib_la_LIBADD = $(zlib_LIBS)
	endif

	if BUILD_COMPRESS_LZ4
	pkglib_LTLIBRARIES += compress_lz4.la compress_lz4hc.la
	compress_lz4_la_LDFLAGS = $(MODULELDFLAGS)
	compress_lz4_la_CFLAGS = $(AM_CFLAGS) $(liblz4_CFLAGS)
	compress_lz4_la_LIBADD = $(liblz4_LIBS)
	compress_lz4hc_la_LDFLAGS = $(MODULELDFLAGS)
	compress_lz4hc_la_CFLAGS = $(AM_CFLAGS) $(liblz4_CFLAGS)
	compress_lz4hc_la_LIBADD = $(liblz4_LIBS)
	endif

	if BUILD_COMPRESS_LZO2
	pkglib_LTLIBRARIES += compress_lzo2.la
	compress_lzo2_la_LDFLAGS = $(MODULELDFLAGS)
	compress_lzo2_la_CFLAGS = $(AM_CFLAGS) $(lzo2_CFLAGS)
	compress_lzo2_la_LIBADD = $(lzo2_LIBS)
	endif

	if BUILD_COMPRESS_LZMA
	pkglib_LTLIBRARIES += compress_lzma.la
	compress_lzma_la_LDFLAGS = $(MODULELDFLAGS)
	compress_lzma_la_CFLAGS = $(AM_CFLAGS) $(liblzma_CFLAGS)
	compress_lzma_la_LIBADD = $(liblzma_LIBS)
	endif

	if BUILD_COMPRESS_BZIP2
	pkglib_LTLIBRARIES += compress_bzip2.la
	compress_bzip2_la_LDFLAGS = $(MODULELDFLAGS)
	compress_bzip2_la_CFLAGS = $(AM_CFLAGS) $(bzip2_CFLAGS)
	compress_bzip2_la_LIBADD = $(bzip2_LIBS)
	endif

	if BUILD_CRYPTO_NSS
	pkglib_LTLIBRARIES += crypto_nss.la
	crypto_nss_la_LDFLAGS = $(MODULELDFLAGS)
	crypto_nss_la_CFLAGS = $(AM_CFLAGS) $(nss_CFLAGS)
	crypto_nss_la_LIBADD = $(nss_LIBS)
	endif

	if BUILD_CRYPTO_OPENSSL
	pkglib_LTLIBRARIES += crypto_openssl.la
	crypto_openssl_la_LDFLAGS = $(MODULELDFLAGS)
	crypto_openssl_la_CFLAGS = $(AM_CFLAGS) $(openssl_CFLAGS)
	crypto_openssl_la_LIBADD = $(openssl_LIBS)
	endif
	diff --git a/poc-code/access-list/ipcheck.c b/libknet/links_acl.c
	similarity index 99%
	rename from poc-code/access-list/ipcheck.c
	rename to libknet/links_acl.c
	index 9774a469..e7b56026 100644
	--- a/poc-code/access-list/ipcheck.c
	+++ b/libknet/links_acl.c
	@@ -1,218 +1,218 @@
	/*
	* Copyright (C) 2016-2019 Red Hat, Inc. All rights reserved.
	*
	* Author: Christine Caulfield <ccaulfie@redhat.com>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include <sys/socket.h>
	#include <netinet/in.h>
	#include <stdint.h>
	#include <string.h>
	#include <malloc.h>
	-#include "ipcheck.h"
	+#include "links_acl.h"

	struct ip_match_entry {
	ipcheck_type_t type;
	ipcheck_acceptreject_t acceptreject;
	struct sockaddr_storage addr1; /* Actual IP address, mask top or low IP */
	struct sockaddr_storage addr2; /* high IP address or address bitmask */
	struct ip_match_entry *next;
	};


	/* Lists of things to match against. These are dummy structs to provide a quick list head */
	static struct ip_match_entry match_entry_head_v4;
	static struct ip_match_entry match_entry_head_v6;

	/*
	* IPv4 See if the address we have matches the current match entry
	*
	*/
	static int ip_matches_v4(struct sockaddr_storage checkip, struct ip_match_entry match_entry)
	{
	struct sockaddr_in *ip_to_check;
	struct sockaddr_in *match1;
	struct sockaddr_in *match2;

	ip_to_check = (struct sockaddr_in *)checkip;
	match1 = (struct sockaddr_in *)&match_entry->addr1;
	match2 = (struct sockaddr_in *)&match_entry->addr2;

	switch(match_entry->type) {
	case IPCHECK_TYPE_ADDRESS:
	if (ip_to_check->sin_addr.s_addr == match1->sin_addr.s_addr)
	return 1;
	break;
	case IPCHECK_TYPE_MASK:
	if ((ip_to_check->sin_addr.s_addr & match2->sin_addr.s_addr) ==
	match1->sin_addr.s_addr)
	return 1;
	break;
	case IPCHECK_TYPE_RANGE:
	if ((ntohl(ip_to_check->sin_addr.s_addr) >= ntohl(match1->sin_addr.s_addr)) &&
	(ntohl(ip_to_check->sin_addr.s_addr) <= ntohl(match2->sin_addr.s_addr)))
	return 1;
	break;

	}
	return 0;
	}

	/* Compare two IPv6 addresses */
	static int ip6addr_cmp(struct in6_addr a, struct in6_addr b)
	{
	uint64_t a_high, a_low;
	uint64_t b_high, b_low;

	/* Not sure why '&' doesn't work below, so I used '+' instead which is effectively
	the same thing because the bottom 32bits are always zero and the value unsigned */
	a_high = ((uint64_t)htonl(a->s6_addr32[0]) << 32) + (uint64_t)htonl(a->s6_addr32[1]);
	a_low = ((uint64_t)htonl(a->s6_addr32[2]) << 32) + (uint64_t)htonl(a->s6_addr32[3]);

	b_high = ((uint64_t)htonl(b->s6_addr32[0]) << 32) + (uint64_t)htonl(b->s6_addr32[1]);
	b_low = ((uint64_t)htonl(b->s6_addr32[2]) << 32) + (uint64_t)htonl(b->s6_addr32[3]);

	if (a_high > b_high)
	return 1;
	if (a_high < b_high)
	return -1;

	if (a_low > b_low)
	return 1;
	if (a_low < b_low)
	return -1;

	return 0;
	}

	/*
	* IPv6 See if the address we have matches the current match entry
	*
	*/
	static int ip_matches_v6(struct sockaddr_storage checkip, struct ip_match_entry match_entry)
	{
	struct sockaddr_in6 *ip_to_check;
	struct sockaddr_in6 *match1;
	struct sockaddr_in6 *match2;
	int i;

	ip_to_check = (struct sockaddr_in6 *)checkip;
	match1 = (struct sockaddr_in6 *)&match_entry->addr1;
	match2 = (struct sockaddr_in6 *)&match_entry->addr2;

	switch(match_entry->type) {
	case IPCHECK_TYPE_ADDRESS:
	if (!memcmp(ip_to_check->sin6_addr.s6_addr32, match1->sin6_addr.s6_addr32, sizeof(struct in6_addr)))
	return 1;
	break;

	case IPCHECK_TYPE_MASK:
	/*
	* Note that this little loop will quit early if there is a non-match so the
	* comparison might look backwards compared to the IPv4 one
	*/
	for (i=sizeof(struct in6_addr)/4-1; i>=0; i--) {
	if ((ip_to_check->sin6_addr.s6_addr32[i] & match2->sin6_addr.s6_addr32[i]) !=
	match1->sin6_addr.s6_addr32[i])
	return 0;
	}
	return 1;
	case IPCHECK_TYPE_RANGE:
	if ((ip6addr_cmp(&ip_to_check->sin6_addr, &match1->sin6_addr) >= 0) &&
	(ip6addr_cmp(&ip_to_check->sin6_addr, &match2->sin6_addr) <= 0))
	return 1;
	break;
	}
	return 0;
	}


	/*
	* YOU ARE HERE
	*/
	int ipcheck_validate(struct sockaddr_storage *checkip)
	{
	struct ip_match_entry *match_entry;
	int (match_fn)(struct sockaddr_storage checkip, struct ip_match_entry *match_entry);

	if (checkip->ss_family == AF_INET){
	match_entry = match_entry_head_v4.next;
	match_fn = ip_matches_v4;
	} else {
	match_entry = match_entry_head_v6.next;
	match_fn = ip_matches_v6;
	}
	while (match_entry) {
	if (match_fn(checkip, match_entry)) {
	if (match_entry->acceptreject == IPCHECK_ACCEPT)
	return 1;
	else
	return 0;
	}
	match_entry = match_entry->next;
	}
	return 0; /* Default reject */
	}

	/*
	* Routines to manuipulate the lists
	*/

	void ipcheck_clear(void)
	{
	struct ip_match_entry *match_entry;
	struct ip_match_entry *next_match_entry;

	match_entry = match_entry_head_v4.next;
	while (match_entry) {
	next_match_entry = match_entry->next;
	free(match_entry);
	match_entry = next_match_entry;
	}

	match_entry = match_entry_head_v6.next;
	while (match_entry) {
	next_match_entry = match_entry->next;
	free(match_entry);
	match_entry = next_match_entry;
	}
	}

	int ipcheck_addip(struct sockaddr_storage ip1, struct sockaddr_storage ip2,
	ipcheck_type_t type, ipcheck_acceptreject_t acceptreject)
	{
	struct ip_match_entry *match_entry;
	struct ip_match_entry *new_match_entry;

	if (type == IPCHECK_TYPE_RANGE &&
	(ip1->ss_family != ip2->ss_family))
	return -1;

	if (ip1->ss_family == AF_INET){
	match_entry = &match_entry_head_v4;
	} else {
	match_entry = &match_entry_head_v6;
	}


	new_match_entry = malloc(sizeof(struct ip_match_entry));
	if (!new_match_entry)
	return -1;

	memmove(&new_match_entry->addr1, ip1, sizeof(struct sockaddr_storage));
	memmove(&new_match_entry->addr2, ip2, sizeof(struct sockaddr_storage));
	new_match_entry->type = type;
	new_match_entry->acceptreject = acceptreject;
	new_match_entry->next = NULL;

	/* Find the end of the list */
	/* is this OK, or should we use a doubly-linked list or bulk-load API call? */
	while (match_entry->next) {
	match_entry = match_entry->next;
	}
	match_entry->next = new_match_entry;

	return 0;
	}
	diff --git a/poc-code/access-list/ipcheck.h b/libknet/links_acl.h
	similarity index 100%
	rename from poc-code/access-list/ipcheck.h
	rename to libknet/links_acl.h
	diff --git a/libknet/tests/Makefile.am b/libknet/tests/Makefile.am
	index c00e6247..f74cb046 100644
	--- a/libknet/tests/Makefile.am
	+++ b/libknet/tests/Makefile.am
	@@ -1,75 +1,81 @@
	#
	# Copyright (C) 2016-2019 Red Hat, Inc. All rights reserved.
	#
	# Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	#
	# This software licensed under GPL-2.0+, LGPL-2.0+
	#

	MAINTAINERCLEANFILES = Makefile.in

	include $(top_srcdir)/build-aux/check.mk
	include $(top_srcdir)/libknet/tests/api-check.mk

	EXTRA_DIST = \
	api-test-coverage \
	- api-check.mk
	+ api-check.mk \
	+ int_links_acl.txt

	AM_CPPFLAGS = -I$(top_srcdir)/libknet
	AM_CFLAGS += $(PTHREAD_CFLAGS)
	LIBS = $(top_builddir)/libknet/libknet.la \
	$(PTHREAD_LIBS) $(dl_LIBS)

	noinst_HEADERS = \
	test-common.h

	# the order of those tests is NOT random.
	# some functions can only be tested properly after some dependents
	# API have been validated upfront.

	check_PROGRAMS = \
	$(api_checks) \
	$(int_checks) \
	$(fun_checks)

	int_checks = \
	int_timediff_test

	fun_checks =

	benchmarks = \
	knet_bench_test

	+# int_links_acl_test can´t run yet standalone
	noinst_PROGRAMS = \
	api_knet_handle_new_limit_test \
	pckt_test \
	+ int_links_acl_test \
	$(benchmarks) \
	$(check_PROGRAMS)

	noinst_SCRIPTS = \
	api-test-coverage

	TESTS = $(check_PROGRAMS)

	if INSTALL_TESTS
	testsuitedir = $(TESTDIR)
	testsuite_PROGRAMS = $(noinst_PROGRAMS)
	endif

	check-local: check-api-test-coverage

	check-api-test-coverage:
	chmod u+x $(top_srcdir)/libknet/tests/api-test-coverage
	$(top_srcdir)/libknet/tests/api-test-coverage $(top_srcdir) $(top_builddir)

	pckt_test_SOURCES = pckt_test.c

	+int_links_acl_test_SOURCES = int_links_acl.c \
	+ ../links_acl.c
	+
	int_timediff_test_SOURCES = int_timediff.c

	knet_bench_test_SOURCES = knet_bench.c \
	test-common.c \
	../common.c \
	../logging.c \
	../compat.c \
	../transport_common.c \
	../threads_common.c
	diff --git a/poc-code/access-list/test_ipcheck.c b/libknet/tests/int_links_acl.c
	similarity index 96%
	rename from poc-code/access-list/test_ipcheck.c
	rename to libknet/tests/int_links_acl.c
	index 46a750b7..27ac545a 100644
	--- a/poc-code/access-list/test_ipcheck.c
	+++ b/libknet/tests/int_links_acl.c
	@@ -1,193 +1,193 @@
	/*
	* Copyright (C) 2016-2019 Red Hat, Inc. All rights reserved.
	*
	* Author: Christine Caulfield <ccaulfie@redhat.com>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include <sys/types.h>
	#include <sys/socket.h>
	#include <netinet/in.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <netdb.h>
	#include <malloc.h>
	-#include "ipcheck.h"
	+#include "links_acl.h"

	/* This is a test program .. remember! */
	#define BUFLEN 1024

	static int get_ipaddress(char buf, struct sockaddr_storage addr)
	{
	struct addrinfo *info;
	struct addrinfo hints;
	int res;

	memset(&hints, 0, sizeof(hints));
	hints.ai_family = AF_UNSPEC;

	res = getaddrinfo(buf, NULL, &hints, &info);
	if (!res) {
	memmove(addr, info->ai_addr, info->ai_addrlen);
	free(info);
	}
	return res;
	}

	static int read_address(char buf, struct sockaddr_storage addr)
	{
	return get_ipaddress(buf, addr);
	}

	static int read_mask(char buf, struct sockaddr_storage addr, struct sockaddr_storage *addr2)
	{
	char tmpbuf[BUFLEN];
	char *slash;
	int ret;

	slash = strchr(buf, '/');
	if (!slash)
	return 1;

	strncpy(tmpbuf, buf, slash-buf);
	tmpbuf[slash-buf] = '\0';

	ret = get_ipaddress(tmpbuf, addr);
	if (ret)
	return ret;

	ret = get_ipaddress(slash+1, addr2);
	if (ret)
	return ret;

	return 0;
	}

	static int read_range(char buf, struct sockaddr_storage addr1, struct sockaddr_storage *addr2)
	{
	char tmpbuf[BUFLEN];
	char *hyphen;
	int ret;

	hyphen = strchr(buf, '-');
	if (!hyphen)
	return 1;

	strncpy(tmpbuf, buf, hyphen-buf);
	tmpbuf[hyphen-buf] = '\0';

	ret = get_ipaddress(tmpbuf, addr1);
	if (ret)
	return ret;

	ret = get_ipaddress(hyphen+1, addr2);
	if (ret)
	return ret;

	return 0;
	}


	static int load_file(void)
	{
	FILE *filterfile;
	char filebuf[BUFLEN];
	int line = 0;
	int ret;
	ipcheck_type_t type;
	ipcheck_acceptreject_t acceptreject;
	struct sockaddr_storage addr1;
	struct sockaddr_storage addr2;

	ipcheck_clear();

	- filterfile = fopen("test_ipcheck.txt", "r");
	+ filterfile = fopen("int_links_acl.txt", "r");
	if (!filterfile) {
	- fprintf(stderr, "Cannot open test_ipcheck.txt\n");
	+ fprintf(stderr, "Cannot open int_links_acl.txt\n");
	return 1;
	}

	while (fgets(filebuf, sizeof(filebuf), filterfile)) {
	filebuf[strlen(filebuf)-1] = '\0'; /* remove trailing LF */
	line++;

	/*
	* First char is A (accept) or R (Reject)
	*/
	switch(filebuf[0] & 0x5F) {
	case 'A':
	acceptreject = IPCHECK_ACCEPT;
	break;
	case 'R':
	acceptreject = IPCHECK_REJECT;
	break;
	default:
	fprintf(stderr, "Unknown record type on line %d: %s\n", line, filebuf);
	goto next_record;
	}

	/*
	* Second char is the filter type:
	* A Address
	* M Mask
	* R Range
	*/
	switch(filebuf[1] & 0x5F) {
	case 'A':
	type = IPCHECK_TYPE_ADDRESS;
	ret = read_address(filebuf+2, &addr1);
	break;
	case 'M':
	type = IPCHECK_TYPE_MASK;
	ret = read_mask(filebuf+2, &addr1, &addr2);
	break;
	case 'R':
	type = IPCHECK_TYPE_RANGE;
	ret = read_range(filebuf+2, &addr1, &addr2);
	break;
	default:
	fprintf(stderr, "Unknown filter type on line %d: %s\n", line, filebuf);
	goto next_record;
	break;
	}
	if (ret) {
	fprintf(stderr, "Failed to parse address on line %d: %s\n", line, filebuf);
	}
	else {
	ipcheck_addip(&addr1, &addr2, type, acceptreject);
	}
	next_record: {} /* empty statement to mollify the compiler */
	}
	fclose(filterfile);

	return 0;
	}

	int main(int argc, char *argv[])
	{
	struct sockaddr_storage saddr;
	int ret;
	int i;

	if (load_file())
	return 1;

	for (i=1; i<argc; i++) {
	ret = get_ipaddress(argv[i], &saddr);
	if (ret) {
	fprintf(stderr, "Cannot parse address %s\n", argv[i]);
	}
	else {
	if (ipcheck_validate(&saddr)) {
	printf("%s is VALID\n", argv[i]);
	}
	else {
	printf("%s is not allowed\n", argv[i]);
	}
	}
	}

	return 0;
	}
	diff --git a/poc-code/access-list/test_ipcheck.txt b/libknet/tests/int_links_acl.txt
	similarity index 100%
	rename from poc-code/access-list/test_ipcheck.txt
	rename to libknet/tests/int_links_acl.txt
	diff --git a/poc-code/Makefile.am b/poc-code/Makefile.am
	index e1b1a735..15d12f78 100644
	--- a/poc-code/Makefile.am
	+++ b/poc-code/Makefile.am
	@@ -1,13 +1,13 @@
	#
	# Copyright (C) 2016-2019 Red Hat, Inc. All rights reserved.
	#
	# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
	#
	# This software licensed under GPL-2.0+, LGPL-2.0+
	#

	MAINTAINERCLEANFILES = Makefile.in

	include $(top_srcdir)/build-aux/check.mk

	-SUBDIRS = access-list iov-hash
	+SUBDIRS = iov-hash
	diff --git a/poc-code/access-list/.gitignore b/poc-code/access-list/.gitignore
	deleted file mode 100644
	index 955474ba..00000000
	--- a/poc-code/access-list/.gitignore
	+++ /dev/null
	@@ -1 +0,0 @@
	-test_ipcheck
	diff --git a/poc-code/access-list/Makefile.am b/poc-code/access-list/Makefile.am
	deleted file mode 100644
	index 80c49c29..00000000
	--- a/poc-code/access-list/Makefile.am
	+++ /dev/null
	@@ -1,22 +0,0 @@
	-#
	-# Copyright (C) 2016-2019 Red Hat, Inc. All rights reserved.
	-#
	-# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
	-#
	-# This software licensed under GPL-2.0+, LGPL-2.0+
	-#
	-
	-MAINTAINERCLEANFILES = Makefile.in
	-
	-include $(top_srcdir)/build-aux/check.mk
	-
	-# override global LIBS that pulls in lots of craft we don't need here
	-LIBS =
	-
	-EXTRA_DIST = test_ipcheck.txt
	-
	-noinst_PROGRAMS = test_ipcheck
	-
	-noinst_HEADERS = ipcheck.h
	-
	-test_ipcheck_SOURCES = ipcheck.c test_ipcheck.c

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 26, 4:46 AM (22 h, 12 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1465179
Default Alt Text: (34 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions