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

LSU.  (Leave "lsu" as an alias for backwards compatibility.)

diff --git a/gencode.c b/gencode.c
index fcc9c1cc02a851da07a20961556f70a55491ab51..6624fd7828c8024942ff37a44a27a86faa7944af 100644 (file)
--- a/gencode.c
+++ b/gencode.c
@@ -21,7 +21,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.45 2006-12-21 19:45:03 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.46 2007-02-08 07:17:25 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -6758,7 +6758,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 *
@@ -6776,9 +6776,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);

diff --git a/gencode.h b/gencode.h
index ceba77c058b2d5eabf09cb93e6321746a4eec4f6..a71b1cb33530ad748aee7f08c3275c91855bf064 100644 (file)
--- a/gencode.h
+++ b/gencode.h
@@ -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.60.2.9 2006-12-21 19:45:04 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.60.2.10 2007-02-08 07:17:25 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 */

diff --git a/grammar.y b/grammar.y
index f08ae5626d055a0ed0e34693cf763b8cbf0cc20d..e2403e3074aabdfcb24e7c769e1a9b37ca3f7558 100644 (file)
--- a/grammar.y
+++ b/grammar.y
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.86.2.6 2006-12-21 19:45:04 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.86.2.7 2007-02-08 07:17:25 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
@@ -444,7 +444,7 @@ atmlistvalue: atmfieldvalue
        ;
        /* MTP2 types quantifier */
 mtp2type: FISU                 { $$ = M_FISU; }
-       | LSU                   { $$ = M_LSU; }
+       | LSSU                  { $$ = M_LSSU; }
        | MSU                   { $$ = M_MSU; }
        ;
        /* MTP3 field types quantifier */

diff --git a/scanner.l b/scanner.l
index a84494aed9a352bcca4670513d0e3529e9d255fb..31e6d2b530b9dc16d7f576bc0625349e8c00c10f 100644 (file)
--- a/scanner.l
+++ b/scanner.l
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.99.2.7 2006-12-21 19:45:04 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.99.2.8 2007-02-08 07:17:25 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;