From: hannes <hannes>
Date: Mon, 18 Oct 2004 12:09:20 +0000 (+0000)
Subject: clean up some confusion between Q.933 and LMI
X-Git-Tag: tcpdump-3.9.1~261
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/3674c4b12eec2318be558a6c496a07eeab0dd24d

clean up some confusion between Q.933 and LMI
---

diff --git a/nlpid.c b/nlpid.c
index 425ad953..a2d6d245 100755
--- a/nlpid.c
+++ b/nlpid.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/nlpid.c,v 1.2 2004-10-12 21:02:00 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/nlpid.c,v 1.3 2004-10-18 12:09:20 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -28,8 +28,8 @@ static const char rcsid[] _U_ =
 
 struct tok nlpid_values[] = {
     { NLPID_NULLNS, "NULL" },
+    { NLPID_Q933, "Q.933" },
     { NLPID_LMI, "LMI" },
-    { NLPID_CISCO_LMI, "Cisco LMI" },
     { NLPID_SNAP, "SNAP" },
     { NLPID_CLNP, "CLNP" },
     { NLPID_ESIS, "ES-IS" },
diff --git a/nlpid.h b/nlpid.h
index 366b36c8..d5b353de 100644
--- a/nlpid.h
+++ b/nlpid.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nlpid.h,v 1.2 2004-10-12 21:02:00 hannes Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/nlpid.h,v 1.3 2004-10-18 12:09:20 hannes Exp $ (LBL) */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
@@ -17,8 +17,8 @@
 extern struct tok nlpid_values[];
 
 #define	NLPID_NULLNS	0x00
-#define NLPID_LMI       0x08 /* ANSI T1.617 Annex D or ITU-T Q.933 Annex A */
-#define NLPID_CISCO_LMI 0x09 /* The original, aka Cisco, aka Gang of Four */
+#define NLPID_Q933      0x08 /* ANSI T1.617 Annex D or ITU-T Q.933 Annex A */
+#define NLPID_LMI       0x09 /* The original, aka Cisco, aka Gang of Four */
 #define NLPID_SNAP      0x80
 #define	NLPID_CLNP	0x81 /* iso9577 */
 #define	NLPID_ESIS	0x82 /* iso9577 */