diff options
| author | mlaier <mlaier@FreeBSD.org> | 2007-10-16 02:07:55 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2007-10-16 02:07:55 +0000 |
| commit | 298dfd4f7489b7259511f0c690a5b04de77b0f77 (patch) | |
| tree | 03bad2e07204c8bfa6cd8122c786eb4c73a5cdc9 /contrib/libpcap/gencode.h | |
| parent | 55470a45cf732a145a7cfbf802f951a937eadee2 (diff) | |
| download | FreeBSD-src-298dfd4f7489b7259511f0c690a5b04de77b0f77.zip FreeBSD-src-298dfd4f7489b7259511f0c690a5b04de77b0f77.tar.gz | |
Resolve merge conflicts
Approved by: re (kensmith)
Obtained from: tcpdump.org
Diffstat (limited to 'contrib/libpcap/gencode.h')
| -rw-r--r-- | contrib/libpcap/gencode.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/contrib/libpcap/gencode.h b/contrib/libpcap/gencode.h index 15aef6d..9363a42 100644 --- a/contrib/libpcap/gencode.h +++ b/contrib/libpcap/gencode.h @@ -19,7 +19,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD$ - * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.60.2.6 2005/09/05 09:08:06 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.60.2.11 2007/06/11 09:52:04 guy Exp $ (LBL) */ /* @@ -174,11 +174,16 @@ end-to-end circuits, ILMI circuits or connection signalling circuit. */ -/*MTP3 field types */ -#define M_SIO 1 -#define M_OPC 2 -#define M_DPC 3 -#define M_SLS 4 +/* MTP2 types */ +#define M_FISU 22 /* FISU */ +#define M_LSSU 23 /* LSSU */ +#define M_MSU 24 /* MSU */ + +/* MTP3 field types */ +#define M_SIO 1 +#define M_OPC 2 +#define M_DPC 3 +#define M_SLS 4 struct slist; @@ -297,6 +302,7 @@ struct block *gen_atmfield_code(int atmfield, bpf_int32 jvalue, bpf_u_int32 jtyp struct block *gen_atmtype_abbrev(int type); struct block *gen_atmmulti_abbrev(int type); +struct block *gen_mtp2type_abbrev(int type); struct block *gen_mtp3field_code(int mtp3field, bpf_u_int32 jvalue, bpf_u_int32 jtype, int reverse); struct block *gen_pf_ifname(const char *); @@ -316,7 +322,7 @@ char *sdup(const char *); struct bpf_insn *icode_to_fcode(struct block *, int *); int pcap_parse(void); -void lex_init(char *); +void lex_init(const char *); void lex_cleanup(void); void sappend(struct slist *, struct slist *); |
