From 4d7fd493790c24aea8b02c8a3f430869115e6719 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 28 Jul 2017 15:42:51 +0800 Subject: ntop: add new recipe ntop is a tool that shows the network usage, similar to what the popular top Unix command does. ntop is based on pcapture and it has been written in a portable way in order to virtually run on every Unix platform. Signed-off-by: Yi Zhao Signed-off-by: Martin Jansa --- .../ntop/ntop/use-static-inline.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 meta-networking/recipes-support/ntop/ntop/use-static-inline.patch (limited to 'meta-networking/recipes-support/ntop/ntop/use-static-inline.patch') diff --git a/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch b/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch new file mode 100644 index 0000000000..2b001c13e8 --- /dev/null +++ b/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch @@ -0,0 +1,32 @@ +[PATCH] replace 'inline' with 'static inline' for gcc 5.x + +gcc 5.x defaults to -std=gnu11 instead of -std=gnu89 which change +the semantics for inline functions and the standalone 'inline' +causes error with "gcc5 -g -o0" + +Replace inline with static inline to be compatible with both gcc 4 +and 5. + +Upstream-status: Pending + +Signed-off-by: Roy Li +--- + nDPI/src/lib/protocols/ssl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nDPI/src/lib/protocols/ssl.c b/nDPI/src/lib/protocols/ssl.c +index 245b8c3..72beda9 100644 +--- a/nDPI/src/lib/protocols/ssl.c ++++ b/nDPI/src/lib/protocols/ssl.c +@@ -39,7 +39,7 @@ static void ipoque_int_ssl_add_connection(struct ipoque_detection_module_struct + + #ifdef HAVE_NTOP + #ifndef WIN32 +-inline int min(int a, int b) { return(a < b ? a : b); } ++static inline int min(int a, int b) { return(a < b ? a : b); } + #endif + + static void stripCertificateTrailer(char *buffer, int buffer_len) { +-- +1.9.1 + -- cgit 1.2.3-korg