diff options
| author | Campus <campus@ntop.org> | 2017-02-13 13:16:14 +0100 |
|---|---|---|
| committer | Campus <campus@ntop.org> | 2017-02-13 13:16:14 +0100 |
| commit | 5c1c8b80e2bb9911f774c6f6e098de3cd4973e2d (patch) | |
| tree | 0b7407a7b45fc119cf1c7d72c336d366d3fc8462 | |
| parent | 363b38ceb015530fa1f054c24ebe6c55483e64c1 (diff) | |
| parent | 787ca096e61ade2f5870139cfefd93f962637217 (diff) | |
Merge branch 'numeronove-dev-numeronove-openbsd' into dev
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | example/ndpi_util.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 0e46e15aa..239187360 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects]) LT_INIT AC_PROG_CC +AM_PROG_CC_C_O AX_PTHREAD if test -d ".git"; then : diff --git a/example/ndpi_util.c b/example/ndpi_util.c index 3397d8a92..09b8c58b6 100644 --- a/example/ndpi_util.c +++ b/example/ndpi_util.c @@ -662,10 +662,12 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow, break; /* Linux Cooked Capture - 113 */ +#ifdef __linux__ case DLT_LINUX_SLL : type = (packet[eth_offset+14] << 8) + packet[eth_offset+15]; ip_offset = 16 + eth_offset; break; +#endif /* Radiotap link-layer - 127 */ case DLT_IEEE802_11_RADIO : |