diff options
| author | guy <guy> | 2004-04-07 18:33:29 +0000 |
|---|---|---|
| committer | guy <guy> | 2004-04-07 18:33:29 +0000 |
| commit | ffe68c0ab51461c266d56a3b5b9174e865bfb6b9 (patch) | |
| tree | 17d18446cb8dd5381659c7bc4aa5c0f3e45015ea /pcap-snoop.c | |
| parent | 841b1f7f776f1cb3bb9dd81cf892baa7f819d61d (diff) | |
From Brian Ginsbach:
handle 65535-byte packets from the UNICOS/mp loopback interface;
add a missing variable to "pcap_inject_snoop()".
Diffstat (limited to 'pcap-snoop.c')
| -rw-r--r-- | pcap-snoop.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pcap-snoop.c b/pcap-snoop.c index 288ae709..18e4b6d2 100644 --- a/pcap-snoop.c +++ b/pcap-snoop.c @@ -20,7 +20,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.52 2004-03-23 19:18:06 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.53 2004-04-07 18:33:29 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -63,8 +63,8 @@ pcap_read_snoop(pcap_t *p, int cnt, pcap_handler callback, u_char *user) { int cc; register struct snoopheader *sh; - register int datalen; - register int caplen; + register u_int datalen; + register u_int caplen; register u_char *cp; again: @@ -97,6 +97,16 @@ again: } sh = (struct snoopheader *)p->buffer; datalen = sh->snoop_packetlen; + + /* + * XXX - Sigh, snoop_packetlen is a 16 bit quantity. If we + * got a short length, but read a full sized snoop pakcet, + * assume we overflowed and add back the 64K... + */ + if (cc == (p->snapshot + sizeof(struct snoopheader)) && + (datalen < p->snapshot)) + datalen += (64 * 1024); + caplen = (datalen < p->snapshot) ? datalen : p->snapshot; cp = (u_char *)(sh + 1) + p->offset; /* XXX */ @@ -128,6 +138,8 @@ again: static int pcap_inject_snoop(pcap_t *p, const void *buf, size_t size) { + int ret; + /* * XXX - libnet overwrites the source address with what I * presume is the interface's address; is that required? |