Updates from Josh Bailey and Ruud Linders.

svn path=/trunk/; revision=10412

1 files changed, 357 insertions, 347 deletions

diff --git a/packet-ipdc.h b/packet-ipdc.h
index ad3ca63ff7..dd80b6a005 100644
--- a/packet-ipdc.h
+++ b/packet-ipdc.h
@@ -1,9 +1,9 @@
 /* packet-ipdc.h
  * Routines for IP Device Control (SS7 over IP) dissection
  * Copyright Lucent Technologies 2004
- * Josh Bailey <joshbailey@lucent.com>
+ * Josh Bailey <joshbailey@lucent.com> and Ruud Linders <ruud@lucent.com>
  *
- * $Id: packet-ipdc.h,v 1.1 2004/03/18 08:25:09 guy Exp $
+ * $Id: packet-ipdc.h,v 1.2 2004/03/20 05:53:40 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -25,16 +25,21 @@
  */
 
 #define	TCP_PORT_IPDC	6668
+#define	TRANS_ID_SIZE_IPDC	4
 
 #define	TEXT_UNDEFINED	"UNDEFINED"
 
-#define TT_UINT         "UINT"
-#define TT_ASCII        "ASCII"
-#define TT_BYTE         "BYTE"
-#define TT_OCTET        "ASCII"
-#define TT_IPA          "IPA"
-#define TT_LINESTATUS   "LINESTATUS"
-#define	TT_CHANNELSTATUS	"CHANNELSTATUS"
+typedef enum {
+	UNKNOWN,
+	UINT,
+	ASCII,
+	BYTE,
+	OCTET,
+	IPA,
+	LINESTATUS,
+	CHANNELSTATUS,
+	Q931,
+} ipdc_tag_type; 
 
 static const value_string line_status_vals[] = {
 	{ 0x00, "Not present" },
@@ -229,400 +234,405 @@ static const value_string tag_description[] = {
 	{ 0, NULL },
 };
 
-static const value_string tag_type[] = {
-	{ 0x01, TT_UINT },
-	{ 0x02, TT_ASCII },
-	{ 0x03, TT_ASCII },
-	{ 0x04, TT_UINT },
-	{ 0x05, TT_ASCII },
-	{ 0x07, TT_UINT },
-	{ 0x0A, TT_BYTE },
-	{ 0x0C, TT_BYTE },
-	{ 0x0D, TT_UINT },
-	{ 0x14, TT_BYTE },
-	{ 0x15, TT_UINT },
-	{ 0x17, TT_BYTE },
-	{ 0x18, TT_ASCII },
-	{ 0x19, TT_ASCII },
-	{ 0x1B, TT_IPA },
-	{ 0x1C, TT_UINT },
-	{ 0x20, TT_UINT },
-	{ 0x21, TT_LINESTATUS },
-	{ 0x22, TT_UINT },
-	{ 0x23, TT_CHANNELSTATUS },
-	{ 0x24, TT_BYTE },
-	{ 0x25, TT_OCTET }, /* TBD */
-	{ 0x26, TT_BYTE },
-	{ 0x27, TT_BYTE },
-	{ 0x28, TT_UINT },
-	{ 0x29, TT_UINT },
-	{ 0x2A, TT_BYTE },
-	{ 0x2B, TT_BYTE },
-	{ 0x2C, TT_UINT },
-	{ 0x2D, TT_BYTE },
-	{ 0x31, TT_UINT },
-	{ 0x32, TT_UINT },
-	{ 0x33, TT_ASCII },
-	{ 0x34, TT_ASCII },
-	{ 0x35, TT_BYTE },
-	{ 0x36, TT_UINT },
-	{ 0x37, TT_UINT },
-	{ 0x38, TT_UINT },
-	{ 0x39, TT_UINT },
-	{ 0x3A, TT_IPA },
-	{ 0x3B, TT_UINT },
-	{ 0x3C, TT_BYTE },
-	{ 0x3D, TT_ASCII },
-	{ 0x3E, TT_UINT },
-	{ 0x40, TT_UINT },
-	{ 0x46, TT_UINT },
-	{ 0x49, TT_BYTE },
-	{ 0x4A, TT_BYTE },
-	{ 0x5D, TT_IPA },
-	{ 0x5E, TT_UINT },
-	{ 0x5F, TT_IPA },
-	{ 0x60, TT_UINT },
-	{ 0x65, TT_BYTE },
-	{ 0x66, TT_BYTE },
-	{ 0x67, TT_UINT },
-	{ 0x68, TT_UINT },
-	{ 0x69, TT_IPA },
-	{ 0x6A, TT_BYTE },
-	{ 0x6F, TT_BYTE },
-	{ 0x70, TT_BYTE },
-	{ 0x71, TT_UINT },
-	{ 0x72, TT_BYTE },
-	{ 0x73, TT_UINT },
-	{ 0x74, TT_BYTE },
-	{ 0x75, TT_BYTE },
-	{ 0x76, TT_BYTE },
-	{ 0x77, TT_BYTE },
-	{ 0x78, TT_BYTE },
-	{ 0x7B, TT_BYTE },
-	{ 0x7C, TT_UINT },
-	{ 0x7D, TT_BYTE },
-	{ 0x7E, TT_UINT },
-	{ 0x86, TT_BYTE },
-	{ 0x90, TT_BYTE },
-	{ 0x91, TT_UINT },
-	{ 0x92, TT_UINT },
-	{ 0x93, TT_UINT },
-	{ 0x94, TT_UINT },
-	{ 0x95, TT_UINT },
-	{ 0x96, TT_UINT },
-	{ 0x97, TT_UINT },
-	{ 0x98, TT_UINT },
-	{ 0x99, TT_UINT },
-	{ 0x9D, TT_UINT },
-	{ 0x9E, TT_UINT },
-	{ 0x9F, TT_UINT },
-	{ 0xA0, TT_UINT },
-	{ 0xA1, TT_UINT },
-	{ 0xA2, TT_UINT },
-	{ 0xA3, TT_BYTE },
-	{ 0xA4, TT_BYTE },
-	{ 0xA5, TT_BYTE },
-	{ 0xA6, TT_UINT },
-	{ 0xA7, TT_UINT },
-	{ 0xB0, TT_BYTE },
-	{ 0xB1, TT_BYTE },
-	{ 0xB2, TT_OCTET },
-	{ 0xB3, TT_OCTET },
-	{ 0xC1, TT_BYTE },
-	{ 0xC2, TT_UINT },
-	{ 0xC3, TT_UINT },
-	{ 0xFE, TT_UINT },
-	{ 0, NULL },
+typedef struct _ipdc_tag_type_val {
+	gint	tag;
+	ipdc_tag_type	type;
+} ipdc_tag_type_val;
+
+static const ipdc_tag_type_val ipdc_tag_types[] = {
+	{ 0x01, UINT },
+	{ 0x02, ASCII },
+	{ 0x03, ASCII },
+	{ 0x04, UINT },
+	{ 0x05, ASCII },
+	{ 0x07, UINT },
+	{ 0x0A, BYTE },
+	{ 0x0C, BYTE },
+	{ 0x0D, UINT },
+	{ 0x14, BYTE },
+	{ 0x15, UINT },
+	{ 0x17, BYTE },
+	{ 0x18, ASCII },
+	{ 0x19, ASCII },
+	{ 0x1B, IPA },
+	{ 0x1C, UINT },
+	{ 0x20, UINT },
+	{ 0x21, LINESTATUS },
+	{ 0x22, UINT },
+	{ 0x23, CHANNELSTATUS },
+	{ 0x24, BYTE },
+	{ 0x25, OCTET }, /* TBD */
+	{ 0x26, BYTE },
+	{ 0x27, BYTE },
+	{ 0x28, UINT },
+	{ 0x29, UINT },
+	{ 0x2A, BYTE },
+	{ 0x2B, BYTE },
+	{ 0x2C, UINT },
+	{ 0x2D, BYTE },
+	{ 0x31, UINT },
+	{ 0x32, UINT },
+	{ 0x33, ASCII },
+	{ 0x34, ASCII },
+	{ 0x35, BYTE },
+	{ 0x36, UINT },
+	{ 0x37, UINT },
+	{ 0x38, UINT },
+	{ 0x39, UINT },
+	{ 0x3A, IPA },
+	{ 0x3B, UINT },
+	{ 0x3C, BYTE },
+	{ 0x3D, ASCII },
+	{ 0x3E, UINT },
+	{ 0x40, UINT },
+	{ 0x46, UINT },
+	{ 0x49, BYTE },
+	{ 0x4A, BYTE },
+	{ 0x5D, IPA },
+	{ 0x5E, UINT },
+	{ 0x5F, IPA },
+	{ 0x60, UINT },
+	{ 0x65, BYTE },
+	{ 0x66, BYTE },
+	{ 0x67, UINT },
+	{ 0x68, UINT },
+	{ 0x69, IPA },
+	{ 0x6A, BYTE },
+	{ 0x6F, BYTE },
+	{ 0x70, BYTE },
+	{ 0x71, UINT },
+	{ 0x72, BYTE },
+	{ 0x73, UINT },
+	{ 0x74, BYTE },
+	{ 0x75, BYTE },
+	{ 0x76, BYTE },
+	{ 0x77, BYTE },
+	{ 0x78, BYTE },
+	{ 0x7B, BYTE },
+	{ 0x7C, UINT },
+	{ 0x7D, BYTE },
+	{ 0x7E, UINT },
+	{ 0x86, BYTE },
+	{ 0x90, BYTE },
+	{ 0x91, UINT },
+	{ 0x92, UINT },
+	{ 0x93, UINT },
+	{ 0x94, UINT },
+	{ 0x95, UINT },
+	{ 0x96, UINT },
+	{ 0x97, UINT },
+	{ 0x98, UINT },
+	{ 0x99, UINT },
+	{ 0x9D, UINT },
+	{ 0x9E, UINT },
+	{ 0x9F, UINT },
+	{ 0xA0, UINT },
+	{ 0xA1, UINT },
+	{ 0xA2, Q931 },
+	{ 0xA3, BYTE },
+	{ 0xA4, BYTE },
+	{ 0xA5, BYTE },
+	{ 0xA6, UINT },
+	{ 0xA7, UINT },
+	{ 0xB0, BYTE },
+	{ 0xB1, BYTE },
+	{ 0xB2, OCTET },
+	{ 0xB3, OCTET },
+	{ 0xC1, BYTE },
+	{ 0xC2, UINT },
+	{ 0xC3, UINT },
+	{ 0xFE, UINT },
+	{ 0xFFFF, UNKNOWN },
 };
 
-#define	MY_TAG(x)	(256 * (x))
+#define	IPDC_TAG(x)	(256 * (x))
 
 static const value_string tag_enum_type[] = {
 	/* Protocol Version */
-	{ MY_TAG(0x01) + 0x00, "Version 0 (Xcom NMI 5.0)" },
-	{ MY_TAG(0x01) + 0x01, "IPDC Version 0.12" },
-	{ MY_TAG(0x01) + 0x02, "IPDC Version 0.15" },
-	{ MY_TAG(0x01) + 0x03, "IPDC Version 0.17" },
-	{ MY_TAG(0x01) + 0x04, "IPDC Version 0.18" },
-	{ MY_TAG(0x01) + 0x05, "IPDC Version 0.19" },
-	{ MY_TAG(0x01) + 0x06, "IPDC Version 0.20" },
+	{ IPDC_TAG(0x01) + 0x00, "Version 0 (Xcom NMI 5.0)" },
+	{ IPDC_TAG(0x01) + 0x01, "IPDC Version 0.12" },
+	{ IPDC_TAG(0x01) + 0x02, "IPDC Version 0.15" },
+	{ IPDC_TAG(0x01) + 0x03, "IPDC Version 0.17" },
+	{ IPDC_TAG(0x01) + 0x04, "IPDC Version 0.18" },
+	{ IPDC_TAG(0x01) + 0x05, "IPDC Version 0.19" },
+	{ IPDC_TAG(0x01) + 0x06, "IPDC Version 0.20" },
 	/* Module type, from Annex B. */
-	{ MY_TAG(0x0a) + 0x01, "Unknown" },
-	{ MY_TAG(0x0a) + 0x02, "Shelf" },
-	{ MY_TAG(0x0a) + 0x03, "Router Card" },
-	{ MY_TAG(0x0a) + 0x04, "8-line Channelized T1" },
-	{ MY_TAG(0x0a) + 0x05, "8-line Channelized E1" },
-	{ MY_TAG(0x0a) + 0x06, "48-modem Card" },
-	{ MY_TAG(0x0a) + 0x07, "192 HDLC Card" },
-	{ MY_TAG(0x0a) + 0x08, "4-port Ethernet Card" },
-	{ MY_TAG(0x0a) + 0x09, "Serial WAN Card" },
-	{ MY_TAG(0x0a) + 0x0A, "HSSI Card" },
-	{ MY_TAG(0x0a) + 0x0B, "10-line Unchannelized T1" },
-	{ MY_TAG(0x0a) + 0x0C, "36-modem (Analog) Card" },
-	{ MY_TAG(0x0a) + 0x0D, "T3 Card" },
-	{ MY_TAG(0x0a) + 0x0E, "48-modem 56K Card" },
-	{ MY_TAG(0x0a) + 0x0F, "Forward" },
-	{ MY_TAG(0x0a) + 0x10, "SDSL Card" },
-	{ MY_TAG(0x0a) + 0x11, "CAP ADSL Card" },
-	{ MY_TAG(0x0a) + 0x12, "DMT ADSL Card" },
-	{ MY_TAG(0x0a) + 0x13, "Standalone Modem Controller" },
-	{ MY_TAG(0x0a) + 0x14, "32-port IDSL Card" },
-	{ MY_TAG(0x0a) + 0x15, "10-line Unchannelized E1" },
-	{ MY_TAG(0x0a) + 0x16, "36-modem (Analog) 2 Card" },
-	{ MY_TAG(0x0a) + 0x17, "CSMX Modem Card" },
-	{ MY_TAG(0x0a) + 0x18, "UDS3 Card" },
-	{ MY_TAG(0x0a) + 0x19, "DS3 ATM Card" },
-	{ MY_TAG(0x0a) + 0x1A, "4-port Ethernet 2 Card" },
-	{ MY_TAG(0x0a) + 0x1B, "192 HDLC 2 Card" },
-	{ MY_TAG(0x0a) + 0x1C, "SDSL 70 Data Card" },
-	{ MY_TAG(0x0a) + 0x1D, "MADD Card" },
-	{ MY_TAG(0x0a) + 0x1E, "SDSL 70 Voice Card" },
-	{ MY_TAG(0x0a) + 0x1F, "OC3 Daughter Card" },
-	{ MY_TAG(0x0a) + 0x20, "OC3 ATM Card" },
-	{ MY_TAG(0x0a) + 0x21, "4-port Ethernet 3 Card" },
-	{ MY_TAG(0x0a) + 0x22, "SRS Ethernet Card" },
-	{ MY_TAG(0x0a) + 0x23, "SDSL ATM Card" },
-	{ MY_TAG(0x0a) + 0x24, "AL DADSL ATM Card" },
-	{ MY_TAG(0x0a) + 0x25, "CSM3V Modem Card" },
-	{ MY_TAG(0x0a) + 0x26, "HDLC2EC Card" },
-	{ MY_TAG(0x0a) + 0x27, "DS3 Daughter Card" },
-	{ MY_TAG(0x0a) + 0x28, "2-port Ethernet Card" },
-	{ MY_TAG(0x0a) + 0x2A, "STM0 Card" },
-	{ MY_TAG(0x0a) + 0x2B, "SDSL Ripper Card" },
-	{ MY_TAG(0x0a) + 0x2F, "Stinger Terminator Card" },
-	{ MY_TAG(0x0a) + 0x30, "GS DADSL Ripper Card" },
-	{ MY_TAG(0x0a) + 0x31, "PCTFIT Card" },
-	{ MY_TAG(0x0a) + 0x32, "PCTFIE Card" },
-	{ MY_TAG(0x0a) + 0x33, "CT DADSL GLITE Card" },
-	{ MY_TAG(0x0a) + 0x34, "DS3 ATM 2 Card" },
-	{ MY_TAG(0x0a) + 0x35, "E3 ATM Card" },
-	{ MY_TAG(0x0a) + 0x36, "24-line Stinger IMA T1 Card" },
-	{ MY_TAG(0x0a) + 0x37, "MADD 2 Card" },
-	{ MY_TAG(0x0a) + 0x38, "GS HDSL 2 Card" },
-	{ MY_TAG(0x0a) + 0x39, "32-line Stinger IDSL Card" },
-	{ MY_TAG(0x0a) + 0x3A, "ANNEXB DADSL ATM Card" },
-	{ MY_TAG(0x0a) + 0x3B, "24-line Stinger IMA E1 Card" },
-	{ MY_TAG(0x0a) + 0x3C, "40C CT DADSL ATM Card" },
-	{ MY_TAG(0x0a) + 0x3D, "4-port Ethernet 3+ Card" },
-	{ MY_TAG(0x0a) + 0x3E, "CLPMT Card" },
-	{ MY_TAG(0x0a) + 0x3F, "CLPME Card" },
-	{ MY_TAG(0x0a) + 0x40, "E3 Daughter Card" },
-	{ MY_TAG(0x0a) + 0x41, "8-line Stinger IMA T1 Card" },
-	{ MY_TAG(0x0a) + 0x42, "8-line Stinger IMA E1 Card" },
-	{ MY_TAG(0x0a) + 0x43, "48A GS DADSL ATM Card" },
-	{ MY_TAG(0x0a) + 0x44, "48B GS DADSL ATM Card" },
-	{ MY_TAG(0x0a) + 0x45, "48C GS DADSL ATM Card" },
-	{ MY_TAG(0x0a) + 0x46, "40A CT DADSL ATM Card" },
-	{ MY_TAG(0x0a) + 0x47, "OC3 ATM 2 Card" },
-	{ MY_TAG(0x0a) + 0x48, "4-port Serial WAN 2 Card" },
-	{ MY_TAG(0x0a) + 0x49, "CDS3 LIM Card" },
-	{ MY_TAG(0x0a) + 0x4A, "R7000 Card" },
-	{ MY_TAG(0x0a) + 0x4B, "VPN Card" },
-	{ MY_TAG(0x0a) + 0x4C, "HSE Card" },
-	{ MY_TAG(0x0a) + 0x4D, "MADD 3 Card" },
-	{ MY_TAG(0x0a) + 0x4E, "Stinger CM V2 Card" },
-	{ MY_TAG(0x0a) + 0x4F, "COC3 LIM Card" },
-	{ MY_TAG(0x0a) + 0x50, "Stinger SHDSL Card" },
-	{ MY_TAG(0x0a) + 0x51, "2-port OC34-port DS3 Daughter Card" },
-	{ MY_TAG(0x0a) + 0x52, "72-line DADSL ATM Card" },
-	{ MY_TAG(0x0a) + 0x53, "36-line DMT MRT Card" },
-	{ MY_TAG(0x0a) + 0x54, "24-line T1 Card" },
-	{ MY_TAG(0x0a) + 0x55, "24-line E1 Card" },
-	{ MY_TAG(0x0a) + 0x56, "Stinger MRT CM Card" },
-	{ MY_TAG(0x0a) + 0x57, "CSTM1 LIM Card" },
+	{ IPDC_TAG(0x0a) + 0x01, "Unknown" },
+	{ IPDC_TAG(0x0a) + 0x02, "Shelf" },
+	{ IPDC_TAG(0x0a) + 0x03, "Router Card" },
+	{ IPDC_TAG(0x0a) + 0x04, "8-line Channelized T1" },
+	{ IPDC_TAG(0x0a) + 0x05, "8-line Channelized E1" },
+	{ IPDC_TAG(0x0a) + 0x06, "48-modem Card" },
+	{ IPDC_TAG(0x0a) + 0x07, "192 HDLC Card" },
+	{ IPDC_TAG(0x0a) + 0x08, "4-port Ethernet Card" },
+	{ IPDC_TAG(0x0a) + 0x09, "Serial WAN Card" },
+	{ IPDC_TAG(0x0a) + 0x0A, "HSSI Card" },
+	{ IPDC_TAG(0x0a) + 0x0B, "10-line Unchannelized T1" },
+	{ IPDC_TAG(0x0a) + 0x0C, "36-modem (Analog) Card" },
+	{ IPDC_TAG(0x0a) + 0x0D, "T3 Card" },
+	{ IPDC_TAG(0x0a) + 0x0E, "48-modem 56K Card" },
+	{ IPDC_TAG(0x0a) + 0x0F, "Forward" },
+	{ IPDC_TAG(0x0a) + 0x10, "SDSL Card" },
+	{ IPDC_TAG(0x0a) + 0x11, "CAP ADSL Card" },
+	{ IPDC_TAG(0x0a) + 0x12, "DMT ADSL Card" },
+	{ IPDC_TAG(0x0a) + 0x13, "Standalone Modem Controller" },
+	{ IPDC_TAG(0x0a) + 0x14, "32-port IDSL Card" },
+	{ IPDC_TAG(0x0a) + 0x15, "10-line Unchannelized E1" },
+	{ IPDC_TAG(0x0a) + 0x16, "36-modem (Analog) 2 Card" },
+	{ IPDC_TAG(0x0a) + 0x17, "CSMX Modem Card" },
+	{ IPDC_TAG(0x0a) + 0x18, "UDS3 Card" },
+	{ IPDC_TAG(0x0a) + 0x19, "DS3 ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x1A, "4-port Ethernet 2 Card" },
+	{ IPDC_TAG(0x0a) + 0x1B, "192 HDLC 2 Card" },
+	{ IPDC_TAG(0x0a) + 0x1C, "SDSL 70 Data Card" },
+	{ IPDC_TAG(0x0a) + 0x1D, "MADD Card" },
+	{ IPDC_TAG(0x0a) + 0x1E, "SDSL 70 Voice Card" },
+	{ IPDC_TAG(0x0a) + 0x1F, "OC3 Daughter Card" },
+	{ IPDC_TAG(0x0a) + 0x20, "OC3 ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x21, "4-port Ethernet 3 Card" },
+	{ IPDC_TAG(0x0a) + 0x22, "SRS Ethernet Card" },
+	{ IPDC_TAG(0x0a) + 0x23, "SDSL ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x24, "AL DADSL ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x25, "CSM3V Modem Card" },
+	{ IPDC_TAG(0x0a) + 0x26, "HDLC2EC Card" },
+	{ IPDC_TAG(0x0a) + 0x27, "DS3 Daughter Card" },
+	{ IPDC_TAG(0x0a) + 0x28, "2-port Ethernet Card" },
+	{ IPDC_TAG(0x0a) + 0x2A, "STM0 Card" },
+	{ IPDC_TAG(0x0a) + 0x2B, "SDSL Ripper Card" },
+	{ IPDC_TAG(0x0a) + 0x2F, "Stinger Terminator Card" },
+	{ IPDC_TAG(0x0a) + 0x30, "GS DADSL Ripper Card" },
+	{ IPDC_TAG(0x0a) + 0x31, "PCTFIT Card" },
+	{ IPDC_TAG(0x0a) + 0x32, "PCTFIE Card" },
+	{ IPDC_TAG(0x0a) + 0x33, "CT DADSL GLITE Card" },
+	{ IPDC_TAG(0x0a) + 0x34, "DS3 ATM 2 Card" },
+	{ IPDC_TAG(0x0a) + 0x35, "E3 ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x36, "24-line Stinger IMA T1 Card" },
+	{ IPDC_TAG(0x0a) + 0x37, "MADD 2 Card" },
+	{ IPDC_TAG(0x0a) + 0x38, "GS HDSL 2 Card" },
+	{ IPDC_TAG(0x0a) + 0x39, "32-line Stinger IDSL Card" },
+	{ IPDC_TAG(0x0a) + 0x3A, "ANNEXB DADSL ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x3B, "24-line Stinger IMA E1 Card" },
+	{ IPDC_TAG(0x0a) + 0x3C, "40C CT DADSL ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x3D, "4-port Ethernet 3+ Card" },
+	{ IPDC_TAG(0x0a) + 0x3E, "CLPMT Card" },
+	{ IPDC_TAG(0x0a) + 0x3F, "CLPME Card" },
+	{ IPDC_TAG(0x0a) + 0x40, "E3 Daughter Card" },
+	{ IPDC_TAG(0x0a) + 0x41, "8-line Stinger IMA T1 Card" },
+	{ IPDC_TAG(0x0a) + 0x42, "8-line Stinger IMA E1 Card" },
+	{ IPDC_TAG(0x0a) + 0x43, "48A GS DADSL ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x44, "48B GS DADSL ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x45, "48C GS DADSL ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x46, "40A CT DADSL ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x47, "OC3 ATM 2 Card" },
+	{ IPDC_TAG(0x0a) + 0x48, "4-port Serial WAN 2 Card" },
+	{ IPDC_TAG(0x0a) + 0x49, "CDS3 LIM Card" },
+	{ IPDC_TAG(0x0a) + 0x4A, "R7000 Card" },
+	{ IPDC_TAG(0x0a) + 0x4B, "VPN Card" },
+	{ IPDC_TAG(0x0a) + 0x4C, "HSE Card" },
+	{ IPDC_TAG(0x0a) + 0x4D, "MADD 3 Card" },
+	{ IPDC_TAG(0x0a) + 0x4E, "Stinger CM V2 Card" },
+	{ IPDC_TAG(0x0a) + 0x4F, "COC3 LIM Card" },
+	{ IPDC_TAG(0x0a) + 0x50, "Stinger SHDSL Card" },
+	{ IPDC_TAG(0x0a) + 0x51, "2-port OC34-port DS3 Daughter Card" },
+	{ IPDC_TAG(0x0a) + 0x52, "72-line DADSL ATM Card" },
+	{ IPDC_TAG(0x0a) + 0x53, "36-line DMT MRT Card" },
+	{ IPDC_TAG(0x0a) + 0x54, "24-line T1 Card" },
+	{ IPDC_TAG(0x0a) + 0x55, "24-line E1 Card" },
+	{ IPDC_TAG(0x0a) + 0x56, "Stinger MRT CM Card" },
+	{ IPDC_TAG(0x0a) + 0x57, "CSTM1 LIM Card" },
 	/* Module status */
-	{ MY_TAG(0x0c) + 0x00, "Not present (empty)" },
-	{ MY_TAG(0x0c) + 0x01, "Out of service (down)" },
-	{ MY_TAG(0x0c) + 0x02, "Up" },
-	{ MY_TAG(0x0c) + 0x03, "Error" },
-	{ MY_TAG(0x0c) + 0x04, "Does not exist" },
+	{ IPDC_TAG(0x0c) + 0x00, "Not present (empty)" },
+	{ IPDC_TAG(0x0c) + 0x01, "Out of service (down)" },
+	{ IPDC_TAG(0x0c) + 0x02, "Up" },
+	{ IPDC_TAG(0x0c) + 0x03, "Error" },
+	{ IPDC_TAG(0x0c) + 0x04, "Does not exist" },
 	/* Line status */
-	{ MY_TAG(0x14) + 0x00, "Not present" },
-	{ MY_TAG(0x14) + 0x01, "Disabled" },
-	{ MY_TAG(0x14) + 0x02, "Red alarm (loss of sync)" },
-	{ MY_TAG(0x14) + 0x03, "Yellow alarm" },
-	{ MY_TAG(0x14) + 0x04, "Other alarms or errors" },
-	{ MY_TAG(0x14) + 0x05, "Up" },
-	{ MY_TAG(0x14) + 0x06, "Loopback" },
+	{ IPDC_TAG(0x14) + 0x00, "Not present" },
+	{ IPDC_TAG(0x14) + 0x01, "Disabled" },
+	{ IPDC_TAG(0x14) + 0x02, "Red alarm (loss of sync)" },
+	{ IPDC_TAG(0x14) + 0x03, "Yellow alarm" },
+	{ IPDC_TAG(0x14) + 0x04, "Other alarms or errors" },
+	{ IPDC_TAG(0x14) + 0x05, "Up" },
+	{ IPDC_TAG(0x14) + 0x06, "Loopback" },
 	/* Bearer capability */
-	{ MY_TAG(0x17) + 0x00, "Voice call" },
-	{ MY_TAG(0x17) + 0x08, "64K data call" },
-	{ MY_TAG(0x17) + 0x09, "56K data call" },
-	{ MY_TAG(0x17) + 0x10,
+	{ IPDC_TAG(0x17) + 0x00, "Voice call" },
+	{ IPDC_TAG(0x17) + 0x08, "64K data call" },
+	{ IPDC_TAG(0x17) + 0x09, "56K data call" },
+	{ IPDC_TAG(0x17) + 0x10,
 	"Modem call (3.1K Audio call) (applies to RCSI for modem call only)" }, 
 	/* Line status array */
-	/* { MY_TAG(0x21) + 0x0, "" }, */
+	/* { IPDC_TAG(0x21) + 0x0, "" }, */
 	/* Channel status array */
-	/* { MY_TAG(0x23) + 0x0, "" }, */
+	/* { IPDC_TAG(0x23) + 0x0, "" }, */
 	/* Requested module state */
-	{ MY_TAG(0x24) + 0x00, "Out of service" },
-	{ MY_TAG(0x24) + 0x01, "Initialize (bring up)" },
+	{ IPDC_TAG(0x24) + 0x00, "Out of service" },
+	{ IPDC_TAG(0x24) + 0x01, "Initialize (bring up)" },
 	/* Requested line state */
-	{ MY_TAG(0x25) + 0x00, "Disable" },
-	{ MY_TAG(0x25) + 0x01, "Enable" },
-	{ MY_TAG(0x25) + 0x02, "Start loopback" },
-	{ MY_TAG(0x25) + 0x03, "Terminate loopback" },
+	{ IPDC_TAG(0x25) + 0x00, "Disable" },
+	{ IPDC_TAG(0x25) + 0x01, "Enable" },
+	{ IPDC_TAG(0x25) + 0x02, "Start loopback" },
+	{ IPDC_TAG(0x25) + 0x03, "Terminate loopback" },
 	/* Requested channel status action */
-	{ MY_TAG(0x26) + 0x00, "Reset to idle" },
-	{ MY_TAG(0x26) + 0x01, "Reset to out of service" },
-	{ MY_TAG(0x26) + 0x02, "Start loopback" },
-	{ MY_TAG(0x26) + 0x03, "Terminate loopback" },
+	{ IPDC_TAG(0x26) + 0x00, "Reset to idle" },
+	{ IPDC_TAG(0x26) + 0x01, "Reset to out of service" },
+	{ IPDC_TAG(0x26) + 0x02, "Start loopback" },
+	{ IPDC_TAG(0x26) + 0x03, "Terminate loopback" },
 	/* Set channel status option */
-	{ MY_TAG(0x27) + 0x00,
+	{ IPDC_TAG(0x27) + 0x00,
 	"Do not perform the indicated action if any of the" \
 	"channels is not in the valid initial state" },
-	{ MY_TAG(0x27) + 0x01,
+	{ IPDC_TAG(0x27) + 0x01,
 	"Perform the indicated action on channels that are on" \
 	"the valid initial state. Other channels are not affected" },
 	/* Set channel status result */
-	{ MY_TAG(0x2a) + 0x00,
+	{ IPDC_TAG(0x2a) + 0x00,
 		"action successfully performed in all channels" },
-	{ MY_TAG(0x2a) + 0x01, "at least one channel failed" },
+	{ IPDC_TAG(0x2a) + 0x01, "at least one channel failed" },
 	/* Prepare for continuity check result */
-	{ MY_TAG(0x2b) + 0x00, "Resources reserved successfully" },
-	{ MY_TAG(0x2b) + 0x01, "Resource not available" },
+	{ IPDC_TAG(0x2b) + 0x00, "Resources reserved successfully" },
+	{ IPDC_TAG(0x2b) + 0x01, "Resource not available" },
 	/* Continuity test result */
-	{ MY_TAG(0x2d) + 0x00, "Test completed successfully" },
-	{ MY_TAG(0x2d) + 0x01, "Test failed" },
+	{ IPDC_TAG(0x2d) + 0x00, "Test completed successfully" },
+	{ IPDC_TAG(0x2d) + 0x01, "Test failed" },
 	/* Tone listen completion status */
-	{ MY_TAG(0x35) + 0x00, "Timeout" },
-	{ MY_TAG(0x35) + 0x01, "No resources available for this operation" },
-	{ MY_TAG(0x35) + 0x02, "Operation terminated by the SS" },
-	{ MY_TAG(0x35) + 0x03, "Tone-to-complete-collection received" },
-	{ MY_TAG(0x35) + 0x04,
+	{ IPDC_TAG(0x35) + 0x00, "Timeout" },
+	{ IPDC_TAG(0x35) + 0x01, "No resources available for this operation" },
+	{ IPDC_TAG(0x35) + 0x02, "Operation terminated by the SS" },
+	{ IPDC_TAG(0x35) + 0x03, "Tone-to-complete-collection received" },
+	{ IPDC_TAG(0x35) + 0x04,
 		"The specified maximum number of tones received" },
-	{ MY_TAG(0x35) + 0x05, "Wait between successive tones too long" },
+	{ IPDC_TAG(0x35) + 0x05, "Wait between successive tones too long" },
 	/* Tone send completion status */
-	{ MY_TAG(0x36) + 0x00, "Operation succeeded" },
-	{ MY_TAG(0x36) + 0x01, "Operation failed" },
-	{ MY_TAG(0x36) + 0x02, "Operation terminated by SS" },
-	{ MY_TAG(0x36) + 0x03, "Operation started" },
-	{ MY_TAG(0x36) + 0x04,
+	{ IPDC_TAG(0x36) + 0x00, "Operation succeeded" },
+	{ IPDC_TAG(0x36) + 0x01, "Operation failed" },
+	{ IPDC_TAG(0x36) + 0x02, "Operation terminated by SS" },
+	{ IPDC_TAG(0x36) + 0x03, "Operation started" },
+	{ IPDC_TAG(0x36) + 0x04,
 		"Operation terminated by administrative action" },
 	/* DTMF send format */
-	{ MY_TAG(0x3c) + 0x00, "Tone" },
-	{ MY_TAG(0x3c) + 0x01, "Event" },
-	{ MY_TAG(0x3c) + 0x02, "Both (default)" },
+	{ IPDC_TAG(0x3c) + 0x00, "Tone" },
+	{ IPDC_TAG(0x3c) + 0x01, "Event" },
+	{ IPDC_TAG(0x3c) + 0x02, "Both (default)" },
 	/* Tone Type */
-	{ MY_TAG(0x49) + 0x00, "MF Tone" },
-	{ MY_TAG(0x49) + 0x01, "DTMF Tone" },
-	{ MY_TAG(0x49) + 0x02, "Analog Test Tone" },
-	{ MY_TAG(0x49) + 0x03, "Announcement" },
-	{ MY_TAG(0x49) + 0x04, "Digital Milli-watt tone" },
-	{ MY_TAG(0x49) + 0x05, "Supplemental tones" },
-	{ MY_TAG(0x49) + 0x06,
+	{ IPDC_TAG(0x49) + 0x00, "MF Tone" },
+	{ IPDC_TAG(0x49) + 0x01, "DTMF Tone" },
+	{ IPDC_TAG(0x49) + 0x02, "Analog Test Tone" },
+	{ IPDC_TAG(0x49) + 0x03, "Announcement" },
+	{ IPDC_TAG(0x49) + 0x04, "Digital Milli-watt tone" },
+	{ IPDC_TAG(0x49) + 0x05, "Supplemental tones" },
+	{ IPDC_TAG(0x49) + 0x06,
 		"Fax tone (CED, no phase reversal, or V.21 flags)" },
-	{ MY_TAG(0x49) + 0x07, "Modem tone (CED, phase reversal)" },
-	{ MY_TAG(0x49) + 0x41, "Ringback tone" },
+	{ IPDC_TAG(0x49) + 0x07, "Modem tone (CED, phase reversal)" },
+	{ IPDC_TAG(0x49) + 0x41, "Ringback tone" },
 	/* Apply/Cancel Tone */
-	{ MY_TAG(0x4a) + 0x00, "Apply tone" },
-	{ MY_TAG(0x4a) + 0x01, "Cancel tone" },
-	{ MY_TAG(0x4a) + 0x02, "Listen for tone" },
+	{ IPDC_TAG(0x4a) + 0x00, "Apply tone" },
+	{ IPDC_TAG(0x4a) + 0x01, "Cancel tone" },
+	{ IPDC_TAG(0x4a) + 0x02, "Listen for tone" },
 	/* Source port type */
-	{ MY_TAG(0x65) + 0x00, "SCN channel" },
+	{ IPDC_TAG(0x65) + 0x00, "SCN channel" },
 	/* Destination port type */
-	{ MY_TAG(0x66) + 0x01, "RTP port" },
+	{ IPDC_TAG(0x66) + 0x01, "RTP port" },
 	/* RTP Port Status */
-	{ MY_TAG(0x6a) + 0x00, "Idle", },
-	{ MY_TAG(0x6a) + 0x01, "Active" },
+	{ IPDC_TAG(0x6a) + 0x00, "Idle", },
+	{ IPDC_TAG(0x6a) + 0x01, "Active" },
 	/* Receive Encoding Type */
-	{ MY_TAG(0x6f) + 0x00, "PCMU (G.711 mu-law)" },
-	{ MY_TAG(0x6f) + 0x04, "G723.1" },
-	{ MY_TAG(0x6f) + 0x08, "PCMA (G.711 A-law)" },
-	{ MY_TAG(0x6f) + 0x12, "G729A" },
-	{ MY_TAG(0x6f) + 0x60, "Transparent data encoding" },
-	{ MY_TAG(0x6f) + 0x61, "T.38 fax over UPD" },
+	{ IPDC_TAG(0x6f) + 0x00, "PCMU (G.711 mu-law)" },
+	{ IPDC_TAG(0x6f) + 0x04, "G723.1" },
+	{ IPDC_TAG(0x6f) + 0x08, "PCMA (G.711 A-law)" },
+	{ IPDC_TAG(0x6f) + 0x12, "G729A" },
+	{ IPDC_TAG(0x6f) + 0x60, "Transparent data encoding" },
+	{ IPDC_TAG(0x6f) + 0x61, "T.38 fax over UPD" },
 	/* Send Encoding Type */
-	{ MY_TAG(0x70) + 0x00, "PCMU (G.711 mu-law)" },
-        { MY_TAG(0x70) + 0x04, "G723.1" },
-        { MY_TAG(0x70) + 0x08, "PCMA (G.711 A-law)" },
-        { MY_TAG(0x70) + 0x12, "G729A" },
-        { MY_TAG(0x70) + 0x60, "Transparent data encoding" },
-        { MY_TAG(0x70) + 0x61, "T.38 fax over UPD" }, 
+	{ IPDC_TAG(0x70) + 0x00, "PCMU (G.711 mu-law)" },
+        { IPDC_TAG(0x70) + 0x04, "G723.1" },
+        { IPDC_TAG(0x70) + 0x08, "PCMA (G.711 A-law)" },
+        { IPDC_TAG(0x70) + 0x12, "G729A" },
+        { IPDC_TAG(0x70) + 0x60, "Transparent data encoding" },
+        { IPDC_TAG(0x70) + 0x61, "T.38 fax over UPD" }, 
 	/* Comfort Noise Generation */
-	{ MY_TAG(0x72) + 0x00, "off" },
-	{ MY_TAG(0x72) + 0x01, "on" },
+	{ IPDC_TAG(0x72) + 0x00, "off" },
+	{ IPDC_TAG(0x72) + 0x01, "on" },
 	/* Echo Cancellation */
-	{ MY_TAG(0x74) + 0x00, "Off" },
-	{ MY_TAG(0x74) + 0x01, "On, 16 ms tail" },
-	{ MY_TAG(0x74) + 0x02, "On, 32 ms tail (default)" },
-	{ MY_TAG(0x74) + 0x03, "On, 64ms tail" },
+	{ IPDC_TAG(0x74) + 0x00, "Off" },
+	{ IPDC_TAG(0x74) + 0x01, "On, 16 ms tail" },
+	{ IPDC_TAG(0x74) + 0x02, "On, 32 ms tail (default)" },
+	{ IPDC_TAG(0x74) + 0x03, "On, 64ms tail" },
         /* Constant DTMF Tone Detection on/off */
-	{ MY_TAG(0x75) + 0x00, "Off" },
-	{ MY_TAG(0x75) + 0x01, "On (Default)" },
+	{ IPDC_TAG(0x75) + 0x00, "Off" },
+	{ IPDC_TAG(0x75) + 0x01, "On (Default)" },
 	/* Constant MF Tone Detection on/off" */
-	{ MY_TAG(0x76) + 0x00, "Off (Default)" },
-	{ MY_TAG(0x76) + 0x01, "On" },
+	{ IPDC_TAG(0x76) + 0x00, "Off (Default)" },
+	{ IPDC_TAG(0x76) + 0x01, "On" },
 	/* Constant Fax tone detection on/off */
-	{ MY_TAG(0x77) + 0x00, "Off" },
-	{ MY_TAG(0x77) + 0x00, "On (Default)" },
+	{ IPDC_TAG(0x77) + 0x00, "Off" },
+	{ IPDC_TAG(0x77) + 0x00, "On (Default)" },
 	/* Constant Modem tone detection on/off */
-	{ MY_TAG(0x78) + 0x00, "Off" },
-	{ MY_TAG(0x78) + 0x01, "On (Default)" },
+	{ IPDC_TAG(0x78) + 0x00, "Off" },
+	{ IPDC_TAG(0x78) + 0x01, "On (Default)" },
 	/* Constant Packet Loss Detection on/off */
-	{ MY_TAG(0x7b) + 0x00, "Off" },
-	{ MY_TAG(0x7b) + 0x01, "On (Default)" },
+	{ IPDC_TAG(0x7b) + 0x00, "Off" },
+	{ IPDC_TAG(0x7b) + 0x01, "On (Default)" },
 	/* Constant Latency Threshold Detection on/off */
-	{ MY_TAG(0x7d) + 0x00, "Off" },
-	{ MY_TAG(0x7d) + 0x01, "On (Default)" },
+	{ IPDC_TAG(0x7d) + 0x00, "Off" },
+	{ IPDC_TAG(0x7d) + 0x01, "On (Default)" },
 	/* Announcement treatment */
-	{ MY_TAG(0x86) + 0x00, "Continuous play" },
-	{ MY_TAG(0x86) + 0x01, "Play 1 time and terminate the call" },
-	{ MY_TAG(0x86) + 0x02, "Play 2 times and terminate the call" },
-	{ MY_TAG(0x86) + 0x03, "Play 3 times and terminate the call" },
-	{ MY_TAG(0x86) + 0x04, "Play 4 times and terminate the call" },
-	{ MY_TAG(0x86) + 0x05, "Play 5 times and terminate the call" },
+	{ IPDC_TAG(0x86) + 0x00, "Continuous play" },
+	{ IPDC_TAG(0x86) + 0x01, "Play 1 time and terminate the call" },
+	{ IPDC_TAG(0x86) + 0x02, "Play 2 times and terminate the call" },
+	{ IPDC_TAG(0x86) + 0x03, "Play 3 times and terminate the call" },
+	{ IPDC_TAG(0x86) + 0x04, "Play 4 times and terminate the call" },
+	{ IPDC_TAG(0x86) + 0x05, "Play 5 times and terminate the call" },
 	/* Packet Statistics Reset Indicator */
-	{ MY_TAG(0x90) + 0x00, "Do not reset" },
-	{ MY_TAG(0x90) + 0x01, "Reset (default)" },
+	{ IPDC_TAG(0x90) + 0x00, "Do not reset" },
+	{ IPDC_TAG(0x90) + 0x01, "Reset (default)" },
 	/* Protocol Type */
-	{ MY_TAG(0xa1) + 0x01, "ITU-T Q931" },
-	{ MY_TAG(0xa1) + 0x02, "Nortel-ISDN" },
-	{ MY_TAG(0xa1) + 0x03, "5ESS-ISDN" },
-	{ MY_TAG(0xa1) + 0x04, "Euro-ISDN" },
+	{ IPDC_TAG(0xa1) + 0x01, "ITU-T Q931" },
+	{ IPDC_TAG(0xa1) + 0x02, "Nortel-ISDN" },
+	{ IPDC_TAG(0xa1) + 0x03, "5ESS-ISDN" },
+	{ IPDC_TAG(0xa1) + 0x04, "Euro-ISDN" },
 	/* Global call ID  Refer Annex A */
-	/* MY_TAG(0xa4) .... */
+	/* IPDC_TAG(0xa4) .... */
 	/* User information line 1 proto */
-	/* MY_TAG(0xa5) .... */
+	/* IPDC_TAG(0xa5) .... */
 	/* Congestion level indicator */
-	{ MY_TAG(0xa6) + 0x00, "No Congestion" },
-	{ MY_TAG(0xa6) + 0x01, "Congestion Level 1" },
-	{ MY_TAG(0xa6) + 0x02, "Congestion Level 2" },
+	{ IPDC_TAG(0xa6) + 0x00, "No Congestion" },
+	{ IPDC_TAG(0xa6) + 0x01, "Congestion Level 1" },
+	{ IPDC_TAG(0xa6) + 0x02, "Congestion Level 2" },
 	/* RADIUS Ascend-auth-type */
-	{ MY_TAG(0xa7) + 0x00, "None" },
-	{ MY_TAG(0xa7) + 0x01, "Any" },
-	{ MY_TAG(0xa7) + 0x02, "PAP (Default)" },
-	{ MY_TAG(0xa7) + 0x03, "CHAP" },
-	{ MY_TAG(0xa7) + 0x03, "MS-CHAP" },
+	{ IPDC_TAG(0xa7) + 0x00, "None" },
+	{ IPDC_TAG(0xa7) + 0x01, "Any" },
+	{ IPDC_TAG(0xa7) + 0x02, "PAP (Default)" },
+	{ IPDC_TAG(0xa7) + 0x03, "CHAP" },
+	{ IPDC_TAG(0xa7) + 0x03, "MS-CHAP" },
 	/* Link status */
-	{ MY_TAG(0xb0) + 0x00, "Successfully connected" },
-	{ MY_TAG(0xb0) + 0x01, "Not connected" },
+	{ IPDC_TAG(0xb0) + 0x00, "Successfully connected" },
+	{ IPDC_TAG(0xb0) + 0x01, "Not connected" },
 	/* Action request */
-	{ MY_TAG(0xb1) + 0x00, "Registration request" },
+	{ IPDC_TAG(0xb1) + 0x00, "Registration request" },
 	/* Calling Party Info */
 	/* Called Party Info */
 	/* Country Code */
-	{ MY_TAG(0xc1) + 0x00, "Argentina" },
-	{ MY_TAG(0xc1) + 0x02, "Australia" },
-	{ MY_TAG(0xc1) + 0x03, "Belgium" },
-	{ MY_TAG(0xc1) + 0x04, "China" },
-	{ MY_TAG(0xc1) + 0x05, "Costa Rica" },
-	{ MY_TAG(0xc1) + 0x06, "Finland" },
-	{ MY_TAG(0xc1) + 0x07, "France" },
-	{ MY_TAG(0xc1) + 0x08, "Germany" },
-	{ MY_TAG(0xc1) + 0x09, "Hong Kong" },
-	{ MY_TAG(0xc1) + 0x0a, "Italy" },
-	{ MY_TAG(0xc1) + 0x0b, "Japan" },
-	{ MY_TAG(0xc1) + 0x0c, "Korea" },
-	{ MY_TAG(0xc1) + 0x0d, "Mexico" },
-	{ MY_TAG(0xc1) + 0x0e, "Netherlands" },
-	{ MY_TAG(0xc1) + 0x0f, "New Zealand" },
-	{ MY_TAG(0xc1) + 0x10, "Singapore" },
-	{ MY_TAG(0xc1) + 0x11, "Spain" },
-	{ MY_TAG(0xc1) + 0x12, "Sweden" },
-	{ MY_TAG(0xc1) + 0x13, "Switzerland" },
-	{ MY_TAG(0xc1) + 0x14, "UK" },
-	{ MY_TAG(0xc1) + 0x15, "US" },
-	{ MY_TAG(0xc1) + 0x15, "Brazil" },
+	{ IPDC_TAG(0xc1) + 0x00, "Argentina" },
+	{ IPDC_TAG(0xc1) + 0x02, "Australia" },
+	{ IPDC_TAG(0xc1) + 0x03, "Belgium" },
+	{ IPDC_TAG(0xc1) + 0x04, "China" },
+	{ IPDC_TAG(0xc1) + 0x05, "Costa Rica" },
+	{ IPDC_TAG(0xc1) + 0x06, "Finland" },
+	{ IPDC_TAG(0xc1) + 0x07, "France" },
+	{ IPDC_TAG(0xc1) + 0x08, "Germany" },
+	{ IPDC_TAG(0xc1) + 0x09, "Hong Kong" },
+	{ IPDC_TAG(0xc1) + 0x0a, "Italy" },
+	{ IPDC_TAG(0xc1) + 0x0b, "Japan" },
+	{ IPDC_TAG(0xc1) + 0x0c, "Korea" },
+	{ IPDC_TAG(0xc1) + 0x0d, "Mexico" },
+	{ IPDC_TAG(0xc1) + 0x0e, "Netherlands" },
+	{ IPDC_TAG(0xc1) + 0x0f, "New Zealand" },
+	{ IPDC_TAG(0xc1) + 0x10, "Singapore" },
+	{ IPDC_TAG(0xc1) + 0x11, "Spain" },
+	{ IPDC_TAG(0xc1) + 0x12, "Sweden" },
+	{ IPDC_TAG(0xc1) + 0x13, "Switzerland" },
+	{ IPDC_TAG(0xc1) + 0x14, "UK" },
+	{ IPDC_TAG(0xc1) + 0x15, "US" },
+	{ IPDC_TAG(0xc1) + 0x15, "Brazil" },
 	{ 0, NULL },
 };