Merge remote-tracking branch 'snabbco/master' into mellanox-lwaftr

# Conflicts:
#	src/apps/vhost/vhost_user.c
#	src/lib/hardware/pci.lua

.version

@@ -1 +1 @@
-2018.06
+2019.11

Makefile

@@ -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/

README.md

@@ -142,5 +142,5 @@ Here are the ways you can get involved:
 - Use the Snabb applications in your network.
 - Create your very own application: [Getting Started](src/doc/getting-started.md).
 - Create Github Issues with your ideas and questions and problems.
-- [Join](https://join.slack.com/t/snabb/shared_invite/enQtMzIyOTIwMTg5ODYyLTMzY2FjMGEzM2QzNDlhMDYxNzU0M2UyNjQ1MDc4MDRjY2Q3MWMwY2Q4YWQ1NDllY2E3NTZkZGUyZTQxNzgyNjc) the [Snabb Slack chat](https://snabb.slack.com/) to hang out and shoot the breeze.
+- [Join](https://join.slack.com/t/snabb/shared_invite/enQtMzIyOTIwMTg5ODYyLWUwYzg2MTIwMjAxZTM1N2RlNGFjMWY1YzRkZGZiN2U5ZGU1NTYwNWJiMmQ3MWQ1MDFjYTg0MjNjNTZjMTFlZGQ) the [Snabb Slack chat](https://snabb.slack.com/) to hang out and shoot the breeze.
 

lib/ljndpi/ndpi/c.lua

@@ -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);