upgrade to libnids 1.20; fixes crashing with TCP options parsing.

This commit is contained in:
brad 2006-01-29 21:27:52 +00:00
parent 034bfba19f
commit 75f54a77ea
3 changed files with 16 additions and 17 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.25 2005/10/15 03:21:12 brad Exp $
# $OpenBSD: Makefile,v 1.26 2006/01/29 21:27:52 brad Exp $
COMMENT= "network monitoring library with TCP/IP reassembly"
DISTNAME= libnids-1.18
PKGNAME= ${DISTNAME}p1
DISTNAME= libnids-1.20
CATEGORIES= net
MASTER_SITES= http://www.packetfactory.net/projects/libnids/dist/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libnids/}
HOMEPAGE= http://www.packetfactory.net/projects/libnids/

View File

@ -1,4 +1,4 @@
MD5 (libnids-1.18.tar.gz) = 9ee6dcdfac97bae6fe611aa27d2594a5
RMD160 (libnids-1.18.tar.gz) = b33ba8237ba0bb31d2515bd5b7552449cfcca8f3
SHA1 (libnids-1.18.tar.gz) = 3494e614e5e5d2f60f2ffe738307e60e77e04a81
SIZE (libnids-1.18.tar.gz) = 114013
MD5 (libnids-1.20.tar.gz) = a36cbd45cbada12420ecc8f82a7e0852
RMD160 (libnids-1.20.tar.gz) = 896562288dd43cc7789974ee0fd54f9e68e09449
SHA1 (libnids-1.20.tar.gz) = bafbe6529430cce2496dbb086b17caa0076368e1
SIZE (libnids-1.20.tar.gz) = 119226

View File

@ -1,23 +1,23 @@
$OpenBSD: patch-src_libnids_c,v 1.1 2005/10/15 03:21:13 brad Exp $
--- src/libnids.c.orig Fri Oct 10 13:41:32 2003
+++ src/libnids.c Fri Oct 14 22:58:32 2005
@@ -198,6 +198,7 @@ static void pcap_hand(u_char * par, stru
break;
$OpenBSD: patch-src_libnids_c,v 1.2 2006/01/29 21:27:52 brad Exp $
--- src/libnids.c.orig Sat Jan 29 05:03:24 2005
+++ src/libnids.c Sun Jan 29 13:43:53 2006
@@ -214,6 +214,7 @@ static void pcap_hand(u_char * par, stru
#endif
#ifdef DLT_IEEE802_11
case DLT_IEEE802_11:
+ case DLT_IEEE802_11_RADIO:
/* I don't know why frame control is always little endian, but it
* works for tcpdump, so who am I to complain? (wam)
*/
@@ -441,6 +442,7 @@ int nids_init()
switch ((linktype = pcap_datalink(desc))) {
#ifdef DLT_IEEE802_11
@@ -462,6 +463,7 @@ int nids_init()
case DLT_PRISM_HEADER:
#endif
case DLT_IEEE802_11:
+ case DLT_IEEE802_11_RADIO:
/* wireless, need to calculate offset per frame */
break;
#endif
@@ -448,7 +450,12 @@ int nids_init()
@@ -469,7 +471,12 @@ int nids_init()
case DLT_NULL:
linkoffset = 4;
break;