Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit libpcap
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 09 Jan 2008 21:43:01 +0100
  • Message-id: <20080109204301.6F36F678335@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libpcap
checked in at Wed Jan 9 21:43:01 CET 2008.

--------
--- libpcap/libpcap.changes 2007-07-26 15:59:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/libpcap/libpcap.changes 2008-01-08
17:51:59.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Jan 8 17:44:31 CET 2008 - prusnak@xxxxxxx
+
+- update to 0.9.8
+ * Change build process to put public libpcap headers into pcap subdir
+ * DLT: Add value for IPMI IPMB packets
+ * DLT: Add value for u10 Networks boards
+ * Require <net/pfvar.h> for pf definitions - allows reading of pflog
+ formatted libpcap files on an OS other than where the file was generated
+- added pcap-bpf.patch
+ * add two structs needed for tahi testsuite
+
+-------------------------------------------------------------------

Old:
----
libpcap-0.9.7-config.diff
libpcap-0.9.7-filter-fix.diff
libpcap-0.9.7-shared.diff
libpcap-0.9.7-socket-timeout.diff
libpcap-0.9.7.tar.bz2

New:
----
libpcap-0.9.8-config.diff
libpcap-0.9.8-filter-fix.diff
libpcap-0.9.8-pcap-bpf.patch
libpcap-0.9.8-shared.diff
libpcap-0.9.8-socket-timeout.diff
libpcap-0.9.8.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libpcap.spec ++++++
--- /var/tmp/diff_new_pack.k29837/_old 2008-01-09 21:41:28.000000000 +0100
+++ /var/tmp/diff_new_pack.k29837/_new 2008-01-09 21:41:28.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libpcap (Version 0.9.7)
+# spec file for package libpcap (Version 0.9.8)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,18 +12,19 @@

Name: libpcap
BuildRequires: bison flex
-Version: 0.9.7
+Version: 0.9.8
Release: 1
-Autoreqprov: on
+AutoReqProv: on
Group: System/Libraries
License: BSD 3-Clause
-URL: http://www.tcpdump.org/
+Url: http://www.tcpdump.org/
Summary: A Library for Network Sniffers
Source: %{name}-%{version}.tar.bz2
Patch0: %{name}-%{version}-shared.diff
Patch1: %{name}-%{version}-filter-fix.diff
Patch2: %{name}-%{version}-config.diff
Patch3: %{name}-%{version}-socket-timeout.diff
+Patch4: %{name}-%{version}-pcap-bpf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -80,6 +81,7 @@
%patch1
%patch2
%patch3
+%patch4

%build
%{suse_update_config -f}
@@ -119,6 +121,15 @@
%{_libdir}/*.*a

%changelog
+* Tue Jan 08 2008 - prusnak@xxxxxxx
+- update to 0.9.8
+ * Change build process to put public libpcap headers into pcap subdir
+ * DLT: Add value for IPMI IPMB packets
+ * DLT: Add value for u10 Networks boards
+ * Require <net/pfvar.h> for pf definitions - allows reading of pflog
+ formatted libpcap files on an OS other than where the file was generated
+- added pcap-bpf.patch
+ * add two structs needed for tahi testsuite
* Thu Jul 26 2007 - prusnak@xxxxxxx
- updated to 0.9.7
* added flags/configuration for cloning bpf device.

++++++ libpcap-0.9.7-config.diff -> libpcap-0.9.8-config.diff ++++++
--- libpcap/libpcap-0.9.7-config.diff 2007-05-02 16:38:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/libpcap/libpcap-0.9.8-config.diff
2008-01-08 17:56:29.000000000 +0100
@@ -1,6 +1,15 @@
--- configure.in
+++ configure.in
-@@ -56,7 +56,7 @@
+@@ -8,7 +8,7 @@
+
+ AC_REVISION($Revision: 1.120.2.13 $)
+ AC_PREREQ(2.50)
+-AC_INIT([libpcap], [0.9.7])
++AC_INIT([libpcap], [0.9.8])
+ AC_CONFIG_SRCDIR([pcap.c])
+
+ AC_CANONICAL_SYSTEM
+@@ -59,7 +59,7 @@
AC_CHECK_FUNCS(vsnprintf snprintf,,
[needsnprintf=yes])
if test $needsnprintf = yes; then

++++++ libpcap-0.9.7-filter-fix.diff -> libpcap-0.9.8-filter-fix.diff ++++++

++++++ libpcap-0.9.8-pcap-bpf.patch ++++++
--- pcap-bpf.h
+++ pcap-bpf.h
@@ -84,6 +84,25 @@
#define BPF_MINBUFSIZE 32

/*
+ * Struct returned by BIOCGSTATS.
+ */
+struct bpf_stat {
+ u_int bs_recv; /* number of packets received */
+ u_int bs_drop; /* number of packets dropped */
+};
+
+/*
+ * Structure prepended to each packet.
+ */
+struct bpf_hdr {
+ struct timeval bh_tstamp; /* time stamp */
+ bpf_u_int32 bh_caplen; /* length of captured portion */
+ bpf_u_int32 bh_datalen; /* original length of packet */
+ u_short bh_hdrlen; /* length of bpf header (this struct
+ plus alignment padding) */
+};
+
+/*
* Structure for "pcap_compile()", "pcap_setfilter()", etc..
*/
struct bpf_program {
++++++ libpcap-0.9.7-shared.diff -> libpcap-0.9.8-shared.diff ++++++

++++++ libpcap-0.9.7-socket-timeout.diff -> libpcap-0.9.8-socket-timeout.diff
++++++
--- libpcap/libpcap-0.9.7-socket-timeout.diff 2007-07-12 10:57:44.000000000
+0200
+++ /mounts/work_src_done/STABLE/libpcap/libpcap-0.9.8-socket-timeout.diff
2008-01-08 17:56:29.000000000 +0100
@@ -1,6 +1,6 @@
--- pcap-linux.c
+++ pcap-linux.c
-@@ -1594,6 +1593,18 @@
+@@ -1595,6 +1595,18 @@
}
}


