This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
47e1814c2b
commit
474436eef2
@ -1,20 +0,0 @@
|
||||
--- print-802_11.c
|
||||
+++ print-802_11.c
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
- "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.31.2.11 2006/06/13 22:25:43 guy Exp $ (LBL)";
|
||||
+ "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.43 2007/02/01 02:18:18 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@@ -264,7 +264,7 @@
|
||||
|
||||
if (pbody->tim.length <= 3)
|
||||
break;
|
||||
- if (pbody->rates.length > sizeof pbody->tim.bitmap)
|
||||
+ if (pbody->tim.length - 3 > sizeof pbody->tim.bitmap)
|
||||
return;
|
||||
if (!TTEST2(*(p + offset), pbody->tim.length - 3))
|
||||
return;
|
||||
@ -1,20 +0,0 @@
|
||||
--- print-bgp.c
|
||||
+++ print-bgp.c
|
||||
@@ -669,7 +669,7 @@
|
||||
tlen-=15;
|
||||
|
||||
/* ok now the variable part - lets read out TLVs*/
|
||||
- while (tlen>0) {
|
||||
+ while (tlen>0 && strlen <= buflen) {
|
||||
if (tlen < 3)
|
||||
return -1;
|
||||
TCHECK2(pptr[0], 3);
|
||||
@@ -684,7 +684,7 @@
|
||||
tlv_type,
|
||||
tlv_len);
|
||||
ttlv_len=ttlv_len/8+1; /* how many bytes do we need to read ? */
|
||||
- while (ttlv_len>0) {
|
||||
+ while (ttlv_len>0 && strlen <= buflen) {
|
||||
TCHECK(pptr[0]);
|
||||
strlen+=snprintf(buf+strlen,buflen-strlen, "%02x",*pptr++);
|
||||
ttlv_len--;
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:24c350e1c5ba24d2cb47e975477b22fb9e041cded2ae489f82eee9136d37d61b
|
||||
size 589766
|
||||
@ -28,7 +28,7 @@
|
||||
/*
|
||||
* Structure of an icmp header.
|
||||
*/
|
||||
@@ -61,7 +67,10 @@
|
||||
@@ -61,8 +67,12 @@
|
||||
u_int16_t icd_id;
|
||||
u_int16_t icd_seq;
|
||||
} ih_idseq;
|
||||
@ -37,18 +37,12 @@
|
||||
+ u_int32_t ih_void;
|
||||
+ struct mtu_discovery ih_mtu_discovery;
|
||||
+ };
|
||||
|
||||
/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
|
||||
struct ih_pmtu {
|
||||
@@ -74,6 +83,7 @@
|
||||
#define icmp_id icmp_hun.ih_idseq.icd_id
|
||||
#define icmp_seq icmp_hun.ih_idseq.icd_seq
|
||||
#define icmp_void icmp_hun.ih_void
|
||||
} icmp_hun;
|
||||
+#define icmp_mtu_discovery icmp_hun.ih_mtu_discovery
|
||||
#define icmp_pmvoid icmp_hun.ih_pmtu.ipm_void
|
||||
#define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu
|
||||
union {
|
||||
@@ -258,12 +268,6 @@
|
||||
#define icmp_pptr icmp_hun.ih_pptr
|
||||
#define icmp_gwaddr icmp_hun.ih_gwaddr
|
||||
#define icmp_id icmp_hun.ih_idseq.icd_id
|
||||
@@ -243,12 +253,6 @@
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
@ -61,7 +55,7 @@
|
||||
/* rfc1256 */
|
||||
struct ih_rdiscovery {
|
||||
u_int8_t ird_addrnum;
|
||||
@@ -386,7 +390,7 @@
|
||||
@@ -415,7 +419,7 @@
|
||||
case ICMP_UNREACH_NEEDFRAG:
|
||||
{
|
||||
register const struct mtu_discovery *mp;
|
||||
3
tcpdump-3.9.7.tar.bz2
Normal file
3
tcpdump-3.9.7.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3273f483853c81d98f2885abd26fe6bf09bdde86dbca0952e8906df6c6de3b33
|
||||
size 713188
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 26 16:03:44 CEST 2007 - prusnak@suse.cz
|
||||
|
||||
- updated to 3.9.7
|
||||
* NFS: Print unsigned values as such
|
||||
* RX: parse safely
|
||||
* BGP: fixes for IPv6-less builds
|
||||
* 801.1ag: use standard codepoint
|
||||
* use /dev/bpf on systems with such a device
|
||||
* 802.11: print QoS data, avoid dissect of no-data frame, ignore padding
|
||||
* smb: make sure that we haven't gone past the end of the captured data
|
||||
* smb: squelch an uninitialized complaint from coverity
|
||||
* NFS: from NetBSD; don't interpret the reply as a possible NFS reply if it got MSG_DENIED
|
||||
* BGP: don't print TLV values that didn't fit, from www.digit-labs.org
|
||||
* revised INSTALL.txt about libpcap dependancy
|
||||
- dropped obsolete patch:
|
||||
* bgp-overflow.diff (fixed in update)
|
||||
* 802_11-overflow.diff (included in update)
|
||||
- changed libpcap to libpcap-devel in BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 12 11:37:08 CEST 2007 - prusnak@suse.cz
|
||||
|
||||
|
||||
28
tcpdump.spec
28
tcpdump.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package tcpdump (Version 3.9.6)
|
||||
# spec file for package tcpdump (Version 3.9.7)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -11,8 +11,8 @@
|
||||
# norootforbuild
|
||||
|
||||
Name: tcpdump
|
||||
BuildRequires: libpcap libsmi openssl-devel
|
||||
Version: 3.9.6
|
||||
BuildRequires: libpcap-devel libsmi openssl-devel
|
||||
Version: 3.9.7
|
||||
Release: 1
|
||||
Autoreqprov: on
|
||||
License: BSD 3-Clause
|
||||
@ -26,8 +26,6 @@ Patch1: %{name}-%{version}-autoconf.diff
|
||||
Patch2: %{name}-%{version}-aliasing.diff
|
||||
Patch3: %{name}-%{version}-uninitialized.diff
|
||||
Patch4: %{name}-%{version}-juniper.diff
|
||||
Patch5: %{name}-%{version}-802_11-overflow.diff
|
||||
Patch6: %{name}-%{version}-bgp-overflow.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -39,13 +37,12 @@ ethernet. It can be used to debug specific network problems.
|
||||
%prep
|
||||
%setup -q
|
||||
rm -rf win32
|
||||
find -d -name CVS -exec rm -rf {} \;
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
|
||||
%build
|
||||
%{suse_update_config -f}
|
||||
@ -75,6 +72,23 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_sbindir}/*
|
||||
|
||||
%changelog
|
||||
* Thu Jul 26 2007 - prusnak@suse.cz
|
||||
- updated to 3.9.7
|
||||
* NFS: Print unsigned values as such
|
||||
* RX: parse safely
|
||||
* BGP: fixes for IPv6-less builds
|
||||
* 801.1ag: use standard codepoint
|
||||
* use /dev/bpf on systems with such a device
|
||||
* 802.11: print QoS data, avoid dissect of no-data frame, ignore padding
|
||||
* smb: make sure that we haven't gone past the end of the captured data
|
||||
* smb: squelch an uninitialized complaint from coverity
|
||||
* NFS: from NetBSD; don't interpret the reply as a possible NFS reply if it got MSG_DENIED
|
||||
* BGP: don't print TLV values that didn't fit, from www.digit-labs.org
|
||||
* revised INSTALL.txt about libpcap dependancy
|
||||
- dropped obsolete patch:
|
||||
* bgp-overflow.diff (fixed in update)
|
||||
* 802_11-overflow.diff (included in update)
|
||||
- changed libpcap to libpcap-devel in BuildRequires
|
||||
* Thu Jul 12 2007 - prusnak@suse.cz
|
||||
- update to 3.9.6
|
||||
* added support for:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user