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 04d476db7c039e43cfd983ea6e44fc6e8a5ece3d..016f3431e564f4e454cb72ca9221a572438f34e4 100644 (file)
--- a/gencode.c
+++ b/gencode.c
@@ -21,7 +21,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #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
 #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
 /* 
  * 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 *
  * 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;
 
                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)
                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);
                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 66ec67d05067806c49c574a09a35a21a0aca48b5..e36e0b79a2a1c64f2ba681be70fae7ae20f84c03 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.
  *
  * 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 */
 
 /* 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 */
 #define M_MSU          24      /* MSU */
 
 /* MTP3 field types */

diff --git a/grammar.y b/grammar.y
index eaf9e76d082f4cf97403151e30cd1532aaa54541..f127fe098648a5bd49772de7090a531b3ad374ee 100644 (file)
--- a/grammar.y
+++ b/grammar.y
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #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
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -141,7 +141,7 @@ pcap_parse()
 %token OAM OAMF4 CONNECTMSG METACONNECT
 %token VPI VCI
 %token RADIO
 %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
 %token SIO OPC DPC SLS
 
 %type  <s> ID


@@ -452,7 +452,7 @@ atmlistvalue: atmfieldvalue
        ;
        /* MTP2 types quantifier */
 mtp2type: FISU                 { $$ = M_FISU; }
        ;
        /* MTP2 types quantifier */
 mtp2type: FISU                 { $$ = M_FISU; }

-       | LSU                   { $$ = M_LSU; }
+       | LSSU                  { $$ = M_LSSU; }

        | MSU                   { $$ = M_MSU; }
        ;
        /* MTP3 field types quantifier */
        | MSU                   { $$ = M_MSU; }
        ;
        /* MTP3 field types quantifier */

diff --git a/scanner.l b/scanner.l
index 5324b5f97f9f9824de6ce872b3c1dcc4fd3b0cfe..4f40124f004fd72ffb65f02fb2e60baaabfa2e94 100644 (file)
--- a/scanner.l
+++ b/scanner.l
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #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
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -289,7 +289,8 @@ reason              return PF_REASON;
 action         return PF_ACTION;
 
 fisu           return FISU;
 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;
 msu            return MSU;
 sio            return SIO;
 opc            return OPC;