++++++ libpcap-0.9.7.tar.bz2 -> libpcap-0.9.8.tar.bz2 ++++++
++++ 10376 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/CHANGES new/libpcap-0.9.8/CHANGES
--- old/libpcap-0.9.7/CHANGES 2007-07-24 04:27:32.000000000 +0200
+++ new/libpcap-0.9.8/CHANGES 2007-09-26 04:09:45.000000000 +0200
@@ -1,4 +1,11 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.11 2007/07/24 02:27:32
mcr Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.13 2007/09/12 22:40:04
ken Exp $ (LBL)
+
+Mon. September 10, 2007. ken@xxxxxxxxxxxxxx Summary for 0.9.8 libpcap
release
+ Change build process to put public libpcap headers into pcap subir
+ DLT: Add value for IPMI IPMB packets
+ DLT: Add value for u10 Networks boards
+ Require <net/pfvar.h> for pf definitions - allows reading of pflog
formatted
+ libpcap files on an OS other than where the file was generated

Wed. July 23, 2007. mcr@xxxxxxxxxxxxxx Summary for 0.9.7 libpcap release

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/config.h.in new/libpcap-0.9.8/config.h.in
--- old/libpcap-0.9.7/config.h.in 2007-07-05 15:55:59.000000000 +0200
+++ new/libpcap-0.9.8/config.h.in 2007-09-26 04:09:45.000000000 +0200
@@ -56,6 +56,9 @@
/* Define to 1 if you have the <netinet/if_ether.h> header file. */
#undef HAVE_NETINET_IF_ETHER_H

+/* Define to 1 if you have the <net/pfvar.h> header file. */
+#undef HAVE_NET_PFVAR_H
+
/* if there's an os_proto.h */
#undef HAVE_OS_PROTO_H

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/configure.in new/libpcap-0.9.8/configure.in
--- old/libpcap-0.9.7/configure.in 2007-07-05 15:56:00.000000000 +0200
+++ new/libpcap-0.9.8/configure.in 2007-09-26 04:09:46.000000000 +0200
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.120.2.12 2007/06/15
17:57:26 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.120.2.13 2007/09/12
19:17:24 guy Exp $ (LBL)
dnl
dnl Copyright (c) 1994, 1995, 1996, 1997
dnl The Regents of the University of California. All rights reserved.
@@ -6,7 +6,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl

-AC_REVISION($Revision: 1.120.2.12 $)
+AC_REVISION($Revision: 1.120.2.13 $)
AC_PREREQ(2.50)
AC_INIT(pcap.c)

