diff --git a/include/ntop_includes.h b/include/ntop_includes.h index 4d27f64a8a..2812de36dd 100644 --- a/include/ntop_includes.h +++ b/include/ntop_includes.h @@ -84,7 +84,6 @@ #include #include #include -#include #include #include #include @@ -128,6 +127,7 @@ extern "C" { #ifdef HAVE_ZLIB #include #endif +#include #include "third-party/uthash.h" diff --git a/scripts/lua/about.lua b/scripts/lua/about.lua index b3c463f1c5..639e144ba7 100644 --- a/scripts/lua/about.lua +++ b/scripts/lua/about.lua @@ -119,6 +119,8 @@ if (ndpi_ver ~= nil) then end end +print("cURL"..info["version.curl"].."\n") + print(" Twitter Bootstrap3.x\n") print(" Font Awesome4.x\n") print("RRDtool"..info["version.rrd"].."\n") diff --git a/src/Lua.cpp b/src/Lua.cpp index fd4bc84797..0726cfdfb0 100644 --- a/src/Lua.cpp +++ b/src/Lua.cpp @@ -5280,6 +5280,7 @@ static int ntop_get_info(lua_State* vm) { lua_push_str_table_entry(vm, "version.redis", ntop->getRedis()->getVersion()); lua_push_str_table_entry(vm, "version.httpd", (char*)mg_version()); lua_push_str_table_entry(vm, "version.git", (char*)NTOPNG_GIT_RELEASE); + lua_push_str_table_entry(vm, "version.curl", LIBCURL_VERSION); lua_push_str_table_entry(vm, "version.luajit", (char*)LUAJIT_VERSION); #ifdef HAVE_GEOIP lua_push_str_table_entry(vm, "version.geoip", (char*)GeoIP_lib_version()); diff --git a/src/NetworkInterface.cpp b/src/NetworkInterface.cpp index 1398c3a836..6ca048bcc1 100644 --- a/src/NetworkInterface.cpp +++ b/src/NetworkInterface.cpp @@ -1992,9 +1992,9 @@ bool NetworkInterface::dissectPacket(u_int32_t bridge_iface_idx, if(h->len > ifMTU) { if(!mtuWarningShown) { - ntop->getTrace()->traceEvent(TRACE_NORMAL, "Invalid packet received [len: %u][max-len: %u].", h->len, ifMTU); - ntop->getTrace()->traceEvent(TRACE_WARNING, "If you have TSO/GRO enabled, please disable it"); #ifdef __linux__ + ntop->getTrace()->traceEvent(TRACE_NORMAL, "Invalid packet received [len: %u][max len: %u].", h->len, ifMTU); + ntop->getTrace()->traceEvent(TRACE_WARNING, "If you have TSO/GRO enabled, please disable it"); ntop->getTrace()->traceEvent(TRACE_WARNING, "Use sudo ethtool -K %s gro off gso off tso off", ifname); #endif mtuWarningShown = true; diff --git a/src/Utils.cpp b/src/Utils.cpp index 5d417d63cd..49a3fc8455 100755 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -26,9 +26,6 @@ #include #endif -#include -#include - // A simple struct for strings. typedef struct { char *s;