mirror of
https://github.com/the-tcpdump-group/tcpdump.git
synced 2024-11-23 18:14:29 +08:00
Patches from NetBSD tree.
This commit is contained in:
mcr
parent
c708411839
commit
05b7f224d8
4
icmp6.h
4
icmp6.h
@ -1,5 +1,5 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/icmp6.h,v 1.17 2005-09-05 09:29:01 guy Exp $ (LBL) */
|
||||
/* $NetBSD: icmp6.h,v 1.13 2000/08/03 16:30:37 itojun Exp $ */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/icmp6.h,v 1.18 2007-08-29 02:31:44 mcr Exp $ (LBL) */
|
||||
/* NetBSD: icmp6.h,v 1.13 2000/08/03 16:30:37 itojun Exp */
|
||||
/* $KAME: icmp6.h,v 1.22 2000/08/03 15:25:16 jinmei Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
|
||||
/* $NetBSD: ieee802_11_radio.h,v 1.2 2006/02/26 03:04:03 dyoung Exp $ */
|
||||
/* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.2 2006-06-13 22:24:06 guy Exp $ */
|
||||
/* NetBSD: ieee802_11_radio.h,v 1.2 2006/02/26 03:04:03 dyoung Exp */
|
||||
/* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.3 2007-08-29 02:31:44 mcr Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003, 2004 David Young. All rights reserved.
|
||||
|
||||
4
ip6.h
4
ip6.h
@ -1,5 +1,5 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/ip6.h,v 1.7 2005-04-20 10:04:16 guy Exp $ (LBL) */
|
||||
/* $NetBSD: ip6.h,v 1.9 2000/07/13 05:34:21 itojun Exp $ */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/ip6.h,v 1.8 2007-08-29 02:31:44 mcr Exp $ (LBL) */
|
||||
/* NetBSD: ip6.h,v 1.9 2000/07/13 05:34:21 itojun Exp */
|
||||
/* $KAME: ip6.h,v 1.9 2000/07/02 21:01:32 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
4
nfs.h
4
nfs.h
@ -1,5 +1,5 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/nfs.h,v 1.7 2002-12-11 07:13:55 guy Exp $ (LBL) */
|
||||
/* $NetBSD: nfs.h,v 1.1 1996/05/23 22:49:53 fvdl Exp $ */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/nfs.h,v 1.8 2007-08-29 02:31:44 mcr Exp $ (LBL) */
|
||||
/* NetBSD: nfs.h,v 1.1 1996/05/23 22:49:53 fvdl Exp */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
/* NetBSD: print-juniper.c,v 1.2 2007/07/24 11:53:45 drochner Exp */
|
||||
|
||||
/*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that: (1) source code
|
||||
@ -15,7 +17,9 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.33 2006-06-14 21:40:00 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.34 2007-08-29 02:31:44 mcr Exp $ (LBL)";
|
||||
#else
|
||||
__RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -546,8 +550,8 @@ juniper_es_print(const struct pcap_pkthdr *h, register const u_char *p)
|
||||
tok2str(juniper_ipsec_type_values,"Unknown",ih->type),
|
||||
ih->type,
|
||||
EXTRACT_32BITS(&ih->spi),
|
||||
ipaddr_string(EXTRACT_32BITS(&ih->src_ip)),
|
||||
ipaddr_string(EXTRACT_32BITS(&ih->dst_ip)),
|
||||
ipaddr_string(&ih->src_ip),
|
||||
ipaddr_string(&ih->dst_ip),
|
||||
l2info.length);
|
||||
} else {
|
||||
printf("ES SA, index %u, ttl %u type %s (%u), length %u\n",
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.45 2007-07-14 22:28:36 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.46 2007-08-29 02:31:44 mcr Exp $";
|
||||
#endif
|
||||
|
||||
#include <tcpdump-stdinc.h>
|
||||
@ -1459,8 +1459,7 @@ ipx_netbios_print(const u_char *data, u_int length)
|
||||
break;
|
||||
if (memcmp(&data[i], "\377SMB", 4) == 0) {
|
||||
smb_fdata(data, "\n>>> IPX transport ", &data[i], 0);
|
||||
if (data != NULL)
|
||||
print_smb(&data[i], maxbuf);
|
||||
print_smb(&data[i], maxbuf);
|
||||
printf("\n");
|
||||
fflush(stdout);
|
||||
break;
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
/* $NetBSD: print-tcp.c,v 1.9 2007/07/26 18:15:12 plunky Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
@ -23,7 +25,9 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.129 2007-04-03 20:02:56 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.130 2007-08-29 02:31:44 mcr Exp $ (LBL)";
|
||||
#else
|
||||
__RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -724,9 +728,9 @@ tcp_verify_signature(const struct ip *ip, const struct tcphdr *tp,
|
||||
u_int16_t savecsum, tlen;
|
||||
#ifdef INET6
|
||||
struct ip6_hdr *ip6;
|
||||
#endif
|
||||
u_int32_t len32;
|
||||
u_int8_t nxt;
|
||||
#endif
|
||||
|
||||
tp1 = *tp;
|
||||
|
||||
|
||||
4
telnet.h
4
telnet.h
@ -1,6 +1,6 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/telnet.h,v 1.4 2002-06-11 17:09:01 itojun Exp $ (LBL) */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/telnet.h,v 1.5 2007-08-29 02:31:44 mcr Exp $ (LBL) */
|
||||
|
||||
/* $NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp $ */
|
||||
/* NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1983, 1993
|
||||
|
||||
Loading…
Reference in New Issue
Block a user