@@ -27,6 +27,9 @@
dnl "AC_LBL_FIXINCLUDES" won't work on some platforms such as Solaris.
dnl
AC_CHECK_HEADERS(sys/ioccom.h sys/sockio.h limits.h paths.h)
+AC_CHECK_HEADERS(net/pfvar.h, , , [#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>])
AC_CHECK_HEADERS(netinet/if_ether.h, , , [#include <sys/types.h>
#include <sys/socket.h>])
if test "$ac_cv_header_netinet_if_ether_h" != yes; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/CREDITS new/libpcap-0.9.8/CREDITS
--- old/libpcap-0.9.7/CREDITS 2007-06-11 21:34:27.000000000 +0200
+++ new/libpcap-0.9.8/CREDITS 2007-09-26 04:09:45.000000000 +0200
@@ -66,6 +66,7 @@
Mark Pizzolato
<List-tcpdump-workers@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Martin Husemann <martin@xxxxxxxxxx>
Matthew Luckie <mjl@xxxxxxxxxxxxx>
+ Max Laier <max@xxxxxxxxxxxxxx>
Mike Kershaw <dragorn@xxxxxxxxxxxxxxxxxx>
Mike Wiacek <mike@xxxxxxxxx>
Monroe Williams <monroe@xxxxxxxxx>
@@ -82,6 +83,7 @@
Peter Jeremy <peter.jeremy@xxxxxxxxxxxxxx>
Phil Wood <cpw@xxxxxxxx>
Rafal Maszkowski <rzm@xxxxxxxxxx>
+ <rcb-isis@xxxxxxxxxxxxxxxxxxxxx>
Rick Jones <raj@xxxxxxxxxx>
Scott Barron <sb125499@xxxxxxxxx>
Scott Gifford <sgifford@xxxxxxx>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/fad-getad.c new/libpcap-0.9.8/fad-getad.c
--- old/libpcap-0.9.7/fad-getad.c 2005-04-10 20:04:49.000000000 +0200
+++ new/libpcap-0.9.8/fad-getad.c 2007-09-26 04:09:46.000000000 +0200
@@ -34,7 +34,7 @@

#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.10.2.1 2005/04/10
18:04:49 hannes Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.10.2.2 2007/09/14
00:45:17 guy Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
@@ -61,7 +61,11 @@
#endif

#ifdef AF_PACKET
-# include <linux/if_packet.h>
+# ifdef __Lynx__
+# include <netpacket/if_packet.h> /* LynxOS */
+# else
+# include <linux/if_packet.h> /* Linux */
+# endif
#endif

/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/FILES new/libpcap-0.9.8/FILES
--- old/libpcap-0.9.7/FILES 2005-07-05 22:52:06.000000000 +0200
+++ new/libpcap-0.9.8/FILES 2007-09-26 04:09:45.000000000 +0200
@@ -97,7 +97,6 @@
pcap.3
pcap.c
pcap.h
-pf.h
ppp.h
savefile.c
scanner.l
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/gencode.c new/libpcap-0.9.8/gencode.c
--- old/libpcap-0.9.7/gencode.c 2007-07-10 21:38:15.000000000 +0200
+++ new/libpcap-0.9.8/gencode.c 2007-09-26 04:09:47.000000000 +0200
@@ -21,7 +21,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.52 2007/06/22
06:43:58 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.53 2007/09/12
19:17:24 guy Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
@@ -73,7 +73,12 @@
#include "ppp.h"
#include "sll.h"
#include "arcnet.h"
-#include "pf.h"
+#ifdef HAVE_NET_PFVAR_H
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/pfvar.h>
+#include <net/if_pflog.h>
+#endif
#ifndef offsetof
#define offsetof(s, e) ((size_t)&((s *)0)->e)
#endif
@@ -1175,12 +1180,13 @@
off_nl_nosnap = 44; /* XXX - what does it do with 802.3
packets? */
return;

+#ifdef HAVE_NET_PFVAR_H
case DLT_PFLOG:
off_linktype = 0;
- /* XXX read this from pf.h? */
off_nl = PFLOG_HDRLEN;
off_nl_nosnap = PFLOG_HDRLEN; /* no 802.2 LLC */
return;
+#endif

case DLT_JUNIPER_MFR:
case DLT_JUNIPER_MLFR:
@@ -2426,6 +2432,7 @@
}
return (gen_cmp(OR_LINK, 0, BPF_W, (bpf_int32)proto));

+#ifdef HAVE_NET_PFVAR_H
case DLT_PFLOG:
/*
* af field is host byte order in contrast to the rest of
@@ -2443,6 +2450,7 @@
return gen_false();
/*NOTREACHED*/
break;
+#endif /* HAVE_NET_PFVAR_H */

case DLT_ARCNET:
case DLT_ARCNET_LINUX:
@@ -6374,10 +6382,12 @@
}
break;

+#ifdef HAVE_NET_PFVAR_H
case DLT_PFLOG:
b0 = gen_cmp(OR_LINK, offsetof(struct pfloghdr, dir), BPF_B,
(bpf_int32)((dir == 0) ? PF_IN : PF_OUT));
break;
+#endif

case DLT_PPP_PPPD:
if (dir) {
@@ -6425,6 +6435,7 @@
return (b0);
}

+#ifdef HAVE_NET_PFVAR_H
/* PF firewall log matched interface */
struct block *
gen_pf_ifname(const char *ifname)
@@ -6534,6 +6545,55 @@

return (b0);
}
+#else /* !HAVE_NET_PFVAR_H */
+struct block *
+gen_pf_ifname(const char *ifname)
+{
+ bpf_error("libpcap was compiled without pf support");
+ /* NOTREACHED */
+ return (NULL);
+}
+
+struct block *
+gen_pf_ruleset(char *ruleset)
+{
+ bpf_error("libpcap was compiled on a machine without pf support");
+ /* NOTREACHED */
+ return (NULL);
+}
+
+struct block *
+gen_pf_rnr(int rnr)
+{
+ bpf_error("libpcap was compiled on a machine without pf support");
+ /* NOTREACHED */
+ return (NULL);
+}
+
+struct block *
+gen_pf_srnr(int srnr)
+{
+ bpf_error("libpcap was compiled on a machine without pf support");
+ /* NOTREACHED */
+ return (NULL);
+}
+
+struct block *
+gen_pf_reason(int reason)
+{
+ bpf_error("libpcap was compiled on a machine without pf support");
+ /* NOTREACHED */
+ return (NULL);
+}
+
+struct block *
+gen_pf_action(int action)
+{
+ bpf_error("libpcap was compiled on a machine without pf support");
+ /* NOTREACHED */
+ return (NULL);
+}
+#endif /* HAVE_NET_PFVAR_H */

struct block *
gen_acode(eaddr, q)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/grammar.y new/libpcap-0.9.8/grammar.y
--- old/libpcap-0.9.7/grammar.y 2007-06-11 21:34:27.000000000 +0200
+++ new/libpcap-0.9.8/grammar.y 2007-09-26 04:09:47.000000000 +0200
@@ -22,7 +22,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.86.2.8 2007/06/11
09:52:04 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.86.2.9 2007/09/12
19:17:25 guy Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
@@ -52,7 +52,11 @@
#include "pcap-int.h"

#include "gencode.h"
-#include "pf.h"
+#ifdef HAVE_NET_PFVAR_H
+#include <net/if.h>
+#include <net/pfvar.h>
+#include <net/if_pflog.h>
+#endif
#include <pcap-namedb.h>

#ifdef HAVE_OS_PROTO_H
@@ -85,6 +89,50 @@
}
#endif

