dect
/
libpcap
Archived
13
0
Fork 0

From Florent Drouin: a Link Status Signal Unit is called an LSSU, not an

LSU.  (Leave "lsu" as an alias for backwards compatibility.)
This commit is contained in:
guy 2007-02-08 07:15:27 +00:00
parent a247db420a
commit d02424cd4c
4 changed files with 12 additions and 11 deletions

View File

@ -21,7 +21,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.275 2006-12-21 19:44:06 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.276 2007-02-08 07:15:27 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@ -6767,7 +6767,7 @@ gen_atmtype_abbrev(type)
/*
* Filtering for MTP2 messages based on li value
* FISU, length is null
* LSU, length is 1 or 2
* LSSU, length is 1 or 2
* MSU, length is 3 or more
*/
struct block *
@ -6785,9 +6785,9 @@ gen_mtp2type_abbrev(type)
b0 = gen_ncmp(OR_PACKET, off_li, BPF_B, 0x3f, BPF_JEQ, 0, 0);
break;
case M_LSU:
case M_LSSU:
if (linktype != DLT_MTP2)
bpf_error("'lsu' supported only on MTP2");
bpf_error("'lssu' supported only on MTP2");
b0 = gen_ncmp(OR_PACKET, off_li, BPF_B, 0x3f, BPF_JGT, 1, 2);
b1 = gen_ncmp(OR_PACKET, off_li, BPF_B, 0x3f, BPF_JGT, 0, 0);
gen_and(b1, b0);

View File

@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.67 2006-12-21 19:44:06 guy Exp $ (LBL)
* @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.68 2007-02-08 07:15:27 guy Exp $ (LBL)
*/
/*
@ -175,7 +175,7 @@
/* MTP2 types */
#define M_FISU 22 /* FISU */
#define M_LSU 23 /* LSU */
#define M_LSSU 23 /* LSSU */
#define M_MSU 24 /* MSU */
/* MTP3 field types */

View File

@ -22,7 +22,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
"@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.94 2006-12-21 19:44:06 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.95 2007-02-08 07:15:27 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@ -141,7 +141,7 @@ pcap_parse()
%token OAM OAMF4 CONNECTMSG METACONNECT
%token VPI VCI
%token RADIO
%token FISU LSU MSU
%token FISU LSSU MSU
%token SIO OPC DPC SLS
%type <s> ID
@ -452,7 +452,7 @@ atmlistvalue: atmfieldvalue
;
/* MTP2 types quantifier */
mtp2type: FISU { $$ = M_FISU; }
| LSU { $$ = M_LSU; }
| LSSU { $$ = M_LSSU; }
| MSU { $$ = M_MSU; }
;
/* MTP3 field types quantifier */

View File

@ -22,7 +22,7 @@
#ifndef lint
static const char rcsid[] _U_ =
"@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.107 2006-12-21 19:44:06 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.108 2007-02-08 07:15:27 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@ -289,7 +289,8 @@ reason return PF_REASON;
action return PF_ACTION;
fisu return FISU;
lsu return LSU;
lssu return LSSU;
lsu return LSSU;
msu return MSU;
sio return SIO;
opc return OPC;