scottk/nDPId
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/nDPId.git synced 2025-11-02 11:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed DISABLE_JSMN define for c-json-stdout (built-in per default).

Browse Source 
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2020-09-26 00:44:29 +02:00
parent d3bb1ccf33
commit adce2272dc
2 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile
View File

@@ -1,5 +1,6 @@
CC = gcc CC = gcc
PROJECT_CFLAGS += -Wall -Wextra $(EXTRA_CFLAGS) -I. PROJECT_CFLAGS += -Wall -Wextra $(EXTRA_CFLAGS) -I.
JSMN_CFLAGS := -DJSMN_STATIC=1 -DJSMN_STRICT=1 -Icontrib/jsmn
LIBS += -pthread -lpcap -lm LIBS += -pthread -lpcap -lm
GOCC = go GOCC = go
@@ -61,10 +62,6 @@ else
ENABLE_SANITIZER_THREAD = no ENABLE_SANITIZER_THREAD = no
endif endif
ifneq ($(DISABLE_JSMN),yes)
DISABLE_JSMN = no
endif
GO_DASHBOARD_SRCS := examples/go-dashboard/main.go examples/go-dashboard/ui/ui.go GO_DASHBOARD_SRCS := examples/go-dashboard/main.go examples/go-dashboard/ui/ui.go
RM = rm -f RM = rm -f
@@ -80,11 +77,7 @@ nDPIsrvd: nDPIsrvd.c utils.c
$(CC) $(PROJECT_CFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS) $(CC) $(PROJECT_CFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS)
examples/c-json-stdout/c-json-stdout: examples/c-json-stdout/c-json-stdout.c examples/c-json-stdout/c-json-stdout: examples/c-json-stdout/c-json-stdout.c
ifneq ($(DISABLE_JSMN),yes) $(CC) $(PROJECT_CFLAGS) $(CFLAGS) $(JSMN_CFLAGS) $@.c -o $@ $(LDFLAGS) $(LIBS)
$(CC) $(PROJECT_CFLAGS) $(CFLAGS) -DJSMN_STATIC=1 -DJSMN_STRICT=1 -DUSE_JSON=1 $@.c -o $@ $(LDFLAGS) $(LIBS)
else
$(CC) $(PROJECT_CFLAGS) $(CFLAGS) $@.c -o $@ $(LDFLAGS) $(LIBS)
endif
examples/go-dashboard/go-dashboard: $(GO_DASHBOARD_SRCS) examples/go-dashboard/go-dashboard: $(GO_DASHBOARD_SRCS)
ifneq ($(GOCC),) ifneq ($(GOCC),)
@@ -97,24 +90,23 @@ clean:
help: help:
@echo '------------------------------------' @echo '------------------------------------'
@echo 'PKG_CONFIG_BIN = $(PKG_CONFIG_BIN)' @echo 'PKG_CONFIG_BIN = $(PKG_CONFIG_BIN)'
@echo 'PKG_CONFIG_PREFIX = $(PKG_CONFIG_PREFIX)' @echo 'PKG_CONFIG_PREFIX = $(PKG_CONFIG_PREFIX)'
@echo 'PC_CFLAGS = $(PC_CFLAGS)' @echo 'PC_CFLAGS = $(PC_CFLAGS)'
@echo 'PC_LDFLAGS = $(PC_LDFLAGS)' @echo 'PC_LDFLAGS = $(PC_LDFLAGS)'
@echo 'CC = $(CC)' @echo 'CC = $(CC)'
@echo 'CFLAGS = $(CFLAGS)' @echo 'CFLAGS = $(CFLAGS)'
@echo 'LDFLAGS = $(LDFLAGS)' @echo 'LDFLAGS = $(LDFLAGS)'
@echo 'PROJECT_CFLAGS = $(PROJECT_CFLAGS)' @echo 'PROJECT_CFLAGS = $(PROJECT_CFLAGS)'
@echo 'LIBS = $(LIBS)' @echo 'LIBS = $(LIBS)'
@echo 'GOCC = $(GOCC)' @echo 'GOCC = $(GOCC)'
@echo 'GOFLAGS = $(GOFLAGS)' @echo 'GOFLAGS = $(GOFLAGS)'
@echo 'CUSTOM_LIBNDPI = $(CUSTOM_LIBNDPI)' @echo 'CUSTOM_LIBNDPI = $(CUSTOM_LIBNDPI)'
@echo 'NDPI_WITH_GCRYPT = $(NDPI_WITH_GCRYPT)' @echo 'NDPI_WITH_GCRYPT = $(NDPI_WITH_GCRYPT)'
@echo 'NDPI_WITH_PCRE = $(NDPI_WITH_PCRE)' @echo 'NDPI_WITH_PCRE = $(NDPI_WITH_PCRE)'
@echo 'ENABLE_DEBUG = $(ENABLE_DEBUG)' @echo 'ENABLE_DEBUG = $(ENABLE_DEBUG)'
@echo 'ENABLE_SANITIZER = $(ENABLE_SANITIZER)' @echo 'ENABLE_SANITIZER = $(ENABLE_SANITIZER)'
@echo 'ENABLE_SANITIZER_THREAD = $(ENABLE_SANITIZER_THREAD)' @echo 'ENABLE_SANITIZER_THREAD = $(ENABLE_SANITIZER_THREAD)'
@echo 'DISABLE_JSMN = $(DISABLE_JSMN)'
@echo '------------------------------------' @echo '------------------------------------'
.PHONY: all clean help .PHONY: all clean help

10
examples/c-json-stdout/c-json-stdout.c
View File

@@ -8,9 +8,7 @@
#include <unistd.h> #include <unistd.h>
#include "config.h" #include "config.h"
#ifdef USE_JSON #include "jsmn.h"
#include "jsmn/jsmn.h"
#endif
static char serv_listen_addr[INET_ADDRSTRLEN] = DISTRIBUTOR_HOST; static char serv_listen_addr[INET_ADDRSTRLEN] = DISTRIBUTOR_HOST;
static uint16_t serv_listen_port = DISTRIBUTOR_PORT; static uint16_t serv_listen_port = DISTRIBUTOR_PORT;
@@ -24,10 +22,8 @@ int main(void)
size_t buf_used = 0; size_t buf_used = 0;
size_t json_start = 0; size_t json_start = 0;
unsigned long long int json_bytes = 0; unsigned long long int json_bytes = 0;
#ifdef USE_JSON
jsmn_parser parser; jsmn_parser parser;
jsmntok_t tokens[128]; jsmntok_t tokens[128];
#endif
if (sockfd < 0) if (sockfd < 0)
{ {
@@ -100,7 +96,6 @@ int main(void)
exit(1); exit(1);
} }
#ifdef USE_JSON
int r; int r;
jsmn_init(&parser); jsmn_init(&parser);
r = jsmn_parse(&parser, r = jsmn_parse(&parser,
@@ -127,9 +122,6 @@ int main(void)
} }
} }
printf("EoF\n"); printf("EoF\n");
#else
printf("RECV[%llu,%zd]: '%.*s'\n\n", buf_wanted, bytes_read, (int)buf_wanted, buf);
#endif
memmove(buf, buf + json_bytes, buf_used - json_bytes); memmove(buf, buf + json_bytes, buf_used - json_bytes);
buf_used -= json_bytes; buf_used -= json_bytes;