e89167f07a
Changes: Thu. April 1, 2010. guy@alum.mit.edu. Summary for 1.1.1 libpcap release Update CHANGES to reflect more of the changes in 1.1.0. Fix build on RHEL5. Fix shared library build on AIX. Thu. March 11, 2010. ken@netfunctional.ca/guy@alum.mit.edu. Summary for 1.1.0 libpcap release Add SocketCAN capture support Add Myricom SNF API support Update Endace DAG and ERF support Add support for shared libraries on Solaris, HP-UX, and AIX Build, install, and un-install shared libraries by default; don't build/install shared libraries on platforms we don't support Fix building from a directory other than the source directory Fix compiler warnings and builds on some platforms Update config.guess and config.sub Support monitor mode on mac80211 devices on Linux Fix USB memory-mapped capturing on Linux; it requires a new DLT_ value On Linux, scan /sys/class/net for devices if we have it; scan it, or /proc/net/dev if we don't have /sys/class/net, even if we have getifaddrs(), as it'll find interfaces with no addresses Add limited support for reading pcap-ng files Fix BPF driver-loading error handling on AIX Support getting the full-length interface description on FreeBSD In the lexical analyzer, free up any addrinfo structure we got back from getaddrinfo(). Add support for BPF and libdlpi in OpenSolaris (and SXCE) Hyphenate "link-layer" everywhere Add /sys/kernel/debug/usb/usbmon to the list of usbmon locations In pcap_read_linux_mmap(), if there are no frames available, call poll() even if we're in non-blocking mode, so we pick up errors, and check for the errors in question. Note that poll() works on BPF devices is Snow Leopard If an ENXIO or ENETDOWN is received, it may mean the device has gone away. Deal with it. For BPF, raise the default capture buffer size to from 32k to 512k Support ps_ifdrop on Linux Added a bunch of #ifdef directives to make wpcap.dll (WinPcap) compile under cygwin. Changes to Linux mmapped captures. Fix bug where create_ring would fail for particular snaplen and buffer size combinations Update pcap-config so that it handles libpcap requiring additional libraries Add workaround for threadsafeness on Windows Add missing mapping for DLT_ENC <-> LINKTYPE_ENC DLT: Add DLT_CAN_SOCKETCAN DLT: Add Solaris ipnet Don't check for DLT_IPNET if it's not defined Add link-layer types for Fibre Channel FC-2 Add link-layer types for Wireless HART Add link-layer types for AOS Add link-layer types for DECT Autoconf fixes (AIX, HP-UX, OSF/1, Tru64 cleanups) Install headers unconditionally, and include vlan.h/bluetooth.h if enabled Autoconf fixes+cleanup Support enabling/disabling bluetooth (--{en,dis}able-bluetooth) Support disabling SITA support (--without-sita) Return -1 on failure to create packet ring (if supported but creation failed) Fix handling of 'any' device, so that it can be opened, and no longer attempt to open it in Monitor mode Add support for snapshot length for USB Memory-Mapped Interface Fix configure and build on recent Linux kernels Fix memory-mapped Linux capture to support pcap_next() and pcap_next_ex() Fixes for Linux USB capture DLT: Add DLT_LINUX_EVDEV DLT: Add DLT_GSMTAP_UM DLT: Add DLT_GSMTAP_ABIS
303 lines
5.1 KiB
C
303 lines
5.1 KiB
C
/*
|
|
* Copyright (c) 1990, 1991, 1992, 1994, 1995, 1996
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that: (1) source code distributions
|
|
* retain the above copyright notice and this paragraph in its entirety, (2)
|
|
* distributions including binary code include the above copyright notice and
|
|
* this paragraph in its entirety in the documentation or other materials
|
|
* provided with the distribution, and (3) all advertising materials mentioning
|
|
* features or use of this software display the following acknowledgement:
|
|
* ``This product includes software developed by the University of California,
|
|
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
|
|
* the University nor the names of its contributors may be used to endorse
|
|
* or promote products derived from this software without specific prior
|
|
* written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
|
|
#ifndef lint
|
|
static const char rcsid[] _U_ =
|
|
"@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.28 2008-01-02 04:16:46 guy Exp $ (LBL)";
|
|
#endif
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#ifdef WIN32
|
|
#include <pcap-stdinc.h>
|
|
#else /* WIN32 */
|
|
#if HAVE_INTTYPES_H
|
|
#include <inttypes.h>
|
|
#elif HAVE_STDINT_H
|
|
#include <stdint.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_BITYPES_H
|
|
#include <sys/bitypes.h>
|
|
#endif
|
|
#include <sys/types.h>
|
|
#endif /* WIN32 */
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "pcap-int.h"
|
|
|
|
#ifdef HAVE_OS_PROTO_H
|
|
#include "os-proto.h"
|
|
#endif
|
|
|
|
char *
|
|
bpf_image(p, n)
|
|
const struct bpf_insn *p;
|
|
int n;
|
|
{
|
|
int v;
|
|
const char *fmt, *op;
|
|
static char image[256];
|
|
char operand[64];
|
|
|
|
v = p->k;
|
|
switch (p->code) {
|
|
|
|
default:
|
|
op = "unimp";
|
|
fmt = "0x%x";
|
|
v = p->code;
|
|
break;
|
|
|
|
case BPF_RET|BPF_K:
|
|
op = "ret";
|
|
fmt = "#%d";
|
|
break;
|
|
|
|
case BPF_RET|BPF_A:
|
|
op = "ret";
|
|
fmt = "";
|
|
break;
|
|
|
|
case BPF_LD|BPF_W|BPF_ABS:
|
|
op = "ld";
|
|
fmt = "[%d]";
|
|
break;
|
|
|
|
case BPF_LD|BPF_H|BPF_ABS:
|
|
op = "ldh";
|
|
fmt = "[%d]";
|
|
break;
|
|
|
|
case BPF_LD|BPF_B|BPF_ABS:
|
|
op = "ldb";
|
|
fmt = "[%d]";
|
|
break;
|
|
|
|
case BPF_LD|BPF_W|BPF_LEN:
|
|
op = "ld";
|
|
fmt = "#pktlen";
|
|
break;
|
|
|
|
case BPF_LD|BPF_W|BPF_IND:
|
|
op = "ld";
|
|
fmt = "[x + %d]";
|
|
break;
|
|
|
|
case BPF_LD|BPF_H|BPF_IND:
|
|
op = "ldh";
|
|
fmt = "[x + %d]";
|
|
break;
|
|
|
|
case BPF_LD|BPF_B|BPF_IND:
|
|
op = "ldb";
|
|
fmt = "[x + %d]";
|
|
break;
|
|
|
|
case BPF_LD|BPF_IMM:
|
|
op = "ld";
|
|
fmt = "#0x%x";
|
|
break;
|
|
|
|
case BPF_LDX|BPF_IMM:
|
|
op = "ldx";
|
|
fmt = "#0x%x";
|
|
break;
|
|
|
|
case BPF_LDX|BPF_MSH|BPF_B:
|
|
op = "ldxb";
|
|
fmt = "4*([%d]&0xf)";
|
|
break;
|
|
|
|
case BPF_LD|BPF_MEM:
|
|
op = "ld";
|
|
fmt = "M[%d]";
|
|
break;
|
|
|
|
case BPF_LDX|BPF_MEM:
|
|
op = "ldx";
|
|
fmt = "M[%d]";
|
|
break;
|
|
|
|
case BPF_ST:
|
|
op = "st";
|
|
fmt = "M[%d]";
|
|
break;
|
|
|
|
case BPF_STX:
|
|
op = "stx";
|
|
fmt = "M[%d]";
|
|
break;
|
|
|
|
case BPF_JMP|BPF_JA:
|
|
op = "ja";
|
|
fmt = "%d";
|
|
v = n + 1 + p->k;
|
|
break;
|
|
|
|
case BPF_JMP|BPF_JGT|BPF_K:
|
|
op = "jgt";
|
|
fmt = "#0x%x";
|
|
break;
|
|
|
|
case BPF_JMP|BPF_JGE|BPF_K:
|
|
op = "jge";
|
|
fmt = "#0x%x";
|
|
break;
|
|
|
|
case BPF_JMP|BPF_JEQ|BPF_K:
|
|
op = "jeq";
|
|
fmt = "#0x%x";
|
|
break;
|
|
|
|
case BPF_JMP|BPF_JSET|BPF_K:
|
|
op = "jset";
|
|
fmt = "#0x%x";
|
|
break;
|
|
|
|
case BPF_JMP|BPF_JGT|BPF_X:
|
|
op = "jgt";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_JMP|BPF_JGE|BPF_X:
|
|
op = "jge";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_JMP|BPF_JEQ|BPF_X:
|
|
op = "jeq";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_JMP|BPF_JSET|BPF_X:
|
|
op = "jset";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_ADD|BPF_X:
|
|
op = "add";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_SUB|BPF_X:
|
|
op = "sub";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_MUL|BPF_X:
|
|
op = "mul";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_DIV|BPF_X:
|
|
op = "div";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_AND|BPF_X:
|
|
op = "and";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_OR|BPF_X:
|
|
op = "or";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_LSH|BPF_X:
|
|
op = "lsh";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_RSH|BPF_X:
|
|
op = "rsh";
|
|
fmt = "x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_ADD|BPF_K:
|
|
op = "add";
|
|
fmt = "#%d";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_SUB|BPF_K:
|
|
op = "sub";
|
|
fmt = "#%d";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_MUL|BPF_K:
|
|
op = "mul";
|
|
fmt = "#%d";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_DIV|BPF_K:
|
|
op = "div";
|
|
fmt = "#%d";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_AND|BPF_K:
|
|
op = "and";
|
|
fmt = "#0x%x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_OR|BPF_K:
|
|
op = "or";
|
|
fmt = "#0x%x";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_LSH|BPF_K:
|
|
op = "lsh";
|
|
fmt = "#%d";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_RSH|BPF_K:
|
|
op = "rsh";
|
|
fmt = "#%d";
|
|
break;
|
|
|
|
case BPF_ALU|BPF_NEG:
|
|
op = "neg";
|
|
fmt = "";
|
|
break;
|
|
|
|
case BPF_MISC|BPF_TAX:
|
|
op = "tax";
|
|
fmt = "";
|
|
break;
|
|
|
|
case BPF_MISC|BPF_TXA:
|
|
op = "txa";
|
|
fmt = "";
|
|
break;
|
|
}
|
|
(void)snprintf(operand, sizeof operand, fmt, v);
|
|
(void)snprintf(image, sizeof image,
|
|
(BPF_CLASS(p->code) == BPF_JMP &&
|
|
BPF_OP(p->code) != BPF_JA) ?
|
|
"(%03d) %-8s %-16s jt %d\tjf %d"
|
|
: "(%03d) %-8s %s",
|
|
n, op, operand, n + 1 + p->jt, n + 1 + p->jf);
|
|
return image;
|
|
}
|