From aa6dcf9cd317d223f6d3f1e12917b807d2abb5d7 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 30 Mar 2017 15:00:06 -0700 Subject: Add a bunch of #defines for OSI NSAP AFI values, and use them. Have the ISUP value_string for those AFI values show "decimal" and "binary" indicators. Update some references. Change-Id: I07797455f5ffa5fa9cd4e0702a6f5db831054937 Reviewed-on: https://code.wireshark.org/review/20798 Reviewed-by: Guy Harris --- epan/osi-utils.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) (limited to 'epan/osi-utils.h') diff --git a/epan/osi-utils.h b/epan/osi-utils.h index ddb1c75ca6..f28b1770cf 100644 --- a/epan/osi-utils.h +++ b/epan/osi-utils.h @@ -42,8 +42,72 @@ #define RFC1237_RD_LEN 2 #define RFC1237_AREA_LEN 3 -#define NSAP_IDI_ISODCC 0x39 -#define NSAP_IDI_GOSIP2 0x47 +/* + * NSAP AFI values. + * + * Individual values. + */ +#define NSAP_IDI_IANA_ICP_DEC 0x34 /* IANA ICP, decimal */ +#define NSAP_IDI_IANA_ICP_BIN 0x35 /* IANA ICP, binary */ +#define NSAP_IDI_X_121_DEC 0x36 /* X.121, decimal */ +#define NSAP_IDI_X_121_BIN 0x37 /* X.121, binary */ +#define NSAP_IDI_ISO_DCC_DEC 0x38 /* ISO DCC, decimal */ +#define NSAP_IDI_ISO_DCC_BIN 0x39 /* ISO DCC, binary */ +#define NSAP_IDI_F_69_DEC 0x40 /* F.69, decimal */ +#define NSAP_IDI_F_69_BIN 0x41 /* F.69, binary */ +#define NSAP_IDI_E_163_DEC 0x42 /* E.163, decimal */ +#define NSAP_IDI_E_163_BIN 0x43 /* E.163, binary */ +#define NSAP_IDI_E_164_DEC 0x44 /* E.163, decimal */ +#define NSAP_IDI_E_164_BIN 0x45 /* E.163, binary */ +#define NSAP_IDI_ISO_6523_ICD_DEC 0x46 /* ISO 6523-ICD, decimal */ +#define NSAP_IDI_ISO_6523_ICD_BIN 0x47 /* ISO 6523-ICD, binary */ +//#define NSAP_IDI_GOSIP2 0x47 +#define NSAP_IDI_LOCAL_DEC 0x48 /* Local, decimal */ +#define NSAP_IDI_LOCAL_BIN 0x49 /* Local, decimal */ +#define NSAP_IDI_LOCAL_ISO_646_CHAR 0x50 /* Local, ISO/IEC 646 character */ +#define NSAP_IDI_LOCAL_NATIONAL_CHAR 0x51 /* Local, national character */ +#define NSAP_IDI_X_121_DEC_2 0x52 /* X.121, decimal */ +#define NSAP_IDI_X_121_BIN_2 0x53 /* X.121, binary */ +#define NSAP_IDI_F_69_DEC_2 0x54 /* F.69, decimal */ +#define NSAP_IDI_F_69_BIN_2 0x55 /* F.69, binary */ +#define NSAP_IDI_E_163_DEC_2 0x56 /* E.163, decimal */ +#define NSAP_IDI_E_163_BIN_2 0x57 /* E.163, binary */ +#define NSAP_IDI_E_164_DEC_2 0x58 /* E.163, decimal */ +#define NSAP_IDI_E_164_BIN_2 0x59 /* E.163, binary */ +#define NSAP_IDI_ITU_T_IND_DEC 0x76 /* ITU-T IND, decimal */ +#define NSAP_IDI_ITU_T_IND_BIN 0x77 /* ITU-T IND, binary */ + +/* + * Group values. + */ +#define NSAP_IDI_IANA_ICP_DEC_GROUP 0xB8 /* IANA ICP, decimal */ +#define NSAP_IDI_IANA_ICP_BIN_GROUP 0xB9 /* IANA ICP, binary */ +#define NSAP_IDI_X_121_DEC_GROUP 0xBA /* X.121, decimal */ +#define NSAP_IDI_X_121_BIN_GROUP 0xBB /* X.121, binary */ +#define NSAP_IDI_ISO_DCC_DEC_GROUP 0xBC /* ISO DCC, decimal */ +#define NSAP_IDI_ISO_DCC_BIN_GROUP 0xBD /* ISO DCC, binary */ +#define NSAP_IDI_F_69_DEC_GROUP 0xBE /* F.69, decimal */ +#define NSAP_IDI_F_69_BIN_GROUP 0xBF /* F.69, binary */ +#define NSAP_IDI_E_163_DEC_GROUP 0xC0 /* E.163, decimal */ +#define NSAP_IDI_E_163_BIN_GROUP 0xC1 /* E.163, binary */ +#define NSAP_IDI_E_164_DEC_GROUP 0xC2 /* E.163, decimal */ +#define NSAP_IDI_E_164_BIN_GROUP 0xC3 /* E.163, binary */ +#define NSAP_IDI_ISO_6523_ICD_DEC_GROUP 0xC4 /* ISO 6523-ICD, decimal */ +#define NSAP_IDI_ISO_6523_ICD_BIN_GROUP 0xC5 /* ISO 6523-ICD, binary */ +#define NSAP_IDI_LOCAL_DEC_GROUP 0xC6 /* Local, decimal */ +#define NSAP_IDI_LOCAL_BIN_GROUP 0xC7 /* Local, decimal */ +#define NSAP_IDI_LOCAL_ISO_646_CHAR_GROUP 0xC8 /* Local, ISO/IEC 646 character */ +#define NSAP_IDI_LOCAL_NATIONAL_CHAR_GROUP 0xC9 /* Local, national character */ +#define NSAP_IDI_X_121_DEC_2_GROUP 0xCA /* X.121, decimal */ +#define NSAP_IDI_X_121_BIN_2_GROUP 0xCB /* X.121, binary */ +#define NSAP_IDI_F_69_DEC_2_GROUP 0xCC /* F.69, decimal */ +#define NSAP_IDI_F_69_BIN_2_GROUP 0xCD /* F.69, binary */ +#define NSAP_IDI_E_163_DEC_2_GROUP 0xCE /* E.163, decimal */ +#define NSAP_IDI_E_163_BIN_2_GROUP 0xCF /* E.163, binary */ +#define NSAP_IDI_E_164_DEC_2_GROUP 0xD0 /* E.163, decimal */ +#define NSAP_IDI_E_164_BIN_2_GROUP 0xD1 /* E.163, binary */ +#define NSAP_IDI_ITU_T_IND_DEC_GROUP 0xE2 /* ITU-T IND, decimal */ +#define NSAP_IDI_ITU_T_IND_BIN_GROUP 0xE3 /* ITU-T IND, binary */ gchar* print_nsap_net ( tvbuff_t *, const gint, int ); gchar* print_area ( tvbuff_t *, const gint, int ); -- cgit v1.2.1