Skip to content
Permalink
Browse files

Merge Snabb release v2019.06 "Deltadromeus" into lwaftr

  • Loading branch information...
eugeneia committed Sep 12, 2019
2 parents 3e73c2f + 24c9a67 commit e3ed4eaceae0fbd975707ae2ec89e3b05e69d60b
Showing 572 changed files with 33,351 additions and 66,991 deletions.
@@ -8,11 +8,7 @@ LUAJIT_CFLAGS := -include $(CURDIR)/gcc-preinclude.h

all: $(LUAJIT) $(SYSCALL) $(PFLUA)
# LuaJIT
@(cd lib/luajit && \
$(MAKE) PREFIX=`pwd`/usr/local \
CFLAGS="$(LUAJIT_CFLAGS)" && \
$(MAKE) DESTDIR=`pwd` install)
(cd lib/luajit/usr/local/bin; ln -fs luajit-2.1.0-beta2 luajit)
@(cd lib/luajit && (cd src && $(MAKE) reusevm) && $(MAKE) CFLAGS="$(LUAJIT_CFLAGS)")
# ljsyscall
@mkdir -p src/syscall/linux
@cp -p lib/ljsyscall/syscall.lua src/
@@ -85,11 +85,11 @@ local lib_version = (function ()
end)()

-- Only nDPI 1.x versions above 1.7 are supported.
if lib_version.major ~= 1 or lib_version.minor < 7 then
if lib_version.major == 1 and lib_version.minor < 7 then
error("Unsupported nDPI version: " .. tostring(lib_version))
end

if lib_version.minor == 7 then
if lib_version.major == 1 and lib_version.minor == 7 then
-- nDPI 1.7
ffi.cdef [[
ndpi_detection_module_t* ndpi_init_detection_module (uint32_t ticks_per_second,
@@ -105,8 +105,8 @@ if lib_version.minor == 7 then
uint32_t src_host, uint16_t src_port,
uint32_t dst_host, uint32_t dst_port);
]]
elseif lib_version.minor == 8 then
-- nDPI 1.8
else
-- nDPI 1.8 and later
ffi.cdef [[
ndpi_detection_module_t* ndpi_init_detection_module (void);

0 comments on commit e3ed4ea

Please sign in to comment.
You can’t perform that action at this time.