fix after removal of DLT_OLD_PFLOG; from Markus Lude <markus.lude@gmx.de>

This commit is contained in:
naddy 2010-07-10 23:18:58 +00:00
parent 8747197419
commit b083429753
3 changed files with 18 additions and 12 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2009/01/27 01:01:16 sthen Exp $ # $OpenBSD: Makefile,v 1.6 2010/07/10 23:18:58 naddy Exp $
COMMENT= IP traffic summarizer COMMENT= IP traffic summarizer
DISTNAME= ipaudit-0.95 DISTNAME= ipaudit-0.95
PKGNAME= ${DISTNAME}p0 REVISION= 1
CATEGORIES= net sysutils CATEGORIES= net sysutils
HOMEPAGE= http://ipaudit.sourceforge.net/ HOMEPAGE= http://ipaudit.sourceforge.net/

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_hash_c,v 1.1 2010/07/10 23:18:58 naddy Exp $
--- src/hash.c.orig Sun Jul 11 01:16:00 2010
+++ src/hash.c Sun Jul 11 01:16:13 2010
@@ -37,6 +37,7 @@ Include files
*/
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "hash.h"

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_ipaudit_c,v 1.1 2009/01/27 01:01:16 sthen Exp $ $OpenBSD: patch-src_ipaudit_c,v 1.2 2010/07/10 23:18:58 naddy Exp $
--- src/ipaudit.c.orig Thu Jan 25 21:04:00 2001 --- src/ipaudit.c.orig Thu Jan 25 22:04:00 2001
+++ src/ipaudit.c Tue Jan 27 00:36:02 2009 +++ src/ipaudit.c Thu Jul 8 15:58:01 2010
@@ -40,6 +40,8 @@ Include Files @@ -40,6 +40,8 @@ Include Files
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -24,7 +24,7 @@ $OpenBSD: patch-src_ipaudit_c,v 1.1 2009/01/27 01:01:16 sthen Exp $
/* /*
------------------------------------------------------------------------ ------------------------------------------------------------------------
@@ -434,6 +442,18 @@ if (debug_m) { @@ -434,6 +442,16 @@ if (debug_m) {
printf ("DataLinkType = %s\n", "DLT_RAW"); break; printf ("DataLinkType = %s\n", "DLT_RAW"); break;
case DLT_ATM_RFC1483: case DLT_ATM_RFC1483:
printf ("DataLinkType = %s\n", "DLT_ATM_RFC1483"); break; printf ("DataLinkType = %s\n", "DLT_ATM_RFC1483"); break;
@ -34,8 +34,6 @@ $OpenBSD: patch-src_ipaudit_c,v 1.1 2009/01/27 01:01:16 sthen Exp $
+ printf ("DataLinkType = %s\n", "DLT_ENC"); break; + printf ("DataLinkType = %s\n", "DLT_ENC"); break;
+ case DLT_PPP_ETHER: + case DLT_PPP_ETHER:
+ printf ("DataLinkType = %s\n", "DLT_PPP_ETHER"); break; + printf ("DataLinkType = %s\n", "DLT_PPP_ETHER"); break;
+ case DLT_OLD_PFLOG:
+ printf ("DataLinkType = %s\n", "DLT_OLD_PFLOG"); break;
+ case DLT_PFLOG: + case DLT_PFLOG:
+ printf ("DataLinkType = %s\n", "DLT_PFLOG"); break; + printf ("DataLinkType = %s\n", "DLT_PFLOG"); break;
+ case DLT_PFSYNC: + case DLT_PFSYNC:
@ -43,7 +41,7 @@ $OpenBSD: patch-src_ipaudit_c,v 1.1 2009/01/27 01:01:16 sthen Exp $
default: default:
printf ("DataLinkType = %d\n", DataLinkType); printf ("DataLinkType = %d\n", DataLinkType);
} }
@@ -1278,6 +1298,22 @@ int get_packetoffset (int DataLinkType) { @@ -1278,6 +1296,19 @@ int get_packetoffset (int DataLinkType) {
case DLT_NULL: case DLT_NULL:
PacketOffset = POFF_NULL; PacketOffset = POFF_NULL;
break; break;
@ -54,9 +52,6 @@ $OpenBSD: patch-src_ipaudit_c,v 1.1 2009/01/27 01:01:16 sthen Exp $
+ case DLT_PPP_ETHER: + case DLT_PPP_ETHER:
+ PacketOffset = 8; + PacketOffset = 8;
+ break; + break;
+ case DLT_OLD_PFLOG:
+ PacketOffset = 28;
+ break;
+ case DLT_ENC: + case DLT_ENC:
+ PacketOffset = ENC_HDRLEN; + PacketOffset = ENC_HDRLEN;
+ break; + break;