Merge branch 'numeronove-dev-numeronove-openbsd' into dev

This commit is contained in:
Campus
2017-02-13 13:16:14 +01:00
2 changed files with 3 additions and 0 deletions
+1
View File
@@ -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 :
+2
View File
@@ -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 :