osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add a bunch of additional NLPIDs from ISO 9577. 

svn path=/trunk/; revision=1583
This commit is contained in:
Guy Harris 2000-01-30 05:50:02 +00:00
parent 0c57cfd820
commit 31ff2ea5f1
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nlpid.h
View File

@ -2,7 +2,7 @@
* Definitions of OSI NLPIDs (Network Layer Protocol IDs)
* Laurent Deniel <deniel@worldnet.fr>
*
* $Id: nlpid.h,v 1.2 2000/01/13 05:41:21 guy Exp $
* $Id: nlpid.h,v 1.3 2000/01/30 05:50:02 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -24,16 +24,22 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* ISO/IEC TR 9577 NLPID values; gathered from various specifications
(not from TR 9577 itself - it's a 19-page document, for which the
American National Standards Institute wants to charge me USD 62.00). */
/* ISO/IEC TR 9577 NLPID values. */
#define NLPID_NULL 0x00
#define NLPID_T_70 0x01 /* T.70 */
#define NLPID_X_633 0x03 /* X.633 */
#define NLPID_Q_931 0x08 /* Q.931, Q.932, Q.933, X.36, ISO 11572, ISO 11582 */
#define NLPID_Q_2931 0x09 /* Q.2931 */
#define NLPID_Q_2119 0x0c /* Q.2119 */
#define NLPID_SNAP 0x80
#define NLPID_ISO8473_CLNP 0x81
#define NLPID_ISO8473_CLNP 0x81 /* X.233 */
#define NLPID_ISO9542_ESIS 0x82
#define NLPID_ISO10589_ISIS 0x83
#define NLPID_ISO9542X25_ESIS 0x8a
#define NLPID_ISO10589_ISIS 0x83
#define NLPID_ISO10747 0x85
#define NLPID_ISO9542X25_ESIS 0x8a
#define NLPID_ISO10030 0x8c
#define NLPID_ISO11577 0x8d /* X.273 */
#define NLPID_IP 0xcc
#define NLPID_PPP 0xcf

10
packet-osi.c
View File

@ -1,7 +1,7 @@
/* packet-osi.c
* Routines for ISO/OSI network and transport protocol packet disassembly
*
* $Id: packet-osi.c,v 1.19 2000/01/26 05:04:29 guy Exp $
* $Id: packet-osi.c,v 1.20 2000/01/30 05:50:02 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
*
* Ethereal - Network traffic analyzer
@ -1594,11 +1594,19 @@ void dissect_clnp(const u_char *pd, int offset, frame_data *fd,
const value_string nlpid_vals[] = {
{ NLPID_NULL, "NULL" },
{ NLPID_T_70, "T.70" },
{ NLPID_X_633, "X.633" },
{ NLPID_Q_931, "Q.931" },
{ NLPID_Q_2931, "Q.2931" },
{ NLPID_Q_2119, "Q.2119" },
{ NLPID_SNAP, "SNAP" },
{ NLPID_ISO8473_CLNP, "CLNP" },
{ NLPID_ISO9542_ESIS, "ESIS" },
{ NLPID_ISO10589_ISIS, "ISIS" },
{ NLPID_ISO10747, "ISO 10747" },
{ NLPID_ISO9542X25_ESIS, "ESIS (X.25)" },
{ NLPID_ISO10030, "ISO 10030" },
{ NLPID_ISO11577, "ISO 11577" },
{ NLPID_IP, "IP" },
{ NLPID_PPP, "PPP" },
{ 0, NULL },