+#ifdef HAVE_NET_PFVAR_H
+static int
+pfreason_to_num(const char *reason)
+{
+ const char *reasons[] = PFRES_NAMES;
+ int i;
+
+ for (i = 0; reasons[i]; i++) {
+ if (pcap_strcasecmp(reason, reasons[i]) == 0)
+ return (i);
+ }
+ bpf_error("unknown PF reason");
+ /*NOTREACHED*/
+}
+
+static int
+pfaction_to_num(const char *action)
+{
+ if (pcap_strcasecmp(action, "pass") == 0 ||
+ pcap_strcasecmp(action, "accept") == 0)
+ return (PF_PASS);
+ else if (pcap_strcasecmp(action, "drop") == 0 ||
+ pcap_strcasecmp(action, "block") == 0)
+ return (PF_DROP);
+ else {
+ bpf_error("unknown PF action");
+ /*NOTREACHED*/
+ }
+}
+#else /* !HAVE_NET_PFVAR_H */
+static int
+pfreason_to_num(const char *reason)
+{
+ bpf_error("libpcap was compiled on a machine without pf support");
+ /*NOTREACHED*/
+}
+
+static int
+pfaction_to_num(const char *action)
+{
+ bpf_error("libpcap was compiled on a machine without pf support");
+ /*NOTREACHED*/
+}
+#endif /* HAVE_NET_PFVAR_H */
%}

