* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#ifdef _WIN32
#include <ws2tcpip.h>
#else
- #include <sys/socket.h>
-
- #ifdef __NetBSD__
- #include <sys/param.h>
- #endif
-
#include <netinet/in.h>
- #include <arpa/inet.h>
#endif /* _WIN32 */
#include <stdlib.h>
#include <setjmp.h>
#include <stdarg.h>
#include <stdio.h>
+#include <stdint.h>
+#include <stddef.h>
#include "pcap-int.h"
#include "extract.h"
#include "ethertype.h"
-#include "nlpid.h"
#include "llc.h"
#include "gencode.h"
#include "ieee80211.h"
-#include "atmuni31.h"
-#include "sunatmpos.h"
#include "pflog.h"
#include "ppp.h"
#include "pcap/sll.h"
#include "pcap/ipnet.h"
-#include "arcnet.h"
#include "diag-control.h"
+#include "pcap-util.h"
#include "scanner.h"
-#if defined(linux)
+#if defined(__linux__)
#include <linux/types.h>
#include <linux/if_packet.h>
#include <linux/filter.h>
#endif
-#ifndef offsetof
-#define offsetof(s, e) ((size_t)&((s *)0)->e)
-#endif
-
#ifdef _WIN32
+ #ifdef HAVE_NPCAP_BPF_H
+ /* Defines BPF extensions for Npcap */
+ #include <npcap-bpf.h>
+ #endif
#ifdef INET6
#if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF)
/* IPv6 address */
#endif
#define GENEVE_PORT 6081
+#define VXLAN_PORT 4789
+
+
+/*
+ * from: NetBSD: if_arc.h,v 1.13 1999/11/19 20:41:19 thorpej Exp
+ */
+
+/* RFC 1051 */
+#define ARCTYPE_IP_OLD 240 /* IP protocol */
+#define ARCTYPE_ARP_OLD 241 /* address resolution protocol */
+
+/* RFC 1201 */
+#define ARCTYPE_IP 212 /* IP protocol */
+#define ARCTYPE_ARP 213 /* address resolution protocol */
+#define ARCTYPE_REVARP 214 /* reverse addr resolution protocol */
+
+#define ARCTYPE_ATALK 221 /* Appletalk */
+#define ARCTYPE_BANIAN 247 /* Banyan Vines */
+#define ARCTYPE_IPX 250 /* Novell IPX */
+
+#define ARCTYPE_INET6 0xc4 /* IPng */
+#define ARCTYPE_DIAGNOSE 0x80 /* as per ANSI/ATA 878.1 */
+
+
+/* Based on UNI3.1 standard by ATM Forum */
+
+/* ATM traffic types based on VPI=0 and (the following VCI */
+#define VCI_PPC 0x05 /* Point-to-point signal msg */
+#define VCI_BCC 0x02 /* Broadcast signal msg */
+#define VCI_OAMF4SC 0x03 /* Segment OAM F4 flow cell */
+#define VCI_OAMF4EC 0x04 /* End-to-end OAM F4 flow cell */
+#define VCI_METAC 0x01 /* Meta signal msg */
+#define VCI_ILMIC 0x10 /* ILMI msg */
+
+/* Q.2931 signalling messages */
+#define CALL_PROCEED 0x02 /* call proceeding */
+#define CONNECT 0x07 /* connect */
+#define CONNECT_ACK 0x0f /* connect_ack */
+#define SETUP 0x05 /* setup */
+#define RELEASE 0x4d /* release */
+#define RELEASE_DONE 0x5a /* release_done */
+#define RESTART 0x46 /* restart */
+#define RESTART_ACK 0x4e /* restart ack */
+#define STATUS 0x7d /* status */
+#define STATUS_ENQ 0x75 /* status ack */
+#define ADD_PARTY 0x80 /* add party */
+#define ADD_PARTY_ACK 0x81 /* add party ack */
+#define ADD_PARTY_REJ 0x82 /* add party rej */
+#define DROP_PARTY 0x83 /* drop party */
+#define DROP_PARTY_ACK 0x84 /* drop party ack */
+
+/* Information Element Parameters in the signalling messages */
+#define CAUSE 0x08 /* cause */
+#define ENDPT_REF 0x54 /* endpoint reference */
+#define AAL_PARA 0x58 /* ATM adaptation layer parameters */
+#define TRAFF_DESCRIP 0x59 /* atm traffic descriptors */
+#define CONNECT_ID 0x5a /* connection identifier */
+#define QOS_PARA 0x5c /* quality of service parameters */
+#define B_HIGHER 0x5d /* broadband higher layer information */
+#define B_BEARER 0x5e /* broadband bearer capability */
+#define B_LOWER 0x5f /* broadband lower information */
+#define CALLING_PARTY 0x6c /* calling party number */
+#define CALLED_PARTY 0x70 /* called party number */
+
+#define Q2931 0x09
+
+/* Q.2931 signalling general messages format */
+#define PROTO_POS 0 /* offset of protocol discriminator */
+#define CALL_REF_POS 2 /* offset of call reference value */
+#define MSG_TYPE_POS 5 /* offset of message type */
+#define MSG_LEN_POS 7 /* offset of message length */
+#define IE_BEGIN_POS 9 /* offset of first information element */
+
+/* format of signalling messages */
+#define TYPE_POS 0
+#define LEN_POS 2
+#define FIELD_BEGIN_POS 4
+
+
+/* SunATM header for ATM packet */
+#define SUNATM_DIR_POS 0
+#define SUNATM_VPI_POS 1
+#define SUNATM_VCI_POS 2
+#define SUNATM_PKT_BEGIN_POS 4 /* Start of ATM packet */
+
+/* Protocol type values in the bottom for bits of the byte at SUNATM_DIR_POS. */
+#define PT_LANE 0x01 /* LANE */
+#define PT_LLC 0x02 /* LLC encapsulation */
+#define PT_ILMI 0x05 /* ILMI */
+#define PT_QSAAL 0x06 /* Q.SAAL */
+
+
+/* Types missing from some systems */
+
+/*
+ * Network layer protocol identifiers
+ */
+#ifndef ISO8473_CLNP
+#define ISO8473_CLNP 0x81
+#endif
+#ifndef ISO9542_ESIS
+#define ISO9542_ESIS 0x82
+#endif
+#ifndef ISO9542X25_ESIS
+#define ISO9542X25_ESIS 0x8a
+#endif
+#ifndef ISO10589_ISIS
+#define ISO10589_ISIS 0x83
+#endif
+
+#define ISIS_L1_LAN_IIH 15
+#define ISIS_L2_LAN_IIH 16
+#define ISIS_PTP_IIH 17
+#define ISIS_L1_LSP 18
+#define ISIS_L2_LSP 20
+#define ISIS_L1_CSNP 24
+#define ISIS_L2_CSNP 25
+#define ISIS_L1_PSNP 26
+#define ISIS_L2_PSNP 27
+/*
+ * The maximum possible value can also be used as a bit mask because the
+ * "PDU Type" field comprises the least significant 5 bits of a particular
+ * octet, see sections 9.5~9.13 of ISO/IEC 10589:2002(E).
+ */
+#define ISIS_PDU_TYPE_MAX 0x1FU
+
+#ifndef ISO8878A_CONS
+#define ISO8878A_CONS 0x84
+#endif
+#ifndef ISO10747_IDRP
+#define ISO10747_IDRP 0x85
+#endif
+
+// Same as in tcpdump/print-sl.c.
+#define SLIPDIR_IN 0
+#define SLIPDIR_OUT 1
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
(cs)->off_linkhdr.is_variable = (new_is_variable); \
(cs)->off_linkhdr.constant_part = (new_constant_part); \
(cs)->off_linkhdr.reg = (new_reg); \
- (cs)->is_geneve = 0; \
+ (cs)->is_encap = 0; \
}
/*
*/
int is_atm;
- /*
- * TRUE if "geneve" appeared in the filter; it causes us to
- * generate code that checks for a Geneve header and assume
- * that later filters apply to the encapsulated payload.
+ /* TRUE if "geneve" or "vxlan" appeared in the filter; it
+ * causes us to generate code that checks for a Geneve or
+ * VXLAN header respectively and assume that later filters
+ * apply to the encapsulated payload.
*/
- int is_geneve;
+ int is_encap;
/*
* TRUE if we need variable length part of VLAN offset
u_int, bpf_u_int32);
static struct block *gen_cmp_le(compiler_state_t *, enum e_offrel, u_int,
u_int, bpf_u_int32);
+static struct block *gen_cmp_ne(compiler_state_t *, enum e_offrel, u_int,
+ u_int size, bpf_u_int32);
static struct block *gen_mcmp(compiler_state_t *, enum e_offrel, u_int,
u_int, bpf_u_int32, bpf_u_int32);
+static struct block *gen_mcmp_ne(compiler_state_t *, enum e_offrel, u_int,
+ u_int, bpf_u_int32, bpf_u_int32);
static struct block *gen_bcmp(compiler_state_t *, enum e_offrel, u_int,
u_int, const u_char *);
+static struct block *gen_jmp(compiler_state_t *, int, bpf_u_int32,
+ struct slist *);
+static struct block *gen_set(compiler_state_t *, bpf_u_int32, struct slist *);
+static struct block *gen_unset(compiler_state_t *, bpf_u_int32, struct slist *);
static struct block *gen_ncmp(compiler_state_t *, enum e_offrel, u_int,
u_int, bpf_u_int32, int, int, bpf_u_int32);
static struct slist *gen_load_absoffsetrel(compiler_state_t *, bpf_abs_offset *,
static void insert_compute_vloffsets(compiler_state_t *, struct block *);
static struct slist *gen_abs_offset_varpart(compiler_state_t *,
bpf_abs_offset *);
-static bpf_u_int32 ethertype_to_ppptype(bpf_u_int32);
+static uint16_t ethertype_to_ppptype(compiler_state_t *, bpf_u_int32);
static struct block *gen_linktype(compiler_state_t *, bpf_u_int32);
static struct block *gen_snap(compiler_state_t *, bpf_u_int32, bpf_u_int32);
static struct block *gen_llc_linktype(compiler_state_t *, bpf_u_int32);
static struct block *gen_hostop(compiler_state_t *, bpf_u_int32, bpf_u_int32,
- int, bpf_u_int32, u_int, u_int);
+ int, u_int, u_int);
#ifdef INET6
static struct block *gen_hostop6(compiler_state_t *, struct in6_addr *,
- struct in6_addr *, int, bpf_u_int32, u_int, u_int);
+ struct in6_addr *, int, u_int, u_int);
#endif
-static struct block *gen_ahostop(compiler_state_t *, const u_char *, int);
-static struct block *gen_ehostop(compiler_state_t *, const u_char *, int);
-static struct block *gen_fhostop(compiler_state_t *, const u_char *, int);
-static struct block *gen_thostop(compiler_state_t *, const u_char *, int);
+static struct block *gen_ahostop(compiler_state_t *, const uint8_t, int);
static struct block *gen_wlanhostop(compiler_state_t *, const u_char *, int);
-static struct block *gen_ipfchostop(compiler_state_t *, const u_char *, int);
+static unsigned char is_mac48_linktype(const int);
+static struct block *gen_mac48host(compiler_state_t *, const u_char *,
+ const u_char, const char *);
static struct block *gen_dnhostop(compiler_state_t *, bpf_u_int32, int);
static struct block *gen_mpls_linktype(compiler_state_t *, bpf_u_int32);
static struct block *gen_host(compiler_state_t *, bpf_u_int32, bpf_u_int32,
#endif
#ifndef INET6
static struct block *gen_gateway(compiler_state_t *, const u_char *,
- struct addrinfo *, int, int);
+ struct addrinfo *, int);
#endif
+static struct block *gen_ip_proto(compiler_state_t *, const uint8_t);
+static struct block *gen_ip6_proto(compiler_state_t *, const uint8_t);
static struct block *gen_ipfrag(compiler_state_t *);
-static struct block *gen_portatom(compiler_state_t *, int, bpf_u_int32);
-static struct block *gen_portrangeatom(compiler_state_t *, u_int, bpf_u_int32,
- bpf_u_int32);
-static struct block *gen_portatom6(compiler_state_t *, int, bpf_u_int32);
-static struct block *gen_portrangeatom6(compiler_state_t *, u_int, bpf_u_int32,
- bpf_u_int32);
-static struct block *gen_portop(compiler_state_t *, u_int, u_int, int);
-static struct block *gen_port(compiler_state_t *, u_int, int, int);
-static struct block *gen_portrangeop(compiler_state_t *, u_int, u_int,
- bpf_u_int32, int);
-static struct block *gen_portrange(compiler_state_t *, u_int, u_int, int, int);
-struct block *gen_portop6(compiler_state_t *, u_int, u_int, int);
-static struct block *gen_port6(compiler_state_t *, u_int, int, int);
-static struct block *gen_portrangeop6(compiler_state_t *, u_int, u_int,
- bpf_u_int32, int);
-static struct block *gen_portrange6(compiler_state_t *, u_int, u_int, int, int);
+static struct block *gen_portatom(compiler_state_t *, int, uint16_t);
+static struct block *gen_portrangeatom(compiler_state_t *, u_int, uint16_t,
+ uint16_t);
+static struct block *gen_portatom6(compiler_state_t *, int, uint16_t);
+static struct block *gen_portrangeatom6(compiler_state_t *, u_int, uint16_t,
+ uint16_t);
+static struct block *gen_port(compiler_state_t *, uint16_t, int, int);
+static struct block *gen_port_common(compiler_state_t *, int, struct block *);
+static struct block *gen_portrange(compiler_state_t *, uint16_t, uint16_t,
+ int, int);
+static struct block *gen_port6(compiler_state_t *, uint16_t, int, int);
+static struct block *gen_port6_common(compiler_state_t *, int, struct block *);
+static struct block *gen_portrange6(compiler_state_t *, uint16_t, uint16_t,
+ int, int);
static int lookup_proto(compiler_state_t *, const char *, int);
#if !defined(NO_PROTOCHAIN)
static struct block *gen_protochain(compiler_state_t *, bpf_u_int32, int);
#endif /* !defined(NO_PROTOCHAIN) */
-static struct block *gen_proto(compiler_state_t *, bpf_u_int32, int, int);
+static struct block *gen_proto(compiler_state_t *, bpf_u_int32, int);
static struct slist *xfer_to_x(compiler_state_t *, struct arth *);
static struct slist *xfer_to_a(compiler_state_t *, struct arth *);
static struct block *gen_mac_multicast(compiler_state_t *, int);
static struct block *gen_len(compiler_state_t *, int, int);
-static struct block *gen_check_802_11_data_frame(compiler_state_t *);
-static struct block *gen_geneve_ll_check(compiler_state_t *cstate);
+static struct block *gen_encap_ll_check(compiler_state_t *cstate);
-static struct block *gen_ppi_dlt_check(compiler_state_t *);
static struct block *gen_atmfield_code_internal(compiler_state_t *, int,
bpf_u_int32, int, int);
static struct block *gen_atmtype_llc(compiler_state_t *);
-static struct block *gen_msg_abbrev(compiler_state_t *, int type);
+static struct block *gen_msg_abbrev(compiler_state_t *, const uint8_t);
+static struct block *gen_atm_prototype(compiler_state_t *, const uint8_t);
+static struct block *gen_atm_vpi(compiler_state_t *, const uint8_t);
+static struct block *gen_atm_vci(compiler_state_t *, const uint16_t);
static void
initchunks(compiler_state_t *cstate)
if (cp == NULL)
return (NULL);
- pcap_strlcpy(cp, s, n);
+ pcapint_strlcpy(cp, s, n);
return (cp);
}
}
static struct block *
-gen_retblk(compiler_state_t *cstate, int v)
+gen_retblk_internal(compiler_state_t *cstate, int v)
{
struct block *b = new_block(cstate, BPF_RET|BPF_K);
return b;
}
+static struct block *
+gen_retblk(compiler_state_t *cstate, int v)
+{
+ if (setjmp(cstate->top_ctx)) {
+ /*
+ * gen_retblk() only fails because a memory
+ * allocation failed in newchunk(), meaning
+ * that it can't return a pointer.
+ *
+ * Return NULL.
+ */
+ return NULL;
+ }
+ return gen_retblk_internal(cstate, v);
+}
+
static inline PCAP_NORETURN_DEF void
syntax(compiler_state_t *cstate)
{
bpf_error(cstate, "syntax error in filter expression");
}
+/*
+ * For the given integer return a string with the keyword (or the nominal
+ * keyword if there is more than one). This is a simpler version of tok2str()
+ * in tcpdump because in this problem space a valid integer value is not
+ * greater than 71.
+ */
+static const char *
+qual2kw(const char *kind, const unsigned id, const char *tokens[],
+ const size_t size)
+{
+ static char buf[4][64];
+ static int idx = 0;
+
+ if (id < size && tokens[id])
+ return tokens[id];
+
+ char *ret = buf[idx];
+ idx = (idx + 1) % (sizeof(buf) / sizeof(buf[0]));
+ ret[0] = '\0'; // just in case
+ snprintf(ret, sizeof(buf[0]), "<invalid %s %u>", kind, id);
+ return ret;
+}
+
+// protocol qualifier keywords
+static const char *
+pqkw(const unsigned id)
+{
+ const char * tokens[] = {
+ [Q_LINK] = "link",
+ [Q_IP] = "ip",
+ [Q_ARP] = "arp",
+ [Q_RARP] = "rarp",
+ [Q_SCTP] = "sctp",
+ [Q_TCP] = "tcp",
+ [Q_UDP] = "udp",
+ [Q_ICMP] = "icmp",
+ [Q_IGMP] = "igmp",
+ [Q_IGRP] = "igrp",
+ [Q_ATALK] = "atalk",
+ [Q_DECNET] = "decnet",
+ [Q_LAT] = "lat",
+ [Q_SCA] = "sca",
+ [Q_MOPRC] = "moprc",
+ [Q_MOPDL] = "mopdl",
+ [Q_IPV6] = "ip6",
+ [Q_ICMPV6] = "icmp6",
+ [Q_AH] = "ah",
+ [Q_ESP] = "esp",
+ [Q_PIM] = "pim",
+ [Q_VRRP] = "vrrp",
+ [Q_AARP] = "aarp",
+ [Q_ISO] = "iso",
+ [Q_ESIS] = "esis",
+ [Q_ISIS] = "isis",
+ [Q_CLNP] = "clnp",
+ [Q_STP] = "stp",
+ [Q_IPX] = "ipx",
+ [Q_NETBEUI] = "netbeui",
+ [Q_ISIS_L1] = "l1",
+ [Q_ISIS_L2] = "l2",
+ [Q_ISIS_IIH] = "iih",
+ [Q_ISIS_SNP] = "snp",
+ [Q_ISIS_CSNP] = "csnp",
+ [Q_ISIS_PSNP] = "psnp",
+ [Q_ISIS_LSP] = "lsp",
+ [Q_RADIO] = "radio",
+ [Q_CARP] = "carp",
+ };
+ return qual2kw("proto", id, tokens, sizeof(tokens) / sizeof(tokens[0]));
+}
+
+// direction qualifier keywords
+static const char *
+dqkw(const unsigned id)
+{
+ const char * map[] = {
+ [Q_SRC] = "src",
+ [Q_DST] = "dst",
+ [Q_OR] = "src or dst",
+ [Q_AND] = "src and dst",
+ [Q_ADDR1] = "addr1",
+ [Q_ADDR2] = "addr2",
+ [Q_ADDR3] = "addr3",
+ [Q_ADDR4] = "addr4",
+ [Q_RA] = "ra",
+ [Q_TA] = "ta",
+ };
+ return qual2kw("dir", id, map, sizeof(map) / sizeof(map[0]));
+}
+
+// ATM keywords
+static const char *
+atmkw(const unsigned id)
+{
+ const char * tokens[] = {
+ [A_METAC] = "metac",
+ [A_BCC] = "bcc",
+ [A_OAMF4SC] = "oamf4sc",
+ [A_OAMF4EC] = "oamf4ec",
+ [A_SC] = "sc",
+ [A_ILMIC] = "ilmic",
+ [A_OAM] = "oam",
+ [A_OAMF4] = "oamf4",
+ [A_LANE] = "lane",
+ [A_VPI] = "vpi",
+ [A_VCI] = "vci",
+ [A_CONNECTMSG] = "connectmsg",
+ [A_METACONNECT] = "metaconnect",
+ };
+ return qual2kw("ATM keyword", id, tokens, sizeof(tokens) / sizeof(tokens[0]));
+}
+
+// SS7 keywords
+static const char *
+ss7kw(const unsigned id)
+{
+ const char * tokens[] = {
+ [M_FISU] = "fisu",
+ [M_LSSU] = "lssu",
+ [M_MSU] = "msu",
+ [MH_FISU] = "hfisu",
+ [MH_LSSU] = "hlssu",
+ [MH_MSU] = "hmsu",
+ [M_SIO] = "sio",
+ [M_OPC] = "opc",
+ [M_DPC] = "dpc",
+ [M_SLS] = "sls",
+ [MH_SIO] = "hsio",
+ [MH_OPC] = "hopc",
+ [MH_DPC] = "hdpc",
+ [MH_SLS] = "hsls",
+ };
+ return qual2kw("MTP keyword", id, tokens, sizeof(tokens) / sizeof(tokens[0]));
+}
+
+static PCAP_NORETURN_DEF void
+fail_kw_on_dlt(compiler_state_t *cstate, const char *keyword)
+{
+ bpf_error(cstate, "'%s' not supported on %s", keyword,
+ pcap_datalink_val_to_description_or_dlt(cstate->linktype));
+}
+
+static void
+assert_pflog(compiler_state_t *cstate, const char *kw)
+{
+ if (cstate->linktype != DLT_PFLOG)
+ bpf_error(cstate, "'%s' supported only on PFLOG linktype", kw);
+}
+
+static void
+assert_atm(compiler_state_t *cstate, const char *kw)
+{
+ /*
+ * Belt and braces: init_linktype() sets either all of these struct
+ * members (for DLT_SUNATM) or none (otherwise).
+ */
+ if (cstate->linktype != DLT_SUNATM ||
+ ! cstate->is_atm ||
+ cstate->off_vpi == OFFSET_NOT_SET ||
+ cstate->off_vci == OFFSET_NOT_SET ||
+ cstate->off_proto == OFFSET_NOT_SET ||
+ cstate->off_payload == OFFSET_NOT_SET)
+ bpf_error(cstate, "'%s' supported only on SUNATM", kw);
+}
+
+static void
+assert_ss7(compiler_state_t *cstate, const char *kw)
+{
+ switch (cstate->linktype) {
+ case DLT_MTP2:
+ case DLT_ERF:
+ case DLT_MTP2_WITH_PHDR:
+ // Belt and braces, same as in assert_atm().
+ if (cstate->off_sio != OFFSET_NOT_SET &&
+ cstate->off_opc != OFFSET_NOT_SET &&
+ cstate->off_dpc != OFFSET_NOT_SET &&
+ cstate->off_sls != OFFSET_NOT_SET)
+ return;
+ }
+ bpf_error(cstate, "'%s' supported only on SS7", kw);
+}
+
+static void
+assert_maxval(compiler_state_t *cstate, const char *name,
+ const bpf_u_int32 val, const bpf_u_int32 maxval)
+{
+ if (val > maxval)
+ bpf_error(cstate, "%s %u greater than maximum %u",
+ name, val, maxval);
+}
+
+#define ERRSTR_802_11_ONLY_KW "'%s' is valid for 802.11 syntax only"
+#define ERRSTR_INVALID_QUAL "'%s' is not a valid qualifier for '%s'"
+#define ERRSTR_UNKNOWN_MAC48HOST "unknown Ethernet-like host '%s'"
+
+// Validate a port/portrange proto qualifier and map to an IP protocol number.
+static int
+port_pq_to_ipproto(compiler_state_t *cstate, const int proto, const char *kw)
+{
+ switch (proto) {
+ case Q_UDP:
+ return IPPROTO_UDP;
+ case Q_TCP:
+ return IPPROTO_TCP;
+ case Q_SCTP:
+ return IPPROTO_SCTP;
+ case Q_DEFAULT:
+ return PROTO_UNDEF;
+ }
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, pqkw(proto), kw);
+}
+
int
pcap_compile(pcap_t *p, struct bpf_program *program,
const char *buf, int optimize, bpf_u_int32 mask)
{
#ifdef _WIN32
- static int done = 0;
+ int err;
+ WSADATA wsaData;
#endif
compiler_state_t cstate;
- const char * volatile xbuf = buf;
yyscan_t scanner = NULL;
- volatile YY_BUFFER_STATE in_buffer = NULL;
+ YY_BUFFER_STATE in_buffer = NULL;
u_int len;
int rc;
}
#ifdef _WIN32
- if (!done) {
- pcap_wsockinit();
- done = 1;
+ /*
+ * Initialize Winsock, asking for the latest version (2.2),
+ * as we may be calling Winsock routines to translate
+ * host names to addresses.
+ */
+ err = WSAStartup(MAKEWORD(2, 2), &wsaData);
+ if (err != 0) {
+ pcapint_fmt_errmsg_for_win32_err(p->errbuf, PCAP_ERRBUF_SIZE,
+ err, "Error calling WSAStartup()");
+ return (PCAP_ERROR);
}
#endif
}
if (pcap_lex_init(&scanner) != 0) {
- pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+ pcapint_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
errno, "can't initialize scanner");
rc = PCAP_ERROR;
goto quit;
}
- in_buffer = pcap__scan_string(xbuf ? xbuf : "", scanner);
+ in_buffer = pcap__scan_string(buf ? buf : "", scanner);
/*
* Associate the compiler state with the lexical analyzer
}
if (cstate.ic.root == NULL) {
+ cstate.ic.root = gen_retblk(&cstate, cstate.snaplen);
+
/*
* Catch errors reported by gen_retblk().
*/
- if (setjmp(cstate.top_ctx)) {
+ if (cstate.ic.root== NULL) {
rc = PCAP_ERROR;
goto quit;
}
- cstate.ic.root = gen_retblk(&cstate, cstate.snaplen);
}
if (optimize && !cstate.no_optimize) {
*/
freechunks(&cstate);
+#ifdef _WIN32
+ WSACleanup();
+#endif
+
return (rc);
}
int
finish_parse(compiler_state_t *cstate, struct block *p)
{
- struct block *ppi_dlt_check;
-
/*
* Catch errors reported by us and routines below us, and return -1
* on an error.
* 802.11 code (*and* anything else for which PPI is used)
* and choose between them early in the BPF program?
*/
- ppi_dlt_check = gen_ppi_dlt_check(cstate);
- if (ppi_dlt_check != NULL)
+ if (cstate->linktype == DLT_PPI) {
+ struct block *ppi_dlt_check = gen_cmp(cstate, OR_PACKET,
+ 4, BPF_W, SWAPLONG(DLT_IEEE802_11));
gen_and(ppi_dlt_check, p);
+ }
- backpatch(p, gen_retblk(cstate, cstate->snaplen));
+ backpatch(p, gen_retblk_internal(cstate, cstate->snaplen));
p->sense = !p->sense;
- backpatch(p, gen_retblk(cstate, 0));
+ backpatch(p, gen_retblk_internal(cstate, 0));
cstate->ic.root = p->head;
return (0);
}
return gen_ncmp(cstate, offrel, offset, size, 0xffffffff, BPF_JGT, 1, v);
}
+static struct block *
+gen_cmp_ne(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
+ u_int size, bpf_u_int32 v)
+{
+ return gen_ncmp(cstate, offrel, offset, size, 0xffffffff, BPF_JEQ, 1, v);
+}
+
static struct block *
gen_mcmp(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
u_int size, bpf_u_int32 v, bpf_u_int32 mask)
{
+ /*
+ * For any A: if mask == 0, it means A & mask == 0, so the result is
+ * true iff v == 0. In this case ideally the caller should have
+ * skipped this invocation and have fewer statement blocks to juggle.
+ * If the caller could have skipped, but has not, produce a block with
+ * fewer statements.
+ *
+ * This could be done in gen_ncmp() in a more generic way, but this
+ * function is the only code path that can have mask == 0.
+ */
+ if (mask == 0)
+ return v ? gen_false(cstate) : gen_true(cstate);
+
return gen_ncmp(cstate, offrel, offset, size, mask, BPF_JEQ, 0, v);
}
+static struct block *
+gen_mcmp_ne(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
+ u_int size, bpf_u_int32 v, bpf_u_int32 mask)
+{
+ return gen_ncmp(cstate, offrel, offset, size, mask, BPF_JEQ, 1, v);
+}
+
static struct block *
gen_bcmp(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
u_int size, const u_char *v)
return b;
}
+static struct block *
+gen_jmp(compiler_state_t *cstate, int jtype, bpf_u_int32 v, struct slist *stmts)
+{
+ struct block *b = new_block(cstate, JMP(jtype));
+ b->s.k = v;
+ b->stmts = stmts;
+ return b;
+}
+
+static struct block *
+gen_set(compiler_state_t *cstate, bpf_u_int32 v, struct slist *stmts)
+{
+ return gen_jmp(cstate, BPF_JSET, v, stmts);
+}
+
+static struct block *
+gen_unset(compiler_state_t *cstate, bpf_u_int32 v, struct slist *stmts)
+{
+ struct block *b = gen_set(cstate, v, stmts);
+ gen_not(b);
+ return b;
+}
+
/*
* AND the field of size "size" at offset "offset" relative to the header
* specified by "offrel" with "mask", and compare it with the value "v"
sappend(s, s2);
}
- b = new_block(cstate, JMP(jtype));
- b->stmts = s;
- b->s.k = v;
- if (reverse && (jtype == BPF_JGT || jtype == BPF_JGE))
+ b = gen_jmp(cstate, jtype, v, s);
+ if (reverse)
gen_not(b);
return b;
}
cstate->off_payload = OFFSET_NOT_SET;
/*
- * And not Geneve.
+ * And not encapsulated with either Geneve or VXLAN.
*/
- cstate->is_geneve = 0;
+ cstate->is_encap = 0;
/*
* No variable length VLAN offset by default
case DLT_PPP_ETHER:
/*
- * This does no include the Ethernet header, and
+ * This does not include the Ethernet header, and
* only covers session state.
*/
cstate->off_linktype.constant_part = 6;
cstate->off_nl_nosnap = 0; /* no 802.2 LLC */
break;
- /*
- * the only BPF-interesting FRF.16 frames are non-control frames;
- * Frame Relay has a variable length link-layer
- * so lets start with offset 4 for now and increments later on (FIXME);
- */
+ /*
+ * the only BPF-interesting FRF.16 frames are non-control frames;
+ * Frame Relay has a variable length link-layer
+ * so lets start with offset 4 for now and increments later on (FIXME);
+ */
case DLT_MFR:
cstate->off_linktype.constant_part = OFFSET_NOT_SET;
cstate->off_linkpl.constant_part = 0;
cstate->off_nl_nosnap = 0; /* no 802.2 LLC */
break;
- case DLT_JUNIPER_MFR:
- case DLT_JUNIPER_MLFR:
- case DLT_JUNIPER_MLPPP:
- case DLT_JUNIPER_PPP:
- case DLT_JUNIPER_CHDLC:
- case DLT_JUNIPER_FRELAY:
+ case DLT_JUNIPER_MFR:
+ case DLT_JUNIPER_MLFR:
+ case DLT_JUNIPER_MLPPP:
+ case DLT_JUNIPER_PPP:
+ case DLT_JUNIPER_CHDLC:
+ case DLT_JUNIPER_FRELAY:
cstate->off_linktype.constant_part = 4;
cstate->off_linkpl.constant_part = 4;
cstate->off_nl = 0;
cstate->off_nl_nosnap = OFFSET_NOT_SET; /* no 802.2 LLC */
- break;
+ break;
case DLT_JUNIPER_ATM1:
cstate->off_linktype.constant_part = 4; /* in reality variable between 4-8 */
/* frames captured on a Juniper PPPoE service PIC
* contain raw ethernet frames */
case DLT_JUNIPER_PPPOE:
- case DLT_JUNIPER_ETHER:
+ case DLT_JUNIPER_ETHER:
cstate->off_linkpl.constant_part = 14;
cstate->off_linktype.constant_part = 16;
cstate->off_nl = 18; /* Ethernet II */
switch (offrel) {
case OR_PACKET:
- s = new_stmt(cstate, BPF_LD|BPF_ABS|size);
- s->s.k = offset;
+ s = new_stmt(cstate, BPF_LD|BPF_ABS|size);
+ s->s.k = offset;
break;
case OR_LINKHDR:
static struct block *
gen_uncond(compiler_state_t *cstate, int rsense)
{
- struct block *b;
struct slist *s;
s = new_stmt(cstate, BPF_LD|BPF_IMM);
s->s.k = !rsense;
- b = new_block(cstate, JMP(BPF_JEQ));
- b->stmts = s;
-
- return b;
+ return gen_jmp(cstate, BPF_JEQ, 0, s);
}
static inline struct block *
return gen_uncond(cstate, 0);
}
-/*
- * Byte-swap a 32-bit number.
- * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
- * big-endian platforms.)
- */
-#define SWAPLONG(y) \
-((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
-
/*
* Generate code to match a particular packet type.
*
* DSAP, as we do for other types <= ETHERMTU
* (i.e., other SAP values)?
*/
- b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
- gen_not(b0);
+ b0 = gen_cmp_le(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
b1 = gen_cmp(cstate, OR_LLC, 0, BPF_H, (ll_proto << 8) | ll_proto);
gen_and(b0, b1);
return b1;
* Now we generate code to check for 802.3
* frames in general.
*/
- b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
- gen_not(b0);
+ b0 = gen_cmp_le(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
/*
* Now add the check for 802.3 frames before the
/*
* Check for 802.2 encapsulation (EtherTalk phase 2?);
- * we check for an Ethernet type field less than
+ * we check for an Ethernet type field less or equal than
* 1500, which means it's an 802.3 length field.
*/
- b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
- gen_not(b0);
+ b0 = gen_cmp_le(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
/*
* 802.2-encapsulated ETHERTYPE_ATALK packets are
default:
if (ll_proto <= ETHERMTU) {
+ assert_maxval(cstate, "LLC DSAP", ll_proto, UINT8_MAX);
/*
* This is an LLC SAP value, so the frames
* that match would be 802.2 frames.
* a length field, <= ETHERMTU) and
* then check the DSAP.
*/
- b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
- gen_not(b0);
+ b0 = gen_cmp_le(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
b1 = gen_cmp(cstate, OR_LINKTYPE, 2, BPF_B, ll_proto);
gen_and(b0, b1);
return b1;
} else {
+ assert_maxval(cstate, "EtherType", ll_proto, UINT16_MAX);
/*
* This is an Ethernet type, so compare
* the length/type field with it (if
default:
if (ll_proto <= ETHERMTU) {
+ assert_maxval(cstate, "LLC DSAP", ll_proto, UINT8_MAX);
/*
* This is an LLC SAP value, so the frames
* that match would be 802.2 frames.
gen_and(b0, b1);
return b1;
} else {
+ assert_maxval(cstate, "EtherType", ll_proto, UINT16_MAX);
/*
* This is an Ethernet type, so compare
* the length/type field with it (if
* 0x04 bit (b2) clear.
*/
sjset_data_frame_1 = new_stmt(cstate, JMP(BPF_JSET));
- sjset_data_frame_1->s.k = 0x08;
+ sjset_data_frame_1->s.k = IEEE80211_FC0_TYPE_DATA;
sappend(s, sjset_data_frame_1);
/*
* the rest of the program.
*/
sjset_data_frame_1->s.jt = sjset_data_frame_2 = new_stmt(cstate, JMP(BPF_JSET));
- sjset_data_frame_2->s.k = 0x04;
+ sjset_data_frame_2->s.k = IEEE80211_FC0_TYPE_CTL;
sappend(s, sjset_data_frame_2);
sjset_data_frame_1->s.jf = snext;
*/
sjset_data_frame_2->s.jt = snext;
sjset_data_frame_2->s.jf = sjset_qos = new_stmt(cstate, JMP(BPF_JSET));
- sjset_qos->s.k = 0x80; /* QoS bit */
+ sjset_qos->s.k = IEEE80211_FC0_SUBTYPE_QOS;
sappend(s, sjset_qos);
/*
}
}
-static struct block *
-gen_ppi_dlt_check(compiler_state_t *cstate)
-{
- struct slist *s_load_dlt;
- struct block *b;
-
- if (cstate->linktype == DLT_PPI)
- {
- /* Create the statements that check for the DLT
- */
- s_load_dlt = new_stmt(cstate, BPF_LD|BPF_W|BPF_ABS);
- s_load_dlt->s.k = 4;
-
- b = new_block(cstate, JMP(BPF_JEQ));
-
- b->stmts = s_load_dlt;
- b->s.k = SWAPLONG(DLT_IEEE802_11);
- }
- else
- {
- b = NULL;
- }
-
- return b;
-}
-
/*
* Take an absolute offset, and:
*
/*
* Map an Ethernet type to the equivalent PPP type.
*/
-static bpf_u_int32
-ethertype_to_ppptype(bpf_u_int32 ll_proto)
+static uint16_t
+ethertype_to_ppptype(compiler_state_t *cstate, bpf_u_int32 ll_proto)
{
switch (ll_proto) {
case ETHERTYPE_IP:
- ll_proto = PPP_IP;
- break;
+ return PPP_IP;
case ETHERTYPE_IPV6:
- ll_proto = PPP_IPV6;
- break;
+ return PPP_IPV6;
case ETHERTYPE_DN:
- ll_proto = PPP_DECNET;
- break;
+ return PPP_DECNET;
case ETHERTYPE_ATALK:
- ll_proto = PPP_APPLE;
- break;
+ return PPP_APPLE;
case ETHERTYPE_NS:
- ll_proto = PPP_NS;
- break;
+ return PPP_NS;
case LLCSAP_ISONS:
- ll_proto = PPP_OSI;
- break;
+ return PPP_OSI;
case LLCSAP_8021D:
/*
* over PPP are Spanning Tree Protocol
* Bridging PDUs.
*/
- ll_proto = PPP_BRPDU;
- break;
+ return PPP_BRPDU;
case LLCSAP_IPX:
- ll_proto = PPP_IPX;
- break;
+ return PPP_IPX;
}
- return (ll_proto);
+ assert_maxval(cstate, "PPP protocol", ll_proto, UINT16_MAX);
+ return (uint16_t)ll_proto;
}
/*
static struct block *
gen_prevlinkhdr_check(compiler_state_t *cstate)
{
- struct block *b0;
-
- if (cstate->is_geneve)
- return gen_geneve_ll_check(cstate);
+ if (cstate->is_encap)
+ return gen_encap_ll_check(cstate);
switch (cstate->prevlinktype) {
*
* (We've already generated a test for LANE.)
*/
- b0 = gen_cmp(cstate, OR_PREVLINKHDR, SUNATM_PKT_BEGIN_POS, BPF_H, 0xFF00);
- gen_not(b0);
- return b0;
+ return gen_cmp_ne(cstate, OR_PREVLINKHDR, SUNATM_PKT_BEGIN_POS, BPF_H, 0xFF00);
default:
/*
gen_linktype(compiler_state_t *cstate, bpf_u_int32 ll_proto)
{
struct block *b0, *b1, *b2;
- const char *description;
/* are we checking MPLS-encapsulated packets? */
if (cstate->label_stack_depth > 0)
case DLT_NETANALYZER:
case DLT_NETANALYZER_TRANSPARENT:
/* Geneve has an EtherType regardless of whether there is an
- * L2 header. */
- if (!cstate->is_geneve)
+ * L2 header. VXLAN always has an EtherType. */
+ if (!cstate->is_encap)
b0 = gen_prevlinkhdr_check(cstate);
else
b0 = NULL;
case DLT_C_HDLC:
case DLT_HDLC:
+ assert_maxval(cstate, "HDLC protocol", ll_proto, UINT16_MAX);
switch (ll_proto) {
case LLCSAP_ISONS:
/*
* Check that we have a data frame.
*/
- b0 = gen_check_802_11_data_frame(cstate);
+ b0 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B,
+ IEEE80211_FC0_TYPE_DATA,
+ IEEE80211_FC0_TYPE_MASK);
/*
* Now check for the specified link-layer type.
*
* Check for LLC encapsulation and then check the protocol.
*/
- b0 = gen_atmfield_code_internal(cstate, A_PROTOTYPE, PT_LLC, BPF_JEQ, 0);
+ b0 = gen_atm_prototype(cstate, PT_LLC);
b1 = gen_llc_linktype(cstate, ll_proto);
gen_and(b0, b1);
return b1;
* map them to the corresponding PPP protocol types.
*/
return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H,
- ethertype_to_ppptype(ll_proto));
+ ethertype_to_ppptype(cstate, ll_proto));
/*NOTREACHED*/
case DLT_PPP_BSDOS:
default:
return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H,
- ethertype_to_ppptype(ll_proto));
+ ethertype_to_ppptype(cstate, ll_proto));
}
/*NOTREACHED*/
/*NOTREACHED*/
case DLT_MFR:
- bpf_error(cstate, "Multi-link Frame Relay link-layer type filtering not implemented");
+ break; // not implemented
- case DLT_JUNIPER_MFR:
- case DLT_JUNIPER_MLFR:
- case DLT_JUNIPER_MLPPP:
+ case DLT_JUNIPER_MFR:
+ case DLT_JUNIPER_MLFR:
+ case DLT_JUNIPER_MLPPP:
case DLT_JUNIPER_ATM1:
case DLT_JUNIPER_ATM2:
case DLT_JUNIPER_PPPOE:
case DLT_JUNIPER_PPPOE_ATM:
- case DLT_JUNIPER_GGSN:
- case DLT_JUNIPER_ES:
- case DLT_JUNIPER_MONITOR:
- case DLT_JUNIPER_SERVICES:
- case DLT_JUNIPER_ETHER:
- case DLT_JUNIPER_PPP:
- case DLT_JUNIPER_FRELAY:
- case DLT_JUNIPER_CHDLC:
- case DLT_JUNIPER_VP:
- case DLT_JUNIPER_ST:
- case DLT_JUNIPER_ISM:
- case DLT_JUNIPER_VS:
- case DLT_JUNIPER_SRX_E2E:
- case DLT_JUNIPER_FIBRECHANNEL:
+ case DLT_JUNIPER_GGSN:
+ case DLT_JUNIPER_ES:
+ case DLT_JUNIPER_MONITOR:
+ case DLT_JUNIPER_SERVICES:
+ case DLT_JUNIPER_ETHER:
+ case DLT_JUNIPER_PPP:
+ case DLT_JUNIPER_FRELAY:
+ case DLT_JUNIPER_CHDLC:
+ case DLT_JUNIPER_VP:
+ case DLT_JUNIPER_ST:
+ case DLT_JUNIPER_ISM:
+ case DLT_JUNIPER_VS:
+ case DLT_JUNIPER_SRX_E2E:
+ case DLT_JUNIPER_FIBRECHANNEL:
case DLT_JUNIPER_ATM_CEMIC:
/* just lets verify the magic number for now -
return gen_ipnet_linktype(cstate, ll_proto);
case DLT_LINUX_IRDA:
- bpf_error(cstate, "IrDA link-layer type filtering not implemented");
-
case DLT_DOCSIS:
- bpf_error(cstate, "DOCSIS link-layer type filtering not implemented");
-
case DLT_MTP2:
case DLT_MTP2_WITH_PHDR:
- bpf_error(cstate, "MTP2 link-layer type filtering not implemented");
-
case DLT_ERF:
- bpf_error(cstate, "ERF link-layer type filtering not implemented");
-
case DLT_PFSYNC:
- bpf_error(cstate, "PFSYNC link-layer type filtering not implemented");
-
case DLT_LINUX_LAPD:
- bpf_error(cstate, "LAPD link-layer type filtering not implemented");
-
case DLT_USB_FREEBSD:
case DLT_USB_LINUX:
case DLT_USB_LINUX_MMAPPED:
case DLT_USBPCAP:
- bpf_error(cstate, "USB link-layer type filtering not implemented");
-
case DLT_BLUETOOTH_HCI_H4:
case DLT_BLUETOOTH_HCI_H4_WITH_PHDR:
- bpf_error(cstate, "Bluetooth link-layer type filtering not implemented");
-
case DLT_CAN20B:
case DLT_CAN_SOCKETCAN:
- bpf_error(cstate, "CAN link-layer type filtering not implemented");
-
case DLT_IEEE802_15_4:
case DLT_IEEE802_15_4_LINUX:
case DLT_IEEE802_15_4_NONASK_PHY:
case DLT_IEEE802_15_4_NOFCS:
case DLT_IEEE802_15_4_TAP:
- bpf_error(cstate, "IEEE 802.15.4 link-layer type filtering not implemented");
-
case DLT_IEEE802_16_MAC_CPS_RADIO:
- bpf_error(cstate, "IEEE 802.16 link-layer type filtering not implemented");
-
case DLT_SITA:
- bpf_error(cstate, "SITA link-layer type filtering not implemented");
-
case DLT_RAIF1:
- bpf_error(cstate, "RAIF1 link-layer type filtering not implemented");
-
case DLT_IPMB_KONTRON:
- case DLT_IPMB_LINUX:
- bpf_error(cstate, "IPMB link-layer type filtering not implemented");
-
+ case DLT_I2C_LINUX:
case DLT_AX25_KISS:
- bpf_error(cstate, "AX.25 link-layer type filtering not implemented");
-
case DLT_NFLOG:
/* Using the fixed-size NFLOG header it is possible to tell only
* the address family of the packet, other meaningful data is
* either missing or behind TLVs.
*/
- bpf_error(cstate, "NFLOG link-layer type filtering not implemented");
+ break; // not implemented
default:
/*
* it's not, it needs to be handled specially
* above.)
*/
+ assert_maxval(cstate, "EtherType", ll_proto, UINT16_MAX);
return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, ll_proto);
/*NOTREACHED */
- } else {
- /*
- * No; report an error.
- */
- description = pcap_datalink_val_to_description_or_dlt(cstate->linktype);
- bpf_error(cstate, "%s link-layer type filtering not implemented",
- description);
- /*NOTREACHED */
}
}
+ bpf_error(cstate, "link-layer type filtering not implemented for %s",
+ pcap_datalink_val_to_description_or_dlt(cstate->linktype));
}
/*
case DLT_EN10MB:
/*
- * We check for an Ethernet type field less than
+ * We check for an Ethernet type field less or equal than
* 1500, which means it's an 802.3 length field.
*/
- b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
- gen_not(b0);
+ b0 = gen_cmp_le(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
/*
* Now check for the purported DSAP and SSAP not being
* 0xFF, to rule out NetWare-over-802.3.
*/
- b1 = gen_cmp(cstate, OR_LLC, 0, BPF_H, 0xFFFF);
- gen_not(b1);
+ b1 = gen_cmp_ne(cstate, OR_LLC, 0, BPF_H, 0xFFFF);
gen_and(b0, b1);
return b1;
/*
* We check for LLC traffic.
*/
- b0 = gen_atmtype_llc(cstate);
- return b0;
+ return gen_atmtype_llc(cstate);
case DLT_IEEE802: /* Token Ring */
/*
/*
* Check that we have a data frame.
*/
- b0 = gen_check_802_11_data_frame(cstate);
- return b0;
+ return gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B,
+ IEEE80211_FC0_TYPE_DATA,
+ IEEE80211_FC0_TYPE_MASK);
default:
- bpf_error(cstate, "'llc' not supported for %s",
- pcap_datalink_val_to_description_or_dlt(cstate->linktype));
+ fail_kw_on_dlt(cstate, "llc");
/*NOTREACHED*/
}
}
* be clear for I frames.
*/
s = gen_load_a(cstate, OR_LLC, 2, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x01;
- b1->stmts = s;
- gen_not(b1);
+ b1 = gen_unset(cstate, 0x01, s);
+
gen_and(b0, b1);
return b1;
}
* here, but should we check for the IPX Ethertype?
*/
if (ll_proto <= ETHERMTU) {
+ assert_maxval(cstate, "LLC DSAP", ll_proto, UINT8_MAX);
/*
* This is an LLC SAP value, so check
* the DSAP.
*/
return gen_cmp(cstate, OR_LLC, 0, BPF_B, ll_proto);
} else {
+ assert_maxval(cstate, "EtherType", ll_proto, UINT16_MAX);
/*
* This is an Ethernet type; we assume that it's
* unlikely that it'll appear in the right place
static struct block *
gen_hostop(compiler_state_t *cstate, bpf_u_int32 addr, bpf_u_int32 mask,
- int dir, bpf_u_int32 ll_proto, u_int src_off, u_int dst_off)
+ int dir, u_int src_off, u_int dst_off)
{
struct block *b0, *b1;
u_int offset;
break;
case Q_AND:
- b0 = gen_hostop(cstate, addr, mask, Q_SRC, ll_proto, src_off, dst_off);
- b1 = gen_hostop(cstate, addr, mask, Q_DST, ll_proto, src_off, dst_off);
+ b0 = gen_hostop(cstate, addr, mask, Q_SRC, src_off, dst_off);
+ b1 = gen_hostop(cstate, addr, mask, Q_DST, src_off, dst_off);
gen_and(b0, b1);
return b1;
case Q_DEFAULT:
case Q_OR:
- b0 = gen_hostop(cstate, addr, mask, Q_SRC, ll_proto, src_off, dst_off);
- b1 = gen_hostop(cstate, addr, mask, Q_DST, ll_proto, src_off, dst_off);
+ b0 = gen_hostop(cstate, addr, mask, Q_SRC, src_off, dst_off);
+ b1 = gen_hostop(cstate, addr, mask, Q_DST, src_off, dst_off);
gen_or(b0, b1);
return b1;
case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_RA:
- bpf_error(cstate, "'ra' is not a valid qualifier for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_TA:
- bpf_error(cstate, "'ta' is not a valid qualifier for addresses other than 802.11 MAC addresses");
+ bpf_error(cstate, ERRSTR_802_11_ONLY_KW, dqkw(dir));
/*NOTREACHED*/
default:
abort();
/*NOTREACHED*/
}
- b0 = gen_linktype(cstate, ll_proto);
- b1 = gen_mcmp(cstate, OR_LINKPL, offset, BPF_W, addr, mask);
- gen_and(b0, b1);
- return b1;
+ return gen_mcmp(cstate, OR_LINKPL, offset, BPF_W, addr, mask);
}
#ifdef INET6
static struct block *
gen_hostop6(compiler_state_t *cstate, struct in6_addr *addr,
- struct in6_addr *mask, int dir, bpf_u_int32 ll_proto, u_int src_off,
- u_int dst_off)
+ struct in6_addr *mask, int dir, u_int src_off, u_int dst_off)
{
struct block *b0, *b1;
u_int offset;
break;
case Q_AND:
- b0 = gen_hostop6(cstate, addr, mask, Q_SRC, ll_proto, src_off, dst_off);
- b1 = gen_hostop6(cstate, addr, mask, Q_DST, ll_proto, src_off, dst_off);
+ b0 = gen_hostop6(cstate, addr, mask, Q_SRC, src_off, dst_off);
+ b1 = gen_hostop6(cstate, addr, mask, Q_DST, src_off, dst_off);
gen_and(b0, b1);
return b1;
case Q_DEFAULT:
case Q_OR:
- b0 = gen_hostop6(cstate, addr, mask, Q_SRC, ll_proto, src_off, dst_off);
- b1 = gen_hostop6(cstate, addr, mask, Q_DST, ll_proto, src_off, dst_off);
+ b0 = gen_hostop6(cstate, addr, mask, Q_SRC, src_off, dst_off);
+ b1 = gen_hostop6(cstate, addr, mask, Q_DST, src_off, dst_off);
gen_or(b0, b1);
return b1;
case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_RA:
- bpf_error(cstate, "'ra' is not a valid qualifier for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_TA:
- bpf_error(cstate, "'ta' is not a valid qualifier for addresses other than 802.11 MAC addresses");
+ bpf_error(cstate, ERRSTR_802_11_ONLY_KW, dqkw(dir));
/*NOTREACHED*/
default:
/* this order is important */
memcpy(a, addr, sizeof(a));
memcpy(m, mask, sizeof(m));
- b1 = gen_mcmp(cstate, OR_LINKPL, offset + 12, BPF_W, ntohl(a[3]), ntohl(m[3]));
- b0 = gen_mcmp(cstate, OR_LINKPL, offset + 8, BPF_W, ntohl(a[2]), ntohl(m[2]));
- gen_and(b0, b1);
- b0 = gen_mcmp(cstate, OR_LINKPL, offset + 4, BPF_W, ntohl(a[1]), ntohl(m[1]));
- gen_and(b0, b1);
- b0 = gen_mcmp(cstate, OR_LINKPL, offset + 0, BPF_W, ntohl(a[0]), ntohl(m[0]));
- gen_and(b0, b1);
- b0 = gen_linktype(cstate, ll_proto);
- gen_and(b0, b1);
- return b1;
+ b1 = NULL;
+ for (int i = 3; i >= 0; i--) {
+ // Same as the Q_IP case in gen_host().
+ if (m[i] == 0 && a[i] == 0)
+ continue;
+ b0 = gen_mcmp(cstate, OR_LINKPL, offset + 4 * i, BPF_W,
+ ntohl(a[i]), ntohl(m[i]));
+ if (b1)
+ gen_and(b0, b1);
+ else
+ b1 = b0;
+ }
+ return b1 ? b1 : gen_true(cstate);
}
#endif
+/*
+ * Like gen_mac48host(), but for DLT_IEEE802_11 (802.11 wireless LAN) and
+ * various 802.11 + radio headers.
+ */
static struct block *
-gen_ehostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
+gen_wlanhostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
{
- register struct block *b0, *b1;
-
- switch (dir) {
- case Q_SRC:
- return gen_bcmp(cstate, OR_LINKHDR, 6, 6, eaddr);
-
- case Q_DST:
- return gen_bcmp(cstate, OR_LINKHDR, 0, 6, eaddr);
-
- case Q_AND:
- b0 = gen_ehostop(cstate, eaddr, Q_SRC);
- b1 = gen_ehostop(cstate, eaddr, Q_DST);
- gen_and(b0, b1);
- return b1;
-
- case Q_DEFAULT:
- case Q_OR:
- b0 = gen_ehostop(cstate, eaddr, Q_SRC);
- b1 = gen_ehostop(cstate, eaddr, Q_DST);
- gen_or(b0, b1);
- return b1;
-
- case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11 with 802.11 headers");
- /*NOTREACHED*/
-
- case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11 with 802.11 headers");
- /*NOTREACHED*/
-
- case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11 with 802.11 headers");
- /*NOTREACHED*/
-
- case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11 with 802.11 headers");
- /*NOTREACHED*/
-
- case Q_RA:
- bpf_error(cstate, "'ra' is only supported on 802.11 with 802.11 headers");
- /*NOTREACHED*/
-
- case Q_TA:
- bpf_error(cstate, "'ta' is only supported on 802.11 with 802.11 headers");
- /*NOTREACHED*/
- }
- abort();
- /*NOTREACHED*/
-}
-
-/*
- * Like gen_ehostop, but for DLT_FDDI
- */
-static struct block *
-gen_fhostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
-{
- struct block *b0, *b1;
-
- switch (dir) {
- case Q_SRC:
- return gen_bcmp(cstate, OR_LINKHDR, 6 + 1 + cstate->pcap_fddipad, 6, eaddr);
-
- case Q_DST:
- return gen_bcmp(cstate, OR_LINKHDR, 0 + 1 + cstate->pcap_fddipad, 6, eaddr);
-
- case Q_AND:
- b0 = gen_fhostop(cstate, eaddr, Q_SRC);
- b1 = gen_fhostop(cstate, eaddr, Q_DST);
- gen_and(b0, b1);
- return b1;
-
- case Q_DEFAULT:
- case Q_OR:
- b0 = gen_fhostop(cstate, eaddr, Q_SRC);
- b1 = gen_fhostop(cstate, eaddr, Q_DST);
- gen_or(b0, b1);
- return b1;
-
- case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_RA:
- bpf_error(cstate, "'ra' is only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_TA:
- bpf_error(cstate, "'ta' is only supported on 802.11");
- /*NOTREACHED*/
- }
- abort();
- /*NOTREACHED*/
-}
-
-/*
- * Like gen_ehostop, but for DLT_IEEE802 (Token Ring)
- */
-static struct block *
-gen_thostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
-{
- register struct block *b0, *b1;
-
- switch (dir) {
- case Q_SRC:
- return gen_bcmp(cstate, OR_LINKHDR, 8, 6, eaddr);
-
- case Q_DST:
- return gen_bcmp(cstate, OR_LINKHDR, 2, 6, eaddr);
-
- case Q_AND:
- b0 = gen_thostop(cstate, eaddr, Q_SRC);
- b1 = gen_thostop(cstate, eaddr, Q_DST);
- gen_and(b0, b1);
- return b1;
-
- case Q_DEFAULT:
- case Q_OR:
- b0 = gen_thostop(cstate, eaddr, Q_SRC);
- b1 = gen_thostop(cstate, eaddr, Q_DST);
- gen_or(b0, b1);
- return b1;
-
- case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_RA:
- bpf_error(cstate, "'ra' is only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_TA:
- bpf_error(cstate, "'ta' is only supported on 802.11");
- /*NOTREACHED*/
- }
- abort();
- /*NOTREACHED*/
-}
-
-/*
- * Like gen_ehostop, but for DLT_IEEE802_11 (802.11 wireless LAN) and
- * various 802.11 + radio headers.
- */
-static struct block *
-gen_wlanhostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
-{
- register struct block *b0, *b1, *b2;
- register struct slist *s;
-
-#ifdef ENABLE_WLAN_FILTERING_PATCH
- /*
- * TODO GV 20070613
- * We need to disable the optimizer because the optimizer is buggy
- * and wipes out some LD instructions generated by the below
- * code to validate the Frame Control bits
- */
- cstate->no_optimize = 1;
-#endif /* ENABLE_WLAN_FILTERING_PATCH */
+ register struct block *b0, *b1, *b2;
+ register struct slist *s;
+
+#ifdef ENABLE_WLAN_FILTERING_PATCH
+ /*
+ * TODO GV 20070613
+ * We need to disable the optimizer because the optimizer is buggy
+ * and wipes out some LD instructions generated by the below
+ * code to validate the Frame Control bits
+ */
+ cstate->no_optimize = 1;
+#endif /* ENABLE_WLAN_FILTERING_PATCH */
switch (dir) {
case Q_SRC:
* First, check for To DS set, i.e. check "link[1] & 0x01".
*/
s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x01; /* To DS */
- b1->stmts = s;
+ b1 = gen_set(cstate, IEEE80211_FC1_DIR_TODS, s);
/*
* If To DS is set, the SA is at 24.
* "!(link[1] & 0x01)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
- b2 = new_block(cstate, JMP(BPF_JSET));
- b2->s.k = 0x01; /* To DS */
- b2->stmts = s;
- gen_not(b2);
+ b2 = gen_unset(cstate, IEEE80211_FC1_DIR_TODS, s);
/*
* If To DS is not set, the SA is at 16.
* the ORed-together checks.
*/
s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x02; /* From DS */
- b1->stmts = s;
+ b1 = gen_set(cstate, IEEE80211_FC1_DIR_FROMDS, s);
gen_and(b1, b0);
/*
* Now check for data frames with From DS not set.
*/
s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
- b2 = new_block(cstate, JMP(BPF_JSET));
- b2->s.k = 0x02; /* From DS */
- b2->stmts = s;
- gen_not(b2);
+ b2 = gen_unset(cstate, IEEE80211_FC1_DIR_FROMDS, s);
/*
* If From DS isn't set, the SA is at 10.
* I.e, check "link[0] & 0x08".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x08;
- b1->stmts = s;
+ b1 = gen_set(cstate, IEEE80211_FC0_TYPE_DATA, s);
/*
* AND that with the checks done for data frames.
* I.e, check "!(link[0] & 0x08)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b2 = new_block(cstate, JMP(BPF_JSET));
- b2->s.k = 0x08;
- b2->stmts = s;
- gen_not(b2);
+ b2 = gen_unset(cstate, IEEE80211_FC0_TYPE_DATA, s);
/*
* For management frames, the SA is at 10.
* I.e., check "!(link[0] & 0x04)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x04;
- b1->stmts = s;
- gen_not(b1);
+ b1 = gen_unset(cstate, IEEE80211_FC0_TYPE_CTL, s);
/*
* AND that with the checks for data and management
* First, check for To DS set, i.e. "link[1] & 0x01".
*/
s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x01; /* To DS */
- b1->stmts = s;
+ b1 = gen_set(cstate, IEEE80211_FC1_DIR_TODS, s);
/*
* If To DS is set, the DA is at 16.
* "!(link[1] & 0x01)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
- b2 = new_block(cstate, JMP(BPF_JSET));
- b2->s.k = 0x01; /* To DS */
- b2->stmts = s;
- gen_not(b2);
+ b2 = gen_unset(cstate, IEEE80211_FC1_DIR_TODS, s);
/*
* If To DS is not set, the DA is at 4.
* I.e, check "link[0] & 0x08".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x08;
- b1->stmts = s;
+ b1 = gen_set(cstate, IEEE80211_FC0_TYPE_DATA, s);
/*
* AND that with the checks done for data frames.
* I.e, check "!(link[0] & 0x08)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b2 = new_block(cstate, JMP(BPF_JSET));
- b2->s.k = 0x08;
- b2->stmts = s;
- gen_not(b2);
+ b2 = gen_unset(cstate, IEEE80211_FC0_TYPE_DATA, s);
/*
* For management frames, the DA is at 4.
* I.e., check "!(link[0] & 0x04)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x04;
- b1->stmts = s;
- gen_not(b1);
+ b1 = gen_unset(cstate, IEEE80211_FC0_TYPE_CTL, s);
/*
* AND that with the checks for data and management
/*
* Not present in CTS or ACK control frames.
*/
- b0 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_TYPE_CTL,
+ b0 = gen_mcmp_ne(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_TYPE_CTL,
IEEE80211_FC0_TYPE_MASK);
- gen_not(b0);
- b1 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_CTS,
+ b1 = gen_mcmp_ne(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_CTS,
IEEE80211_FC0_SUBTYPE_MASK);
- gen_not(b1);
- b2 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_ACK,
+ b2 = gen_mcmp_ne(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_ACK,
IEEE80211_FC0_SUBTYPE_MASK);
- gen_not(b2);
gen_and(b1, b2);
gen_or(b0, b2);
b1 = gen_bcmp(cstate, OR_LINKHDR, 10, 6, eaddr);
/*
* Not present in control frames.
*/
- b0 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_TYPE_CTL,
+ b0 = gen_mcmp_ne(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_TYPE_CTL,
IEEE80211_FC0_TYPE_MASK);
- gen_not(b0);
b1 = gen_bcmp(cstate, OR_LINKHDR, 16, 6, eaddr);
gen_and(b0, b1);
return b1;
* I.e, check "(link[0] & 0x08)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x08;
- b1->stmts = s;
+ b1 = gen_set(cstate, IEEE80211_FC0_TYPE_DATA, s);
/*
* Check addr1.
/*
* Not present in CTS or ACK control frames.
*/
- b0 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_TYPE_CTL,
+ b0 = gen_mcmp_ne(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_TYPE_CTL,
IEEE80211_FC0_TYPE_MASK);
- gen_not(b0);
- b1 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_CTS,
+ b1 = gen_mcmp_ne(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_CTS,
IEEE80211_FC0_SUBTYPE_MASK);
- gen_not(b1);
- b2 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_ACK,
+ b2 = gen_mcmp_ne(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_ACK,
IEEE80211_FC0_SUBTYPE_MASK);
- gen_not(b2);
gen_and(b1, b2);
gen_or(b0, b2);
* I.e, check "(link[0] & 0x08)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x08;
- b1->stmts = s;
+ b1 = gen_set(cstate, IEEE80211_FC0_TYPE_DATA, s);
/*
* AND that with the check for frames other than
/*NOTREACHED*/
}
-/*
- * Like gen_ehostop, but for RFC 2625 IP-over-Fibre-Channel.
- * (We assume that the addresses are IEEE 48-bit MAC addresses,
- * as the RFC states.)
- */
-static struct block *
-gen_ipfchostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
-{
- register struct block *b0, *b1;
-
- switch (dir) {
- case Q_SRC:
- return gen_bcmp(cstate, OR_LINKHDR, 10, 6, eaddr);
-
- case Q_DST:
- return gen_bcmp(cstate, OR_LINKHDR, 2, 6, eaddr);
-
- case Q_AND:
- b0 = gen_ipfchostop(cstate, eaddr, Q_SRC);
- b1 = gen_ipfchostop(cstate, eaddr, Q_DST);
- gen_and(b0, b1);
- return b1;
-
- case Q_DEFAULT:
- case Q_OR:
- b0 = gen_ipfchostop(cstate, eaddr, Q_SRC);
- b1 = gen_ipfchostop(cstate, eaddr, Q_DST);
- gen_or(b0, b1);
- return b1;
-
- case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_RA:
- bpf_error(cstate, "'ra' is only supported on 802.11");
- /*NOTREACHED*/
-
- case Q_TA:
- bpf_error(cstate, "'ta' is only supported on 802.11");
- /*NOTREACHED*/
- }
- abort();
- /*NOTREACHED*/
-}
-
/*
* This is quite tricky because there may be pad bytes in front of the
* DECNET header, and then there are two possible data packet formats that
return b1;
case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are not valid qualifiers for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_RA:
- bpf_error(cstate, "'ra' is not a valid qualifier for addresses other than 802.11 MAC addresses");
- /*NOTREACHED*/
-
case Q_TA:
- bpf_error(cstate, "'ta' is not a valid qualifier for addresses other than 802.11 MAC addresses");
+ bpf_error(cstate, ERRSTR_802_11_ONLY_KW, dqkw(dir));
/*NOTREACHED*/
default:
abort();
/*NOTREACHED*/
}
- b0 = gen_linktype(cstate, ETHERTYPE_DN);
+ /*
+ * In a DECnet message inside an Ethernet frame the first two bytes
+ * immediately after EtherType are the [litle-endian] DECnet message
+ * length, which is irrelevant in this context.
+ *
+ * "pad = 1" means the third byte equals 0x81, thus it is the PLENGTH
+ * 8-bit bitmap of the optional padding before the packet route header.
+ * The bitmap always has bit 7 set to 1 and in this case has bits 0-6
+ * (TOTAL-PAD-SEQUENCE-LENGTH) set to integer value 1. The latter
+ * means there aren't any PAD bytes after the bitmap, so the header
+ * begins at the fourth byte. "pad = 0" means bit 7 of the third byte
+ * is set to 0, thus the header begins at the third byte.
+ *
+ * The header can be in several (as mentioned above) formats, all of
+ * which begin with the FLAGS 8-bit bitmap, which always has bit 7
+ * (PF, "pad field") set to 0 regardless of any padding present before
+ * the header. "Short header" means bits 0-2 of the bitmap encode the
+ * integer value 2 (SFDP), and "long header" means value 6 (LFDP).
+ *
+ * To test PLENGTH and FLAGS, use multiple-byte constants with the
+ * values and the masks, this maps to the required single bytes of
+ * the message correctly on both big-endian and little-endian hosts.
+ * For the DECnet address use SWAPSHORT(), which always swaps bytes,
+ * because the wire encoding is little-endian and BPF multiple-byte
+ * loads are big-endian. When the destination address is near enough
+ * to PLENGTH and FLAGS, generate one 32-bit comparison instead of two
+ * smaller ones.
+ */
/* Check for pad = 1, long header case */
- tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_H,
- (bpf_u_int32)ntohs(0x0681), (bpf_u_int32)ntohs(0x07FF));
+ tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_H, 0x8106U, 0xFF07U);
b1 = gen_cmp(cstate, OR_LINKPL, 2 + 1 + offset_lh,
- BPF_H, (bpf_u_int32)ntohs((u_short)addr));
+ BPF_H, SWAPSHORT(addr));
gen_and(tmp, b1);
/* Check for pad = 0, long header case */
- tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_B, (bpf_u_int32)0x06,
- (bpf_u_int32)0x7);
+ tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_B, 0x06U, 0x07U);
b2 = gen_cmp(cstate, OR_LINKPL, 2 + offset_lh, BPF_H,
- (bpf_u_int32)ntohs((u_short)addr));
+ SWAPSHORT(addr));
gen_and(tmp, b2);
gen_or(b2, b1);
/* Check for pad = 1, short header case */
- tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_H,
- (bpf_u_int32)ntohs(0x0281), (bpf_u_int32)ntohs(0x07FF));
- b2 = gen_cmp(cstate, OR_LINKPL, 2 + 1 + offset_sh, BPF_H,
- (bpf_u_int32)ntohs((u_short)addr));
- gen_and(tmp, b2);
+ if (dir == Q_DST) {
+ b2 = gen_mcmp(cstate, OR_LINKPL, 2, BPF_W,
+ 0x81020000U | SWAPSHORT(addr),
+ 0xFF07FFFFU);
+ } else {
+ tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_H, 0x8102U, 0xFF07U);
+ b2 = gen_cmp(cstate, OR_LINKPL, 2 + 1 + offset_sh, BPF_H,
+ SWAPSHORT(addr));
+ gen_and(tmp, b2);
+ }
gen_or(b2, b1);
/* Check for pad = 0, short header case */
- tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_B, (bpf_u_int32)0x02,
- (bpf_u_int32)0x7);
- b2 = gen_cmp(cstate, OR_LINKPL, 2 + offset_sh, BPF_H,
- (bpf_u_int32)ntohs((u_short)addr));
- gen_and(tmp, b2);
+ if (dir == Q_DST) {
+ b2 = gen_mcmp(cstate, OR_LINKPL, 2, BPF_W,
+ 0x02000000U | SWAPSHORT(addr) << 8,
+ 0x07FFFF00U);
+ } else {
+ tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_B, 0x02U, 0x07U);
+ b2 = gen_cmp(cstate, OR_LINKPL, 2 + offset_sh, BPF_H,
+ SWAPSHORT(addr));
+ gen_and(tmp, b2);
+ }
gen_or(b2, b1);
- /* Combine with test for cstate->linktype */
- gen_and(b0, b1);
return b1;
}
{
struct block *b0, *b1;
- switch (ll_proto) {
+ switch (ll_proto) {
- case ETHERTYPE_IP:
- /* match the bottom-of-stack bit */
- b0 = gen_mcmp(cstate, OR_LINKPL, (u_int)-2, BPF_B, 0x01, 0x01);
- /* match the IPv4 version number */
- b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_B, 0x40, 0xf0);
- gen_and(b0, b1);
- return b1;
+ case ETHERTYPE_IP:
+ /* match the bottom-of-stack bit */
+ b0 = gen_mcmp(cstate, OR_LINKPL, (u_int)-2, BPF_B, 0x01, 0x01);
+ /* match the IPv4 version number */
+ b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_B, 0x40, 0xf0);
+ gen_and(b0, b1);
+ return b1;
- case ETHERTYPE_IPV6:
- /* match the bottom-of-stack bit */
- b0 = gen_mcmp(cstate, OR_LINKPL, (u_int)-2, BPF_B, 0x01, 0x01);
- /* match the IPv4 version number */
- b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_B, 0x60, 0xf0);
- gen_and(b0, b1);
- return b1;
+ case ETHERTYPE_IPV6:
+ /* match the bottom-of-stack bit */
+ b0 = gen_mcmp(cstate, OR_LINKPL, (u_int)-2, BPF_B, 0x01, 0x01);
+ /* match the IPv6 version number */
+ b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_B, 0x60, 0xf0);
+ gen_and(b0, b1);
+ return b1;
- default:
- /* FIXME add other L3 proto IDs */
- bpf_error(cstate, "unsupported protocol over mpls");
- /*NOTREACHED*/
- }
+ default:
+ /* FIXME add other L3 proto IDs */
+ bpf_error(cstate, "unsupported protocol over mpls");
+ /*NOTREACHED*/
+ }
}
static struct block *
int proto, int dir, int type)
{
struct block *b0, *b1;
- const char *typestr;
-
- if (type == Q_NET)
- typestr = "net";
- else
- typestr = "host";
switch (proto) {
return b0;
case Q_LINK:
- bpf_error(cstate, "link-layer modifier applied to %s", typestr);
+ // "link net NETNAME" and variations thereof
+ break; // invalid qualifier
case Q_IP:
- return gen_hostop(cstate, addr, mask, dir, ETHERTYPE_IP, 12, 16);
+ b0 = gen_linktype(cstate, ETHERTYPE_IP);
+ /*
+ * Belt and braces: if other code works correctly, any host
+ * bits are clear and mask == 0 means addr == 0. In this case
+ * the call to gen_hostop() would produce an "always true"
+ * instruction block and ANDing it with the link type check
+ * would be a no-op.
+ */
+ if (mask == 0 && addr == 0)
+ return b0;
+ b1 = gen_hostop(cstate, addr, mask, dir, 12, 16);
+ gen_and(b0, b1);
+ return b1;
case Q_RARP:
- return gen_hostop(cstate, addr, mask, dir, ETHERTYPE_REVARP, 14, 24);
+ b0 = gen_linktype(cstate, ETHERTYPE_REVARP);
+ // Same as for Q_IP above.
+ if (mask == 0 && addr == 0)
+ return b0;
+ b1 = gen_hostop(cstate, addr, mask, dir, 14, 24);
+ gen_and(b0, b1);
+ return b1;
case Q_ARP:
- return gen_hostop(cstate, addr, mask, dir, ETHERTYPE_ARP, 14, 24);
+ b0 = gen_linktype(cstate, ETHERTYPE_ARP);
+ // Same as for Q_IP above.
+ if (mask == 0 && addr == 0)
+ return b0;
+ b1 = gen_hostop(cstate, addr, mask, dir, 14, 24);
+ gen_and(b0, b1);
+ return b1;
case Q_SCTP:
- bpf_error(cstate, "'sctp' modifier applied to %s", typestr);
-
case Q_TCP:
- bpf_error(cstate, "'tcp' modifier applied to %s", typestr);
-
case Q_UDP:
- bpf_error(cstate, "'udp' modifier applied to %s", typestr);
-
case Q_ICMP:
- bpf_error(cstate, "'icmp' modifier applied to %s", typestr);
-
case Q_IGMP:
- bpf_error(cstate, "'igmp' modifier applied to %s", typestr);
-
case Q_IGRP:
- bpf_error(cstate, "'igrp' modifier applied to %s", typestr);
-
case Q_ATALK:
- bpf_error(cstate, "AppleTalk host filtering not implemented");
+ break; // invalid qualifier
case Q_DECNET:
- return gen_dnhostop(cstate, addr, dir);
+ b0 = gen_linktype(cstate, ETHERTYPE_DN);
+ b1 = gen_dnhostop(cstate, addr, dir);
+ gen_and(b0, b1);
+ return b1;
case Q_LAT:
- bpf_error(cstate, "LAT host filtering not implemented");
-
case Q_SCA:
- bpf_error(cstate, "SCA host filtering not implemented");
-
case Q_MOPRC:
- bpf_error(cstate, "MOPRC host filtering not implemented");
-
case Q_MOPDL:
- bpf_error(cstate, "MOPDL host filtering not implemented");
-
case Q_IPV6:
- bpf_error(cstate, "'ip6' modifier applied to ip host");
-
case Q_ICMPV6:
- bpf_error(cstate, "'icmp6' modifier applied to %s", typestr);
-
case Q_AH:
- bpf_error(cstate, "'ah' modifier applied to %s", typestr);
-
case Q_ESP:
- bpf_error(cstate, "'esp' modifier applied to %s", typestr);
-
case Q_PIM:
- bpf_error(cstate, "'pim' modifier applied to %s", typestr);
-
case Q_VRRP:
- bpf_error(cstate, "'vrrp' modifier applied to %s", typestr);
-
case Q_AARP:
- bpf_error(cstate, "AARP host filtering not implemented");
-
case Q_ISO:
- bpf_error(cstate, "ISO host filtering not implemented");
-
case Q_ESIS:
- bpf_error(cstate, "'esis' modifier applied to %s", typestr);
-
case Q_ISIS:
- bpf_error(cstate, "'isis' modifier applied to %s", typestr);
-
case Q_CLNP:
- bpf_error(cstate, "'clnp' modifier applied to %s", typestr);
-
case Q_STP:
- bpf_error(cstate, "'stp' modifier applied to %s", typestr);
-
case Q_IPX:
- bpf_error(cstate, "IPX host filtering not implemented");
-
case Q_NETBEUI:
- bpf_error(cstate, "'netbeui' modifier applied to %s", typestr);
-
case Q_ISIS_L1:
- bpf_error(cstate, "'l1' modifier applied to %s", typestr);
-
case Q_ISIS_L2:
- bpf_error(cstate, "'l2' modifier applied to %s", typestr);
-
case Q_ISIS_IIH:
- bpf_error(cstate, "'iih' modifier applied to %s", typestr);
-
case Q_ISIS_SNP:
- bpf_error(cstate, "'snp' modifier applied to %s", typestr);
-
case Q_ISIS_CSNP:
- bpf_error(cstate, "'csnp' modifier applied to %s", typestr);
-
case Q_ISIS_PSNP:
- bpf_error(cstate, "'psnp' modifier applied to %s", typestr);
-
case Q_ISIS_LSP:
- bpf_error(cstate, "'lsp' modifier applied to %s", typestr);
-
case Q_RADIO:
- bpf_error(cstate, "'radio' modifier applied to %s", typestr);
-
case Q_CARP:
- bpf_error(cstate, "'carp' modifier applied to %s", typestr);
+ break; // invalid qualifier
default:
abort();
}
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, pqkw(proto),
+ type == Q_NET ? "ip net" : "ip host");
/*NOTREACHED*/
}
gen_host6(compiler_state_t *cstate, struct in6_addr *addr,
struct in6_addr *mask, int proto, int dir, int type)
{
- const char *typestr;
-
- if (type == Q_NET)
- typestr = "net";
- else
- typestr = "host";
+ struct block *b0, *b1;
switch (proto) {
case Q_DEFAULT:
- return gen_host6(cstate, addr, mask, Q_IPV6, dir, type);
-
- case Q_LINK:
- bpf_error(cstate, "link-layer modifier applied to ip6 %s", typestr);
-
- case Q_IP:
- bpf_error(cstate, "'ip' modifier applied to ip6 %s", typestr);
+ case Q_IPV6:
+ b0 = gen_linktype(cstate, ETHERTYPE_IPV6);
+ // Same as the Q_IP case in gen_host().
+ if (
+ ! memcmp(mask, &in6addr_any, sizeof(struct in6_addr)) &&
+ ! memcmp(addr, &in6addr_any, sizeof(struct in6_addr))
+ )
+ return b0;
+ b1 = gen_hostop6(cstate, addr, mask, dir, 8, 24);
+ gen_and(b0, b1);
+ return b1;
+ case Q_LINK:
+ case Q_IP:
case Q_RARP:
- bpf_error(cstate, "'rarp' modifier applied to ip6 %s", typestr);
-
case Q_ARP:
- bpf_error(cstate, "'arp' modifier applied to ip6 %s", typestr);
-
case Q_SCTP:
- bpf_error(cstate, "'sctp' modifier applied to ip6 %s", typestr);
-
case Q_TCP:
- bpf_error(cstate, "'tcp' modifier applied to ip6 %s", typestr);
-
case Q_UDP:
- bpf_error(cstate, "'udp' modifier applied to ip6 %s", typestr);
-
case Q_ICMP:
- bpf_error(cstate, "'icmp' modifier applied to ip6 %s", typestr);
-
case Q_IGMP:
- bpf_error(cstate, "'igmp' modifier applied to ip6 %s", typestr);
-
case Q_IGRP:
- bpf_error(cstate, "'igrp' modifier applied to ip6 %s", typestr);
-
case Q_ATALK:
- bpf_error(cstate, "AppleTalk modifier applied to ip6 %s", typestr);
-
case Q_DECNET:
- bpf_error(cstate, "'decnet' modifier applied to ip6 %s", typestr);
-
case Q_LAT:
- bpf_error(cstate, "'lat' modifier applied to ip6 %s", typestr);
-
case Q_SCA:
- bpf_error(cstate, "'sca' modifier applied to ip6 %s", typestr);
-
case Q_MOPRC:
- bpf_error(cstate, "'moprc' modifier applied to ip6 %s", typestr);
-
case Q_MOPDL:
- bpf_error(cstate, "'mopdl' modifier applied to ip6 %s", typestr);
-
- case Q_IPV6:
- return gen_hostop6(cstate, addr, mask, dir, ETHERTYPE_IPV6, 8, 24);
-
case Q_ICMPV6:
- bpf_error(cstate, "'icmp6' modifier applied to ip6 %s", typestr);
-
case Q_AH:
- bpf_error(cstate, "'ah' modifier applied to ip6 %s", typestr);
-
case Q_ESP:
- bpf_error(cstate, "'esp' modifier applied to ip6 %s", typestr);
-
case Q_PIM:
- bpf_error(cstate, "'pim' modifier applied to ip6 %s", typestr);
-
case Q_VRRP:
- bpf_error(cstate, "'vrrp' modifier applied to ip6 %s", typestr);
-
case Q_AARP:
- bpf_error(cstate, "'aarp' modifier applied to ip6 %s", typestr);
-
case Q_ISO:
- bpf_error(cstate, "'iso' modifier applied to ip6 %s", typestr);
-
case Q_ESIS:
- bpf_error(cstate, "'esis' modifier applied to ip6 %s", typestr);
-
case Q_ISIS:
- bpf_error(cstate, "'isis' modifier applied to ip6 %s", typestr);
-
case Q_CLNP:
- bpf_error(cstate, "'clnp' modifier applied to ip6 %s", typestr);
-
case Q_STP:
- bpf_error(cstate, "'stp' modifier applied to ip6 %s", typestr);
-
case Q_IPX:
- bpf_error(cstate, "'ipx' modifier applied to ip6 %s", typestr);
-
case Q_NETBEUI:
- bpf_error(cstate, "'netbeui' modifier applied to ip6 %s", typestr);
-
case Q_ISIS_L1:
- bpf_error(cstate, "'l1' modifier applied to ip6 %s", typestr);
-
case Q_ISIS_L2:
- bpf_error(cstate, "'l2' modifier applied to ip6 %s", typestr);
-
case Q_ISIS_IIH:
- bpf_error(cstate, "'iih' modifier applied to ip6 %s", typestr);
-
case Q_ISIS_SNP:
- bpf_error(cstate, "'snp' modifier applied to ip6 %s", typestr);
-
case Q_ISIS_CSNP:
- bpf_error(cstate, "'csnp' modifier applied to ip6 %s", typestr);
-
case Q_ISIS_PSNP:
- bpf_error(cstate, "'psnp' modifier applied to ip6 %s", typestr);
-
case Q_ISIS_LSP:
- bpf_error(cstate, "'lsp' modifier applied to ip6 %s", typestr);
-
case Q_RADIO:
- bpf_error(cstate, "'radio' modifier applied to ip6 %s", typestr);
-
case Q_CARP:
- bpf_error(cstate, "'carp' modifier applied to ip6 %s", typestr);
+ break; // invalid qualifier
default:
abort();
}
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, pqkw(proto),
+ type == Q_NET ? "ip6 net" : "ip6 host");
/*NOTREACHED*/
}
#endif
+static unsigned char
+is_mac48_linktype(const int linktype)
+{
+ switch (linktype) {
+ case DLT_EN10MB:
+ case DLT_FDDI:
+ case DLT_IEEE802:
+ case DLT_IEEE802_11:
+ case DLT_IEEE802_11_RADIO:
+ case DLT_IEEE802_11_RADIO_AVS:
+ case DLT_IP_OVER_FC:
+ case DLT_NETANALYZER:
+ case DLT_NETANALYZER_TRANSPARENT:
+ case DLT_PPI:
+ case DLT_PRISM_HEADER:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static struct block *
+gen_mac48host(compiler_state_t *cstate, const u_char *eaddr, const u_char dir,
+ const char *keyword)
+{
+ struct block *b1 = NULL;
+ u_int src_off, dst_off;
+
+ switch (cstate->linktype) {
+ case DLT_EN10MB:
+ case DLT_NETANALYZER:
+ case DLT_NETANALYZER_TRANSPARENT:
+ b1 = gen_prevlinkhdr_check(cstate);
+ src_off = 6;
+ dst_off = 0;
+ break;
+ case DLT_FDDI:
+ src_off = 6 + 1 + cstate->pcap_fddipad;
+ dst_off = 0 + 1 + cstate->pcap_fddipad;
+ break;
+ case DLT_IEEE802:
+ src_off = 8;
+ dst_off = 2;
+ break;
+ case DLT_IEEE802_11:
+ case DLT_PRISM_HEADER:
+ case DLT_IEEE802_11_RADIO_AVS:
+ case DLT_IEEE802_11_RADIO:
+ case DLT_PPI:
+ return gen_wlanhostop(cstate, eaddr, dir);
+ case DLT_IP_OVER_FC:
+ /*
+ * Assume that the addresses are IEEE 48-bit MAC addresses,
+ * as RFC 2625 states.
+ */
+ src_off = 10;
+ dst_off = 2;
+ break;
+ case DLT_SUNATM:
+ /*
+ * This is LLC-multiplexed traffic; if it were
+ * LANE, cstate->linktype would have been set to
+ * DLT_EN10MB.
+ */
+ /* FALLTHROUGH */
+ default:
+ fail_kw_on_dlt(cstate, keyword);
+ }
+
+ struct block *b0, *tmp;
+
+ switch (dir) {
+ case Q_SRC:
+ b0 = gen_bcmp(cstate, OR_LINKHDR, src_off, 6, eaddr);
+ break;
+ case Q_DST:
+ b0 = gen_bcmp(cstate, OR_LINKHDR, dst_off, 6, eaddr);
+ break;
+ case Q_AND:
+ tmp = gen_bcmp(cstate, OR_LINKHDR, src_off, 6, eaddr);
+ b0 = gen_bcmp(cstate, OR_LINKHDR, dst_off, 6, eaddr);
+ gen_and(tmp, b0);
+ break;
+ case Q_DEFAULT:
+ case Q_OR:
+ tmp = gen_bcmp(cstate, OR_LINKHDR, src_off, 6, eaddr);
+ b0 = gen_bcmp(cstate, OR_LINKHDR, dst_off, 6, eaddr);
+ gen_or(tmp, b0);
+ break;
+ default:
+ bpf_error(cstate, ERRSTR_802_11_ONLY_KW, dqkw(dir));
+ }
+
+ if (b1 != NULL)
+ gen_and(b1, b0);
+ return b0;
+}
+
#ifndef INET6
+/*
+ * This primitive is non-directional by design, so the grammar does not allow
+ * to qualify it with a direction.
+ */
static struct block *
gen_gateway(compiler_state_t *cstate, const u_char *eaddr,
- struct addrinfo *alist, int proto, int dir)
+ struct addrinfo *alist, int proto)
{
struct block *b0, *b1, *tmp;
struct addrinfo *ai;
struct sockaddr_in *sin;
- if (dir != 0)
- bpf_error(cstate, "direction applied to 'gateway'");
-
switch (proto) {
case Q_DEFAULT:
case Q_IP:
case Q_ARP:
case Q_RARP:
- switch (cstate->linktype) {
- case DLT_EN10MB:
- case DLT_NETANALYZER:
- case DLT_NETANALYZER_TRANSPARENT:
- b1 = gen_prevlinkhdr_check(cstate);
- b0 = gen_ehostop(cstate, eaddr, Q_OR);
- if (b1 != NULL)
- gen_and(b1, b0);
- break;
- case DLT_FDDI:
- b0 = gen_fhostop(cstate, eaddr, Q_OR);
- break;
- case DLT_IEEE802:
- b0 = gen_thostop(cstate, eaddr, Q_OR);
- break;
- case DLT_IEEE802_11:
- case DLT_PRISM_HEADER:
- case DLT_IEEE802_11_RADIO_AVS:
- case DLT_IEEE802_11_RADIO:
- case DLT_PPI:
- b0 = gen_wlanhostop(cstate, eaddr, Q_OR);
- break;
- case DLT_SUNATM:
- /*
- * This is LLC-multiplexed traffic; if it were
- * LANE, cstate->linktype would have been set to
- * DLT_EN10MB.
- */
- bpf_error(cstate,
- "'gateway' supported only on ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel");
- break;
- case DLT_IP_OVER_FC:
- b0 = gen_ipfchostop(cstate, eaddr, Q_OR);
- break;
- default:
- bpf_error(cstate,
- "'gateway' supported only on ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel");
- }
+ b0 = gen_mac48host(cstate, eaddr, Q_OR, "gateway");
b1 = NULL;
for (ai = alist; ai != NULL; ai = ai->ai_next) {
/*
gen_and(b0, b1);
return b1;
}
- bpf_error(cstate, "illegal modifier of 'gateway'");
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, pqkw(proto), "gateway");
/*NOTREACHED*/
}
#endif
switch (proto) {
case Q_SCTP:
- b1 = gen_proto(cstate, IPPROTO_SCTP, Q_DEFAULT, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_SCTP, Q_DEFAULT);
case Q_TCP:
- b1 = gen_proto(cstate, IPPROTO_TCP, Q_DEFAULT, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_TCP, Q_DEFAULT);
case Q_UDP:
- b1 = gen_proto(cstate, IPPROTO_UDP, Q_DEFAULT, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_UDP, Q_DEFAULT);
case Q_ICMP:
- b1 = gen_proto(cstate, IPPROTO_ICMP, Q_IP, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_ICMP, Q_IP);
#ifndef IPPROTO_IGMP
#define IPPROTO_IGMP 2
#endif
case Q_IGMP:
- b1 = gen_proto(cstate, IPPROTO_IGMP, Q_IP, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_IGMP, Q_IP);
#ifndef IPPROTO_IGRP
#define IPPROTO_IGRP 9
#endif
case Q_IGRP:
- b1 = gen_proto(cstate, IPPROTO_IGRP, Q_IP, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_IGRP, Q_IP);
#ifndef IPPROTO_PIM
#define IPPROTO_PIM 103
#endif
case Q_PIM:
- b1 = gen_proto(cstate, IPPROTO_PIM, Q_DEFAULT, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_PIM, Q_DEFAULT);
#ifndef IPPROTO_VRRP
#define IPPROTO_VRRP 112
#endif
case Q_VRRP:
- b1 = gen_proto(cstate, IPPROTO_VRRP, Q_IP, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_VRRP, Q_IP);
#ifndef IPPROTO_CARP
#define IPPROTO_CARP 112
#endif
case Q_CARP:
- b1 = gen_proto(cstate, IPPROTO_CARP, Q_IP, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_CARP, Q_IP);
case Q_IP:
- b1 = gen_linktype(cstate, ETHERTYPE_IP);
- break;
+ return gen_linktype(cstate, ETHERTYPE_IP);
case Q_ARP:
- b1 = gen_linktype(cstate, ETHERTYPE_ARP);
- break;
+ return gen_linktype(cstate, ETHERTYPE_ARP);
case Q_RARP:
- b1 = gen_linktype(cstate, ETHERTYPE_REVARP);
- break;
+ return gen_linktype(cstate, ETHERTYPE_REVARP);
case Q_LINK:
- bpf_error(cstate, "link layer applied in wrong context");
+ break; // invalid syntax
case Q_ATALK:
- b1 = gen_linktype(cstate, ETHERTYPE_ATALK);
- break;
+ return gen_linktype(cstate, ETHERTYPE_ATALK);
case Q_AARP:
- b1 = gen_linktype(cstate, ETHERTYPE_AARP);
- break;
+ return gen_linktype(cstate, ETHERTYPE_AARP);
case Q_DECNET:
- b1 = gen_linktype(cstate, ETHERTYPE_DN);
- break;
+ return gen_linktype(cstate, ETHERTYPE_DN);
case Q_SCA:
- b1 = gen_linktype(cstate, ETHERTYPE_SCA);
- break;
+ return gen_linktype(cstate, ETHERTYPE_SCA);
case Q_LAT:
- b1 = gen_linktype(cstate, ETHERTYPE_LAT);
- break;
+ return gen_linktype(cstate, ETHERTYPE_LAT);
case Q_MOPDL:
- b1 = gen_linktype(cstate, ETHERTYPE_MOPDL);
- break;
+ return gen_linktype(cstate, ETHERTYPE_MOPDL);
case Q_MOPRC:
- b1 = gen_linktype(cstate, ETHERTYPE_MOPRC);
- break;
+ return gen_linktype(cstate, ETHERTYPE_MOPRC);
case Q_IPV6:
- b1 = gen_linktype(cstate, ETHERTYPE_IPV6);
- break;
+ return gen_linktype(cstate, ETHERTYPE_IPV6);
#ifndef IPPROTO_ICMPV6
#define IPPROTO_ICMPV6 58
#endif
case Q_ICMPV6:
- b1 = gen_proto(cstate, IPPROTO_ICMPV6, Q_IPV6, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_ICMPV6, Q_IPV6);
#ifndef IPPROTO_AH
#define IPPROTO_AH 51
#endif
case Q_AH:
- b1 = gen_proto(cstate, IPPROTO_AH, Q_DEFAULT, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_AH, Q_DEFAULT);
#ifndef IPPROTO_ESP
#define IPPROTO_ESP 50
#endif
case Q_ESP:
- b1 = gen_proto(cstate, IPPROTO_ESP, Q_DEFAULT, Q_DEFAULT);
- break;
+ return gen_proto(cstate, IPPROTO_ESP, Q_DEFAULT);
case Q_ISO:
- b1 = gen_linktype(cstate, LLCSAP_ISONS);
- break;
+ return gen_linktype(cstate, LLCSAP_ISONS);
case Q_ESIS:
- b1 = gen_proto(cstate, ISO9542_ESIS, Q_ISO, Q_DEFAULT);
- break;
+ return gen_proto(cstate, ISO9542_ESIS, Q_ISO);
case Q_ISIS:
- b1 = gen_proto(cstate, ISO10589_ISIS, Q_ISO, Q_DEFAULT);
- break;
+ return gen_proto(cstate, ISO10589_ISIS, Q_ISO);
case Q_ISIS_L1: /* all IS-IS Level1 PDU-Types */
- b0 = gen_proto(cstate, ISIS_L1_LAN_IIH, Q_ISIS, Q_DEFAULT);
- b1 = gen_proto(cstate, ISIS_PTP_IIH, Q_ISIS, Q_DEFAULT); /* FIXME extract the circuit-type bits */
+ b0 = gen_proto(cstate, ISIS_L1_LAN_IIH, Q_ISIS);
+ b1 = gen_proto(cstate, ISIS_PTP_IIH, Q_ISIS); /* FIXME extract the circuit-type bits */
gen_or(b0, b1);
- b0 = gen_proto(cstate, ISIS_L1_LSP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L1_LSP, Q_ISIS);
gen_or(b0, b1);
- b0 = gen_proto(cstate, ISIS_L1_CSNP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L1_CSNP, Q_ISIS);
gen_or(b0, b1);
- b0 = gen_proto(cstate, ISIS_L1_PSNP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L1_PSNP, Q_ISIS);
gen_or(b0, b1);
- break;
+ return b1;
case Q_ISIS_L2: /* all IS-IS Level2 PDU-Types */
- b0 = gen_proto(cstate, ISIS_L2_LAN_IIH, Q_ISIS, Q_DEFAULT);
- b1 = gen_proto(cstate, ISIS_PTP_IIH, Q_ISIS, Q_DEFAULT); /* FIXME extract the circuit-type bits */
+ b0 = gen_proto(cstate, ISIS_L2_LAN_IIH, Q_ISIS);
+ b1 = gen_proto(cstate, ISIS_PTP_IIH, Q_ISIS); /* FIXME extract the circuit-type bits */
gen_or(b0, b1);
- b0 = gen_proto(cstate, ISIS_L2_LSP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L2_LSP, Q_ISIS);
gen_or(b0, b1);
- b0 = gen_proto(cstate, ISIS_L2_CSNP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L2_CSNP, Q_ISIS);
gen_or(b0, b1);
- b0 = gen_proto(cstate, ISIS_L2_PSNP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L2_PSNP, Q_ISIS);
gen_or(b0, b1);
- break;
+ return b1;
case Q_ISIS_IIH: /* all IS-IS Hello PDU-Types */
- b0 = gen_proto(cstate, ISIS_L1_LAN_IIH, Q_ISIS, Q_DEFAULT);
- b1 = gen_proto(cstate, ISIS_L2_LAN_IIH, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L1_LAN_IIH, Q_ISIS);
+ b1 = gen_proto(cstate, ISIS_L2_LAN_IIH, Q_ISIS);
gen_or(b0, b1);
- b0 = gen_proto(cstate, ISIS_PTP_IIH, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_PTP_IIH, Q_ISIS);
gen_or(b0, b1);
- break;
+ return b1;
case Q_ISIS_LSP:
- b0 = gen_proto(cstate, ISIS_L1_LSP, Q_ISIS, Q_DEFAULT);
- b1 = gen_proto(cstate, ISIS_L2_LSP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L1_LSP, Q_ISIS);
+ b1 = gen_proto(cstate, ISIS_L2_LSP, Q_ISIS);
gen_or(b0, b1);
- break;
+ return b1;
case Q_ISIS_SNP:
- b0 = gen_proto(cstate, ISIS_L1_CSNP, Q_ISIS, Q_DEFAULT);
- b1 = gen_proto(cstate, ISIS_L2_CSNP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L1_CSNP, Q_ISIS);
+ b1 = gen_proto(cstate, ISIS_L2_CSNP, Q_ISIS);
gen_or(b0, b1);
- b0 = gen_proto(cstate, ISIS_L1_PSNP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L1_PSNP, Q_ISIS);
gen_or(b0, b1);
- b0 = gen_proto(cstate, ISIS_L2_PSNP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L2_PSNP, Q_ISIS);
gen_or(b0, b1);
- break;
+ return b1;
case Q_ISIS_CSNP:
- b0 = gen_proto(cstate, ISIS_L1_CSNP, Q_ISIS, Q_DEFAULT);
- b1 = gen_proto(cstate, ISIS_L2_CSNP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L1_CSNP, Q_ISIS);
+ b1 = gen_proto(cstate, ISIS_L2_CSNP, Q_ISIS);
gen_or(b0, b1);
- break;
+ return b1;
case Q_ISIS_PSNP:
- b0 = gen_proto(cstate, ISIS_L1_PSNP, Q_ISIS, Q_DEFAULT);
- b1 = gen_proto(cstate, ISIS_L2_PSNP, Q_ISIS, Q_DEFAULT);
+ b0 = gen_proto(cstate, ISIS_L1_PSNP, Q_ISIS);
+ b1 = gen_proto(cstate, ISIS_L2_PSNP, Q_ISIS);
gen_or(b0, b1);
- break;
+ return b1;
case Q_CLNP:
- b1 = gen_proto(cstate, ISO8473_CLNP, Q_ISO, Q_DEFAULT);
- break;
+ return gen_proto(cstate, ISO8473_CLNP, Q_ISO);
case Q_STP:
- b1 = gen_linktype(cstate, LLCSAP_8021D);
- break;
+ return gen_linktype(cstate, LLCSAP_8021D);
case Q_IPX:
- b1 = gen_linktype(cstate, LLCSAP_IPX);
- break;
+ return gen_linktype(cstate, LLCSAP_IPX);
case Q_NETBEUI:
- b1 = gen_linktype(cstate, LLCSAP_NETBEUI);
- break;
+ return gen_linktype(cstate, LLCSAP_NETBEUI);
case Q_RADIO:
- bpf_error(cstate, "'radio' is not a valid protocol type");
+ break; // invalid syntax
default:
abort();
}
- return b1;
+ bpf_error(cstate, "'%s' cannot be used as an abbreviation", pqkw(proto));
}
struct block *
return gen_proto_abbrev_internal(cstate, proto);
}
+static struct block *
+gen_ip_proto(compiler_state_t *cstate, const uint8_t proto)
+{
+ return gen_cmp(cstate, OR_LINKPL, 9, BPF_B, proto);
+}
+
+static struct block *
+gen_ip6_proto(compiler_state_t *cstate, const uint8_t proto)
+{
+ return gen_cmp(cstate, OR_LINKPL, 6, BPF_B, proto);
+}
+
static struct block *
gen_ipfrag(compiler_state_t *cstate)
{
struct slist *s;
- struct block *b;
/* not IPv4 frag other than the first frag */
s = gen_load_a(cstate, OR_LINKPL, 6, BPF_H);
- b = new_block(cstate, JMP(BPF_JSET));
- b->s.k = 0x1fff;
- b->stmts = s;
- gen_not(b);
-
- return b;
+ return gen_unset(cstate, 0x1fff, s);
}
/*
* headers).
*/
static struct block *
-gen_portatom(compiler_state_t *cstate, int off, bpf_u_int32 v)
+gen_portatom(compiler_state_t *cstate, int off, uint16_t v)
{
return gen_cmp(cstate, OR_TRAN_IPV4, off, BPF_H, v);
}
static struct block *
-gen_portatom6(compiler_state_t *cstate, int off, bpf_u_int32 v)
+gen_portatom6(compiler_state_t *cstate, int off, uint16_t v)
{
return gen_cmp(cstate, OR_TRAN_IPV6, off, BPF_H, v);
}
static struct block *
-gen_portop(compiler_state_t *cstate, u_int port, u_int proto, int dir)
+gen_port(compiler_state_t *cstate, uint16_t port, int proto, int dir)
{
- struct block *b0, *b1, *tmp;
-
- /* ip proto 'proto' and not a fragment other than the first fragment */
- tmp = gen_cmp(cstate, OR_LINKPL, 9, BPF_B, proto);
- b0 = gen_ipfrag(cstate);
- gen_and(tmp, b0);
+ struct block *b1, *tmp;
switch (dir) {
case Q_SRC:
break;
case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are not valid qualifiers for ports");
- /*NOTREACHED*/
-
case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are not valid qualifiers for ports");
- /*NOTREACHED*/
-
case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are not valid qualifiers for ports");
- /*NOTREACHED*/
-
case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are not valid qualifiers for ports");
- /*NOTREACHED*/
-
case Q_RA:
- bpf_error(cstate, "'ra' is not a valid qualifier for ports");
- /*NOTREACHED*/
-
case Q_TA:
- bpf_error(cstate, "'ta' is not a valid qualifier for ports");
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, dqkw(dir), "port");
/*NOTREACHED*/
default:
abort();
/*NOTREACHED*/
}
- gen_and(b0, b1);
- return b1;
+ return gen_port_common(cstate, proto, b1);
}
static struct block *
-gen_port(compiler_state_t *cstate, u_int port, int ip_proto, int dir)
+gen_port_common(compiler_state_t *cstate, int proto, struct block *b1)
{
- struct block *b0, *b1, *tmp;
+ struct block *b0, *tmp;
/*
* ether proto ip
* encapsulation with LLCSAP_IP.
*
* So we always check for ETHERTYPE_IP.
+ *
+ * At the time of this writing all three L4 protocols the "port" and
+ * "portrange" primitives support (TCP, UDP and SCTP) have the source
+ * and the destination ports identically encoded in the transport
+ * protocol header. So without a proto qualifier the only difference
+ * between the implemented cases is the protocol number and all other
+ * checks need to be made exactly once.
+ *
+ * If the expression syntax in future starts to support ports for
+ * another L4 protocol that has unsigned integer ports encoded using a
+ * different size and/or offset, this will require a different code.
*/
- b0 = gen_linktype(cstate, ETHERTYPE_IP);
-
- switch (ip_proto) {
+ switch (proto) {
case IPPROTO_UDP:
case IPPROTO_TCP:
case IPPROTO_SCTP:
- b1 = gen_portop(cstate, port, (u_int)ip_proto, dir);
+ tmp = gen_ip_proto(cstate, (uint8_t)proto);
break;
case PROTO_UNDEF:
- tmp = gen_portop(cstate, port, IPPROTO_TCP, dir);
- b1 = gen_portop(cstate, port, IPPROTO_UDP, dir);
- gen_or(tmp, b1);
- tmp = gen_portop(cstate, port, IPPROTO_SCTP, dir);
- gen_or(tmp, b1);
+ tmp = gen_ip_proto(cstate, IPPROTO_UDP);
+ gen_or(gen_ip_proto(cstate, IPPROTO_TCP), tmp);
+ gen_or(gen_ip_proto(cstate, IPPROTO_SCTP), tmp);
break;
default:
abort();
}
+ // Not a fragment other than the first fragment.
+ b0 = gen_ipfrag(cstate);
+ gen_and(tmp, b0);
gen_and(b0, b1);
+ // "link proto \ip"
+ gen_and(gen_linktype(cstate, ETHERTYPE_IP), b1);
return b1;
}
-struct block *
-gen_portop6(compiler_state_t *cstate, u_int port, u_int proto, int dir)
+static struct block *
+gen_port6(compiler_state_t *cstate, uint16_t port, int proto, int dir)
{
- struct block *b0, *b1, *tmp;
-
- /* ip6 proto 'proto' */
- /* XXX - catch the first fragment of a fragmented packet? */
- b0 = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, proto);
+ struct block *b1, *tmp;
switch (dir) {
case Q_SRC:
default:
abort();
}
- gen_and(b0, b1);
- return b1;
+ return gen_port6_common(cstate, proto, b1);
}
static struct block *
-gen_port6(compiler_state_t *cstate, u_int port, int ip_proto, int dir)
+gen_port6_common(compiler_state_t *cstate, int proto, struct block *b1)
{
- struct block *b0, *b1, *tmp;
+ struct block *tmp;
- /* link proto ip6 */
- b0 = gen_linktype(cstate, ETHERTYPE_IPV6);
-
- switch (ip_proto) {
+ // "ip6 proto 'ip_proto'"
+ switch (proto) {
case IPPROTO_UDP:
case IPPROTO_TCP:
case IPPROTO_SCTP:
- b1 = gen_portop6(cstate, port, (u_int)ip_proto, dir);
+ tmp = gen_ip6_proto(cstate, (uint8_t)proto);
break;
case PROTO_UNDEF:
- tmp = gen_portop6(cstate, port, IPPROTO_TCP, dir);
- b1 = gen_portop6(cstate, port, IPPROTO_UDP, dir);
- gen_or(tmp, b1);
- tmp = gen_portop6(cstate, port, IPPROTO_SCTP, dir);
- gen_or(tmp, b1);
+ // Same as in gen_port_common().
+ tmp = gen_ip6_proto(cstate, IPPROTO_UDP);
+ gen_or(gen_ip6_proto(cstate, IPPROTO_TCP), tmp);
+ gen_or(gen_ip6_proto(cstate, IPPROTO_SCTP), tmp);
break;
default:
abort();
}
- gen_and(b0, b1);
+ // XXX - catch the first fragment of a fragmented packet?
+ gen_and(tmp, b1);
+ // "link proto \ip6"
+ gen_and(gen_linktype(cstate, ETHERTYPE_IPV6), b1);
return b1;
}
/* gen_portrange code */
static struct block *
-gen_portrangeatom(compiler_state_t *cstate, u_int off, bpf_u_int32 v1,
- bpf_u_int32 v2)
+gen_portrangeatom(compiler_state_t *cstate, u_int off, uint16_t v1,
+ uint16_t v2)
{
- struct block *b1, *b2;
-
- if (v1 > v2) {
- /*
- * Reverse the order of the ports, so v1 is the lower one.
- */
- bpf_u_int32 vtemp;
+ if (v1 == v2)
+ return gen_portatom(cstate, off, v1);
- vtemp = v1;
- v1 = v2;
- v2 = vtemp;
- }
+ struct block *b1, *b2;
- b1 = gen_cmp_ge(cstate, OR_TRAN_IPV4, off, BPF_H, v1);
- b2 = gen_cmp_le(cstate, OR_TRAN_IPV4, off, BPF_H, v2);
+ b1 = gen_cmp_ge(cstate, OR_TRAN_IPV4, off, BPF_H, min(v1, v2));
+ b2 = gen_cmp_le(cstate, OR_TRAN_IPV4, off, BPF_H, max(v1, v2));
gen_and(b1, b2);
}
static struct block *
-gen_portrangeop(compiler_state_t *cstate, u_int port1, u_int port2,
- bpf_u_int32 proto, int dir)
+gen_portrange(compiler_state_t *cstate, uint16_t port1, uint16_t port2,
+ int proto, int dir)
{
- struct block *b0, *b1, *tmp;
-
- /* ip proto 'proto' and not a fragment other than the first fragment */
- tmp = gen_cmp(cstate, OR_LINKPL, 9, BPF_B, proto);
- b0 = gen_ipfrag(cstate);
- gen_and(tmp, b0);
+ struct block *b1, *tmp;
switch (dir) {
case Q_SRC:
break;
case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are not valid qualifiers for port ranges");
- /*NOTREACHED*/
-
case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are not valid qualifiers for port ranges");
- /*NOTREACHED*/
-
case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are not valid qualifiers for port ranges");
- /*NOTREACHED*/
-
case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are not valid qualifiers for port ranges");
- /*NOTREACHED*/
-
case Q_RA:
- bpf_error(cstate, "'ra' is not a valid qualifier for port ranges");
- /*NOTREACHED*/
-
case Q_TA:
- bpf_error(cstate, "'ta' is not a valid qualifier for port ranges");
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, dqkw(dir), "portrange");
/*NOTREACHED*/
default:
abort();
/*NOTREACHED*/
}
- gen_and(b0, b1);
- return b1;
+ return gen_port_common(cstate, proto, b1);
}
static struct block *
-gen_portrange(compiler_state_t *cstate, u_int port1, u_int port2, int ip_proto,
- int dir)
+gen_portrangeatom6(compiler_state_t *cstate, u_int off, uint16_t v1,
+ uint16_t v2)
{
- struct block *b0, *b1, *tmp;
+ if (v1 == v2)
+ return gen_portatom6(cstate, off, v1);
- /* link proto ip */
- b0 = gen_linktype(cstate, ETHERTYPE_IP);
+ struct block *b1, *b2;
- switch (ip_proto) {
- case IPPROTO_UDP:
- case IPPROTO_TCP:
- case IPPROTO_SCTP:
- b1 = gen_portrangeop(cstate, port1, port2, (bpf_u_int32)ip_proto,
- dir);
- break;
-
- case PROTO_UNDEF:
- tmp = gen_portrangeop(cstate, port1, port2, IPPROTO_TCP, dir);
- b1 = gen_portrangeop(cstate, port1, port2, IPPROTO_UDP, dir);
- gen_or(tmp, b1);
- tmp = gen_portrangeop(cstate, port1, port2, IPPROTO_SCTP, dir);
- gen_or(tmp, b1);
- break;
-
- default:
- abort();
- }
- gen_and(b0, b1);
- return b1;
-}
-
-static struct block *
-gen_portrangeatom6(compiler_state_t *cstate, u_int off, bpf_u_int32 v1,
- bpf_u_int32 v2)
-{
- struct block *b1, *b2;
-
- if (v1 > v2) {
- /*
- * Reverse the order of the ports, so v1 is the lower one.
- */
- bpf_u_int32 vtemp;
-
- vtemp = v1;
- v1 = v2;
- v2 = vtemp;
- }
-
- b1 = gen_cmp_ge(cstate, OR_TRAN_IPV6, off, BPF_H, v1);
- b2 = gen_cmp_le(cstate, OR_TRAN_IPV6, off, BPF_H, v2);
+ b1 = gen_cmp_ge(cstate, OR_TRAN_IPV6, off, BPF_H, min(v1, v2));
+ b2 = gen_cmp_le(cstate, OR_TRAN_IPV6, off, BPF_H, max(v1, v2));
gen_and(b1, b2);
}
static struct block *
-gen_portrangeop6(compiler_state_t *cstate, u_int port1, u_int port2,
- bpf_u_int32 proto, int dir)
+gen_portrange6(compiler_state_t *cstate, uint16_t port1, uint16_t port2,
+ int proto, int dir)
{
- struct block *b0, *b1, *tmp;
-
- /* ip6 proto 'proto' */
- /* XXX - catch the first fragment of a fragmented packet? */
- b0 = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, proto);
+ struct block *b1, *tmp;
switch (dir) {
case Q_SRC:
default:
abort();
}
- gen_and(b0, b1);
-
- return b1;
-}
-
-static struct block *
-gen_portrange6(compiler_state_t *cstate, u_int port1, u_int port2, int ip_proto,
- int dir)
-{
- struct block *b0, *b1, *tmp;
- /* link proto ip6 */
- b0 = gen_linktype(cstate, ETHERTYPE_IPV6);
-
- switch (ip_proto) {
- case IPPROTO_UDP:
- case IPPROTO_TCP:
- case IPPROTO_SCTP:
- b1 = gen_portrangeop6(cstate, port1, port2, (bpf_u_int32)ip_proto,
- dir);
- break;
-
- case PROTO_UNDEF:
- tmp = gen_portrangeop6(cstate, port1, port2, IPPROTO_TCP, dir);
- b1 = gen_portrangeop6(cstate, port1, port2, IPPROTO_UDP, dir);
- gen_or(tmp, b1);
- tmp = gen_portrangeop6(cstate, port1, port2, IPPROTO_SCTP, dir);
- gen_or(tmp, b1);
- break;
-
- default:
- abort();
- }
- gen_and(b0, b1);
- return b1;
+ return gen_port6_common(cstate, proto, b1);
}
static int
}
#if !defined(NO_PROTOCHAIN)
+/*
+ * This primitive is non-directional by design, so the grammar does not allow
+ * to qualify it with a direction.
+ */
static struct block *
gen_protochain(compiler_state_t *cstate, bpf_u_int32 v, int proto)
{
switch (proto) {
case Q_IP:
case Q_IPV6:
+ assert_maxval(cstate, "protocol number", v, UINT8_MAX);
break;
case Q_DEFAULT:
b0 = gen_protochain(cstate, v, Q_IP);
gen_or(b0, b);
return b;
default:
- bpf_error(cstate, "bad protocol applied for 'protochain'");
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, pqkw(proto), "protochain");
/*NOTREACHED*/
}
* A = P[X];
* X = X + (P[X + 1] + 2) * 4;
*/
- /* A = X */
- s[i - 1]->s.jt = s[i] = new_stmt(cstate, BPF_MISC|BPF_TXA);
- i++;
/* A = P[X + packet head]; */
s[i] = new_stmt(cstate, BPF_LD|BPF_IND|BPF_B);
s[i]->s.k = cstate->off_linkpl.constant_part + cstate->off_nl;
+ s[i - 1]->s.jt = s[i];
i++;
/* MEM[reg2] = A */
s[i] = new_stmt(cstate, BPF_ST);
/*
* emit final check
+ * Remember, s[0] is dummy.
*/
- b = new_block(cstate, JMP(BPF_JEQ));
- b->stmts = s[1]; /*remember, s[0] is dummy*/
- b->s.k = v;
+ b = gen_jmp(cstate, BPF_JEQ, v, s[1]);
free_reg(cstate, reg2);
}
#endif /* !defined(NO_PROTOCHAIN) */
-static struct block *
-gen_check_802_11_data_frame(compiler_state_t *cstate)
-{
- struct slist *s;
- struct block *b0, *b1;
-
- /*
- * A data frame has the 0x08 bit (b3) in the frame control field set
- * and the 0x04 bit (b2) clear.
- */
- s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b0 = new_block(cstate, JMP(BPF_JSET));
- b0->s.k = 0x08;
- b0->stmts = s;
-
- s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x04;
- b1->stmts = s;
- gen_not(b1);
-
- gen_and(b1, b0);
-
- return b0;
-}
-
/*
* Generate code that checks whether the packet is a packet for protocol
* <proto> and whether the type field in that protocol's header has
*
* If <proto> is Q_DEFAULT, i.e. just "proto" was specified, it checks
* against Q_IP and Q_IPV6.
+ *
+ * This primitive is non-directional by design, so the grammar does not allow
+ * to qualify it with a direction.
*/
static struct block *
-gen_proto(compiler_state_t *cstate, bpf_u_int32 v, int proto, int dir)
+gen_proto(compiler_state_t *cstate, bpf_u_int32 v, int proto)
{
struct block *b0, *b1;
struct block *b2;
- if (dir != Q_DEFAULT)
- bpf_error(cstate, "direction applied to 'proto'");
-
switch (proto) {
case Q_DEFAULT:
- b0 = gen_proto(cstate, v, Q_IP, dir);
- b1 = gen_proto(cstate, v, Q_IPV6, dir);
+ b0 = gen_proto(cstate, v, Q_IP);
+ b1 = gen_proto(cstate, v, Q_IPV6);
gen_or(b0, b1);
return b1;
return gen_linktype(cstate, v);
case Q_IP:
+ assert_maxval(cstate, "protocol number", v, UINT8_MAX);
/*
* For FDDI, RFC 1188 says that SNAP encapsulation is used,
* not LLC encapsulation with LLCSAP_IP.
* So we always check for ETHERTYPE_IP.
*/
b0 = gen_linktype(cstate, ETHERTYPE_IP);
- b1 = gen_cmp(cstate, OR_LINKPL, 9, BPF_B, v);
+ // 0 <= v <= UINT8_MAX
+ b1 = gen_ip_proto(cstate, (uint8_t)v);
gen_and(b0, b1);
return b1;
case Q_ARP:
- bpf_error(cstate, "arp does not encapsulate another protocol");
- /*NOTREACHED*/
-
case Q_RARP:
- bpf_error(cstate, "rarp does not encapsulate another protocol");
- /*NOTREACHED*/
-
case Q_SCTP:
- bpf_error(cstate, "'sctp proto' is bogus");
- /*NOTREACHED*/
-
case Q_TCP:
- bpf_error(cstate, "'tcp proto' is bogus");
- /*NOTREACHED*/
-
case Q_UDP:
- bpf_error(cstate, "'udp proto' is bogus");
- /*NOTREACHED*/
-
case Q_ICMP:
- bpf_error(cstate, "'icmp proto' is bogus");
- /*NOTREACHED*/
-
case Q_IGMP:
- bpf_error(cstate, "'igmp proto' is bogus");
- /*NOTREACHED*/
-
case Q_IGRP:
- bpf_error(cstate, "'igrp proto' is bogus");
- /*NOTREACHED*/
-
case Q_ATALK:
- bpf_error(cstate, "AppleTalk encapsulation is not specifiable");
- /*NOTREACHED*/
-
case Q_DECNET:
- bpf_error(cstate, "DECNET encapsulation is not specifiable");
- /*NOTREACHED*/
-
case Q_LAT:
- bpf_error(cstate, "LAT does not encapsulate another protocol");
- /*NOTREACHED*/
-
case Q_SCA:
- bpf_error(cstate, "SCA does not encapsulate another protocol");
- /*NOTREACHED*/
-
case Q_MOPRC:
- bpf_error(cstate, "MOPRC does not encapsulate another protocol");
- /*NOTREACHED*/
-
case Q_MOPDL:
- bpf_error(cstate, "MOPDL does not encapsulate another protocol");
- /*NOTREACHED*/
+ break; // invalid qualifier
case Q_IPV6:
+ assert_maxval(cstate, "protocol number", v, UINT8_MAX);
b0 = gen_linktype(cstate, ETHERTYPE_IPV6);
/*
* Also check for a fragment header before the final
* header.
*/
- b2 = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, IPPROTO_FRAGMENT);
+ b2 = gen_ip6_proto(cstate, IPPROTO_FRAGMENT);
b1 = gen_cmp(cstate, OR_LINKPL, 40, BPF_B, v);
gen_and(b2, b1);
- b2 = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, v);
+ // 0 <= v <= UINT8_MAX
+ b2 = gen_ip6_proto(cstate, (uint8_t)v);
gen_or(b2, b1);
gen_and(b0, b1);
return b1;
case Q_ICMPV6:
- bpf_error(cstate, "'icmp6 proto' is bogus");
- /*NOTREACHED*/
-
case Q_AH:
- bpf_error(cstate, "'ah proto' is bogus");
- /*NOTREACHED*/
-
case Q_ESP:
- bpf_error(cstate, "'esp proto' is bogus");
- /*NOTREACHED*/
-
case Q_PIM:
- bpf_error(cstate, "'pim proto' is bogus");
- /*NOTREACHED*/
-
case Q_VRRP:
- bpf_error(cstate, "'vrrp proto' is bogus");
- /*NOTREACHED*/
-
case Q_AARP:
- bpf_error(cstate, "'aarp proto' is bogus");
- /*NOTREACHED*/
+ break; // invalid qualifier
case Q_ISO:
+ assert_maxval(cstate, "ISO protocol", v, UINT8_MAX);
switch (cstate->linktype) {
case DLT_FRELAY:
}
case Q_ESIS:
- bpf_error(cstate, "'esis proto' is bogus");
- /*NOTREACHED*/
+ break; // invalid qualifier
case Q_ISIS:
- b0 = gen_proto(cstate, ISO10589_ISIS, Q_ISO, Q_DEFAULT);
+ assert_maxval(cstate, "IS-IS PDU type", v, ISIS_PDU_TYPE_MAX);
+ b0 = gen_proto(cstate, ISO10589_ISIS, Q_ISO);
/*
* 4 is the offset of the PDU type relative to the IS-IS
* header.
+ * Except when it is not, see above.
*/
- b1 = gen_cmp(cstate, OR_LINKPL_NOSNAP, 4, BPF_B, v);
+ unsigned pdu_type_offset;
+ switch (cstate->linktype) {
+ case DLT_C_HDLC:
+ case DLT_HDLC:
+ pdu_type_offset = 5;
+ break;
+ default:
+ pdu_type_offset = 4;
+ }
+ b1 = gen_mcmp(cstate, OR_LINKPL_NOSNAP, pdu_type_offset, BPF_B,
+ v, ISIS_PDU_TYPE_MAX);
gen_and(b0, b1);
return b1;
case Q_CLNP:
- bpf_error(cstate, "'clnp proto' is not supported");
- /*NOTREACHED*/
-
case Q_STP:
- bpf_error(cstate, "'stp proto' is bogus");
- /*NOTREACHED*/
-
case Q_IPX:
- bpf_error(cstate, "'ipx proto' is bogus");
- /*NOTREACHED*/
-
case Q_NETBEUI:
- bpf_error(cstate, "'netbeui proto' is bogus");
- /*NOTREACHED*/
-
case Q_ISIS_L1:
- bpf_error(cstate, "'l1 proto' is bogus");
- /*NOTREACHED*/
-
case Q_ISIS_L2:
- bpf_error(cstate, "'l2 proto' is bogus");
- /*NOTREACHED*/
-
case Q_ISIS_IIH:
- bpf_error(cstate, "'iih proto' is bogus");
- /*NOTREACHED*/
-
case Q_ISIS_SNP:
- bpf_error(cstate, "'snp proto' is bogus");
- /*NOTREACHED*/
-
case Q_ISIS_CSNP:
- bpf_error(cstate, "'csnp proto' is bogus");
- /*NOTREACHED*/
-
case Q_ISIS_PSNP:
- bpf_error(cstate, "'psnp proto' is bogus");
- /*NOTREACHED*/
-
case Q_ISIS_LSP:
- bpf_error(cstate, "'lsp proto' is bogus");
- /*NOTREACHED*/
-
case Q_RADIO:
- bpf_error(cstate, "'radio proto' is bogus");
- /*NOTREACHED*/
-
case Q_CARP:
- bpf_error(cstate, "'carp proto' is bogus");
- /*NOTREACHED*/
+ break; // invalid qualifier
default:
abort();
/*NOTREACHED*/
}
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, pqkw(proto), "proto");
/*NOTREACHED*/
}
free(cpy);
break;
}
-#if defined(ultrix) || defined(__osf__)
- /* Special hack in case NFS isn't in /etc/services */
- if (strcmp(cpy, "nfs") == 0) {
- val = 2049;
- *proto = PROTO_UNDEF;
- free(cpy);
- break;
- }
-#endif
bpf_set_error(cstate, "'%s' is not a valid port", cpy);
free(cpy);
longjmp(cstate->top_ctx, 1);
/*NOTREACHED*/
+#ifdef _AIX
+ PCAP_UNREACHABLE
+#endif /* _AIX */
case STOULEN_ERROR:
/* Error already set. */
longjmp(cstate->top_ctx, 1);
/*NOTREACHED*/
+#ifdef _AIX
+ PCAP_UNREACHABLE
+#endif /* _AIX */
default:
/* Should not happen */
int proto = q.proto;
int dir = q.dir;
int tproto;
- u_char *eaddr;
+ u_char *eaddrp;
+ u_char eaddr[6];
bpf_u_int32 mask, addr;
struct addrinfo *res, *res0;
struct sockaddr_in *sin4;
case Q_DEFAULT:
case Q_HOST:
if (proto == Q_LINK) {
- switch (cstate->linktype) {
-
- case DLT_EN10MB:
- case DLT_NETANALYZER:
- case DLT_NETANALYZER_TRANSPARENT:
- eaddr = pcap_ether_hostton(name);
- if (eaddr == NULL)
- bpf_error(cstate,
- "unknown ether host '%s'", name);
- tmp = gen_prevlinkhdr_check(cstate);
- b = gen_ehostop(cstate, eaddr, dir);
- if (tmp != NULL)
- gen_and(tmp, b);
- free(eaddr);
- return b;
-
- case DLT_FDDI:
- eaddr = pcap_ether_hostton(name);
- if (eaddr == NULL)
- bpf_error(cstate,
- "unknown FDDI host '%s'", name);
- b = gen_fhostop(cstate, eaddr, dir);
- free(eaddr);
- return b;
-
- case DLT_IEEE802:
- eaddr = pcap_ether_hostton(name);
- if (eaddr == NULL)
- bpf_error(cstate,
- "unknown token ring host '%s'", name);
- b = gen_thostop(cstate, eaddr, dir);
- free(eaddr);
- return b;
-
- case DLT_IEEE802_11:
- case DLT_PRISM_HEADER:
- case DLT_IEEE802_11_RADIO_AVS:
- case DLT_IEEE802_11_RADIO:
- case DLT_PPI:
- eaddr = pcap_ether_hostton(name);
- if (eaddr == NULL)
- bpf_error(cstate,
- "unknown 802.11 host '%s'", name);
- b = gen_wlanhostop(cstate, eaddr, dir);
- free(eaddr);
- return b;
-
- case DLT_IP_OVER_FC:
- eaddr = pcap_ether_hostton(name);
- if (eaddr == NULL)
- bpf_error(cstate,
- "unknown Fibre Channel host '%s'", name);
- b = gen_ipfchostop(cstate, eaddr, dir);
- free(eaddr);
- return b;
- }
-
- bpf_error(cstate, "only ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel supports link-level host name");
+ const char *context = "link host NAME";
+ if (! is_mac48_linktype(cstate->linktype))
+ fail_kw_on_dlt(cstate, context);
+ eaddrp = pcap_ether_hostton(name);
+ if (eaddrp == NULL)
+ bpf_error(cstate, ERRSTR_UNKNOWN_MAC48HOST, name);
+ memcpy(eaddr, eaddrp, sizeof(eaddr));
+ free(eaddrp);
+ return gen_mac48host(cstate, eaddr, q.dir, context);
} else if (proto == Q_DECNET) {
/*
* A long time ago on Ultrix libpcap supported
}
case Q_PORT:
- if (proto != Q_DEFAULT &&
- proto != Q_UDP && proto != Q_TCP && proto != Q_SCTP)
- bpf_error(cstate, "illegal qualifier of 'port'");
+ (void)port_pq_to_ipproto(cstate, proto, "port"); // validate only
if (pcap_nametoport(name, &port, &real_proto) == 0)
bpf_error(cstate, "unknown port '%s'", name);
if (proto == Q_UDP) {
bpf_error(cstate, "illegal port number %d < 0", port);
if (port > 65535)
bpf_error(cstate, "illegal port number %d > 65535", port);
- b = gen_port(cstate, port, real_proto, dir);
- gen_or(gen_port6(cstate, port, real_proto, dir), b);
+ // real_proto can be PROTO_UNDEF
+ b = gen_port(cstate, (uint16_t)port, real_proto, dir);
+ gen_or(gen_port6(cstate, (uint16_t)port, real_proto, dir), b);
return b;
case Q_PORTRANGE:
- if (proto != Q_DEFAULT &&
- proto != Q_UDP && proto != Q_TCP && proto != Q_SCTP)
- bpf_error(cstate, "illegal qualifier of 'portrange'");
+ (void)port_pq_to_ipproto(cstate, proto, "portrange"); // validate only
stringtoportrange(cstate, name, &port1, &port2, &real_proto);
if (proto == Q_UDP) {
if (real_proto == IPPROTO_TCP)
if (port2 > 65535)
bpf_error(cstate, "illegal port number %d > 65535", port2);
- b = gen_portrange(cstate, port1, port2, real_proto, dir);
- gen_or(gen_portrange6(cstate, port1, port2, real_proto, dir), b);
+ // real_proto can be PROTO_UNDEF
+ b = gen_portrange(cstate, (uint16_t)port1, (uint16_t)port2,
+ real_proto, dir);
+ gen_or(gen_portrange6(cstate, (uint16_t)port1, (uint16_t)port2,
+ real_proto, dir), b);
return b;
case Q_GATEWAY:
#ifndef INET6
- eaddr = pcap_ether_hostton(name);
- if (eaddr == NULL)
- bpf_error(cstate, "unknown ether host: %s", name);
+ if (! is_mac48_linktype(cstate->linktype))
+ fail_kw_on_dlt(cstate, "gateway");
+ eaddrp = pcap_ether_hostton(name);
+ if (eaddrp == NULL)
+ bpf_error(cstate, ERRSTR_UNKNOWN_MAC48HOST, name);
+ memcpy(eaddr, eaddrp, sizeof(eaddr));
+ free(eaddrp);
res = pcap_nametoaddrinfo(name);
cstate->ai = res;
if (res == NULL)
bpf_error(cstate, "unknown host '%s'", name);
- b = gen_gateway(cstate, eaddr, res, proto, dir);
+ b = gen_gateway(cstate, eaddr, res, proto);
cstate->ai = NULL;
freeaddrinfo(res);
if (b == NULL)
case Q_PROTO:
real_proto = lookup_proto(cstate, name, proto);
if (real_proto >= 0)
- return gen_proto(cstate, real_proto, proto, dir);
+ return gen_proto(cstate, real_proto, proto);
else
bpf_error(cstate, "unknown protocol: %s", name);
{
register int nlen, mlen;
bpf_u_int32 n, m;
+ uint64_t m64;
/*
* Catch errors reported by us and routines below us, and return NULL
if (setjmp(cstate->top_ctx))
return (NULL);
- nlen = __pcap_atoin(s1, &n);
+ nlen = pcapint_atoin(s1, &n);
if (nlen < 0)
bpf_error(cstate, "invalid IPv4 address '%s'", s1);
/* Promote short ipaddr */
n <<= 32 - nlen;
if (s2 != NULL) {
- mlen = __pcap_atoin(s2, &m);
+ mlen = pcapint_atoin(s2, &m);
if (mlen < 0)
bpf_error(cstate, "invalid IPv4 address '%s'", s2);
/* Promote short ipaddr */
/* Convert mask len to mask */
if (masklen > 32)
bpf_error(cstate, "mask length must be <= 32");
- if (masklen == 0) {
- /*
- * X << 32 is not guaranteed by C to be 0; it's
- * undefined.
- */
- m = 0;
- } else
- m = 0xffffffff << (32 - masklen);
+ m64 = UINT64_C(0xffffffff) << (32 - masklen);
+ m = (bpf_u_int32)m64;
if ((n & ~m) != 0)
bpf_error(cstate, "non-network bits set in \"%s/%d\"",
s1, masklen);
return gen_host(cstate, n, m, q.proto, q.dir, q.addr);
default:
+ // Q_HOST and Q_GATEWAY only (see the grammar)
bpf_error(cstate, "Mask syntax for networks only");
/*NOTREACHED*/
}
* {N}.{N}.{N}.{N}, of which only the first potentially stands
* for a valid DECnet address.
*/
- vlen = __pcap_atodn(s, &v);
+ vlen = pcapint_atodn(s, &v);
if (vlen == 0)
bpf_error(cstate, "invalid DECnet address '%s'", s);
} else {
* {N}.{N}.{N}.{N}, all of which potentially stand for a valid
* IPv4 address.
*/
- vlen = __pcap_atoin(s, &v);
+ vlen = pcapint_atoin(s, &v);
if (vlen < 0)
bpf_error(cstate, "invalid IPv4 address '%s'", s);
}
if (proto == Q_DECNET)
return gen_host(cstate, v, 0, proto, dir, q.addr);
else if (proto == Q_LINK) {
+ // "link (host|net) IPV4ADDR" and variations thereof
bpf_error(cstate, "illegal link layer address");
} else {
mask = 0xffffffff;
}
case Q_PORT:
- if (proto == Q_UDP)
- proto = IPPROTO_UDP;
- else if (proto == Q_TCP)
- proto = IPPROTO_TCP;
- else if (proto == Q_SCTP)
- proto = IPPROTO_SCTP;
- else if (proto == Q_DEFAULT)
- proto = PROTO_UNDEF;
- else
- bpf_error(cstate, "illegal qualifier of 'port'");
+ proto = port_pq_to_ipproto(cstate, proto, "port");
if (v > 65535)
bpf_error(cstate, "illegal port number %u > 65535", v);
+ // proto can be PROTO_UNDEF
{
struct block *b;
- b = gen_port(cstate, v, proto, dir);
- gen_or(gen_port6(cstate, v, proto, dir), b);
+ b = gen_port(cstate, (uint16_t)v, proto, dir);
+ gen_or(gen_port6(cstate, (uint16_t)v, proto, dir), b);
return b;
}
case Q_PORTRANGE:
- if (proto == Q_UDP)
- proto = IPPROTO_UDP;
- else if (proto == Q_TCP)
- proto = IPPROTO_TCP;
- else if (proto == Q_SCTP)
- proto = IPPROTO_SCTP;
- else if (proto == Q_DEFAULT)
- proto = PROTO_UNDEF;
- else
- bpf_error(cstate, "illegal qualifier of 'portrange'");
+ proto = port_pq_to_ipproto(cstate, proto, "portrange");
if (v > 65535)
bpf_error(cstate, "illegal port number %u > 65535", v);
+ // proto can be PROTO_UNDEF
{
struct block *b;
- b = gen_portrange(cstate, v, v, proto, dir);
- gen_or(gen_portrange6(cstate, v, v, proto, dir), b);
+ b = gen_portrange(cstate, (uint16_t)v, (uint16_t)v,
+ proto, dir);
+ gen_or(gen_portrange6(cstate, (uint16_t)v, (uint16_t)v,
+ proto, dir), b);
return b;
}
/*NOTREACHED*/
case Q_PROTO:
- return gen_proto(cstate, v, proto, dir);
+ return gen_proto(cstate, v, proto);
#if !defined(NO_PROTOCHAIN)
case Q_PROTOCHAIN:
return b;
default:
+ // Q_GATEWAY only (see the grammar)
bpf_error(cstate, "invalid qualifier against IPv6 address");
/*NOTREACHED*/
}
struct block *
gen_ecode(compiler_state_t *cstate, const char *s, struct qual q)
{
- struct block *b, *tmp;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
return (NULL);
if ((q.addr == Q_HOST || q.addr == Q_DEFAULT) && q.proto == Q_LINK) {
+ const char *context = "link host XX:XX:XX:XX:XX:XX";
+ if (! is_mac48_linktype(cstate->linktype))
+ fail_kw_on_dlt(cstate, context);
cstate->e = pcap_ether_aton(s);
if (cstate->e == NULL)
bpf_error(cstate, "malloc");
- switch (cstate->linktype) {
- case DLT_EN10MB:
- case DLT_NETANALYZER:
- case DLT_NETANALYZER_TRANSPARENT:
- tmp = gen_prevlinkhdr_check(cstate);
- b = gen_ehostop(cstate, cstate->e, (int)q.dir);
- if (tmp != NULL)
- gen_and(tmp, b);
- break;
- case DLT_FDDI:
- b = gen_fhostop(cstate, cstate->e, (int)q.dir);
- break;
- case DLT_IEEE802:
- b = gen_thostop(cstate, cstate->e, (int)q.dir);
- break;
- case DLT_IEEE802_11:
- case DLT_PRISM_HEADER:
- case DLT_IEEE802_11_RADIO_AVS:
- case DLT_IEEE802_11_RADIO:
- case DLT_PPI:
- b = gen_wlanhostop(cstate, cstate->e, (int)q.dir);
- break;
- case DLT_IP_OVER_FC:
- b = gen_ipfchostop(cstate, cstate->e, (int)q.dir);
- break;
- default:
- free(cstate->e);
- cstate->e = NULL;
- bpf_error(cstate, "ethernet addresses supported only on ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel");
- /*NOTREACHED*/
- }
+ struct block *b = gen_mac48host(cstate, cstate->e, q.dir, context);
free(cstate->e);
cstate->e = NULL;
return (b);
}
switch (proto) {
default:
- bpf_error(cstate, "unsupported index operation");
+ bpf_error(cstate, "'%s' does not support the index operation", pqkw(proto));
case Q_RADIO:
/*
/*
* Check if we have an icmp6 next header
*/
- b = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, 58);
+ b = gen_ip6_proto(cstate, 58);
if (inst->b)
gen_and(inst->b, b);
inst->b = b;
gen_len(compiler_state_t *cstate, int jmp, int n)
{
struct slist *s;
- struct block *b;
s = new_stmt(cstate, BPF_LD|BPF_LEN);
- b = new_block(cstate, JMP(jmp));
- b->stmts = s;
- b->s.k = n;
-
- return b;
+ return gen_jmp(cstate, jmp, n, s);
}
struct block *
if (setjmp(cstate->top_ctx))
return (NULL);
+ assert_maxval(cstate, "byte argument", val, UINT8_MAX);
+
switch (op) {
default:
abort();
return gen_cmp(cstate, OR_LINKHDR, (u_int)idx, BPF_B, val);
case '<':
- b = gen_cmp_lt(cstate, OR_LINKHDR, (u_int)idx, BPF_B, val);
- return b;
+ return gen_cmp_lt(cstate, OR_LINKHDR, (u_int)idx, BPF_B, val);
case '>':
- b = gen_cmp_gt(cstate, OR_LINKHDR, (u_int)idx, BPF_B, val);
- return b;
+ return gen_cmp_gt(cstate, OR_LINKHDR, (u_int)idx, BPF_B, val);
case '|':
s = new_stmt(cstate, BPF_ALU|BPF_OR|BPF_K);
break;
}
s->s.k = val;
- b = new_block(cstate, JMP(BPF_JEQ));
- b->stmts = s;
+ // Load the required byte first.
+ struct slist *s0 = gen_load_a(cstate, OR_LINKHDR, idx, BPF_B);
+ sappend(s0, s);
+ b = gen_jmp(cstate, BPF_JEQ, 0, s0);
gen_not(b);
return b;
}
-static const u_char abroadcast[] = { 0x0 };
-
struct block *
gen_broadcast(compiler_state_t *cstate, int proto)
{
switch (cstate->linktype) {
case DLT_ARCNET:
case DLT_ARCNET_LINUX:
- return gen_ahostop(cstate, abroadcast, Q_DST);
- case DLT_EN10MB:
- case DLT_NETANALYZER:
- case DLT_NETANALYZER_TRANSPARENT:
- b1 = gen_prevlinkhdr_check(cstate);
- b0 = gen_ehostop(cstate, ebroadcast, Q_DST);
- if (b1 != NULL)
- gen_and(b1, b0);
- return b0;
- case DLT_FDDI:
- return gen_fhostop(cstate, ebroadcast, Q_DST);
- case DLT_IEEE802:
- return gen_thostop(cstate, ebroadcast, Q_DST);
- case DLT_IEEE802_11:
- case DLT_PRISM_HEADER:
- case DLT_IEEE802_11_RADIO_AVS:
- case DLT_IEEE802_11_RADIO:
- case DLT_PPI:
- return gen_wlanhostop(cstate, ebroadcast, Q_DST);
- case DLT_IP_OVER_FC:
- return gen_ipfchostop(cstate, ebroadcast, Q_DST);
- default:
- bpf_error(cstate, "not a broadcast link");
+ // ARCnet broadcast is [8-bit] destination address 0.
+ return gen_ahostop(cstate, 0, Q_DST);
}
+ return gen_mac48host(cstate, ebroadcast, Q_DST, "broadcast");
/*NOTREACHED*/
case Q_IP:
b0 = gen_linktype(cstate, ETHERTYPE_IP);
hostmask = ~cstate->netmask;
b1 = gen_mcmp(cstate, OR_LINKPL, 16, BPF_W, 0, hostmask);
- b2 = gen_mcmp(cstate, OR_LINKPL, 16, BPF_W,
- ~0 & hostmask, hostmask);
+ b2 = gen_mcmp(cstate, OR_LINKPL, 16, BPF_W, hostmask, hostmask);
gen_or(b1, b2);
gen_and(b0, b2);
return b2;
}
- bpf_error(cstate, "only link-layer/IP broadcast filters supported");
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, pqkw(proto), "broadcast");
/*NOTREACHED*/
}
static struct block *
gen_mac_multicast(compiler_state_t *cstate, int offset)
{
- register struct block *b0;
register struct slist *s;
/* link[offset] & 1 != 0 */
s = gen_load_a(cstate, OR_LINKHDR, offset, BPF_B);
- b0 = new_block(cstate, JMP(BPF_JSET));
- b0->s.k = 1;
- b0->stmts = s;
- return b0;
+ return gen_set(cstate, 1, s);
}
struct block *
switch (cstate->linktype) {
case DLT_ARCNET:
case DLT_ARCNET_LINUX:
- /* all ARCnet multicasts use the same address */
- return gen_ahostop(cstate, abroadcast, Q_DST);
+ // ARCnet multicast is the same as broadcast.
+ return gen_ahostop(cstate, 0, Q_DST);
case DLT_EN10MB:
case DLT_NETANALYZER:
case DLT_NETANALYZER_TRANSPARENT:
* First, check for To DS set, i.e. "link[1] & 0x01".
*/
s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x01; /* To DS */
- b1->stmts = s;
+ b1 = gen_set(cstate, IEEE80211_FC1_DIR_TODS, s);
/*
* If To DS is set, the DA is at 16.
* "!(link[1] & 0x01)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
- b2 = new_block(cstate, JMP(BPF_JSET));
- b2->s.k = 0x01; /* To DS */
- b2->stmts = s;
- gen_not(b2);
+ b2 = gen_unset(cstate, IEEE80211_FC1_DIR_TODS, s);
/*
* If To DS is not set, the DA is at 4.
* I.e, check "link[0] & 0x08".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x08;
- b1->stmts = s;
+ b1 = gen_set(cstate, IEEE80211_FC0_TYPE_DATA, s);
/*
* AND that with the checks done for data frames.
* I.e, check "!(link[0] & 0x08)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b2 = new_block(cstate, JMP(BPF_JSET));
- b2->s.k = 0x08;
- b2->stmts = s;
- gen_not(b2);
+ b2 = gen_unset(cstate, IEEE80211_FC0_TYPE_DATA, s);
/*
* For management frames, the DA is at 4.
* I.e., check "!(link[0] & 0x04)".
*/
s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
- b1 = new_block(cstate, JMP(BPF_JSET));
- b1->s.k = 0x04;
- b1->stmts = s;
- gen_not(b1);
+ b1 = gen_unset(cstate, IEEE80211_FC0_TYPE_CTL, s);
/*
* AND that with the checks for data and management
gen_and(b1, b0);
return b0;
case DLT_IP_OVER_FC:
- b0 = gen_mac_multicast(cstate, 2);
- return b0;
+ return gen_mac_multicast(cstate, 2);
default:
break;
}
- /* Link not known to support multicasts */
- break;
+ fail_kw_on_dlt(cstate, "multicast");
+ /*NOTREACHED*/
case Q_IP:
b0 = gen_linktype(cstate, ETHERTYPE_IP);
gen_and(b0, b1);
return b1;
}
- bpf_error(cstate, "link-layer multicast filters supported only on ethernet/FDDI/token ring/ARCNET/802.11/ATM LANE/Fibre Channel");
+ bpf_error(cstate, ERRSTR_INVALID_QUAL, pqkw(proto), "multicast");
/*NOTREACHED*/
}
+#ifdef __linux__
+/*
+ * This is Linux; we require PF_PACKET support. If this is a *live* capture,
+ * we can look at special meta-data in the filter expression; otherwise we
+ * can't because it is either a savefile (rfile != NULL) or a pcap_t created
+ * using pcap_open_dead() (rfile == NULL). Thus check for a flag that
+ * pcap_activate() conditionally sets.
+ */
+static void
+require_basic_bpf_extensions(compiler_state_t *cstate, const char *keyword)
+{
+ if (cstate->bpf_pcap->bpf_codegen_flags & BPF_SPECIAL_BASIC_HANDLING)
+ return;
+ bpf_error(cstate, "%s not supported on %s (not a live capture)",
+ keyword,
+ pcap_datalink_val_to_description_or_dlt(cstate->linktype));
+}
+#endif // __linux__
+
struct block *
gen_ifindex(compiler_state_t *cstate, int ifindex)
{
- register struct block *b0;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
switch (cstate->linktype) {
case DLT_LINUX_SLL2:
/* match packets on this interface */
- b0 = gen_cmp(cstate, OR_LINKHDR, 4, BPF_W, ifindex);
- break;
+ return gen_cmp(cstate, OR_LINKHDR, 4, BPF_W, ifindex);
default:
-#if defined(linux)
- /*
- * This is Linux; we require PF_PACKET support.
- * If this is a *live* capture, we can look at
- * special meta-data in the filter expression;
- * if it's a savefile, we can't.
- */
- if (cstate->bpf_pcap->rfile != NULL) {
- /* We have a FILE *, so this is a savefile */
- bpf_error(cstate, "ifindex not supported on %s when reading savefiles",
- pcap_datalink_val_to_description_or_dlt(cstate->linktype));
- /*NOTREACHED*/
- }
+#if defined(__linux__)
+ require_basic_bpf_extensions(cstate, "ifindex");
/* match ifindex */
- b0 = gen_cmp(cstate, OR_LINKHDR, SKF_AD_OFF + SKF_AD_IFINDEX, BPF_W,
+ return gen_cmp(cstate, OR_LINKHDR, SKF_AD_OFF + SKF_AD_IFINDEX, BPF_W,
ifindex);
-#else /* defined(linux) */
- bpf_error(cstate, "ifindex not supported on %s",
- pcap_datalink_val_to_description_or_dlt(cstate->linktype));
+#else /* defined(__linux__) */
+ fail_kw_on_dlt(cstate, "ifindex");
/*NOTREACHED*/
-#endif /* defined(linux) */
+#endif /* defined(__linux__) */
}
- return (b0);
}
/*
- * Filter on inbound (dir == 0) or outbound (dir == 1) traffic.
+ * Filter on inbound (outbound == 0) or outbound (outbound == 1) traffic.
* Outbound traffic is sent by this machine, while inbound traffic is
* sent by a remote machine (and may include packets destined for a
* unicast or multicast link-layer address we are not subscribing to).
* better accomplished using a higher-layer filter.
*/
struct block *
-gen_inbound(compiler_state_t *cstate, int dir)
+gen_inbound_outbound(compiler_state_t *cstate, const int outbound)
{
register struct block *b0;
*/
switch (cstate->linktype) {
case DLT_SLIP:
- b0 = gen_relation_internal(cstate, BPF_JEQ,
- gen_load_internal(cstate, Q_LINK, gen_loadi_internal(cstate, 0), 1),
- gen_loadi_internal(cstate, 0),
- dir);
- break;
+ return gen_cmp(cstate, OR_LINKHDR, 0, BPF_B,
+ outbound ? SLIPDIR_OUT : SLIPDIR_IN);
case DLT_IPNET:
- if (dir) {
- /* match outgoing packets */
- b0 = gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, IPNET_OUTBOUND);
- } else {
- /* match incoming packets */
- b0 = gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, IPNET_INBOUND);
- }
- break;
+ return gen_cmp(cstate, OR_LINKHDR, 2, BPF_H,
+ outbound ? IPNET_OUTBOUND : IPNET_INBOUND);
case DLT_LINUX_SLL:
/* match outgoing packets */
b0 = gen_cmp(cstate, OR_LINKHDR, 0, BPF_H, LINUX_SLL_OUTGOING);
- if (!dir) {
+ if (! outbound) {
/* to filter on inbound traffic, invert the match */
gen_not(b0);
}
- break;
+ return b0;
case DLT_LINUX_SLL2:
/* match outgoing packets */
b0 = gen_cmp(cstate, OR_LINKHDR, 10, BPF_B, LINUX_SLL_OUTGOING);
- if (!dir) {
+ if (! outbound) {
/* to filter on inbound traffic, invert the match */
gen_not(b0);
}
- break;
+ return b0;
case DLT_PFLOG:
- b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, dir), BPF_B,
- ((dir == 0) ? PF_IN : PF_OUT));
- break;
+ return gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, dir), BPF_B,
+ outbound ? PF_OUT : PF_IN);
case DLT_PPP_PPPD:
- if (dir) {
- /* match outgoing packets */
- b0 = gen_cmp(cstate, OR_LINKHDR, 0, BPF_B, PPP_PPPD_OUT);
- } else {
- /* match incoming packets */
- b0 = gen_cmp(cstate, OR_LINKHDR, 0, BPF_B, PPP_PPPD_IN);
- }
- break;
+ return gen_cmp(cstate, OR_LINKHDR, 0, BPF_B, outbound ? PPP_PPPD_OUT : PPP_PPPD_IN);
- case DLT_JUNIPER_MFR:
- case DLT_JUNIPER_MLFR:
- case DLT_JUNIPER_MLPPP:
+ case DLT_JUNIPER_MFR:
+ case DLT_JUNIPER_MLFR:
+ case DLT_JUNIPER_MLPPP:
case DLT_JUNIPER_ATM1:
case DLT_JUNIPER_ATM2:
case DLT_JUNIPER_PPPOE:
case DLT_JUNIPER_PPPOE_ATM:
- case DLT_JUNIPER_GGSN:
- case DLT_JUNIPER_ES:
- case DLT_JUNIPER_MONITOR:
- case DLT_JUNIPER_SERVICES:
- case DLT_JUNIPER_ETHER:
- case DLT_JUNIPER_PPP:
- case DLT_JUNIPER_FRELAY:
- case DLT_JUNIPER_CHDLC:
- case DLT_JUNIPER_VP:
- case DLT_JUNIPER_ST:
- case DLT_JUNIPER_ISM:
- case DLT_JUNIPER_VS:
- case DLT_JUNIPER_SRX_E2E:
- case DLT_JUNIPER_FIBRECHANNEL:
+ case DLT_JUNIPER_GGSN:
+ case DLT_JUNIPER_ES:
+ case DLT_JUNIPER_MONITOR:
+ case DLT_JUNIPER_SERVICES:
+ case DLT_JUNIPER_ETHER:
+ case DLT_JUNIPER_PPP:
+ case DLT_JUNIPER_FRELAY:
+ case DLT_JUNIPER_CHDLC:
+ case DLT_JUNIPER_VP:
+ case DLT_JUNIPER_ST:
+ case DLT_JUNIPER_ISM:
+ case DLT_JUNIPER_VS:
+ case DLT_JUNIPER_SRX_E2E:
+ case DLT_JUNIPER_FIBRECHANNEL:
case DLT_JUNIPER_ATM_CEMIC:
-
/* juniper flags (including direction) are stored
* the byte after the 3-byte magic number */
- if (dir) {
- /* match outgoing packets */
- b0 = gen_mcmp(cstate, OR_LINKHDR, 3, BPF_B, 0, 0x01);
- } else {
- /* match incoming packets */
- b0 = gen_mcmp(cstate, OR_LINKHDR, 3, BPF_B, 1, 0x01);
- }
- break;
+ return gen_mcmp(cstate, OR_LINKHDR, 3, BPF_B, outbound ? 0 : 1, 0x01);
default:
/*
* with newer capture APIs, allowing it to be saved
* in pcapng files.
*/
-#if defined(linux)
- /*
- * This is Linux; we require PF_PACKET support.
- * If this is a *live* capture, we can look at
- * special meta-data in the filter expression;
- * if it's a savefile, we can't.
- */
- if (cstate->bpf_pcap->rfile != NULL) {
- /* We have a FILE *, so this is a savefile */
- bpf_error(cstate, "inbound/outbound not supported on %s when reading savefiles",
- pcap_datalink_val_to_description_or_dlt(cstate->linktype));
- /*NOTREACHED*/
- }
+#if defined(__linux__)
+ require_basic_bpf_extensions(cstate, outbound ? "outbound" : "inbound");
/* match outgoing packets */
b0 = gen_cmp(cstate, OR_LINKHDR, SKF_AD_OFF + SKF_AD_PKTTYPE, BPF_H,
PACKET_OUTGOING);
- if (!dir) {
+ if (! outbound) {
/* to filter on inbound traffic, invert the match */
gen_not(b0);
}
-#else /* defined(linux) */
- bpf_error(cstate, "inbound/outbound not supported on %s",
- pcap_datalink_val_to_description_or_dlt(cstate->linktype));
+ return b0;
+#else /* defined(__linux__) */
+ fail_kw_on_dlt(cstate, outbound ? "outbound" : "inbound");
/*NOTREACHED*/
-#endif /* defined(linux) */
+#endif /* defined(__linux__) */
}
- return (b0);
}
/* PF firewall log matched interface */
struct block *
gen_pf_ifname(compiler_state_t *cstate, const char *ifname)
{
- struct block *b0;
u_int len, off;
/*
if (setjmp(cstate->top_ctx))
return (NULL);
- if (cstate->linktype != DLT_PFLOG) {
- bpf_error(cstate, "ifname supported only on PF linktype");
- /*NOTREACHED*/
- }
+ assert_pflog(cstate, "ifname");
+
len = sizeof(((struct pfloghdr *)0)->ifname);
off = offsetof(struct pfloghdr, ifname);
if (strlen(ifname) >= len) {
len-1);
/*NOTREACHED*/
}
- b0 = gen_bcmp(cstate, OR_LINKHDR, off, (u_int)strlen(ifname),
+ return gen_bcmp(cstate, OR_LINKHDR, off, (u_int)strlen(ifname),
(const u_char *)ifname);
- return (b0);
}
/* PF firewall log ruleset name */
struct block *
gen_pf_ruleset(compiler_state_t *cstate, char *ruleset)
{
- struct block *b0;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
if (setjmp(cstate->top_ctx))
return (NULL);
- if (cstate->linktype != DLT_PFLOG) {
- bpf_error(cstate, "ruleset supported only on PF linktype");
- /*NOTREACHED*/
- }
+ assert_pflog(cstate, "ruleset");
if (strlen(ruleset) >= sizeof(((struct pfloghdr *)0)->ruleset)) {
bpf_error(cstate, "ruleset names can only be %ld characters",
/*NOTREACHED*/
}
- b0 = gen_bcmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, ruleset),
+ return gen_bcmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, ruleset),
(u_int)strlen(ruleset), (const u_char *)ruleset);
- return (b0);
}
/* PF firewall log rule number */
struct block *
gen_pf_rnr(compiler_state_t *cstate, int rnr)
{
- struct block *b0;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
if (setjmp(cstate->top_ctx))
return (NULL);
- if (cstate->linktype != DLT_PFLOG) {
- bpf_error(cstate, "rnr supported only on PF linktype");
- /*NOTREACHED*/
- }
+ assert_pflog(cstate, "rnr");
- b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, rulenr), BPF_W,
+ return gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, rulenr), BPF_W,
(bpf_u_int32)rnr);
- return (b0);
}
/* PF firewall log sub-rule number */
struct block *
gen_pf_srnr(compiler_state_t *cstate, int srnr)
{
- struct block *b0;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
if (setjmp(cstate->top_ctx))
return (NULL);
- if (cstate->linktype != DLT_PFLOG) {
- bpf_error(cstate, "srnr supported only on PF linktype");
- /*NOTREACHED*/
- }
+ assert_pflog(cstate, "srnr");
- b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, subrulenr), BPF_W,
+ return gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, subrulenr), BPF_W,
(bpf_u_int32)srnr);
- return (b0);
}
/* PF firewall log reason code */
struct block *
gen_pf_reason(compiler_state_t *cstate, int reason)
{
- struct block *b0;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
if (setjmp(cstate->top_ctx))
return (NULL);
- if (cstate->linktype != DLT_PFLOG) {
- bpf_error(cstate, "reason supported only on PF linktype");
- /*NOTREACHED*/
- }
+ assert_pflog(cstate, "reason");
- b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, reason), BPF_B,
+ return gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, reason), BPF_B,
(bpf_u_int32)reason);
- return (b0);
}
/* PF firewall log action */
struct block *
gen_pf_action(compiler_state_t *cstate, int action)
{
- struct block *b0;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
if (setjmp(cstate->top_ctx))
return (NULL);
- if (cstate->linktype != DLT_PFLOG) {
- bpf_error(cstate, "action supported only on PF linktype");
- /*NOTREACHED*/
- }
+ assert_pflog(cstate, "action");
- b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, action), BPF_B,
+ return gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, action), BPF_B,
(bpf_u_int32)action);
- return (b0);
}
/* IEEE 802.11 wireless header */
struct block *
gen_p80211_type(compiler_state_t *cstate, bpf_u_int32 type, bpf_u_int32 mask)
{
- struct block *b0;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
case DLT_PRISM_HEADER:
case DLT_IEEE802_11_RADIO_AVS:
case DLT_IEEE802_11_RADIO:
- b0 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, type, mask);
- break;
+ case DLT_PPI:
+ return gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, type, mask);
default:
- bpf_error(cstate, "802.11 link-layer types supported only on 802.11");
+ fail_kw_on_dlt(cstate, "type/subtype");
/*NOTREACHED*/
}
-
- return (b0);
}
struct block *
gen_p80211_fcdir(compiler_state_t *cstate, bpf_u_int32 fcdir)
{
- struct block *b0;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
case DLT_PRISM_HEADER:
case DLT_IEEE802_11_RADIO_AVS:
case DLT_IEEE802_11_RADIO:
- break;
+ case DLT_PPI:
+ return gen_mcmp(cstate, OR_LINKHDR, 1, BPF_B, fcdir,
+ IEEE80211_FC1_DIR_MASK);
default:
- bpf_error(cstate, "frame direction supported only with 802.11 headers");
+ fail_kw_on_dlt(cstate, "dir");
/*NOTREACHED*/
}
-
- b0 = gen_mcmp(cstate, OR_LINKHDR, 1, BPF_B, fcdir,
- IEEE80211_FC1_DIR_MASK);
-
- return (b0);
}
+// Process an ARCnet host address string.
struct block *
gen_acode(compiler_state_t *cstate, const char *s, struct qual q)
{
- struct block *b;
-
/*
* Catch errors reported by us and routines below us, and return NULL
* on an error.
case DLT_ARCNET_LINUX:
if ((q.addr == Q_HOST || q.addr == Q_DEFAULT) &&
q.proto == Q_LINK) {
- cstate->e = pcap_ether_aton(s);
- if (cstate->e == NULL)
- bpf_error(cstate, "malloc");
- b = gen_ahostop(cstate, cstate->e, (int)q.dir);
- free(cstate->e);
- cstate->e = NULL;
- return (b);
+ uint8_t addr;
+ /*
+ * The lexer currently defines the address format in a
+ * way that makes this error condition never true.
+ * Let's check it anyway in case this part of the lexer
+ * changes in future.
+ */
+ if (! pcapint_atoan(s, &addr))
+ bpf_error(cstate, "invalid ARCnet address '%s'", s);
+ return gen_ahostop(cstate, addr, (int)q.dir);
} else
bpf_error(cstate, "ARCnet address used in non-arc expression");
/*NOTREACHED*/
}
}
+// Compare an ARCnet host address with the given value.
static struct block *
-gen_ahostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
+gen_ahostop(compiler_state_t *cstate, const uint8_t eaddr, int dir)
{
register struct block *b0, *b1;
switch (dir) {
- /* src comes first, different from Ethernet */
+ /*
+ * ARCnet is different from Ethernet: the source address comes before
+ * the destination address, each is one byte long. This holds for all
+ * three "buffer formats" in RFC 1201 Section 2.1, see also page 4-10
+ * in the 1983 edition of the "ARCNET Designer's Handbook" published
+ * by Datapoint (document number 61610-01).
+ */
case Q_SRC:
- return gen_bcmp(cstate, OR_LINKHDR, 0, 1, eaddr);
+ return gen_cmp(cstate, OR_LINKHDR, 0, BPF_B, eaddr);
case Q_DST:
- return gen_bcmp(cstate, OR_LINKHDR, 1, 1, eaddr);
+ return gen_cmp(cstate, OR_LINKHDR, 1, BPF_B, eaddr);
case Q_AND:
b0 = gen_ahostop(cstate, eaddr, Q_SRC);
return b1;
case Q_ADDR1:
- bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11");
- /*NOTREACHED*/
-
case Q_ADDR2:
- bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11");
- /*NOTREACHED*/
-
case Q_ADDR3:
- bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11");
- /*NOTREACHED*/
-
case Q_ADDR4:
- bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11");
- /*NOTREACHED*/
-
case Q_RA:
- bpf_error(cstate, "'ra' is only supported on 802.11");
- /*NOTREACHED*/
-
case Q_TA:
- bpf_error(cstate, "'ta' is only supported on 802.11");
+ bpf_error(cstate, ERRSTR_802_11_ONLY_KW, dqkw(dir));
/*NOTREACHED*/
}
abort();
static struct block *
gen_vlan_vid_test(compiler_state_t *cstate, bpf_u_int32 vlan_num)
{
- if (vlan_num > 0x0fff) {
- bpf_error(cstate, "VLAN tag %u greater than maximum %u",
- vlan_num, 0x0fff);
- }
+ assert_maxval(cstate, "VLAN tag", vlan_num, 0x0fff);
return gen_mcmp(cstate, OR_LINKPL, 0, BPF_H, vlan_num, 0x0fff);
}
unsigned cnt;
s = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
- s->s.k = SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT;
+ s->s.k = (bpf_u_int32)(SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT);
/* true -> next instructions, false -> beginning of b_vid */
sjeq = new_stmt(cstate, JMP(BPF_JEQ));
sjeq->s.jf = b_vid->stmts;
sappend(s, sjeq);
- s2 = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
- s2->s.k = SKF_AD_OFF + SKF_AD_VLAN_TAG;
+ s2 = new_stmt(cstate, BPF_LD|BPF_H|BPF_ABS);
+ s2->s.k = (bpf_u_int32)(SKF_AD_OFF + SKF_AD_VLAN_TAG);
sappend(s, s2);
sjeq->s.jt = s2;
gen_vlan_bpf_extensions(compiler_state_t *cstate, bpf_u_int32 vlan_num,
int has_vlan_tag)
{
- struct block *b0, *b_tpid, *b_vid = NULL;
- struct slist *s;
+ struct block *b0, *b_tpid, *b_vid = NULL;
+ struct slist *s;
- /* generate new filter code based on extracting packet
- * metadata */
- s = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
- s->s.k = SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT;
+ /* generate new filter code based on extracting packet
+ * metadata */
+ s = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
+ s->s.k = (bpf_u_int32)(SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT);
- b0 = new_block(cstate, JMP(BPF_JEQ));
- b0->stmts = s;
- b0->s.k = 1;
+ b0 = gen_jmp(cstate, BPF_JEQ, 1, s);
/*
* This is tricky. We need to insert the statements updating variable
b0 = b_vid;
}
- return b0;
+ return b0;
}
#endif
* Check for a VLAN packet, and then change the offsets to point
* to the type and data fields within the VLAN packet. Just
* increment the offsets, so that we can support a hierarchy, e.g.
- * "vlan 300 && vlan 200" to capture VLAN 200 encapsulated within
+ * "vlan 100 && vlan 200" to capture VLAN 200 encapsulated within
* VLAN 100.
*
* XXX - this is a bit of a kludge. If we were to split the
switch (cstate->linktype) {
case DLT_EN10MB:
- case DLT_NETANALYZER:
- case DLT_NETANALYZER_TRANSPARENT:
+ /*
+ * Newer version of the Linux kernel pass around
+ * packets in which the VLAN tag has been removed
+ * from the packet data and put into metadata.
+ *
+ * This requires special treatment.
+ */
#if defined(SKF_AD_VLAN_TAG_PRESENT)
/* Verify that this is the outer part of the packet and
* not encapsulated somehow. */
has_vlan_tag);
break;
+ case DLT_NETANALYZER:
+ case DLT_NETANALYZER_TRANSPARENT:
case DLT_IEEE802_11:
case DLT_PRISM_HEADER:
case DLT_IEEE802_11_RADIO_AVS:
case DLT_IEEE802_11_RADIO:
+ /*
+ * These are either Ethernet packets with an additional
+ * metadata header (the NetAnalyzer types), or 802.11
+ * packets, possibly with an additional metadata header.
+ *
+ * For the first of those, the VLAN tag is in the normal
+ * place, so the special-case handling above isn't
+ * necessary.
+ *
+ * For the second of those, we don't do the special-case
+ * handling for now.
+ */
b0 = gen_vlan_no_bpf_extensions(cstate, vlan_num, has_vlan_tag);
break;
* label_num might be clobbered by longjmp - yeah, it might, but *WHO CARES*?
* It's not *used* after setjmp returns.
*/
-struct block *
-gen_mpls(compiler_state_t *cstate, bpf_u_int32 label_num_arg,
+static struct block *
+gen_mpls_internal(compiler_state_t *cstate, bpf_u_int32 label_num,
int has_label_num)
{
- volatile bpf_u_int32 label_num = label_num_arg;
struct block *b0, *b1;
- /*
- * Catch errors reported by us and routines below us, and return NULL
- * on an error.
- */
- if (setjmp(cstate->top_ctx))
- return (NULL);
-
if (cstate->label_stack_depth > 0) {
/* just match the bottom-of-stack bit clear */
b0 = gen_mcmp(cstate, OR_PREVMPLSHDR, 2, BPF_B, 0, 0x01);
/* If a specific MPLS label is requested, check it */
if (has_label_num) {
- if (label_num > 0xFFFFF) {
- bpf_error(cstate, "MPLS label %u greater than maximum %u",
- label_num, 0xFFFFF);
- }
+ assert_maxval(cstate, "MPLS label", label_num, 0xFFFFF);
label_num = label_num << 12; /* label is shifted 12 bits on the wire */
b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_W, label_num,
0xfffff000); /* only compare the first 20 bits */
return (b0);
}
+struct block *
+gen_mpls(compiler_state_t *cstate, bpf_u_int32 label_num, int has_label_num)
+{
+ /*
+ * Catch errors reported by us and routines below us, and return NULL
+ * on an error.
+ */
+ if (setjmp(cstate->top_ctx))
+ return (NULL);
+
+ return gen_mpls_internal(cstate, label_num, has_label_num);
+}
+
/*
* Support PPPOE discovery and session.
*/
return gen_linktype(cstate, ETHERTYPE_PPPOED);
}
+/*
+ * RFC 2516 Section 4:
+ *
+ * The Ethernet payload for PPPoE is as follows:
+ *
+ * 1 2 3
+ * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | VER | TYPE | CODE | SESSION_ID |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | LENGTH | payload ~
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
struct block *
gen_pppoes(compiler_state_t *cstate, bpf_u_int32 sess_num, int has_sess_num)
{
/* If a specific session is requested, check PPPoE session id */
if (has_sess_num) {
- if (sess_num > 0x0000ffff) {
- bpf_error(cstate, "PPPoE session number %u greater than maximum %u",
- sess_num, 0x0000ffff);
- }
- b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_W, sess_num, 0x0000ffff);
+ assert_maxval(cstate, "PPPoE session number", sess_num, UINT16_MAX);
+ b1 = gen_cmp(cstate, OR_LINKPL, 2, BPF_H, sess_num);
gen_and(b0, b1);
b0 = b1;
}
* specified. Parameterized to handle both IPv4 and IPv6. */
static struct block *
gen_geneve_check(compiler_state_t *cstate,
- struct block *(*gen_portfn)(compiler_state_t *, u_int, int, int),
+ struct block *(*gen_portfn)(compiler_state_t *, uint16_t, int, int),
enum e_offrel offrel, bpf_u_int32 vni, int has_vni)
{
struct block *b0, *b1;
b0 = b1;
if (has_vni) {
- if (vni > 0xffffff) {
- bpf_error(cstate, "Geneve VNI %u greater than maximum %u",
- vni, 0xffffff);
- }
+ assert_maxval(cstate, "Geneve VNI", vni, 0xffffff);
vni <<= 8; /* VNI is in the upper 3 bytes */
b1 = gen_mcmp(cstate, offrel, 12, BPF_W, vni, 0xffffff00);
gen_and(b0, b1);
/* Forcibly append these statements to the true condition
* of the protocol check by creating a new block that is
* always true and ANDing them. */
- b1 = new_block(cstate, BPF_JMP|BPF_JEQ|BPF_X);
- b1->stmts = s;
- b1->s.k = 0;
+ b1 = gen_jmp(cstate, BPF_JMP|BPF_JEQ|BPF_X, 0, s);
gen_and(b0, b1);
s1 = new_stmt(cstate, BPF_MISC|BPF_TAX);
sappend(s, s1);
- b1 = new_block(cstate, BPF_JMP|BPF_JEQ|BPF_X);
- b1->stmts = s;
- b1->s.k = 0;
+ b1 = gen_jmp(cstate, BPF_JMP|BPF_JEQ|BPF_X, 0, s);
gen_and(b0, b1);
gen_and(b0, b1);
- cstate->is_geneve = 1;
+ cstate->is_encap = 1;
+
+ return b1;
+}
+
+/* Check that this is VXLAN and the VNI is correct if
+ * specified. Parameterized to handle both IPv4 and IPv6. */
+static struct block *
+gen_vxlan_check(compiler_state_t *cstate,
+ struct block *(*gen_portfn)(compiler_state_t *, uint16_t, int, int),
+ enum e_offrel offrel, bpf_u_int32 vni, int has_vni)
+{
+ struct block *b0, *b1;
+
+ b0 = gen_portfn(cstate, VXLAN_PORT, IPPROTO_UDP, Q_DST);
+
+ /* Check that the VXLAN header has the flag bits set
+ * correctly. */
+ b1 = gen_cmp(cstate, offrel, 8, BPF_B, 0x08);
+ gen_and(b0, b1);
+ b0 = b1;
+
+ if (has_vni) {
+ assert_maxval(cstate, "VXLAN VNI", vni, 0xffffff);
+ vni <<= 8; /* VNI is in the upper 3 bytes */
+ b1 = gen_mcmp(cstate, offrel, 12, BPF_W, vni, 0xffffff00);
+ gen_and(b0, b1);
+ b0 = b1;
+ }
+
+ return b0;
+}
+
+/* The IPv4 and IPv6 VXLAN checks need to do two things:
+ * - Verify that this actually is VXLAN with the right VNI.
+ * - Place the IP header length (plus variable link prefix if
+ * needed) into register A to be used later to compute
+ * the inner packet offsets. */
+static struct block *
+gen_vxlan4(compiler_state_t *cstate, bpf_u_int32 vni, int has_vni)
+{
+ struct block *b0, *b1;
+ struct slist *s, *s1;
+
+ b0 = gen_vxlan_check(cstate, gen_port, OR_TRAN_IPV4, vni, has_vni);
+
+ /* Load the IP header length into A. */
+ s = gen_loadx_iphdrlen(cstate);
+
+ s1 = new_stmt(cstate, BPF_MISC|BPF_TXA);
+ sappend(s, s1);
+
+ /* Forcibly append these statements to the true condition
+ * of the protocol check by creating a new block that is
+ * always true and ANDing them. */
+ b1 = gen_jmp(cstate, BPF_JMP|BPF_JEQ|BPF_X, 0, s);
+
+ gen_and(b0, b1);
+
+ return b1;
+}
+
+static struct block *
+gen_vxlan6(compiler_state_t *cstate, bpf_u_int32 vni, int has_vni)
+{
+ struct block *b0, *b1;
+ struct slist *s, *s1;
+
+ b0 = gen_vxlan_check(cstate, gen_port6, OR_TRAN_IPV6, vni, has_vni);
+
+ /* Load the IP header length. We need to account for a
+ * variable length link prefix if there is one. */
+ s = gen_abs_offset_varpart(cstate, &cstate->off_linkpl);
+ if (s) {
+ s1 = new_stmt(cstate, BPF_LD|BPF_IMM);
+ s1->s.k = 40;
+ sappend(s, s1);
+
+ s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_X);
+ s1->s.k = 0;
+ sappend(s, s1);
+ } else {
+ s = new_stmt(cstate, BPF_LD|BPF_IMM);
+ s->s.k = 40;
+ }
+
+ /* Forcibly append these statements to the true condition
+ * of the protocol check by creating a new block that is
+ * always true and ANDing them. */
+ s1 = new_stmt(cstate, BPF_MISC|BPF_TAX);
+ sappend(s, s1);
+
+ b1 = gen_jmp(cstate, BPF_JMP|BPF_JEQ|BPF_X, 0, s);
+
+ gen_and(b0, b1);
+
+ return b1;
+}
+
+/* We need to store three values based on the VXLAN header:
+ * - The offset of the linktype.
+ * - The offset of the end of the VXLAN header.
+ * - The offset of the end of the encapsulated MAC header. */
+static struct slist *
+gen_vxlan_offsets(compiler_state_t *cstate)
+{
+ struct slist *s, *s1;
+
+ /* Calculate the offset of the VXLAN header itself. This
+ * includes the IP header computed previously (including any
+ * variable link prefix) and stored in A plus the fixed size
+ * headers (fixed link prefix, MAC length, UDP header). */
+ s = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
+ s->s.k = cstate->off_linkpl.constant_part + cstate->off_nl + 8;
+
+ /* Add the VXLAN header length to its offset and store */
+ s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
+ s1->s.k = 8;
+ sappend(s, s1);
+
+ /* Push the link header. VXLAN packets always contain Ethernet
+ * frames. */
+ PUSH_LINKHDR(cstate, DLT_EN10MB, 1, 0, alloc_reg(cstate));
+
+ s1 = new_stmt(cstate, BPF_ST);
+ s1->s.k = cstate->off_linkhdr.reg;
+ sappend(s, s1);
+
+ /* As the payload is an Ethernet packet, we can use the
+ * EtherType of the payload directly as the linktype. */
+ s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
+ s1->s.k = 12;
+ sappend(s, s1);
+
+ cstate->off_linktype.reg = alloc_reg(cstate);
+ cstate->off_linktype.is_variable = 1;
+ cstate->off_linktype.constant_part = 0;
+
+ s1 = new_stmt(cstate, BPF_ST);
+ s1->s.k = cstate->off_linktype.reg;
+ sappend(s, s1);
+
+ /* Two bytes further is the end of the Ethernet header and the
+ * start of the payload. */
+ s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
+ s1->s.k = 2;
+ sappend(s, s1);
+
+ /* Move the result to X. */
+ s1 = new_stmt(cstate, BPF_MISC|BPF_TAX);
+ sappend(s, s1);
+
+ /* Store the final result of our linkpl calculation. */
+ cstate->off_linkpl.reg = alloc_reg(cstate);
+ cstate->off_linkpl.is_variable = 1;
+ cstate->off_linkpl.constant_part = 0;
+
+ s1 = new_stmt(cstate, BPF_STX);
+ s1->s.k = cstate->off_linkpl.reg;
+ sappend(s, s1);
+
+ cstate->off_nl = 0;
+
+ return s;
+}
+
+/* Check to see if this is a VXLAN packet. */
+struct block *
+gen_vxlan(compiler_state_t *cstate, bpf_u_int32 vni, int has_vni)
+{
+ struct block *b0, *b1;
+ struct slist *s;
+
+ /*
+ * Catch errors reported by us and routines below us, and return NULL
+ * on an error.
+ */
+ if (setjmp(cstate->top_ctx))
+ return (NULL);
+
+ b0 = gen_vxlan4(cstate, vni, has_vni);
+ b1 = gen_vxlan6(cstate, vni, has_vni);
+
+ gen_or(b0, b1);
+ b0 = b1;
+
+ /* Later filters should act on the payload of the VXLAN frame,
+ * update all of the header pointers. Attach this code so that
+ * it gets executed in the event that the VXLAN filter matches. */
+ s = gen_vxlan_offsets(cstate);
+
+ b1 = gen_true(cstate);
+ sappend(s, b1->stmts);
+ b1->stmts = s;
+
+ gen_and(b0, b1);
+
+ cstate->is_encap = 1;
return b1;
}
/* Check that the encapsulated frame has a link layer header
* for Ethernet filters. */
static struct block *
-gen_geneve_ll_check(compiler_state_t *cstate)
+gen_encap_ll_check(compiler_state_t *cstate)
{
struct block *b0;
struct slist *s, *s1;
s1->s.k = cstate->off_linkpl.reg;
sappend(s, s1);
- b0 = new_block(cstate, BPF_JMP|BPF_JEQ|BPF_X);
- b0->stmts = s;
- b0->s.k = 0;
+ b0 = gen_jmp(cstate, BPF_JMP|BPF_JEQ|BPF_X, 0, s);
gen_not(b0);
return b0;
gen_atmfield_code_internal(compiler_state_t *cstate, int atmfield,
bpf_u_int32 jvalue, int jtype, int reverse)
{
- struct block *b0;
+ assert_atm(cstate, atmkw(atmfield));
switch (atmfield) {
case A_VPI:
- if (!cstate->is_atm)
- bpf_error(cstate, "'vpi' supported only on raw ATM");
- if (cstate->off_vpi == OFFSET_NOT_SET)
- abort();
- b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_vpi, BPF_B,
+ assert_maxval(cstate, "VPI", jvalue, UINT8_MAX);
+ return gen_ncmp(cstate, OR_LINKHDR, cstate->off_vpi, BPF_B,
0xffffffffU, jtype, reverse, jvalue);
- break;
case A_VCI:
- if (!cstate->is_atm)
- bpf_error(cstate, "'vci' supported only on raw ATM");
- if (cstate->off_vci == OFFSET_NOT_SET)
- abort();
- b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_vci, BPF_H,
- 0xffffffffU, jtype, reverse, jvalue);
- break;
-
- case A_PROTOTYPE:
- if (cstate->off_proto == OFFSET_NOT_SET)
- abort(); /* XXX - this isn't on FreeBSD */
- b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_proto, BPF_B,
- 0x0fU, jtype, reverse, jvalue);
- break;
-
- case A_MSGTYPE:
- if (cstate->off_payload == OFFSET_NOT_SET)
- abort();
- b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_payload + MSG_TYPE_POS, BPF_B,
- 0xffffffffU, jtype, reverse, jvalue);
- break;
-
- case A_CALLREFTYPE:
- if (!cstate->is_atm)
- bpf_error(cstate, "'callref' supported only on raw ATM");
- if (cstate->off_proto == OFFSET_NOT_SET)
- abort();
- b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_proto, BPF_B,
+ assert_maxval(cstate, "VCI", jvalue, UINT16_MAX);
+ return gen_ncmp(cstate, OR_LINKHDR, cstate->off_vci, BPF_H,
0xffffffffU, jtype, reverse, jvalue);
- break;
default:
abort();
}
- return b0;
}
static struct block *
-gen_atmtype_metac(compiler_state_t *cstate)
+gen_atm_vpi(compiler_state_t *cstate, const uint8_t v)
{
- struct block *b0, *b1;
-
- b0 = gen_atmfield_code_internal(cstate, A_VPI, 0, BPF_JEQ, 0);
- b1 = gen_atmfield_code_internal(cstate, A_VCI, 1, BPF_JEQ, 0);
- gen_and(b0, b1);
- return b1;
+ return gen_atmfield_code_internal(cstate, A_VPI, v, BPF_JEQ, 0);
}
static struct block *
-gen_atmtype_sc(compiler_state_t *cstate)
+gen_atm_vci(compiler_state_t *cstate, const uint16_t v)
{
- struct block *b0, *b1;
+ return gen_atmfield_code_internal(cstate, A_VCI, v, BPF_JEQ, 0);
+}
- b0 = gen_atmfield_code_internal(cstate, A_VPI, 0, BPF_JEQ, 0);
- b1 = gen_atmfield_code_internal(cstate, A_VCI, 5, BPF_JEQ, 0);
- gen_and(b0, b1);
- return b1;
+static struct block *
+gen_atm_prototype(compiler_state_t *cstate, const uint8_t v)
+{
+ return gen_mcmp(cstate, OR_LINKHDR, cstate->off_proto, BPF_B, v, 0x0fU);
}
static struct block *
{
struct block *b0;
- b0 = gen_atmfield_code_internal(cstate, A_PROTOTYPE, PT_LLC, BPF_JEQ, 0);
+ b0 = gen_atm_prototype(cstate, PT_LLC);
cstate->linktype = cstate->prevlinktype;
return b0;
}
if (setjmp(cstate->top_ctx))
return (NULL);
+ assert_atm(cstate, atmkw(type));
+
switch (type) {
case A_METAC:
/* Get all packets in Meta signalling Circuit */
- if (!cstate->is_atm)
- bpf_error(cstate, "'metac' supported only on raw ATM");
- b1 = gen_atmtype_metac(cstate);
- break;
+ b0 = gen_atm_vpi(cstate, 0);
+ b1 = gen_atm_vci(cstate, 1);
+ gen_and(b0, b1);
+ return b1;
case A_BCC:
/* Get all packets in Broadcast Circuit*/
- if (!cstate->is_atm)
- bpf_error(cstate, "'bcc' supported only on raw ATM");
- b0 = gen_atmfield_code_internal(cstate, A_VPI, 0, BPF_JEQ, 0);
- b1 = gen_atmfield_code_internal(cstate, A_VCI, 2, BPF_JEQ, 0);
+ b0 = gen_atm_vpi(cstate, 0);
+ b1 = gen_atm_vci(cstate, 2);
gen_and(b0, b1);
- break;
+ return b1;
case A_OAMF4SC:
/* Get all cells in Segment OAM F4 circuit*/
- if (!cstate->is_atm)
- bpf_error(cstate, "'oam4sc' supported only on raw ATM");
- b0 = gen_atmfield_code_internal(cstate, A_VPI, 0, BPF_JEQ, 0);
- b1 = gen_atmfield_code_internal(cstate, A_VCI, 3, BPF_JEQ, 0);
+ b0 = gen_atm_vpi(cstate, 0);
+ b1 = gen_atm_vci(cstate, 3);
gen_and(b0, b1);
- break;
+ return b1;
case A_OAMF4EC:
/* Get all cells in End-to-End OAM F4 Circuit*/
- if (!cstate->is_atm)
- bpf_error(cstate, "'oam4ec' supported only on raw ATM");
- b0 = gen_atmfield_code_internal(cstate, A_VPI, 0, BPF_JEQ, 0);
- b1 = gen_atmfield_code_internal(cstate, A_VCI, 4, BPF_JEQ, 0);
+ b0 = gen_atm_vpi(cstate, 0);
+ b1 = gen_atm_vci(cstate, 4);
gen_and(b0, b1);
- break;
+ return b1;
case A_SC:
/* Get all packets in connection Signalling Circuit */
- if (!cstate->is_atm)
- bpf_error(cstate, "'sc' supported only on raw ATM");
- b1 = gen_atmtype_sc(cstate);
- break;
+ b0 = gen_atm_vpi(cstate, 0);
+ b1 = gen_atm_vci(cstate, 5);
+ gen_and(b0, b1);
+ return b1;
case A_ILMIC:
/* Get all packets in ILMI Circuit */
- if (!cstate->is_atm)
- bpf_error(cstate, "'ilmic' supported only on raw ATM");
- b0 = gen_atmfield_code_internal(cstate, A_VPI, 0, BPF_JEQ, 0);
- b1 = gen_atmfield_code_internal(cstate, A_VCI, 16, BPF_JEQ, 0);
+ b0 = gen_atm_vpi(cstate, 0);
+ b1 = gen_atm_vci(cstate, 16);
gen_and(b0, b1);
- break;
+ return b1;
case A_LANE:
/* Get all LANE packets */
- if (!cstate->is_atm)
- bpf_error(cstate, "'lane' supported only on raw ATM");
- b1 = gen_atmfield_code_internal(cstate, A_PROTOTYPE, PT_LANE, BPF_JEQ, 0);
+ b1 = gen_atm_prototype(cstate, PT_LANE);
/*
* Arrange that all subsequent tests assume LANE
cstate->off_linkpl.constant_part = cstate->off_linkhdr.constant_part + 14; /* Ethernet */
cstate->off_nl = 0; /* Ethernet II */
cstate->off_nl_nosnap = 3; /* 802.3+802.2 */
- break;
-
- case A_LLC:
- /* Get all LLC-encapsulated packets */
- if (!cstate->is_atm)
- bpf_error(cstate, "'llc' supported only on raw ATM");
- b1 = gen_atmtype_llc(cstate);
- break;
+ return b1;
default:
abort();
}
- return b1;
}
/*
if (setjmp(cstate->top_ctx))
return (NULL);
+ assert_ss7(cstate, ss7kw(type));
+
switch (type) {
case M_FISU:
- if ( (cstate->linktype != DLT_MTP2) &&
- (cstate->linktype != DLT_ERF) &&
- (cstate->linktype != DLT_MTP2_WITH_PHDR) )
- bpf_error(cstate, "'fisu' supported only on MTP2");
- /* gen_ncmp(cstate, offrel, offset, size, mask, jtype, reverse, value) */
- b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B,
+ return gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B,
0x3fU, BPF_JEQ, 0, 0U);
- break;
case M_LSSU:
- if ( (cstate->linktype != DLT_MTP2) &&
- (cstate->linktype != DLT_ERF) &&
- (cstate->linktype != DLT_MTP2_WITH_PHDR) )
- bpf_error(cstate, "'lssu' supported only on MTP2");
b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B,
0x3fU, BPF_JGT, 1, 2U);
b1 = gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B,
0x3fU, BPF_JGT, 0, 0U);
gen_and(b1, b0);
- break;
+ return b0;
case M_MSU:
- if ( (cstate->linktype != DLT_MTP2) &&
- (cstate->linktype != DLT_ERF) &&
- (cstate->linktype != DLT_MTP2_WITH_PHDR) )
- bpf_error(cstate, "'msu' supported only on MTP2");
- b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B,
+ return gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B,
0x3fU, BPF_JGT, 0, 2U);
- break;
case MH_FISU:
- if ( (cstate->linktype != DLT_MTP2) &&
- (cstate->linktype != DLT_ERF) &&
- (cstate->linktype != DLT_MTP2_WITH_PHDR) )
- bpf_error(cstate, "'hfisu' supported only on MTP2_HSL");
- /* gen_ncmp(cstate, offrel, offset, size, mask, jtype, reverse, value) */
- b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H,
+ return gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H,
0xff80U, BPF_JEQ, 0, 0U);
- break;
case MH_LSSU:
- if ( (cstate->linktype != DLT_MTP2) &&
- (cstate->linktype != DLT_ERF) &&
- (cstate->linktype != DLT_MTP2_WITH_PHDR) )
- bpf_error(cstate, "'hlssu' supported only on MTP2_HSL");
b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H,
0xff80U, BPF_JGT, 1, 0x0100U);
b1 = gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H,
0xff80U, BPF_JGT, 0, 0U);
gen_and(b1, b0);
- break;
+ return b0;
case MH_MSU:
- if ( (cstate->linktype != DLT_MTP2) &&
- (cstate->linktype != DLT_ERF) &&
- (cstate->linktype != DLT_MTP2_WITH_PHDR) )
- bpf_error(cstate, "'hmsu' supported only on MTP2_HSL");
- b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H,
+ return gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H,
0xff80U, BPF_JGT, 0, 0x0100U);
- break;
default:
abort();
}
- return b0;
}
/*
- * The jvalue_arg dance is to avoid annoying whining by compilers that
- * jvalue might be clobbered by longjmp - yeah, it might, but *WHO CARES*?
- * It's not *used* after setjmp returns.
+ * These maximum valid values are all-ones, so they double as the bitmasks
+ * before any bitwise shifting.
*/
-struct block *
-gen_mtp3field_code(compiler_state_t *cstate, int mtp3field,
- bpf_u_int32 jvalue_arg, int jtype, int reverse)
+#define MTP2_SIO_MAXVAL UINT8_MAX
+#define MTP3_PC_MAXVAL 0x3fffU
+#define MTP3_SLS_MAXVAL 0xfU
+
+static struct block *
+gen_mtp3field_code_internal(compiler_state_t *cstate, int mtp3field,
+ bpf_u_int32 jvalue, int jtype, int reverse)
{
- volatile bpf_u_int32 jvalue = jvalue_arg;
- struct block *b0;
- bpf_u_int32 val1 , val2 , val3;
u_int newoff_sio;
u_int newoff_opc;
u_int newoff_dpc;
u_int newoff_sls;
- /*
- * Catch errors reported by us and routines below us, and return NULL
- * on an error.
- */
- if (setjmp(cstate->top_ctx))
- return (NULL);
-
newoff_sio = cstate->off_sio;
newoff_opc = cstate->off_opc;
newoff_dpc = cstate->off_dpc;
newoff_sls = cstate->off_sls;
+
+ assert_ss7(cstate, ss7kw(mtp3field));
+
switch (mtp3field) {
+ /*
+ * See UTU-T Rec. Q.703, Section 2.2, Figure 3/Q.703.
+ *
+ * SIO is the simplest field: the size is one byte and the offset is a
+ * multiple of bytes, so the only detail to get right is the value of
+ * the [right-to-left] field offset.
+ */
case MH_SIO:
newoff_sio += 3; /* offset for MTP2_HSL */
/* FALLTHROUGH */
case M_SIO:
- if (cstate->off_sio == OFFSET_NOT_SET)
- bpf_error(cstate, "'sio' supported only on SS7");
- /* sio coded on 1 byte so max value 255 */
- if(jvalue > 255)
- bpf_error(cstate, "sio value %u too big; max value = 255",
- jvalue);
- b0 = gen_ncmp(cstate, OR_PACKET, newoff_sio, BPF_B, 0xffffffffU,
+ assert_maxval(cstate, ss7kw(mtp3field), jvalue, MTP2_SIO_MAXVAL);
+ // Here the bitmask means "do not apply a bitmask".
+ return gen_ncmp(cstate, OR_PACKET, newoff_sio, BPF_B, UINT32_MAX,
jtype, reverse, jvalue);
- break;
+ /*
+ * See UTU-T Rec. Q.704, Section 2.2, Figure 3/Q.704.
+ *
+ * SLS, OPC and DPC are more complicated: none of these is sized in a
+ * multiple of 8 bits, MTP3 encoding is little-endian and MTP packet
+ * diagrams are meant to be read right-to-left. This means in the
+ * diagrams within individual fields and concatenations thereof
+ * bitwise shifts and masks can be noted in the common left-to-right
+ * manner until each final value is ready to be byte-swapped and
+ * handed to gen_ncmp(). See also gen_dnhostop(), which solves a
+ * similar problem in a similar way.
+ *
+ * Offsets of fields within the packet header always have the
+ * right-to-left meaning. Note that in DLT_MTP2 and possibly other
+ * DLTs the offset does not include the F (Flag) field at the
+ * beginning of each message.
+ *
+ * For example, if the 8-bit SIO field has a 3 byte [RTL] offset, the
+ * 32-bit standard routing header has a 4 byte [RTL] offset and could
+ * be tested entirely using a single BPF_W comparison. In this case
+ * the 14-bit DPC field [LTR] bitmask would be 0x3FFF, the 14-bit OPC
+ * field [LTR] bitmask would be (0x3FFF << 14) and the 4-bit SLS field
+ * [LTR] bitmask would be (0xF << 28), all of which conveniently
+ * correlates with the [RTL] packet diagram until the byte-swapping is
+ * done before use.
+ *
+ * The code below uses this approach for OPC, which spans 3 bytes.
+ * DPC and SLS use shorter loads, SLS also uses a different offset.
+ */
case MH_OPC:
newoff_opc += 3;
/* FALLTHROUGH */
case M_OPC:
- if (cstate->off_opc == OFFSET_NOT_SET)
- bpf_error(cstate, "'opc' supported only on SS7");
- /* opc coded on 14 bits so max value 16383 */
- if (jvalue > 16383)
- bpf_error(cstate, "opc value %u too big; max value = 16383",
- jvalue);
- /* the following instructions are made to convert jvalue
- * to the form used to write opc in an ss7 message*/
- val1 = jvalue & 0x00003c00;
- val1 = val1 >>10;
- val2 = jvalue & 0x000003fc;
- val2 = val2 <<6;
- val3 = jvalue & 0x00000003;
- val3 = val3 <<22;
- jvalue = val1 + val2 + val3;
- b0 = gen_ncmp(cstate, OR_PACKET, newoff_opc, BPF_W, 0x00c0ff0fU,
- jtype, reverse, jvalue);
- break;
+ assert_maxval(cstate, ss7kw(mtp3field), jvalue, MTP3_PC_MAXVAL);
+ return gen_ncmp(cstate, OR_PACKET, newoff_opc, BPF_W,
+ SWAPLONG(MTP3_PC_MAXVAL << 14), jtype, reverse,
+ SWAPLONG(jvalue << 14));
case MH_DPC:
newoff_dpc += 3;
/* FALLTHROUGH */
case M_DPC:
- if (cstate->off_dpc == OFFSET_NOT_SET)
- bpf_error(cstate, "'dpc' supported only on SS7");
- /* dpc coded on 14 bits so max value 16383 */
- if (jvalue > 16383)
- bpf_error(cstate, "dpc value %u too big; max value = 16383",
- jvalue);
- /* the following instructions are made to convert jvalue
- * to the forme used to write dpc in an ss7 message*/
- val1 = jvalue & 0x000000ff;
- val1 = val1 << 24;
- val2 = jvalue & 0x00003f00;
- val2 = val2 << 8;
- jvalue = val1 + val2;
- b0 = gen_ncmp(cstate, OR_PACKET, newoff_dpc, BPF_W, 0xff3f0000U,
- jtype, reverse, jvalue);
- break;
+ assert_maxval(cstate, ss7kw(mtp3field), jvalue, MTP3_PC_MAXVAL);
+ return gen_ncmp(cstate, OR_PACKET, newoff_dpc, BPF_H,
+ SWAPSHORT(MTP3_PC_MAXVAL), jtype, reverse,
+ SWAPSHORT(jvalue));
case MH_SLS:
newoff_sls += 3;
/* FALLTHROUGH */
case M_SLS:
- if (cstate->off_sls == OFFSET_NOT_SET)
- bpf_error(cstate, "'sls' supported only on SS7");
- /* sls coded on 4 bits so max value 15 */
- if (jvalue > 15)
- bpf_error(cstate, "sls value %u too big; max value = 15",
- jvalue);
- /* the following instruction is made to convert jvalue
- * to the forme used to write sls in an ss7 message*/
- jvalue = jvalue << 4;
- b0 = gen_ncmp(cstate, OR_PACKET, newoff_sls, BPF_B, 0xf0U,
- jtype, reverse, jvalue);
- break;
+ assert_maxval(cstate, ss7kw(mtp3field), jvalue, MTP3_SLS_MAXVAL);
+ return gen_ncmp(cstate, OR_PACKET, newoff_sls, BPF_B,
+ MTP3_SLS_MAXVAL << 4, jtype, reverse,
+ jvalue << 4);
default:
abort();
}
- return b0;
}
-static struct block *
-gen_msg_abbrev(compiler_state_t *cstate, int type)
+struct block *
+gen_mtp3field_code(compiler_state_t *cstate, int mtp3field,
+ bpf_u_int32 jvalue, int jtype, int reverse)
{
- struct block *b1;
+ /*
+ * Catch errors reported by us and routines below us, and return NULL
+ * on an error.
+ */
+ if (setjmp(cstate->top_ctx))
+ return (NULL);
+
+ return gen_mtp3field_code_internal(cstate, mtp3field, jvalue, jtype,
+ reverse);
+}
+static struct block *
+gen_msg_abbrev(compiler_state_t *cstate, const uint8_t type)
+{
/*
* Q.2931 signalling protocol messages for handling virtual circuits
* establishment and teardown
*/
- switch (type) {
-
- case A_SETUP:
- b1 = gen_atmfield_code_internal(cstate, A_MSGTYPE, SETUP, BPF_JEQ, 0);
- break;
-
- case A_CALLPROCEED:
- b1 = gen_atmfield_code_internal(cstate, A_MSGTYPE, CALL_PROCEED, BPF_JEQ, 0);
- break;
-
- case A_CONNECT:
- b1 = gen_atmfield_code_internal(cstate, A_MSGTYPE, CONNECT, BPF_JEQ, 0);
- break;
-
- case A_CONNECTACK:
- b1 = gen_atmfield_code_internal(cstate, A_MSGTYPE, CONNECT_ACK, BPF_JEQ, 0);
- break;
-
- case A_RELEASE:
- b1 = gen_atmfield_code_internal(cstate, A_MSGTYPE, RELEASE, BPF_JEQ, 0);
- break;
-
- case A_RELEASE_DONE:
- b1 = gen_atmfield_code_internal(cstate, A_MSGTYPE, RELEASE_DONE, BPF_JEQ, 0);
- break;
-
- default:
- abort();
- }
- return b1;
+ return gen_cmp(cstate, OR_LINKHDR, cstate->off_payload + MSG_TYPE_POS,
+ BPF_B, type);
}
struct block *
if (setjmp(cstate->top_ctx))
return (NULL);
+ assert_atm(cstate, atmkw(type));
+
switch (type) {
case A_OAM:
- if (!cstate->is_atm)
- bpf_error(cstate, "'oam' supported only on raw ATM");
/* OAM F4 type */
- b0 = gen_atmfield_code_internal(cstate, A_VCI, 3, BPF_JEQ, 0);
- b1 = gen_atmfield_code_internal(cstate, A_VCI, 4, BPF_JEQ, 0);
+ b0 = gen_atm_vci(cstate, 3);
+ b1 = gen_atm_vci(cstate, 4);
gen_or(b0, b1);
- b0 = gen_atmfield_code_internal(cstate, A_VPI, 0, BPF_JEQ, 0);
+ b0 = gen_atm_vpi(cstate, 0);
gen_and(b0, b1);
- break;
+ return b1;
case A_OAMF4:
- if (!cstate->is_atm)
- bpf_error(cstate, "'oamf4' supported only on raw ATM");
/* OAM F4 type */
- b0 = gen_atmfield_code_internal(cstate, A_VCI, 3, BPF_JEQ, 0);
- b1 = gen_atmfield_code_internal(cstate, A_VCI, 4, BPF_JEQ, 0);
+ b0 = gen_atm_vci(cstate, 3);
+ b1 = gen_atm_vci(cstate, 4);
gen_or(b0, b1);
- b0 = gen_atmfield_code_internal(cstate, A_VPI, 0, BPF_JEQ, 0);
+ b0 = gen_atm_vpi(cstate, 0);
gen_and(b0, b1);
- break;
+ return b1;
case A_CONNECTMSG:
/*
* Get Q.2931 signalling messages for switched
* virtual connection
*/
- if (!cstate->is_atm)
- bpf_error(cstate, "'connectmsg' supported only on raw ATM");
- b0 = gen_msg_abbrev(cstate, A_SETUP);
- b1 = gen_msg_abbrev(cstate, A_CALLPROCEED);
+ b0 = gen_msg_abbrev(cstate, SETUP);
+ b1 = gen_msg_abbrev(cstate, CALL_PROCEED);
gen_or(b0, b1);
- b0 = gen_msg_abbrev(cstate, A_CONNECT);
+ b0 = gen_msg_abbrev(cstate, CONNECT);
gen_or(b0, b1);
- b0 = gen_msg_abbrev(cstate, A_CONNECTACK);
+ b0 = gen_msg_abbrev(cstate, CONNECT_ACK);
gen_or(b0, b1);
- b0 = gen_msg_abbrev(cstate, A_RELEASE);
+ b0 = gen_msg_abbrev(cstate, RELEASE);
gen_or(b0, b1);
- b0 = gen_msg_abbrev(cstate, A_RELEASE_DONE);
+ b0 = gen_msg_abbrev(cstate, RELEASE_DONE);
gen_or(b0, b1);
- b0 = gen_atmtype_sc(cstate);
+ b0 = gen_atmtype_abbrev(cstate, A_SC);
gen_and(b0, b1);
- break;
+ return b1;
case A_METACONNECT:
- if (!cstate->is_atm)
- bpf_error(cstate, "'metaconnect' supported only on raw ATM");
- b0 = gen_msg_abbrev(cstate, A_SETUP);
- b1 = gen_msg_abbrev(cstate, A_CALLPROCEED);
+ b0 = gen_msg_abbrev(cstate, SETUP);
+ b1 = gen_msg_abbrev(cstate, CALL_PROCEED);
gen_or(b0, b1);
- b0 = gen_msg_abbrev(cstate, A_CONNECT);
+ b0 = gen_msg_abbrev(cstate, CONNECT);
gen_or(b0, b1);
- b0 = gen_msg_abbrev(cstate, A_RELEASE);
+ b0 = gen_msg_abbrev(cstate, RELEASE);
gen_or(b0, b1);
- b0 = gen_msg_abbrev(cstate, A_RELEASE_DONE);
+ b0 = gen_msg_abbrev(cstate, RELEASE_DONE);
gen_or(b0, b1);
- b0 = gen_atmtype_metac(cstate);
+ b0 = gen_atmtype_abbrev(cstate, A_METAC);
gen_and(b0, b1);
- break;
+ return b1;
default:
abort();
}
- return b1;
}
projects / libpcap / blobdiff