From Albert Chin: fix a typo and a cut-and-pasteo.
This commit is contained in:
parent
b791874357
commit
b423e17024
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] _U_ =
|
static const char rcsid[] _U_ =
|
||||||
"@(#) $Header: /tcpdump/master/libpcap/pcap-pf.c,v 1.91 2005-02-26 21:58:06 guy Exp $ (LBL)";
|
"@(#) $Header: /tcpdump/master/libpcap/pcap-pf.c,v 1.92 2005-04-19 00:55:48 guy Exp $ (LBL)";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -129,7 +129,7 @@ pcap_read_pf(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
|
||||||
*/
|
*/
|
||||||
n = 0;
|
n = 0;
|
||||||
#ifdef PCAP_FDDIPAD
|
#ifdef PCAP_FDDIPAD
|
||||||
pad = p->fddipad;
|
pad = pc->fddipad;
|
||||||
#endif
|
#endif
|
||||||
while (cc > 0) {
|
while (cc > 0) {
|
||||||
/*
|
/*
|
||||||
|
@ -191,7 +191,7 @@ pcap_read_pf(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
|
||||||
*
|
*
|
||||||
#ifdef PCAP_FDDIPAD
|
#ifdef PCAP_FDDIPAD
|
||||||
* Note: the filter code was generated assuming
|
* Note: the filter code was generated assuming
|
||||||
* that p->fddipad was the amount of padding
|
* that pc->fddipad was the amount of padding
|
||||||
* before the header, as that's what's required
|
* before the header, as that's what's required
|
||||||
* in the kernel, so we run the filter before
|
* in the kernel, so we run the filter before
|
||||||
* skipping that padding.
|
* skipping that padding.
|
||||||
|
@ -448,7 +448,7 @@ your system may not be properly configured; see the packetfilter(4) man page\n",
|
||||||
/* set truncation */
|
/* set truncation */
|
||||||
#ifdef PCAP_FDDIPAD
|
#ifdef PCAP_FDDIPAD
|
||||||
if (p->linktype == DLT_FDDI) {
|
if (p->linktype == DLT_FDDI) {
|
||||||
p->fddipad = PCAP_FDDIPAD:
|
p->fddipad = PCAP_FDDIPAD;
|
||||||
|
|
||||||
/* packetfilter includes the padding in the snapshot */
|
/* packetfilter includes the padding in the snapshot */
|
||||||
snaplen += PCAP_FDDIPAD;
|
snaplen += PCAP_FDDIPAD;
|
||||||
|
|
Reference in New Issue