%union {
@@ -351,28 +399,10 @@
;

reason: NUM { $$ = $1; }
- | ID { const char *reasons[] = PFRES_NAMES;
- int i;
- for (i = 0; reasons[i]; i++) {
- if (pcap_strcasecmp($1, reasons[i])
== 0) {
- $$ = i;
- break;
- }
- }
- if (reasons[i] == NULL)
- bpf_error("unknown PF reason");
- }
+ | ID { $$ = pfreason_to_num($1); }
;

-action: ID { if (pcap_strcasecmp($1, "pass") == 0
||
- pcap_strcasecmp($1, "accept") == 0)
- $$ = PF_PASS;
- else if (pcap_strcasecmp($1, "drop") == 0 ||
- pcap_strcasecmp($1, "block") == 0)
- $$ = PF_DROP;
- else
- bpf_error("unknown PF action");
- }
+action: ID { $$ = pfaction_to_num($1); }
;

relop: '>' { $$ = BPF_JGT; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/INSTALL.txt new/libpcap-0.9.8/INSTALL.txt
--- old/libpcap-0.9.7/INSTALL.txt 2005-07-05 22:52:06.000000000 +0200
+++ new/libpcap-0.9.8/INSTALL.txt 2007-09-26 04:09:45.000000000 +0200
@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.1 2005/06/20
21:30:14 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.2 2007/09/12
19:17:24 guy Exp $ (LBL)

To build libpcap, run "./configure" (a shell script). The configure
script will determine your system attributes and generate an
@@ -373,7 +373,6 @@
pcap.3 - manual entry
pcap.c - pcap utility routines
pcap.h - public libpcap definitions
-pf.h - OpenBSD DLT_PFLOG definitions
ppp.h - Point to Point Protocol definitions
rawss7.h - information on DLT_ types for SS7
savefile.c - offline support
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/optimize.c new/libpcap-0.9.8/optimize.c
--- old/libpcap-0.9.7/optimize.c 2007-07-24 00:29:05.000000000 +0200
+++ new/libpcap-0.9.8/optimize.c 2007-09-26 04:09:47.000000000 +0200
@@ -22,7 +22,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.85.2.2 2007/07/15
19:55:04 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.85.2.3 2007/09/12
21:29:45 guy Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
@@ -1972,7 +1972,7 @@
*/
unMarkAll();
n = count_blocks(root);
- blocks = (struct block **)malloc(n * sizeof(*blocks));
+ blocks = (struct block **)calloc(n, sizeof(*blocks));
if (blocks == NULL)
bpf_error("malloc");
unMarkAll();
@@ -1980,14 +1980,14 @@
number_blks_r(root);

n_edges = 2 * n_blocks;
- edges = (struct edge **)malloc(n_edges * sizeof(*edges));
+ edges = (struct edge **)calloc(n_edges, sizeof(*edges));
if (edges == NULL)
bpf_error("malloc");

/*
* The number of levels is bounded by the number of nodes.
*/
- levels = (struct block **)malloc(n_blocks * sizeof(*levels));
+ levels = (struct block **)calloc(n_blocks, sizeof(*levels));
if (levels == NULL)
bpf_error("malloc");

@@ -2034,8 +2034,8 @@
* we'll need.
*/
maxval = 3 * max_stmts;
- vmap = (struct vmapinfo *)malloc(maxval * sizeof(*vmap));
- vnode_base = (struct valnode *)malloc(maxval * sizeof(*vnode_base));
+ vmap = (struct vmapinfo *)calloc(maxval, sizeof(*vmap));
+ vnode_base = (struct valnode *)calloc(maxval, sizeof(*vnode_base));
if (vmap == NULL || vnode_base == NULL)
bpf_error("malloc");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/pcap-bpf.h new/libpcap-0.9.8/pcap-bpf.h
--- old/libpcap-0.9.7/pcap-bpf.h 2007-07-24 00:29:05.000000000 +0200
+++ new/libpcap-0.9.8/pcap-bpf.h 2007-09-26 04:09:47.000000000 +0200
@@ -37,7 +37,7 @@
*
* @(#)bpf.h 7.1 (Berkeley) 5/7/91
*
- * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.34.2.20 2007/07/19
06:20:53 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.34.2.24 2007/09/19
02:52:12 guy Exp $ (LBL)
*/

/*
@@ -132,7 +132,7 @@
#define DLT_AX25 3 /* Amateur Radio AX.25 */
#define DLT_PRONET 4 /* Proteon ProNET Token Ring */
#define DLT_CHAOS 5 /* Chaos */
-#define DLT_IEEE802 6 /* IEEE 802 Networks */
+#define DLT_IEEE802 6 /* 802.5 Token Ring */
#define DLT_ARCNET 7 /* ARCNET, with BSD-style header */
#define DLT_SLIP 8 /* Serial Line IP */
#define DLT_PPP 9 /* Point-to-point Protocol */
@@ -707,6 +707,40 @@
*/
#define DLT_SITA 196

+/*
+ * Various link-layer types, with a pseudo-header, for Endace DAG cards;
+ * encapsulates Endace ERF records. Requested by Stephen Donnelly
+ * <stephen@xxxxxxxxxx>.
+ */
+#define DLT_ERF 197
+
+/*
+ * Special header prepended to Ethernet packets when capturing from a
+ * u10 Networks board. Requested by Phil Mulholland
+ * <phil@xxxxxxxxxxxxxxx>.
+ */
+#define DLT_RAIF1 198
+
+/*
+ * IPMB packet for IPMI, beginning with the I2C slave address, followed
+ * by the netFn and LUN, etc.. Requested by Chanthy Toeung
+ * <chanthy.toeung@xxxxxxxxxxxxxx>.
+ */
+#define DLT_IPMB 199
+
+/*
+ * Juniper-private data link type, as per request from
+ * Hannes Gredler <hannes@xxxxxxxxxxx>.
+ * The DLT_ is used for capturing data on a secure tunnel interface.
+ */
+#define DLT_JUNIPER_ST 200
+
+/*
+ * Bluetooth HCI UART transport layer (part H:4), with pseudo-header
+ * that includes direction information; requested by Paolo Abeni.
+ */
+#define DLT_BLUETOOTH_HCI_H4_WITH_PHDR 201
+

/*
* The instruction encodings.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/pcap.c new/libpcap-0.9.8/pcap.c
--- old/libpcap-0.9.7/pcap.c 2007-07-05 15:56:01.000000000 +0200
+++ new/libpcap-0.9.8/pcap.c 2007-09-26 04:09:47.000000000 +0200
@@ -33,7 +33,7 @@

#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.17 2007/06/22
06:43:58 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.19 2007/09/19
02:50:52 guy Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
@@ -240,7 +240,7 @@
**dlt_buffer = p->linktype;
return (1);
} else {
- *dlt_buffer = (int*)malloc(sizeof(**dlt_buffer) * p->dlt_count);
+ *dlt_buffer = (int*)calloc(sizeof(**dlt_buffer), p->dlt_count);
if (*dlt_buffer == NULL) {
(void)snprintf(p->errbuf, sizeof(p->errbuf),
"malloc: %s", pcap_strerror(errno));
@@ -817,7 +817,7 @@
#ifdef HAVE_VERSION_H
#include "version.h"
#else
-static const char pcap_version_string[] = "libpcap version 0.9.7";
+static const char pcap_version_string[] = "libpcap version 0.9.8";
#endif

#ifdef WIN32
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/pf.h new/libpcap-0.9.8/pf.h
--- old/libpcap-0.9.7/pf.h 2004-04-02 08:33:30.000000000 +0200
+++ new/libpcap-0.9.8/pf.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Hartmeier
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @(#) $Header: /tcpdump/master/libpcap/pf.h,v 1.3 2004/04/02 06:33:30 guy
Exp $ (LBL)
- */
-
-/* from $OpenBSD: pfvar.h,v 1.170 2003/08/22 21:50:34 david Exp $ */
-
-enum { PF_INOUT=0, PF_IN=1, PF_OUT=2 };
-enum { PF_PASS=0, PF_DROP=1, PF_SCRUB=2, PF_NAT=3, PF_NONAT=4,
- PF_BINAT=5, PF_NOBINAT=6, PF_RDR=7, PF_NORDR=8, PF_SYNPROXY_DROP=9 };
-
-/* Reasons code for passing/dropping a packet */
-#define PFRES_MATCH 0 /* Explicit match of a rule */
-#define PFRES_BADOFF 1 /* Bad offset for pull_hdr */
-#define PFRES_FRAG 2 /* Dropping following fragment */
-#define PFRES_SHORT 3 /* Dropping short packet */
-#define PFRES_NORM 4 /* Dropping by normalizer */
-#define PFRES_MEMORY 5 /* Dropped due to lacking mem */
-#define PFRES_MAX 6 /* total+1 */
-
-#define PFRES_NAMES { \
- "match", \
- "bad-offset", \
- "fragment", \
- "short", \
- "normalize", \
- "memory", \
- NULL \
-}
-
-#define PF_RULESET_NAME_SIZE 16
-
-/* from $OpenBSD: if_pflog.h,v 1.9 2003/07/15 20:27:27 dhartmei Exp $ */
-
-#ifndef IFNAMSIZ
-#define IFNAMSIZ 16
-#endif
-
-struct pfloghdr {
- u_int8_t length;
- u_int8_t af;
- u_int8_t action;
- u_int8_t reason;
- char ifname[IFNAMSIZ];
- char ruleset[PF_RULESET_NAME_SIZE];
- u_int32_t rulenr;
- u_int32_t subrulenr;
- u_int8_t dir;
- u_int8_t pad[3];
-};
-#define PFLOG_HDRLEN sizeof(struct pfloghdr)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/savefile.c new/libpcap-0.9.8/savefile.c
--- old/libpcap-0.9.7/savefile.c 2007-07-24 00:29:05.000000000 +0200
+++ new/libpcap-0.9.8/savefile.c 2007-09-26 04:09:47.000000000 +0200
@@ -30,7 +30,7 @@

#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.27 2007/07/19
06:20:53 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.30 2007/08/14
20:57:49 guy Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
@@ -530,6 +530,27 @@
*/
#define LINKTYPE_SITA 196

+/*
+ * Various link-layer types, with a pseudo-header, for Endace DAG cards;
+ * encapsulates Endace ERF records. Requested by Stephen Donnelly
+ * <stephen@xxxxxxxxxx>.
+ */
+#define LINKTYPE_ERF 197
+
+/*
+ * Special header prepended to Ethernet packets when capturing from a
+ * u10 Networks board. Requested by Phil Mulholland
+ * <phil@xxxxxxxxxxxxxxx>.
+ */
+#define LINKTYPE_RAIF1 198
+
+/*
+ * IPMB packet for IPMI, beginning with the I2C slave address, followed
+ * by the netFn and LUN, etc.. Requested by Chanthy Toeung
+ * <chanthy.toeung@xxxxxxxxxxxxxx>.
+ */
+#define LINKTYPE_IPMB 199
+

static struct linktype_map {
int dlt;
@@ -781,6 +802,15 @@
/* Various link-layer types for SITA */
{ DLT_SITA, LINKTYPE_SITA },

+ /* Various link-layer types for Endace */
+ { DLT_ERF, LINKTYPE_ERF },
+
+ /* Special header for u10 Networks boards */
+ { DLT_RAIF1, LINKTYPE_RAIF1 },
+
+ /* IPMB */
+ { DLT_IPMB, LINKTYPE_IPMB },
+
{ -1, -1 }
};

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/VERSION new/libpcap-0.9.8/VERSION
--- old/libpcap-0.9.7/VERSION 2007-07-05 15:55:59.000000000 +0200
+++ new/libpcap-0.9.8/VERSION 2007-09-26 04:09:45.000000000 +0200
@@ -1 +1 @@
-0.9.7
+0.9.8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libpcap-0.9.7/Win32/Src/gai_strerror.c
new/libpcap-0.9.8/Win32/Src/gai_strerror.c
--- old/libpcap-0.9.7/Win32/Src/gai_strerror.c 2006-01-22 19:14:17.000000000
+0100
+++ new/libpcap-0.9.8/Win32/Src/gai_strerror.c 2007-09-26 04:09:47.000000000
+0200
@@ -67,6 +67,11 @@
#define EAI_MAX (sizeof(ai_errlist)/sizeof(ai_errlist[0]))
#endif

+/* on MingW, gai_strerror is available.
+ We need to compile gai_strerrorA only for Cygwin
+ */
+#ifndef gai_strerror
+
char *
WSAAPI gai_strerrorA(int ecode)
{
@@ -75,3 +80,4 @@
return "Unknown error";
}

+#endif /* gai_strerror */
\ No newline at end of file


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages