aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-05-26 06:32:51 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-05-26 06:32:51 +0000
commit6a4ed4f4c33d0a6250dfeb4e5547a944c7a1dcf9 (patch)
tree8bd7db59a48a0f131cc60c825e414f41cf5ce5ea /epan/dissectors
parent224206b1a346d798f294f42943fdb7d8fdb6a1bf (diff)
From Michael Mann.
Part of "display filters with redundancies of PROTABBREV in them." The ones left outs should be fixed differently I think. Rename som ndps hf variables while at it. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2794 svn path=/trunk/; revision=37406
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-acn.c4
-rw-r--r--epan/dissectors/packet-afp.c2
-rw-r--r--epan/dissectors/packet-fmp_notify.c2
-rw-r--r--epan/dissectors/packet-infiniband_sdp.c2
-rw-r--r--epan/dissectors/packet-ldss.c2
-rw-r--r--epan/dissectors/packet-ndps.c214
-rw-r--r--epan/dissectors/packet-q708.c814
-rw-r--r--epan/dissectors/packet-sccp.c5
-rw-r--r--epan/dissectors/packet-smb2.c56
-rw-r--r--epan/dissectors/packet-tn3270.c2
-rw-r--r--epan/dissectors/packet-wassp.c4
-rw-r--r--epan/dissectors/packet-who.c2
-rw-r--r--epan/dissectors/packet-wlccp.c18
13 files changed, 972 insertions, 155 deletions
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index 8107154ae1..f3478691ac 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -2897,13 +2897,13 @@ void proto_register_acn(void)
},
/* Reciprocal Channel */
{ &hf_acn_reciprocal_channel,
- { "Reciprocal Channel Number", "acn.acn_reciprocal_channel",
+ { "Reciprocal Channel Number", "acn.reciprocal_channel",
FT_UINT16, BASE_DEC_HEX, NULL, 0x0,
"Reciprocal Channel", HFILL }
},
/* Refuse Code */
{ &hf_acn_refuse_code,
- { "Refuse Code", "acn.acn_refuse_code",
+ { "Refuse Code", "acn.refuse_code",
FT_UINT8, BASE_DEC, VALS(acn_refuse_code_vals), 0x0,
NULL, HFILL }
},
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 0699dd095e..d3b2716a12 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -4818,7 +4818,7 @@ proto_register_afp(void)
"The response to this packet is in this packet", HFILL }},
{ &hf_afp_login_flags,
- { "Flags", "afp.afp_login_flags",
+ { "Flags", "afp.login_flags",
FT_UINT16, BASE_HEX, NULL, 0 /* 0x0FFF*/,
"Login flags", HFILL }},
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index 5058b1e3b6..aa72603cd5 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -496,7 +496,7 @@ proto_register_fmp_notify(void)
{
static hf_register_info hf[] = {
{ &hf_fmp_notify_procedure, {
- "Procedure", "fmp_notify.fmp_notify_procedure", FT_UINT32, BASE_DEC,
+ "Procedure", "fmp_notify.notify_procedure", FT_UINT32, BASE_DEC,
VALS(fmp_notify_proc_vals) , 0, NULL, HFILL }}, /* New addition */
{ &hf_fmp_status, {
diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c
index b7443eeb75..b0437c6efb 100644
--- a/epan/dissectors/packet-infiniband_sdp.c
+++ b/epan/dissectors/packet-infiniband_sdp.c
@@ -361,7 +361,7 @@ proto_register_ib_sdp(void)
FT_UINT8, BASE_HEX, NULL, 0x2, "Out-Of-Band Data is pending", HFILL}
},
{&hf_ib_sdp_flags_reqpipe, {
- "REQ_PIPE", "infiniband.infiniband.sdp.bsdh.reqpipe",
+ "REQ_PIPE", "infiniband.sdp.bsdh.reqpipe",
FT_UINT8, BASE_HEX, NULL, 0x4, "Request change to Pipelined Mode", HFILL}
},
{&hf_ib_sdp_bufs, {
diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index def063472f..7cf097e550 100644
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -830,7 +830,7 @@ proto_register_ldss (void) {
static hf_register_info hf[] = {
{ &hf_ldss_message_id,
{ "LDSS Message ID",
- "ldss.ldss_message_id",
+ "ldss.message_id",
FT_UINT16, BASE_DEC, ldss_message_id_value, 0x0,
NULL, HFILL
}
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index 3ad837fea2..1fae570df3 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -120,8 +120,8 @@ static int hf_oid_struct_size = -1;
static int hf_object_name = -1;
static int hf_ndps_document_number = -1;
static int hf_ndps_nameorid = -1;
-static int hf_local_object_name = -1;
-static int hf_printer_name = -1;
+static int hf_ndps_local_object_name = -1;
+static int hf_ndps_printer_name = -1;
static int hf_ndps_qualified_name = -1;
static int hf_ndps_item_count = -1;
static int hf_ndps_num_passwords = -1;
@@ -146,7 +146,7 @@ static int hf_ndps_other_error = -1;
static int hf_ndps_other_error_2 = -1;
static int hf_ndps_session = -1;
static int hf_ndps_abort_flag = -1;
-static int hf_obj_attribute_type = -1;
+static int hf_ndps_obj_attribute_type = -1;
static int hf_ndps_attribute_value = -1;
static int hf_ndps_lower_range = -1;
static int hf_ndps_upper_range = -1;
@@ -200,7 +200,7 @@ static int hf_answer_time = -1;
static int hf_oid_asn1_type = -1;
static int hf_ndps_item_ptr = -1;
static int hf_ndps_len = -1;
-static int hf_limit_enc = -1;
+static int hf_ndps_limit_enc = -1;
static int hf_ndps_delivery_add_count = -1;
static int hf_ndps_qualified_name2 = -1;
static int hf_ndps_delivery_add_type = -1;
@@ -2236,7 +2236,7 @@ name_or_id(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset)
break;
case 2: /* Local */
- foffset = ndps_string(tvb, hf_local_object_name, ndps_tree, foffset, NULL);
+ foffset = ndps_string(tvb, hf_ndps_local_object_name, ndps_tree, foffset, NULL);
break;
}
foffset += align_4(tvb, foffset);
@@ -2253,7 +2253,7 @@ qualifiedname(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset)
foffset += 4;
if (qualified_name_type != 0) {
if (qualified_name_type == 1) {
- foffset = ndps_string(tvb, hf_printer_name, ndps_tree, foffset, NULL);
+ foffset = ndps_string(tvb, hf_ndps_printer_name, ndps_tree, foffset, NULL);
}
else
{
@@ -2278,13 +2278,13 @@ objectidentification(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset)
switch(object_type)
{
case 0: /* Printer Contained Object ID */
- foffset = ndps_string(tvb, hf_printer_name, atree, foffset, NULL);
+ foffset = ndps_string(tvb, hf_ndps_printer_name, atree, foffset, NULL);
proto_tree_add_item(atree, hf_ndps_object, tvb, foffset,
4, FALSE);
foffset += 4;
break;
case 1: /* Document Identifier */
- foffset = ndps_string(tvb, hf_printer_name, atree, foffset, NULL);
+ foffset = ndps_string(tvb, hf_ndps_printer_name, atree, foffset, NULL);
proto_tree_add_item(atree, hf_ndps_document_number, tvb, foffset,
4, FALSE);
foffset += 4;
@@ -2306,7 +2306,7 @@ objectidentification(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset)
foffset = ndps_string(tvb, hf_object_name, atree, foffset, NULL);
break;
case 6: /* Printer Configuration Object ID */
- foffset = ndps_string(tvb, hf_printer_name, atree, foffset, NULL);
+ foffset = ndps_string(tvb, hf_ndps_printer_name, atree, foffset, NULL);
break;
case 7: /* Qualified Name */
foffset = qualifiedname(tvb, ndps_tree, foffset);
@@ -2715,7 +2715,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset)
attribute_type = tvb_get_ntohl(tvb, foffset);
if (ndps_show_oids)
{
- proto_tree_add_item(ndps_tree, hf_obj_attribute_type, tvb, foffset, 4, FALSE);
+ proto_tree_add_item(ndps_tree, hf_ndps_obj_attribute_type, tvb, foffset, 4, FALSE);
}
foffset += 4;
switch(attribute_type)
@@ -5576,7 +5576,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g
foffset += 4;
proto_tree_add_item(ndps_tree, hf_ndps_ds_info_type, tvb, foffset, 4, FALSE);
foffset += 4;
- foffset = ndps_string(tvb, hf_printer_name, ndps_tree, foffset, NULL);
+ foffset = ndps_string(tvb, hf_ndps_printer_name, ndps_tree, foffset, NULL);
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "DS Object Name");
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = qualifiedname(tvb, atree, foffset);
@@ -7148,7 +7148,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_len, tvb, foffset, 4, FALSE);
foffset += 4;
- proto_tree_add_item(atree, hf_limit_enc, tvb, foffset, 4, FALSE);
+ proto_tree_add_item(atree, hf_ndps_limit_enc, tvb, foffset, 4, FALSE);
foffset += 4;
proto_item_set_end(aitem, tvb, foffset);
/* Object Results Set */
@@ -8563,47 +8563,47 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_object_name,
- { "Object Name", "ndps.ndps_object_name",
+ { "Object Name", "ndps.object_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_document_number,
- { "Document Number", "ndps.ndps_doc_num",
+ { "Document Number", "ndps.doc_num",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_doc_content,
- { "Document Content", "ndps.ndps_doc_content",
+ { "Document Content", "ndps.doc_content",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_nameorid,
- { "Name or ID Type", "ndps.ndps_nameorid",
+ { "Name or ID Type", "ndps.nameorid",
FT_UINT32, BASE_HEX, VALS(nameorid_enum), 0x0,
NULL, HFILL }},
- { &hf_local_object_name,
- { "Local Object Name", "ndps.ndps_loc_object_name",
+ { &hf_ndps_local_object_name,
+ { "Local Object Name", "ndps.loc_object_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- { &hf_printer_name,
- { "Printer Name", "ndps.ndps_printer_name",
+ { &hf_ndps_printer_name,
+ { "Printer Name", "ndps.printer_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_qualified_name,
- { "Qualified Name Type", "ndps.ndps_qual_name_type",
+ { "Qualified Name Type", "ndps.qual_name_type",
FT_UINT32, BASE_HEX, VALS(qualified_name_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_qualified_name2,
- { "Qualified Name Type", "ndps.ndps_qual_name_type2",
+ { "Qualified Name Type", "ndps.qual_name_type2",
FT_UINT32, BASE_HEX, VALS(qualified_name_enum2), 0x0,
NULL, HFILL }},
{ &hf_ndps_item_count,
- { "Number of Items", "ndps.ndps_item_count",
+ { "Number of Items", "ndps.item_count",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
@@ -8688,37 +8688,37 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_qualifier,
- { "Qualifier", "ndps.ndps_qual",
+ { "Qualifier", "ndps.qual",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_lib_error,
- { "Library Error", "ndps.ndps_lib_error",
+ { "Library Error", "ndps.lib_error",
FT_UINT32, BASE_HEX, VALS(ndps_error_types), 0x0,
NULL, HFILL }},
{ &hf_ndps_other_error,
- { "Other Error", "ndps.ndps_other_error",
+ { "Other Error", "ndps.other_error",
FT_UINT32, BASE_HEX, VALS(ndps_error_types), 0x0,
NULL, HFILL }},
{ &hf_ndps_other_error_2,
- { "Other Error 2", "ndps.ndps_other_error_2",
+ { "Other Error 2", "ndps.other_error_2",
FT_UINT32, BASE_HEX, VALS(ndps_error_types), 0x0,
NULL, HFILL }},
{ &hf_ndps_session,
- { "Session Handle", "ndps.ndps_session",
+ { "Session Handle", "ndps.session",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_abort_flag,
- { "Abort?", "ndps.ndps_abort",
+ { "Abort?", "ndps.abort",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- { &hf_obj_attribute_type,
- { "Value Syntax", "ndps.ndps_attrib_type",
+ { &hf_ndps_obj_attribute_type,
+ { "Value Syntax", "ndps.attrib_type",
FT_UINT32, BASE_HEX, VALS(ndps_attribute_enum), 0x0,
NULL, HFILL }},
@@ -8753,12 +8753,12 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_attrib_boolean,
- { "Value?", "ndps.ndps_attrib_boolean",
+ { "Value?", "ndps.attrib_boolean",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_realization,
- { "Realization Type", "ndps.ndps_realization",
+ { "Realization Type", "ndps.realization",
FT_UINT32, BASE_HEX, VALS(ndps_realization_enum), 0x0,
NULL, HFILL }},
@@ -8773,22 +8773,22 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_dim_value,
- { "Dimension Value Type", "ndps.ndps_dim_value",
+ { "Dimension Value Type", "ndps.dim_value",
FT_UINT32, BASE_HEX, VALS(ndps_dim_value_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_dim_flag,
- { "Dimension Flag", "ndps.ndps_dim_falg",
+ { "Dimension Flag", "ndps.dim_falg",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_xydim_value,
- { "XY Dimension Value Type", "ndps.ndps_xydim_value",
+ { "XY Dimension Value Type", "ndps.xydim_value",
FT_UINT32, BASE_HEX, VALS(ndps_xydim_value_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_location_value,
- { "Location Value Type", "ndps.ndps_location_value",
+ { "Location Value Type", "ndps.location_value",
FT_UINT32, BASE_HEX, VALS(ndps_location_value_enum), 0x0,
NULL, HFILL }},
@@ -8813,52 +8813,52 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_edge_value,
- { "Edge Value", "ndps.ndps_edge_value",
+ { "Edge Value", "ndps.edge_value",
FT_UINT32, BASE_HEX, VALS(ndps_edge_value_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_cardinal_or_oid,
- { "Cardinal or OID", "ndps.ndps_car_or_oid",
+ { "Cardinal or OID", "ndps.car_or_oid",
FT_UINT32, BASE_HEX, VALS(ndps_card_or_oid_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_cardinal_name_or_oid,
- { "Cardinal Name or OID", "ndps.ndps_car_name_or_oid",
+ { "Cardinal Name or OID", "ndps.car_name_or_oid",
FT_UINT32, BASE_HEX, VALS(ndps_card_name_or_oid_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_integer_or_oid,
- { "Integer or OID", "ndps.ndps_integer_or_oid",
+ { "Integer or OID", "ndps.integer_or_oid",
FT_UINT32, BASE_HEX, VALS(ndps_integer_or_oid_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_profile_id,
- { "Profile ID", "ndps.ndps_profile_id",
+ { "Profile ID", "ndps.profile_id",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_persistence,
- { "Persistence", "ndps.ndps_persistence",
+ { "Persistence", "ndps.persistence",
FT_UINT32, BASE_HEX, VALS(ndps_persistence_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_language_count,
- { "Number of Languages", "ndps.ndps_language_count",
+ { "Number of Languages", "ndps.language_count",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_language_id,
- { "Language ID", "ndps.ndps_lang_id",
+ { "Language ID", "ndps.lang_id",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_address_type,
- { "Address Type", "ndps.ndps_address_type",
+ { "Address Type", "ndps.address_type",
FT_UINT32, BASE_HEX, VALS(ndps_address_type_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_address,
- { "Address", "ndps.ndps_address",
+ { "Address", "ndps.address",
FT_UINT32, BASE_HEX, VALS(ndps_address_enum), 0x0,
NULL, HFILL }},
@@ -8868,12 +8868,12 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_event_type,
- { "Event Type", "ndps.ndps_event_type",
+ { "Event Type", "ndps.event_type",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_event_object_identifier,
- { "Event Object Type", "ndps.ndps_event_object_identifier",
+ { "Event Object Type", "ndps.event_object_identifier",
FT_UINT32, BASE_HEX, VALS(ndps_event_object_enum), 0x0,
NULL, HFILL }},
@@ -8918,22 +8918,22 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_server_type,
- { "NDPS Server Type", "ndps.ndps_server_type",
+ { "NDPS Server Type", "ndps.server_type",
FT_UINT32, BASE_HEX, VALS(ndps_server_type_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_num_services,
- { "Number of Services", "ndps.ndps_num_services",
+ { "Number of Services", "ndps.num_services",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_service_type,
- { "NDPS Service Type", "ndps.ndps_service_type",
+ { "NDPS Service Type", "ndps.service_type",
FT_UINT32, BASE_HEX, VALS(ndps_service_type_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_service_enabled,
- { "Service Enabled?", "ndps.ndps_service_enabled",
+ { "Service Enabled?", "ndps.service_enabled",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
@@ -8963,7 +8963,7 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_object_op,
- { "Operation", "ndps.ndps_object_op",
+ { "Operation", "ndps.object_op",
FT_UINT32, BASE_HEX, VALS(ndps_object_op_enum), 0x0,
NULL, HFILL }},
@@ -8983,12 +8983,12 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_len,
- { "Length", "ndps.ndps_len",
+ { "Length", "ndps.len",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_limit_enc,
- { "Limit Encountered", "ndps.ndps_limit_enc",
+ { &hf_ndps_limit_enc,
+ { "Limit Encountered", "ndps.limit_enc",
FT_UINT32, BASE_HEX, VALS(ndps_limit_enc_enum), 0x0,
NULL, HFILL }},
@@ -8998,12 +8998,12 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_delivery_add_type,
- { "Delivery Address Type", "ndps.ndps_delivery_add_type",
+ { "Delivery Address Type", "ndps.delivery_add_type",
FT_UINT32, BASE_HEX, VALS(ndps_delivery_add_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_criterion_type,
- { "Criterion Type", "ndps.ndps_criterion_type",
+ { "Criterion Type", "ndps.criterion_type",
FT_UINT32, BASE_HEX, VALS(ndps_attribute_enum), 0x0,
NULL, HFILL }},
@@ -9013,57 +9013,57 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_ignored_type,
- { "Ignored Type", "ndps.ndps_ignored_type",
+ { "Ignored Type", "ndps.ignored_type",
FT_UINT32, BASE_HEX, VALS(ndps_attribute_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_num_resources,
- { "Number of Resources", "ndps.ndps_num_resources",
+ { "Number of Resources", "ndps.num_resources",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_resource_type,
- { "Resource Type", "ndps.ndps_resource_type",
+ { "Resource Type", "ndps.resource_type",
FT_UINT32, BASE_HEX, VALS(ndps_resource_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_identifier_type,
- { "Identifier Type", "ndps.ndps_identifier_type",
+ { "Identifier Type", "ndps.identifier_type",
FT_UINT32, BASE_HEX, VALS(ndps_identifier_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_page_flag,
- { "Page Flag", "ndps.ndps_page_flag",
+ { "Page Flag", "ndps.page_flag",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_media_type,
- { "Media Type", "ndps.ndps_media_type",
+ { "Media Type", "ndps.media_type",
FT_UINT32, BASE_HEX, VALS(ndps_media_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_page_size,
- { "Page Size", "ndps.ndps_page_size",
+ { "Page Size", "ndps.page_size",
FT_UINT32, BASE_HEX, VALS(ndps_page_size_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_direction,
- { "Direction", "ndps.ndps_direction",
+ { "Direction", "ndps.direction",
FT_UINT32, BASE_HEX, VALS(ndps_pres_direction_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_page_order,
- { "Page Order", "ndps.ndps_page_order",
+ { "Page Order", "ndps.page_order",
FT_UINT32, BASE_HEX, VALS(ndps_page_order_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_medium_size,
- { "Medium Size", "ndps.ndps_medium_size",
+ { "Medium Size", "ndps.medium_size",
FT_UINT32, BASE_HEX, VALS(ndps_medium_size_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_long_edge_feeds,
- { "Long Edge Feeds?", "ndps.ndps_long_edge_feeds",
+ { "Long Edge Feeds?", "ndps.long_edge_feeds",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
@@ -9078,47 +9078,47 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_page_orientation,
- { "Page Orientation", "ndps.ndps_page_orientation",
+ { "Page Orientation", "ndps.page_orientation",
FT_UINT32, BASE_HEX, VALS(ndps_page_orientation_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_numbers_up,
- { "Numbers Up", "ndps.ndps_numbers_up",
+ { "Numbers Up", "ndps.numbers_up",
FT_UINT32, BASE_HEX, VALS(ndps_numbers_up_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_xdimension,
- { "X Dimension", "ndps.ndps_xdimension",
+ { "X Dimension", "ndps.xdimension",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_ydimension,
- { "Y Dimension", "ndps.ndps_ydimension",
+ { "Y Dimension", "ndps.ydimension",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_state_severity,
- { "State Severity", "ndps.ndps_state_severity",
+ { "State Severity", "ndps.state_severity",
FT_UINT32, BASE_HEX, VALS(ndps_state_severity_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_training,
- { "Training", "ndps.ndps_training",
+ { "Training", "ndps.training",
FT_UINT32, BASE_HEX, VALS(ndps_training_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_colorant_set,
- { "Colorant Set", "ndps.ndps_colorant_set",
+ { "Colorant Set", "ndps.colorant_set",
FT_UINT32, BASE_HEX, VALS(ndps_colorant_set_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_card_enum_time,
- { "Cardinal, Enum, or Time", "ndps.ndps_card_enum_time",
+ { "Cardinal, Enum, or Time", "ndps.card_enum_time",
FT_UINT32, BASE_HEX, VALS(ndps_card_enum_time_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_attrs_arg,
- { "List Attribute Operation", "ndps.ndps_attrs_arg",
+ { "List Attribute Operation", "ndps.attrs_arg",
FT_UINT32, BASE_HEX, VALS(ndps_attrs_arg_enum), 0x0,
NULL, HFILL }},
@@ -9133,32 +9133,32 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_filter,
- { "Filter Type", "ndps.ndps_filter",
+ { "Filter Type", "ndps.filter",
FT_UINT32, BASE_HEX, VALS(ndps_filter_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_item_filter,
- { "Filter Item Operation", "ndps.ndps_filter_item",
+ { "Filter Item Operation", "ndps.filter_item",
FT_UINT32, BASE_HEX, VALS(ndps_filter_item_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_substring_match,
- { "Substring Match", "ndps.ndps_substring_match",
+ { "Substring Match", "ndps.substring_match",
FT_UINT32, BASE_HEX, VALS(ndps_match_criteria_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_time_limit,
- { "Time Limit", "ndps.ndps_time_limit",
+ { "Time Limit", "ndps.time_limit",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_count_limit,
- { "Count Limit", "ndps.ndps_count_limit",
+ { "Count Limit", "ndps.count_limit",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_operator,
- { "Operator Type", "ndps.ndps_operator",
+ { "Operator Type", "ndps.operator",
FT_UINT32, BASE_DEC, VALS(ndps_operator_enum), 0x0,
NULL, HFILL }},
@@ -9168,32 +9168,32 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_retrieve_restrictions,
- { "Retrieve Restrictions", "ndps.ndps_ret_restrict",
+ { "Retrieve Restrictions", "ndps.ret_restrict",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_bind_security_option_count,
- { "Number of Bind Security Options", "ndps.ndps_bind_security_count",
+ { "Number of Bind Security Options", "ndps.bind_security_count",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_bind_security,
- { "Bind Security Options", "ndps.ndps_bind_security",
+ { "Bind Security Options", "ndps.bind_security",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_max_items,
- { "Maximum Items in List", "ndps.ndps_max_items",
+ { "Maximum Items in List", "ndps.max_items",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_status_flags,
- { "Status Flag", "ndps.ndps_status_flags",
+ { "Status Flag", "ndps.status_flags",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_resource_list_type,
- { "Resource Type", "ndps.ndps_resource_type",
+ { "Resource Type", "ndps.resource_type",
FT_UINT32, BASE_DEC, VALS(ndps_resource_type_enum), 0x0,
NULL, HFILL }},
@@ -9444,7 +9444,7 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_force,
- { "Force?", "ndps.ndps_force",
+ { "Force?", "ndps.force",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
@@ -9479,37 +9479,37 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_list_profiles_type,
- { "List Profiles Type", "ndps.ndps_list_profiles_type",
+ { "List Profiles Type", "ndps.list_profiles_type",
FT_UINT32, BASE_HEX, VALS(ndps_attrs_arg_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_list_profiles_choice_type,
- { "List Profiles Choice Type", "ndps.ndps_list_profiles_choice_type",
+ { "List Profiles Choice Type", "ndps.list_profiles_choice_type",
FT_UINT32, BASE_HEX, VALS(ndps_list_profiles_choice_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_list_profiles_result_type,
- { "List Profiles Result Type", "ndps.ndps_list_profiles_result_type",
+ { "List Profiles Result Type", "ndps.list_profiles_result_type",
FT_UINT32, BASE_HEX, VALS(ndps_list_profiles_result_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_integer_type_flag,
- { "Integer Type Flag", "ndps.ndps_integer_type_flag",
+ { "Integer Type Flag", "ndps.integer_type_flag",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_integer_type_value,
- { "Integer Type Value", "ndps.ndps_integer_type_value",
+ { "Integer Type Value", "ndps.integer_type_value",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_continuation_option,
- { "Continuation Option", "ndps.ndps_continuation_option",
+ { "Continuation Option", "ndps.continuation_option",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ndps_ds_info_type,
- { "DS Info Type", "ndps.ndps_ds_info_type",
+ { "DS Info Type", "ndps.ds_info_type",
FT_UINT32, BASE_HEX, VALS(ndps_ds_info_enum), 0x0,
NULL, HFILL }},
@@ -9519,7 +9519,7 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_list_services_type,
- { "Services Type", "ndps.ndps_list_services_type",
+ { "Services Type", "ndps.list_services_type",
FT_UINT32, BASE_HEX, VALS(ndps_list_services_enum), 0x0,
NULL, HFILL }},
@@ -9539,7 +9539,7 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_data_item_type,
- { "Item Type", "ndps.ndps_data_item_type",
+ { "Item Type", "ndps.data_item_type",
FT_UINT32, BASE_HEX, VALS(ndps_data_item_enum), 0x0,
NULL, HFILL }},
@@ -9574,7 +9574,7 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_list_local_servers_type,
- { "Server Type", "ndps.ndps_list_local_server_type",
+ { "Server Type", "ndps.list_local_server_type",
FT_UINT32, BASE_HEX, VALS(ndps_list_local_servers_enum), 0x0,
NULL, HFILL }},
@@ -9584,12 +9584,12 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_client_server_type,
- { "Client/Server Type", "ndps.ndps_client_server_type",
+ { "Client/Server Type", "ndps.client_server_type",
FT_UINT32, BASE_HEX, VALS(ndps_client_server_enum), 0x0,
NULL, HFILL }},
{ &hf_ndps_session_type,
- { "Session Type", "ndps.ndps_session_type",
+ { "Session Type", "ndps.session_type",
FT_UINT32, BASE_HEX, VALS(ndps_session_type_enum), 0x0,
NULL, HFILL }},
@@ -9619,7 +9619,7 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_get_session_type,
- { "Session Type", "ndps.ndps_get_session_type",
+ { "Session Type", "ndps.get_session_type",
FT_UINT32, BASE_HEX, VALS(ndps_get_session_type_enum), 0x0,
NULL, HFILL }},
@@ -9634,12 +9634,12 @@ proto_register_ndps(void)
NULL, HFILL }},
{ &hf_ndps_get_resman_session_type,
- { "Session Type", "ndps.ndps_get_resman_session_type",
+ { "Session Type", "ndps.get_resman_session_type",
FT_UINT32, BASE_HEX, VALS(ndps_get_resman_session_type_enum), 0x0,
NULL, HFILL }},
{ &hf_problem_type,
- { "Problem Type", "ndps.ndps_get_resman_session_type",
+ { "Problem Type", "ndps.get_resman_session_type",
FT_UINT32, BASE_HEX, VALS(problem_type_enum), 0x0,
NULL, HFILL }},
diff --git a/epan/dissectors/packet-q708.c b/epan/dissectors/packet-q708.c
index 7d524feccd..4d8027537a 100644
--- a/epan/dissectors/packet-q708.c
+++ b/epan/dissectors/packet-q708.c
@@ -303,6 +303,12 @@ static const value_string q708_sanc_areas[] = {
{ 765, "Netherlands (Kingdom of the)" },
{ 766, "Finland" },
{ 767, "Finland" },
+
+ { 768, "Unassigned" },
+ { 769, "Unassigned" },
+ { 770, "Unassigned" },
+ { 771, "Unassigned" },
+
{ 772, "Canada" },
{ 773, "Canada" },
{ 774, "Canada" },
@@ -313,8 +319,18 @@ static const value_string q708_sanc_areas[] = {
{ 779, "Canada" },
{ 780, "Canada" },
{ 781, "Canada" },
+
+ { 782, "Unassigned" },
+ { 783, "Unassigned" },
+
{ 784, "Saint Pierre and Miquelon (Collectivite territoriale de la Republique francaise)" },
+
+ { 785, "Unassigned" },
+
{ 786, "Greenland (Denmark)" },
+
+ { 787, "Unassigned" },
+
{ 788, "United States of America" },
{ 789, "United States of America" },
{ 790, "United States of America" },
@@ -356,7 +372,17 @@ static const value_string q708_sanc_areas[] = {
{ 826, "United States of America" },
{ 827, "United States of America" },
{ 828, "Puerto Rico" },
+
+ { 829, "Unassigned" },
+ { 830, "Unassigned" },
+ { 831, "Unassigned" },
+
{ 832, "United States Virgin Islands" },
+
+ { 833, "Unassigned" },
+ { 834, "Unassigned" },
+ { 835, "Unassigned" },
+
{ 836, "Mexico" },
{ 837, "Mexico" },
{ 838, "Mexico" },
@@ -369,42 +395,100 @@ static const value_string q708_sanc_areas[] = {
{ 845, "Jamaica" },
{ 846, "Jamaica" },
{ 847, "Jamaica" },
+
+ { 848, "Unassigned" },
+ { 849, "Unassigned" },
+ { 850, "Unassigned" },
+ { 851, "Unassigned" },
+
{ 852, "Barbados" },
{ 853, "Barbados" },
{ 854, "Barbados" },
+ { 855, "Unassigned" },
{ 856, "Antigua and Barbuda" },
{ 857, "Antigua and Barbuda" },
+ { 858, "Unassigned" },
+ { 859, "Unassigned" },
{ 860, "Cayman Islands" },
{ 861, "Cayman Islands" },
+ { 862, "Unassigned" },
+ { 863, "Unassigned" },
{ 864, "British Virgin Islands" },
{ 865, "British Virgin Islands" },
+ { 866, "Unassigned" },
+ { 867, "Unassigned" },
{ 868, "Bermuda" },
+ { 869, "Unassigned" },
+ { 870, "Unassigned" },
+ { 871, "Unassigned" },
{ 872, "Grenada" },
+ { 873, "Unassigned" },
+ { 874, "Unassigned" },
+ { 875, "Unassigned" },
{ 876, "Montserrat" },
+ { 877, "Unassigned" },
+ { 878, "Unassigned" },
+ { 879, "Unassigned" },
{ 880, "Saint Kitts and Nevis" },
+ { 881, "Unassigned" },
+ { 882, "Unassigned" },
+ { 883, "Unassigned" },
{ 884, "Saint Lucia" },
+ { 885, "Unassigned" },
+ { 886, "Unassigned" },
+ { 887, "Unassigned" },
{ 888, "Saint Vincent and the Grenadines" },
+ { 889, "Unassigned" },
+ { 890, "Unassigned" },
+ { 891, "Unassigned" },
{ 892, "Netherlands Antilles" },
{ 893, "Netherlands Antilles" },
{ 894, "Netherlands Antilles" },
+ { 895, "Unassigned" },
{ 896, "Bahamas (Commonwealth of the)" },
+ { 897, "Unassigned" },
+ { 898, "Unassigned" },
+ { 899, "Unassigned" },
{ 900, "Dominica (Commonwealth of)" },
+ { 901, "Unassigned" },
+ { 902, "Unassigned" },
+ { 903, "Unassigned" },
{ 904, "Cuba" },
{ 905, "Cuba" },
+ { 906, "Unassigned" },
+ { 907, "Unassigned" },
{ 908, "Dominican Republic" },
{ 909, "Dominican Republic" },
+ { 910, "Unassigned" },
+ { 911, "Unassigned" },
{ 912, "Haiti (Republic of)" },
+ { 913, "Unassigned" },
+ { 914, "Unassigned" },
+ { 915, "Unassigned" },
{ 916, "Trinidad and Tobago" },
{ 917, "Trinidad and Tobago" },
{ 918, "Trinidad and Tobago" },
+ { 919, "Unassigned" },
{ 920, "Turks and Caicos Islands" },
{ 921, "Turks and Caicos Islands" },
{ 922, "Turks and Caicos Islands" },
+ { 923, "Unassigned" },
{ 924, "Guadeloupe (French Department of)" },
+ { 925, "Unassigned" },
+ { 926, "Unassigned" },
+ { 927, "Unassigned" },
{ 928, "Martinique (French Department of)" },
+ { 929, "Unassigned" },
+ { 930, "Unassigned" },
+ { 931, "Unassigned" },
{ 932, "Aruba" },
+ { 933, "Unassigned" },
+ { 934, "Unassigned" },
+ { 935, "Unassigned" },
{ 936, "Anguilla" },
{ 937, "Anguilla" },
+ { 938, "Unassigned" },
+ { 939, "Unassigned" },
{ 940, "Mexico" },
{ 941, "Mexico" },
{ 942, "Mexico" },
@@ -438,8 +522,35 @@ static const value_string q708_sanc_areas[] = {
{ 970, "United States of America" },
{ 971, "United States of America" },
{ 972, "United States of America" },
+ { 973, "Unassigned" },
+ { 974, "Unassigned" },
+ { 975, "Unassigned" },
+ { 976, "Unassigned" },
+ { 977, "Unassigned" },
+
{ 978, "Saint Helena" },
+ { 979, "Unassigned" },
+ { 980, "Unassigned" },
+ { 981, "Unassigned" },
+ { 982, "Unassigned" },
{ 983, "Mexico" },
+ { 984, "Unassigned" },
+ { 985, "Unassigned" },
+ { 986, "Unassigned" },
+ { 987, "Unassigned" },
+ { 988, "Unassigned" },
+ { 989, "Unassigned" },
+ { 990, "Unassigned" },
+ { 991, "Unassigned" },
+ { 992, "Unassigned" },
+ { 993, "Unassigned" },
+ { 994, "Unassigned" },
+ { 995, "Unassigned" },
+ { 996, "Unassigned" },
+ { 997, "Unassigned" },
+ { 998, "Unassigned" },
+ { 999, "Unassigned" },
+ { 1000, "Unassigned" },
{ 1001, "Albania (Republic of)" },
{ 1002, "Latvia (Republic of)" },
{ 1003, "United Kingdom of Great Britain and Northern Ireland" },
@@ -463,6 +574,9 @@ static const value_string q708_sanc_areas[] = {
{ 1021, "Poland (Republic of)" },
{ 1022, "Germany (Federal Republic of)" },
{ 1023, "Germany (Federal Republic of)" },
+ { 1024, "Unassigned" },
+ { 1025, "Unassigned" },
+ { 1026, "Unassigned" },
{ 1027, "Israel (State of)" },
{ 1028, "Israel (State of)" },
{ 1029, "India (Republic of)" },
@@ -478,6 +592,7 @@ static const value_string q708_sanc_areas[] = {
{ 1039, "India (Republic of)" },
{ 1040, "India (Republic of)" },
{ 1041, "India (Republic of)" },
+ { 1042, "Unassigned" },
{ 1043, "Pakistan (Islamic Republic of)" },
{ 1044, "Pakistan (Islamic Republic of)" },
{ 1045, "Pakistan (Islamic Republic of)" },
@@ -488,12 +603,15 @@ static const value_string q708_sanc_areas[] = {
{ 1050, "Sri Lanka (Democratic Socialist Republic of)" },
{ 1051, "Sri Lanka (Democratic Socialist Republic of)" },
{ 1052, "Myanmar (Union of)" },
+ { 1053, "Unassigned" },
{ 1054, "Lebanon" },
{ 1055, "Jordan (Hashemite Kingdom of)" },
{ 1056, "Jordan (Hashemite Kingdom of)" },
{ 1057, "Jordan (Hashemite Kingdom of)" },
{ 1058, "Syrian Arab Republic" },
+ { 1059, "Unassigned" },
{ 1060, "Iraq (Republic of)" },
+ { 1061, "Unassigned" },
{ 1062, "Kuwait (State of)" },
{ 1063, "Saudi Arabia (Kingdom of)" },
{ 1064, "Saudi Arabia (Kingdom of)" },
@@ -503,6 +621,7 @@ static const value_string q708_sanc_areas[] = {
{ 1068, "Oman (Sultanate of)" },
{ 1069, "Oman (Sultanate of)" },
{ 1070, "Yemen (Republic of)" },
+ { 1071, "Unassigned" },
{ 1072, "United Arab Emirates" },
{ 1073, "United Arab Emirates" },
{ 1074, "Israel (State of)" },
@@ -512,16 +631,23 @@ static const value_string q708_sanc_areas[] = {
{ 1078, "Qatar (State of)" },
{ 1079, "Qatar (State of)" },
{ 1080, "Mongolia" },
+ { 1081, "Unassigned" },
{ 1082, "Nepal (Federal Democratic Republic of)" },
{ 1083, "Nepal (Federal Democratic Republic of)" },
{ 1084, "United Arab Emirates" },
{ 1085, "United Arab Emirates" },
{ 1086, "United Arab Emirates" },
+ { 1087, "Unassigned" },
{ 1088, "Iran (Islamic Republic of)" },
{ 1089, "Iran (Islamic Republic of)" },
+ { 1090, "Unassigned" },
+ { 1091, "Unassigned" },
+ { 1092, "Unassigned" },
+ { 1093, "Unassigned" },
{ 1094, "Azerbaijani Republic" },
{ 1095, "Azerbaijani Republic" },
{ 1096, "Bhutan (Kingdom of)" },
+ { 1097, "Unassigned" },
{ 1098, "Kazakhstan (Republic of)" },
{ 1099, "Kazakhstan (Republic of)" },
{ 1100, "Kazakhstan (Republic of)" },
@@ -535,7 +661,19 @@ static const value_string q708_sanc_areas[] = {
{ 1108, "Japan" },
{ 1109, "Japan" },
{ 1110, "Japan" },
+ { 1111, "Unassigned" },
{ 1112, "Bahrain (Kingdom of)" },
+ { 1113, "Unassigned" },
+ { 1114, "Unassigned" },
+ { 1115, "Unassigned" },
+ { 1116, "Unassigned" },
+ { 1117, "Unassigned" },
+ { 1118, "Unassigned" },
+ { 1119, "Unassigned" },
+ { 1120, "Unassigned" },
+ { 1121, "Unassigned" },
+ { 1122, "Unassigned" },
+ { 1123, "Unassigned" },
{ 1124, "Korea (Republic of)" },
{ 1125, "Korea (Republic of)" },
{ 1126, "Korea (Republic of)" },
@@ -551,6 +689,10 @@ static const value_string q708_sanc_areas[] = {
{ 1136, "Cambodia (Kingdom of)" },
{ 1137, "Cambodia (Kingdom of)" },
{ 1138, "Lao People's Democratic Republic" },
+ { 1139, "Unassigned" },
+ { 1140, "Unassigned" },
+ { 1141, "Unassigned" },
+ { 1142, "Unassigned" },
{ 1143, "Macao, China" },
{ 1144, "China (People's Republic of)" },
{ 1145, "China (People's Republic of)" },
@@ -561,15 +703,24 @@ static const value_string q708_sanc_areas[] = {
{ 1150, "China (People's Republic of)" },
{ 1151, "China (People's Republic of)" },
{ 1152, "China (People's Republic of)" },
+ { 1153, "Unassigned" },
+ { 1154, "Unassigned" },
+ { 1155, "Unassigned" },
+ { 1156, "Unassigned" },
+ { 1157, "Unassigned" },
+ { 1158, "Unassigned" },
{ 1159, "Democratic People's Republic of Korea" },
{ 1160, "Afghanistan" },
{ 1161, "Afghanistan" },
+ { 1162, "Unassigned" },
+ { 1163, "Unassigned" },
{ 1164, "Bangladesh (People's Republic of)" },
{ 1165, "Bangladesh (People's Republic of)" },
{ 1166, "Bangladesh (People's Republic of)" },
{ 1167, "Bangladesh (People's Republic of)" },
{ 1168, "Maldives (Republic of)" },
{ 1169, "Korea (Republic of)" },
+ { 1170, "Unassigned" },
{ 1171, "Korea (Republic of)" },
{ 1172, "Korea (Republic of)" },
{ 1173, "Korea (Republic of)" },
@@ -578,13 +729,21 @@ static const value_string q708_sanc_areas[] = {
{ 1176, "Korea (Republic of)" },
{ 1177, "Korea (Republic of)" },
{ 1178, "Korea (Republic of)" },
+ { 1179, "Unassigned" },
+ { 1180, "Unassigned" },
{ 1181, "Tajikistan (Republic of)" },
{ 1182, "Tajikistan (Republic of)" },
{ 1183, "Tajikistan (Republic of)" },
{ 1184, "Turkmenistan" },
+ { 1185, "Unassigned" },
+ { 1186, "Unassigned" },
+ { 1187, "Unassigned" },
{ 1188, "Uzbekistan (Republic of)" },
{ 1189, "Uzbekistan (Republic of)" },
+ { 1190, "Unassigned" },
{ 1191, "Kyrgyz Republic" },
+ { 1192, "Unassigned" },
+ { 1193, "Unassigned" },
{ 1194, "Taiwan, China" },
{ 1195, "Taiwan, China" },
{ 1196, "Taiwan, China" },
@@ -598,12 +757,56 @@ static const value_string q708_sanc_areas[] = {
{ 1204, "Hong Kong, China" },
{ 1205, "Hong Kong, China" },
{ 1206, "Hong Kong, China" },
+ { 1207, "Unassigned" },
+ { 1208, "Unassigned" },
+ { 1209, "Unassigned" },
+ { 1210, "Unassigned" },
+ { 1211, "Unassigned" },
+ { 1212, "Unassigned" },
+ { 1213, "Unassigned" },
{ 1214, "Sri Lanka (Democratic Socialist Republic of)" },
{ 1215, "Sri Lanka (Democratic Socialist Republic of)" },
+ { 1216, "Unassigned" },
+ { 1217, "Unassigned" },
+ { 1218, "Unassigned" },
{ 1219, "Jordan (Hashemite Kingdom of)" },
+ { 1220, "Unassigned" },
+ { 1221, "Unassigned" },
+ { 1222, "Unassigned" },
+ { 1223, "Unassigned" },
{ 1224, "Kuwait (State of)" },
+ { 1225, "Unassigned" },
+ { 1226, "Unassigned" },
+ { 1227, "Unassigned" },
+ { 1228, "Unassigned" },
{ 1229, "Viet Nam (Socialist Republic of)" },
+ { 1230, "Unassigned" },
+ { 1231, "Unassigned" },
+ { 1232, "Unassigned" },
+ { 1233, "Unassigned" },
+ { 1234, "Unassigned" },
{ 1235, "Maldives (Republic of)" },
+ { 1236, "Unassigned" },
+ { 1237, "Unassigned" },
+ { 1238, "Unassigned" },
+ { 1239, "Unassigned" },
+ { 1240, "Unassigned" },
+ { 1241, "Unassigned" },
+ { 1242, "Unassigned" },
+ { 1243, "Unassigned" },
+ { 1244, "Unassigned" },
+ { 1245, "Unassigned" },
+ { 1246, "Unassigned" },
+ { 1247, "Unassigned" },
+ { 1248, "Unassigned" },
+ { 1249, "Unassigned" },
+ { 1250, "Unassigned" },
+ { 1251, "Unassigned" },
+ { 1252, "Unassigned" },
+ { 1253, "Unassigned" },
+ { 1254, "Unassigned" },
+ { 1255, "Unassigned" },
+ { 1256, "Unassigned" },
{ 1257, "Armenia (Republic of)" },
{ 1258, "Greece" },
{ 1259, "Spain" },
@@ -627,6 +830,7 @@ static const value_string q708_sanc_areas[] = {
{ 1277, "United Kingdom of Great Britain and Northern Ireland" },
{ 1278, "United Kingdom of Great Britain and Northern Ireland" },
{ 1279, "United Kingdom of Great Britain and Northern Ireland" },
+ { 1280, "Unassigned" },
{ 1281, "Malaysia" },
{ 1282, "Malaysia" },
{ 1283, "Malaysia" },
@@ -652,6 +856,10 @@ static const value_string q708_sanc_areas[] = {
{ 1303, "Indonesia (Republic of)" },
{ 1304, "Indonesia (Republic of)" },
{ 1305, "Indonesia (Republic of)" },
+ { 1306, "Unassigned" },
+ { 1307, "Unassigned" },
+ { 1308, "Unassigned" },
+ { 1309, "Unassigned" },
{ 1310, "Philippines (Republic of the)" },
{ 1311, "Philippines (Republic of the)" },
{ 1312, "Philippines (Republic of the)" },
@@ -661,6 +869,7 @@ static const value_string q708_sanc_areas[] = {
{ 1316, "Philippines (Republic of the)" },
{ 1317, "Philippines (Republic of the)" },
{ 1318, "Philippines (Republic of the)" },
+ { 1319, "Unassigned" },
{ 1320, "Thailand" },
{ 1321, "Thailand" },
{ 1322, "Thailand" },
@@ -679,34 +888,63 @@ static const value_string q708_sanc_areas[] = {
{ 1335, "Singapore (Republic of)" },
{ 1336, "Brunei Darussalam" },
{ 1337, "Brunei Darussalam" },
+ { 1338, "Unassigned" },
+ { 1339, "Unassigned" },
{ 1340, "New Zealand" },
{ 1341, "New Zealand" },
{ 1342, "New Zealand" },
{ 1343, "New Zealand" },
+ { 1344, "Unassigned" },
{ 1345, "New Zealand" },
+ { 1346, "Unassigned" },
{ 1347, "New Zealand" },
+ { 1348, "Unassigned" },
+ { 1349, "Unassigned" },
{ 1350, "Guam" },
+ { 1351, "Unassigned" },
{ 1352, "Nauru (Republic of)" },
+ { 1353, "Unassigned" },
{ 1354, "Papua New Guinea" },
{ 1355, "Papua New Guinea" },
+ { 1356, "Unassigned" },
+ { 1357, "Unassigned" },
{ 1358, "Tonga (Kingdom of)" },
+ { 1359, "Unassigned" },
{ 1360, "Solomon Islands" },
+ { 1361, "Unassigned" },
{ 1362, "Vanuatu (Republic of)" },
+ { 1363, "Unassigned" },
{ 1364, "Fiji (Republic of)" },
{ 1365, "Fiji (Republic of)" },
{ 1366, "Wallis and Futuna (Territoire francais d'outre-mer)" },
+ { 1367, "Unassigned" },
{ 1368, "American Samoa" },
+ { 1369, "Unassigned" },
{ 1370, "Niue" },
+ { 1371, "Unassigned" },
{ 1372, "New Caledonia (Territoire francais d'outre-mer)" },
+ { 1373, "Unassigned" },
{ 1374, "French Polynesia (Territoire francais d'outre-mer)" },
+ { 1375, "Unassigned" },
{ 1376, "Cook Islands" },
+ { 1377, "Unassigned" },
{ 1378, "Samoa (Independent State of)" },
+ { 1379, "Unassigned" },
{ 1380, "Kiribati (Republic of)" },
+ { 1381, "Unassigned" },
{ 1382, "Tuvalu" },
+ { 1383, "Unassigned" },
+ { 1384, "Unassigned" },
{ 1385, "Marshall Islands (Republic of the)" },
+ { 1386, "Unassigned" },
{ 1387, "Micronesia (Federated States of)" },
+ { 1388, "Unassigned" },
+ { 1389, "Unassigned" },
{ 1390, "Palau (Republic of)" },
+ { 1391, "Unassigned" },
+ { 1392, "Unassigned" },
{ 1393, "Northern Mariana Islands (Commonwealth of the)" },
+ { 1394, "Unassigned" },
{ 1395, "Australia" },
{ 1396, "Australia" },
{ 1397, "Australia" },
@@ -714,10 +952,127 @@ static const value_string q708_sanc_areas[] = {
{ 1399, "Australia" },
{ 1400, "Australia" },
{ 1401, "Australia" },
+ { 1402, "Unassigned" },
+ { 1403, "Unassigned" },
+ { 1404, "Unassigned" },
+ { 1405, "Unassigned" },
+ { 1406, "Unassigned" },
+ { 1407, "Unassigned" },
+ { 1408, "Unassigned" },
+ { 1409, "Unassigned" },
{ 1410, "Democratic Republic of Timor-Leste" },
+ { 1411, "Unassigned" },
+ { 1412, "Unassigned" },
+ { 1413, "Unassigned" },
+ { 1414, "Unassigned" },
+ { 1415, "Unassigned" },
+ { 1416, "Unassigned" },
+ { 1417, "Unassigned" },
+ { 1418, "Unassigned" },
+ { 1419, "Unassigned" },
{ 1420, "Singapore (Republic of)" },
{ 1421, "Singapore (Republic of)" },
+
+ { 1422, "Unassigned" },
+ { 1423, "Unassigned" },
+ { 1424, "Unassigned" },
+ { 1425, "Unassigned" },
+ { 1426, "Unassigned" },
+ { 1427, "Unassigned" },
+ { 1428, "Unassigned" },
+ { 1429, "Unassigned" },
+
+ { 1430, "Unassigned" },
+ { 1431, "Unassigned" },
+ { 1432, "Unassigned" },
+ { 1433, "Unassigned" },
+ { 1434, "Unassigned" },
+ { 1435, "Unassigned" },
+ { 1436, "Unassigned" },
+ { 1437, "Unassigned" },
+ { 1438, "Unassigned" },
+ { 1439, "Unassigned" },
+
+ { 1440, "Unassigned" },
+ { 1441, "Unassigned" },
+ { 1442, "Unassigned" },
+ { 1443, "Unassigned" },
+ { 1444, "Unassigned" },
+ { 1445, "Unassigned" },
+ { 1446, "Unassigned" },
+ { 1447, "Unassigned" },
+ { 1448, "Unassigned" },
+ { 1449, "Unassigned" },
+
+ { 1450, "Unassigned" },
+ { 1451, "Unassigned" },
+ { 1452, "Unassigned" },
+ { 1453, "Unassigned" },
+ { 1454, "Unassigned" },
+ { 1455, "Unassigned" },
+ { 1456, "Unassigned" },
+ { 1457, "Unassigned" },
+ { 1458, "Unassigned" },
+ { 1459, "Unassigned" },
+
+
+ { 1460, "Unassigned" },
+ { 1461, "Unassigned" },
+ { 1462, "Unassigned" },
+ { 1463, "Unassigned" },
+ { 1464, "Unassigned" },
+ { 1465, "Unassigned" },
+ { 1466, "Unassigned" },
+ { 1467, "Unassigned" },
+ { 1468, "Unassigned" },
+ { 1469, "Unassigned" },
+
+ { 1470, "Unassigned" },
+ { 1471, "Unassigned" },
+ { 1472, "Unassigned" },
+ { 1473, "Unassigned" },
+ { 1474, "Unassigned" },
+ { 1475, "Unassigned" },
+ { 1476, "Unassigned" },
+ { 1477, "Unassigned" },
+ { 1478, "Unassigned" },
+ { 1479, "Unassigned" },
+
+ { 1480, "Unassigned" },
+ { 1481, "Unassigned" },
+ { 1482, "Unassigned" },
+ { 1483, "Unassigned" },
+ { 1484, "Unassigned" },
+ { 1485, "Unassigned" },
+ { 1486, "Unassigned" },
+ { 1487, "Unassigned" },
+ { 1488, "Unassigned" },
+ { 1489, "Unassigned" },
+
+ { 1490, "Unassigned" },
+ { 1491, "Unassigned" },
+ { 1492, "Unassigned" },
+ { 1493, "Unassigned" },
+ { 1494, "Unassigned" },
+ { 1495, "Unassigned" },
+ { 1496, "Unassigned" },
+ { 1497, "Unassigned" },
+ { 1498, "Unassigned" },
+ { 1499, "Unassigned" },
+
{ 1500, "The Former Yugoslav Republic of Macedonia" },
+ { 1501, "Unassigned" },
+ { 1502, "Unassigned" },
+ { 1503, "Unassigned" },
+ { 1504, "Unassigned" },
+ { 1505, "Unassigned" },
+ { 1506, "Unassigned" },
+ { 1507, "Unassigned" },
+ { 1508, "Unassigned" },
+ { 1509, "Unassigned" },
+ { 1510, "Unassigned" },
+ { 1511, "Unassigned" },
+ { 1512, "Unassigned" },
{ 1513, "Georgia" },
{ 1514, "Armenia (Republic of)" },
{ 1515, "Malta" },
@@ -741,6 +1096,9 @@ static const value_string q708_sanc_areas[] = {
{ 1533, "Poland (Republic of)" },
{ 1534, "Greece" },
{ 1535, "Italy" },
+ { 1536, "Unassigned" },
+ { 1537, "Unassigned" },
+ { 1538, "Unassigned" },
{ 1539, "Egypt (Arab Republic of)" },
{ 1540, "Egypt (Arab Republic of)" },
{ 1541, "Egypt (Arab Republic of)" },
@@ -749,10 +1107,13 @@ static const value_string q708_sanc_areas[] = {
{ 1544, "Morocco (Kingdom of)" },
{ 1545, "Morocco (Kingdom of)" },
{ 1546, "Tunisia" },
+ { 1547, "Unassigned" },
{ 1548, "Libya (Socialist People's Libyan Arab Jamahiriya)" },
{ 1549, "Libya (Socialist People's Libyan Arab Jamahiriya)" },
{ 1550, "Gambia (Republic of the)" },
+ { 1551, "Unassigned" },
{ 1552, "Senegal (Republic of)" },
+ { 1553, "Unassigned" },
{ 1554, "Mauritania (Islamic Republic of)" },
{ 1555, "Mauritania (Islamic Republic of)" },
{ 1556, "Mali (Republic of)" },
@@ -762,13 +1123,17 @@ static const value_string q708_sanc_areas[] = {
{ 1560, "Cote d'Ivoire (Republic of)" },
{ 1561, "Cote d'Ivoire (Republic of)" },
{ 1562, "Burkina Faso" },
+ { 1563, "Unassigned" },
{ 1564, "Niger (Republic of the)" },
{ 1565, "Niger (Republic of the)" },
{ 1566, "Togolese Republic" },
+ { 1567, "Unassigned" },
{ 1568, "Benin (Republic of)" },
+ { 1569, "Unassigned" },
{ 1570, "Mauritius (Republic of)" },
{ 1571, "Mauritius (Republic of)" },
{ 1572, "Liberia (Republic of)" },
+ { 1573, "Unassigned" },
{ 1574, "Sierra Leone" },
{ 1575, "Sierra Leone" },
{ 1576, "Ghana" },
@@ -776,12 +1141,15 @@ static const value_string q708_sanc_areas[] = {
{ 1578, "Nigeria (Federal Republic of)" },
{ 1579, "Nigeria (Federal Republic of)" },
{ 1580, "Chad (Republic of)" },
+ { 1581, "Unassigned" },
{ 1582, "Central African Republic" },
{ 1583, "Central African Republic" },
{ 1584, "Cameroon (Republic of)" },
{ 1585, "Cameroon (Republic of)" },
{ 1586, "Cape Verde (Republic of)" },
+ { 1587, "Unassigned" },
{ 1588, "Sao Tome and Principe (Democratic Republic of)" },
+ { 1589, "Unassigned" },
{ 1590, "Equatorial Guinea (Republic of)" },
{ 1591, "Gabonese Republic" },
{ 1592, "Gabonese Republic" },
@@ -793,6 +1161,7 @@ static const value_string q708_sanc_areas[] = {
{ 1598, "Angola (Republic of)" },
{ 1599, "Angola (Republic of)" },
{ 1600, "Guinea-Bissau (Republic of)" },
+ { 1601, "Unassigned" },
{ 1602, "Seychelles (Republic of)" },
{ 1603, "Seychelles (Republic of)" },
{ 1604, "Sudan (Republic of the)" },
@@ -800,8 +1169,11 @@ static const value_string q708_sanc_areas[] = {
{ 1606, "Rwanda (Republic of)" },
{ 1607, "Rwanda (Republic of)" },
{ 1608, "Ethiopia (Federal Democratic Republic of)" },
+ { 1609, "Unassigned" },
{ 1610, "Somali Democratic Republic" },
+ { 1611, "Unassigned" },
{ 1612, "Djibouti (Republic of)" },
+ { 1613, "Unassigned" },
{ 1614, "Kenya (Republic of)" },
{ 1615, "Kenya (Republic of)" },
{ 1616, "Tanzania (United Republic of)" },
@@ -811,18 +1183,27 @@ static const value_string q708_sanc_areas[] = {
{ 1620, "Burundi (Republic of)" },
{ 1621, "Burundi (Republic of)" },
{ 1622, "Mozambique (Republic of)" },
+ { 1623, "Unassigned" },
+ { 1624, "Unassigned" },
+ { 1625, "Unassigned" },
{ 1626, "Zambia (Republic of)" },
+ { 1627, "Unassigned" },
{ 1628, "Madagascar (Republic of)" },
{ 1629, "Madagascar (Republic of)" },
{ 1630, "French Departments and Territories in the Indian Ocean" },
+ { 1631, "Unassigned" },
{ 1632, "Zimbabwe (Republic of)" },
{ 1633, "Zimbabwe (Republic of)" },
{ 1634, "Namibia (Republic of)" },
+ { 1635, "Unassigned" },
{ 1636, "Malawi" },
+ { 1637, "Unassigned" },
{ 1638, "Lesotho (Kingdom of)" },
+ { 1639, "Unassigned" },
{ 1640, "Botswana (Republic of)" },
{ 1641, "Botswana (Republic of)" },
{ 1642, "Swaziland (Kingdom of)" },
+ { 1643, "Unassigned" },
{ 1644, "Comoros (Union of the)" },
{ 1645, "South Africa (Republic of)" },
{ 1646, "South Africa (Republic of)" },
@@ -830,15 +1211,137 @@ static const value_string q708_sanc_areas[] = {
{ 1648, "South Africa (Republic of)" },
{ 1649, "South Africa (Republic of)" },
{ 1650, "Eritrea" },
+ { 1651, "Unassigned" },
{ 1652, "Ascension" },
+ { 1653, "Unassigned" },
+ { 1654, "Unassigned" },
+ { 1655, "Unassigned" },
{ 1656, "Diego Garcia" },
+
+ { 1657, "Unassigned" },
+ { 1658, "Unassigned" },
+ { 1659, "Unassigned" },
+ { 1660, "Unassigned" },
+ { 1661, "Unassigned" },
+ { 1662, "Unassigned" },
+ { 1663, "Unassigned" },
+ { 1664, "Unassigned" },
+ { 1665, "Unassigned" },
+
{ 1666, "Uganda (Republic of)" },
{ 1667, "Uganda (Republic of)" },
+
+ { 1668, "Unassigned" },
+ { 1669, "Unassigned" },
+ { 1670, "Unassigned" },
+ { 1671, "Unassigned" },
+ { 1672, "Unassigned" },
+ { 1673, "Unassigned" },
+ { 1674, "Unassigned" },
+ { 1675, "Unassigned" },
+
{ 1676, "Angola (Republic of)" },
+ { 1677, "Unassigned" },
+ { 1678, "Unassigned" },
+ { 1679, "Unassigned" },
+ { 1680, "Unassigned" },
+ { 1681, "Unassigned" },
+ { 1682, "Unassigned" },
+ { 1683, "Unassigned" },
+ { 1684, "Unassigned" },
+ { 1685, "Unassigned" },
{ 1686, "Morocco (Kingdom of)" },
+ { 1687, "Unassigned" },
+ { 1688, "Unassigned" },
+ { 1689, "Unassigned" },
+ { 1690, "Unassigned" },
+ { 1691, "Unassigned" },
+ { 1692, "Unassigned" },
+ { 1693, "Unassigned" },
+ { 1694, "Unassigned" },
+ { 1695, "Unassigned" },
{ 1696, "Ghana" },
+ { 1697, "Unassigned" },
+ { 1698, "Unassigned" },
+ { 1699, "Unassigned" },
+ { 1700, "Unassigned" },
+ { 1701, "Unassigned" },
+ { 1702, "Unassigned" },
+ { 1703, "Unassigned" },
+ { 1704, "Unassigned" },
+ { 1705, "Unassigned" },
{ 1706, "Sudan (Republic of the)" },
+
+ { 1707, "Unassigned" },
+ { 1708, "Unassigned" },
+ { 1709, "Unassigned" },
+
+ { 1710, "Unassigned" },
+ { 1711, "Unassigned" },
+ { 1712, "Unassigned" },
+ { 1713, "Unassigned" },
+ { 1714, "Unassigned" },
+ { 1715, "Unassigned" },
+ { 1716, "Unassigned" },
+ { 1717, "Unassigned" },
+ { 1718, "Unassigned" },
+ { 1719, "Unassigned" },
+
+ { 1720, "Unassigned" },
+ { 1721, "Unassigned" },
+ { 1722, "Unassigned" },
+ { 1723, "Unassigned" },
+ { 1724, "Unassigned" },
+ { 1725, "Unassigned" },
+ { 1726, "Unassigned" },
+ { 1727, "Unassigned" },
+ { 1728, "Unassigned" },
+ { 1729, "Unassigned" },
+
+ { 1730, "Unassigned" },
+ { 1731, "Unassigned" },
+ { 1732, "Unassigned" },
+ { 1733, "Unassigned" },
+ { 1734, "Unassigned" },
+ { 1735, "Unassigned" },
+ { 1736, "Unassigned" },
+ { 1737, "Unassigned" },
+ { 1738, "Unassigned" },
+ { 1739, "Unassigned" },
+
+ { 1740, "Unassigned" },
+ { 1741, "Unassigned" },
+ { 1742, "Unassigned" },
+ { 1743, "Unassigned" },
+ { 1744, "Unassigned" },
+ { 1745, "Unassigned" },
+ { 1746, "Unassigned" },
+ { 1747, "Unassigned" },
+ { 1748, "Unassigned" },
+ { 1749, "Unassigned" },
+
+ { 1750, "Unassigned" },
+ { 1751, "Unassigned" },
+ { 1752, "Unassigned" },
+ { 1753, "Unassigned" },
+ { 1754, "Unassigned" },
+ { 1755, "Unassigned" },
+
{ 1756, "The Former Yugoslav Republic of Macedonia" },
+
+ { 1757, "Unassigned" },
+ { 1758, "Unassigned" },
+ { 1759, "Unassigned" },
+
+ { 1760, "Unassigned" },
+ { 1761, "Unassigned" },
+ { 1762, "Unassigned" },
+ { 1763, "Unassigned" },
+ { 1764, "Unassigned" },
+ { 1765, "Unassigned" },
+ { 1766, "Unassigned" },
+ { 1767, "Unassigned" },
+
{ 1768, "Sweden" },
{ 1769, "France" },
{ 1770, "Czech Republic" },
@@ -863,10 +1366,18 @@ static const value_string q708_sanc_areas[] = {
{ 1789, "Slovenia (Republic of)" },
{ 1790, "United Kingdom of Great Britain and Northern Ireland" },
{ 1791, "United Kingdom of Great Britain and Northern Ireland" },
+ { 1792, "Unassigned" },
+ { 1793, "Unassigned" },
+ { 1794, "Unassigned" },
+ { 1795, "Unassigned" },
{ 1796, "Belize" },
+ { 1797, "Unassigned" },
+ { 1798, "Unassigned" },
+ { 1799, "Unassigned" },
{ 1800, "Guatemala (Republic of)" },
{ 1801, "Guatemala (Republic of)" },
{ 1802, "Guatemala (Republic of)" },
+ { 1803, "Unassigned" },
{ 1804, "El Salvador (Republic of)" },
{ 1805, "El Salvador (Republic of)" },
{ 1806, "El Salvador (Republic of)" },
@@ -876,7 +1387,10 @@ static const value_string q708_sanc_areas[] = {
{ 1810, "Honduras (Republic of)" },
{ 1812, "Nicaragua" },
{ 1813, "Nicaragua" },
+ { 1814, "Unassigned" },
+ { 1815, "Unassigned" },
{ 1816, "Costa Rica" },
+ { 1817, "Unassigned" },
{ 1818, "Panama (Republic of)" },
{ 1819, "Panama (Republic of)" },
{ 1820, "Panama (Republic of)" },
@@ -907,6 +1421,9 @@ static const value_string q708_sanc_areas[] = {
{ 1845, "Brazil (Federative Republic of)" },
{ 1846, "Brazil (Federative Republic of)" },
{ 1847, "Brazil (Federative Republic of)" },
+ { 1848, "Unassigned" },
+ { 1849, "Unassigned" },
+ { 1850, "Unassigned" },
{ 1851, "Chile" },
{ 1852, "Chile" },
{ 1853, "Chile" },
@@ -926,19 +1443,172 @@ static const value_string q708_sanc_areas[] = {
{ 1867, "Bolivia (Plurinational State of)" },
{ 1868, "Guyana" },
{ 1869, "Guyana" },
+ { 1870, "Unassigned" },
+ { 1871, "Unassigned" },
{ 1872, "Ecuador" },
{ 1873, "Ecuador" },
{ 1874, "Ecuador" },
{ 1876, "French Guiana (French Department of)" },
+ { 1877, "Unassigned" },
+ { 1878, "Unassigned" },
+ { 1879, "Unassigned" },
{ 1880, "Paraguay (Republic of)" },
{ 1881, "Paraguay (Republic of)" },
+ { 1882, "Unassigned" },
+ { 1883, "Unassigned" },
{ 1884, "Suriname (Republic of)" },
{ 1885, "Suriname (Republic of)" },
+ { 1886, "Unassigned" },
+ { 1887, "Unassigned" },
{ 1888, "Uruguay (Eastern Republic of)" },
{ 1889, "Uruguay (Eastern Republic of)" },
+ { 1890, "Unassigned" },
{ 1891, "Falkland Islands (Malvinas)" },
+
+ { 1892, "Unassigned" },
+ { 1893, "Unassigned" },
+ { 1894, "Unassigned" },
+ { 1895, "Unassigned" },
+ { 1896, "Unassigned" },
+ { 1897, "Unassigned" },
+ { 1898, "Unassigned" },
+ { 1899, "Unassigned" },
+
+ { 1900, "Unassigned" },
+ { 1901, "Unassigned" },
+ { 1902, "Unassigned" },
+ { 1903, "Unassigned" },
+ { 1904, "Unassigned" },
+ { 1905, "Unassigned" },
+ { 1906, "Unassigned" },
+ { 1907, "Unassigned" },
+ { 1908, "Unassigned" },
+ { 1909, "Unassigned" },
+
+ { 1910, "Unassigned" },
+ { 1911, "Unassigned" },
+ { 1912, "Unassigned" },
+ { 1913, "Unassigned" },
+ { 1914, "Unassigned" },
+ { 1915, "Unassigned" },
+ { 1916, "Unassigned" },
+ { 1917, "Unassigned" },
+ { 1918, "Unassigned" },
+ { 1919, "Unassigned" },
+
+ { 1920, "Unassigned" },
+ { 1921, "Unassigned" },
+ { 1922, "Unassigned" },
+ { 1923, "Unassigned" },
+ { 1924, "Unassigned" },
+ { 1925, "Unassigned" },
+ { 1926, "Unassigned" },
+ { 1927, "Unassigned" },
+ { 1928, "Unassigned" },
+ { 1929, "Unassigned" },
+
+ { 1930, "Unassigned" },
+ { 1931, "Unassigned" },
+ { 1932, "Unassigned" },
+ { 1933, "Unassigned" },
+ { 1934, "Unassigned" },
+ { 1935, "Unassigned" },
+ { 1936, "Unassigned" },
+ { 1937, "Unassigned" },
+ { 1938, "Unassigned" },
+ { 1939, "Unassigned" },
+
+ { 1940, "Unassigned" },
+ { 1941, "Unassigned" },
{ 1942, "Bolivia (Plurinational State of)" },
{ 1943, "Bolivia (Plurinational State of)" },
+ { 1945, "Unassigned" },
+ { 1946, "Unassigned" },
+ { 1947, "Unassigned" },
+ { 1948, "Unassigned" },
+ { 1949, "Unassigned" },
+
+ { 1950, "Unassigned" },
+ { 1951, "Unassigned" },
+ { 1952, "Unassigned" },
+ { 1953, "Unassigned" },
+ { 1954, "Unassigned" },
+ { 1955, "Unassigned" },
+ { 1956, "Unassigned" },
+ { 1957, "Unassigned" },
+ { 1958, "Unassigned" },
+ { 1959, "Unassigned" },
+
+ { 1960, "Unassigned" },
+ { 1961, "Unassigned" },
+ { 1962, "Unassigned" },
+ { 1963, "Unassigned" },
+ { 1964, "Unassigned" },
+ { 1965, "Unassigned" },
+ { 1966, "Unassigned" },
+ { 1967, "Unassigned" },
+ { 1968, "Unassigned" },
+ { 1969, "Unassigned" },
+
+ { 1970, "Unassigned" },
+ { 1971, "Unassigned" },
+ { 1972, "Unassigned" },
+ { 1973, "Unassigned" },
+ { 1974, "Unassigned" },
+ { 1975, "Unassigned" },
+ { 1976, "Unassigned" },
+ { 1977, "Unassigned" },
+ { 1978, "Unassigned" },
+ { 1979, "Unassigned" },
+
+ { 1980, "Unassigned" },
+ { 1981, "Unassigned" },
+ { 1982, "Unassigned" },
+ { 1983, "Unassigned" },
+ { 1984, "Unassigned" },
+ { 1985, "Unassigned" },
+ { 1986, "Unassigned" },
+ { 1987, "Unassigned" },
+ { 1988, "Unassigned" },
+ { 1989, "Unassigned" },
+
+ { 1990, "Unassigned" },
+ { 1991, "Unassigned" },
+ { 1992, "Unassigned" },
+ { 1993, "Unassigned" },
+ { 1994, "Unassigned" },
+ { 1995, "Unassigned" },
+ { 1996, "Unassigned" },
+ { 1997, "Unassigned" },
+ { 1998, "Unassigned" },
+ { 1999, "Unassigned" },
+
+ { 2000, "Unassigned" },
+ { 2001, "Unassigned" },
+ { 2002, "Unassigned" },
+ { 2003, "Unassigned" },
+ { 2004, "Unassigned" },
+ { 2005, "Unassigned" },
+ { 2006, "Unassigned" },
+ { 2007, "Unassigned" },
+ { 2008, "Unassigned" },
+ { 2009, "Unassigned" },
+
+ { 2010, "Unassigned" },
+ { 2011, "Unassigned" },
+ { 2012, "Unassigned" },
+ { 2013, "Unassigned" },
+ { 2014, "Unassigned" },
+ { 2015, "Unassigned" },
+ { 2016, "Unassigned" },
+ { 2017, "Unassigned" },
+ { 2018, "Unassigned" },
+ { 2019, "Unassigned" },
+
+ { 2020, "Unassigned" },
+ { 2021, "Unassigned" },
+ { 2022, "Unassigned" },
+ { 2023, "Unassigned" },
{ 2024, "United Kingdom of Great Britain and Northern Ireland" },
{ 2025, "Bosnia and Herzegovina" },
{ 2026, "United Kingdom of Great Britain and Northern Ireland" },
@@ -976,9 +1646,11 @@ static const value_string q708_sanc_areas[] = {
static const value_string q708_ispc_point_name[] = {
{ 4096, "LTN ISC Vaduz" },
{ 4097, "LTN ISC Eschen" },
+ { 4098, "Unassigned" },
{ 4099, "Mobilikom GMSC Mauren" },
{ 4100, "Mobilkom GMSC Mauren" },
{ 4101, "VIAG GMSC Balzers" },
+ { 4102, "Unassigned" },
{ 4103, "Tele2 GMSC/ISC Vaduz" },
{ 4104, "Roma/Via T. Maestrelli" },
{ 4105, "Milano/Via A. De Gasperi S. Donato Milanese" },
@@ -1026,6 +1698,7 @@ static const value_string q708_ispc_point_name[] = {
{ 4147, "AMSTNLAL00T, Amsterdam" },
{ 4148, "amEagle, Schiphol-Rijk" },
{ 4149, "ROTMSC01, Rotterdam" },
+ { 4150, "Unassigned" },
{ 4151, "bbned-asd1, Amsterdam" },
{ 4152, "AMSB, Amsterdam" },
{ 4153, "AMS-GS-GW1, Amsterdam" },
@@ -1046,6 +1719,7 @@ static const value_string q708_ispc_point_name[] = {
{ 4168, "ASD STP2, Amsterdam" },
{ 4169, "RT STP2, Rotterdam" },
{ 4170, "RT 1P, Rotterdam" },
+ { 4171, "Unassigned" },
{ 4172, "MSTPGV1, Den Haag" },
{ 4173, "MSTP EHv1, Eindhoven" },
{ 4174, "ASD 2 GW1, Amsterdam" },
@@ -1072,17 +1746,22 @@ static const value_string q708_ispc_point_name[] = {
{ 4195, "Liege/C" },
{ 4196, "Bruxelles" },
{ 4197, "Brussels MGW" },
+ { 4198, "Unassigned" },
{ 4199, "Antwerpen/E" },
{ 4200, "..." },
{ 4201, "Bruxelles, A/STP" },
{ 4202, "Telenet-Antwerpen" },
{ 4203, "Concert-Bruxelles-Ensor" },
+ { 4204, "Unassigned" },
+ { 4205, "Unassigned" },
{ 4206, "Bruxelles" },
{ 4207, "..." },
{ 4208, "Bruxelles L/STP" },
{ 4209, "Bruxelles, Evere" },
{ 4210, "Antwerpen" },
+ { 4211, "Unassigned" },
{ 4212, "T2 Antwerpen 1" },
+ { 4213, "Unassigned" },
{ 4214, "FCI Bruxelles" },
{ 4215, "Bruxelles, B/STP" },
{ 4216, "Bruxelles M/STP" },
@@ -1167,14 +1846,19 @@ static const value_string q708_ispc_point_name[] = {
{ 4295, "MC 5" },
{ 4296, "Wien" },
{ 4297, "Wien" },
+ { 4298, "Unassigned" },
{ 4299, "Wien" },
{ 4300, "Wien" },
{ 4301, "Wien" },
{ 4302, "Wien" },
{ 4303, "Wien" },
{ 4304, "Wien" },
+ { 4305, "Unassigned" },
+ { 4306, "Unassigned" },
+ { 4307, "Unassigned" },
{ 4308, "Wien" },
{ 4309, "Wien" },
+ { 4310, "Unassigned" },
{ 4311, "Wien" },
{ 4312, "Madrid" },
{ 4313, "Barcelona" },
@@ -1216,6 +1900,7 @@ static const value_string q708_ispc_point_name[] = {
{ 4349, "Barcelona" },
{ 4350, "Jundiz (Alava)" },
{ 4351, "Barcelona" },
+ { 4352, "Unassigned" },
{ 4353, "Budapest BP1" },
{ 4354, "Budapest BP2" },
{ 4355, "BP MSTP1" },
@@ -1446,6 +2131,7 @@ static const value_string q708_ispc_point_name[] = {
{ 4580, "Craphi1 CZ" },
{ 4581, "Ceznet Praha CZ" },
{ 4582, "SZDC CZ" },
+ { 4583, "Unassigned" },
{ 4584, "Basel" },
{ 4585, "Renens VD" },
{ 4586, "..." },
@@ -1464,6 +2150,7 @@ static const value_string q708_ispc_point_name[] = {
{ 4599, "Zurich" },
{ 4600, "Chiasso" },
{ 4601, "GESTP01" },
+ { 4602, "Unassigned" },
{ 4603, "Zurich" },
{ 4604, "Zurich" },
{ 4605, "Crissier" },
@@ -1472,23 +2159,34 @@ static const value_string q708_ispc_point_name[] = {
{ 4608, "Wien" },
{ 4609, "Wien" },
{ 4610, "Wien" },
+ { 4611, "Unassigned" },
+ { 4612, "Unassigned" },
{ 4613, "Wien" },
+ { 4614, "Unassigned" },
{ 4615, "Linz" },
{ 4616, "Wien" },
{ 4617, "Wien" },
{ 4618, "Wien" },
{ 4619, "Wien" },
{ 4620, "Wien" },
+ { 4621, "Unassigned" },
{ 4622, "Wien" },
{ 4623, "Wien" },
{ 4624, "Wien" },
{ 4625, "Wien" },
+ { 4626, "Unassigned" },
{ 4627, "Wien" },
+ { 4628, "Unassigned" },
{ 4629, "Wien" },
{ 4630, "Wien" },
+ { 4631, "Unassigned" },
{ 4632, "Wien" },
{ 4633, "Wien" },
{ 4634, "Wien" },
+ { 4635, "Unassigned" },
+ { 4636, "Unassigned" },
+ { 4637, "Unassigned" },
+ { 4638, "Unassigned" },
{ 4639, "Wien" },
{ 4640, "Kelvin 2" },
{ 4641, "Kelvin" },
@@ -1555,19 +2253,37 @@ static const value_string q708_ispc_point_name[] = {
{ 4702, "JE/W/STP" },
{ 4703, "JE/MP/MSX" },
{ 4704, "Copenhagen - Copenhagen dnc" },
+ { 4705, "Unassigned" },
{ 4706, "Copenhagen - Albertslund dnc" },
+ { 4707, "Unassigned" },
{ 4708, "..." },
+ { 4709, "Unassigned" },
{ 4710, "Copenhagen - Copenhagen dsa" },
+ { 4711, "Unassigned" },
{ 4712, "Copenhagen - Albertslund ISG" },
{ 4713, "..." },
{ 4714, "Copenhagen" },
{ 4715, "Copenhagen" },
+ { 4716, "Unassigned" },
+ { 4717, "Unassigned" },
+ { 4718, "Unassigned" },
+ { 4719, "Unassigned" },
{ 4720, "Copenhagen" },
{ 4721, "Copenhagen - Ejby LS" },
+ { 4722, "Unassigned" },
+ { 4723, "Unassigned" },
+ { 4724, "Unassigned" },
{ 4725, "..." },
+ { 4726, "Unassigned" },
+ { 4727, "Unassigned" },
+ { 4728, "Unassigned" },
{ 4729, "Glostrup" },
+ { 4730, "Unassigned" },
+ { 4731, "Unassigned" },
{ 4732, "Copenhagen - Orestaden LS" },
{ 4733, "Telehouse Glostrup" },
+ { 4734, "Unassigned" },
+ { 4735, "Unassigned" },
{ 4736, "Stockholm (Stockholm UX1)" },
{ 4737, "Stockholm (VMS1)" },
{ 4738, "Stockholm (MSC1)" },
@@ -1627,6 +2343,7 @@ static const value_string q708_ispc_point_name[] = {
{ 4792, "MSC JBV-nett" },
{ 4793, "Oslo PA1I" },
{ 4794, "STVR_LX" },
+ { 4795, "Unassigned" },
{ 4796, "NIT-GW1" },
{ 4797, "Eik MSC 1" },
{ 4798, "NMT Oslo MSC1" },
@@ -1638,24 +2355,37 @@ static const value_string q708_ispc_point_name[] = {
{ 4804, "Helsinki (OPS2)" },
{ 4805, "Helsinki (OPS 2 HP Server Fonecta Oy)" },
{ 4806, "Helsinki (MGTS)" },
+ { 4807, "Unassigned" },
+ { 4808, "Unassigned" },
{ 4809, "Helsinki (GIWU)" },
+ { 4810, "Unassigned" },
{ 4811, "Hameenlinna (HML1 Surpass MGC)" },
{ 4812, "Helsinki (HMG02 TSIC)" },
+ { 4813, "Unassigned" },
+ { 4814, "Unassigned" },
{ 4815, "Hyvinkaa (KOE10 Surpass)" },
{ 4816, "Mariehamn (Mariehamn)" },
{ 4817, "Jomala (Jomala)" },
+ { 4818, "Unassigned" },
+ { 4819, "Unassigned" },
{ 4820, "Helsinki (FI1)" },
{ 4821, "Tampere (FI2)" },
+ { 4822, "Unassigned" },
+ { 4823, "Unassigned" },
+ { 4824, "Unassigned" },
{ 4825, "Helsinki (FITEST)" },
{ 4826, "Vantaa (MY1)" },
{ 4827, "Vantaa (MY2)" },
{ 4828, "Vantaa (HKIGMSC01)" },
+ { 4829, "Unassigned" },
+ { 4830, "Unassigned" },
{ 4831, "Helsinki (Helsinki1)" },
{ 4832, "Tallinn" },
{ 4833, "Tallinn" },
{ 4834, "Tallinn" },
{ 4835, "Tallinn" },
{ 4836, "Tallinn" },
+ { 4837, "Unassigned" },
{ 4838, "Tallinn" },
{ 4839, "Tallinn" },
{ 4840, "Parma Via Goito 14" },
@@ -1693,18 +2423,27 @@ static const value_string q708_ispc_point_name[] = {
{ 4872, "Mobistar STP TO2 BRU" },
{ 4873, "Mobistar STP TO3 ANT" },
{ 4874, "Bruxelles-1" },
+ { 4875, "Unassigned" },
{ 4876, "ZMSC1" },
{ 4877, "GMSC3" },
{ 4878, "VILKPN1A" },
{ 4879, "Telenet-Asse" },
+ { 4880, "Unassigned" },
+ { 4881, "Unassigned" },
+ { 4882, "Unassigned" },
{ 4883, "BSTP 1/Brussels STP" },
{ 4884, "ASTP1/Antwerp STP" },
{ 4885, "BXL A" },
{ 4886, "BRUSS701" },
{ 4887, "Dolphin Villende MSC 1" },
+ { 4888, "Unassigned" },
{ 4889, "MLNKT/Nivelles" },
+ { 4890, "Unassigned" },
+ { 4891, "Unassigned" },
{ 4892, "..." },
{ 4893, "..." },
+ { 4894, "Unassigned" },
+ { 4895, "Unassigned" },
{ 4896, "Moscow International Switching Centre-3" },
{ 4897, "St Petersburg International Switching Centre" },
{ 4898, "Moscow International Switching Centre-4" },
@@ -1716,6 +2455,9 @@ static const value_string q708_ispc_point_name[] = {
{ 4904, "IGW1/MOS International gateway 1, Moscow" },
{ 4905, "IGW2/SPB International gateway 2, St Petersburg" },
{ 4906, "IGW3/NVS International gateway 3, Novosibirsk" },
+ { 4907, "Unassigned" },
+ { 4908, "Unassigned" },
+ { 4910, "Unassigned" },
{ 4911, "IGW4/HAB International gateway 4, Khabarovsk" },
{ 4912, "Moscow International Gateway 1, GSM" },
{ 4913, "St. Petersburg International Gateway, GSM" },
@@ -6370,9 +7112,11 @@ static const value_string q708_ispc_point_name[] = {
static const value_string q708_ispc_operator_name[] = {
{ 4096, "LTN Liechtenstein TeleNet AG" },
{ 4097, "LTN Liechtenstein TeleNet AG" },
+ { 4098, "Unassigned" },
{ 4099, "Mobilkom (Liechtenstein) AG" },
{ 4100, "Mobilkom (Liechtenstein) AG" },
{ 4101, "VIAG Europlatform AG" },
+ { 4102, "Unassigned" },
{ 4103, "Tele2 AG" },
{ 4104, "Albacom S.p.A." },
{ 4105, "Albacom S.p.A." },
@@ -6420,6 +7164,7 @@ static const value_string q708_ispc_operator_name[] = {
{ 4147, "Coolwave Communications B.V." },
{ 4148, "Orange Nederland N.V." },
{ 4149, "T-Mobile Netherlands B.V." },
+ { 4150, "Unassigned" },
{ 4151, "bbned N.V." },
{ 4152, "Tele2 (Netherlands) B.V." },
{ 4153, "Alphacomm Solutions B.V." },
@@ -6440,6 +7185,7 @@ static const value_string q708_ispc_operator_name[] = {
{ 4168, "KPN Telecom B.V." },
{ 4169, "KPN Telecom B.V." },
{ 4170, "KPN Telecom B.V." },
+ { 4171, "Unassigned" },
{ 4172, "KPN Mobile The Netherlands B.V." },
{ 4173, "KPN Mobile The Netherlands B.V." },
{ 4174, "KPN Telecom B.V." },
@@ -6466,17 +7212,22 @@ static const value_string q708_ispc_operator_name[] = {
{ 4195, "Belgacom" },
{ 4196, "WorldCom" },
{ 4197, "Tele2 Belgium" },
+ { 4198, "Unassigned" },
{ 4199, "Belgacom" },
{ 4200, "Combellga" },
{ 4201, "Belgacom" },
{ 4202, "Telenet N.V." },
{ 4203, "Concert Communications Company" },
+ { 4204, "Unassigned" },
+ { 4205, "Unassigned" },
{ 4206, "Global One" },
{ 4207, "Combellga" },
{ 4208, "Belgacom International Carrier Services" },
{ 4209, "Colt Telecom" },
{ 4210, "Unisource Belgium" },
+ { 4211, "Unassigned" },
{ 4212, "T2 Belgium NV" },
+ { 4213, "Unassigned" },
{ 4214, "FCI Carrier Services" },
{ 4215, "Belgacom" },
{ 4216, "Belgacom International Carrier Services" },
@@ -6561,14 +7312,19 @@ static const value_string q708_ispc_operator_name[] = {
{ 4295, "Monaco Telecom" },
{ 4296, "T-Mobile Austria" },
{ 4297, "MITACS Telekomservice" },
+ { 4298, "Unassigned" },
{ 4299, "Orange Austria Telecommunication" },
{ 4300, "Barablu Mobile Austria" },
{ 4301, "Hutchison 3G Austria" },
{ 4302, "Hutchison 3G Austria" },
{ 4303, "Schrego Communications Ltd." },
{ 4304, "Colt Telekom Austria" },
+ { 4305, "Unassigned" },
+ { 4306, "Unassigned" },
+ { 4307, "Unassigned" },
{ 4308, "Verizon Austria" },
{ 4309, "Telekom Austria TA" },
+ { 4310, "Unassigned" },
{ 4311, "Telekom Austria TA" },
{ 4312, "Grupalia Internet S.A." },
{ 4313, "Interchat S.L." },
@@ -6610,6 +7366,7 @@ static const value_string q708_ispc_operator_name[] = {
{ 4349, "Redes y Servicios Liberalizados, S.A." },
{ 4350, "Euskaltel, S.A." },
{ 4351, "BT Espana, S.A.U." },
+ { 4352, "Unassigned" },
{ 4353, "Magyar Telekom Plc" },
{ 4354, "Magyar Telekom Plc" },
{ 4355, "Magyar Telekom Plc" },
@@ -6840,6 +7597,7 @@ static const value_string q708_ispc_operator_name[] = {
{ 4580, "Radiokomunikace a.s." },
{ 4581, "CEZ ITC Services a.s." },
{ 4582, "Sprava zeleznicni cesty, st org." },
+ { 4583, "Unassigned" },
{ 4584, "Elephant Talk Communication GmbH" },
{ 4585, "Orange Communications SA" },
{ 4586, "IVY Telecom SA" },
@@ -6858,6 +7616,7 @@ static const value_string q708_ispc_operator_name[] = {
{ 4599, "Cablecom GmbH" },
{ 4600, "C.I.T. SA" },
{ 4601, "Sunrise Communications AG" },
+ { 4602, "Unassigned" },
{ 4603, "Calltrade Carrier Services AG" },
{ 4604, "TNE AG" },
{ 4605, "Orange Communication SA" },
@@ -6866,23 +7625,34 @@ static const value_string q708_ispc_operator_name[] = {
{ 4608, "Telekom Austria TA" },
{ 4609, "Telekom Austria TA" },
{ 4610, "Telekom Austria TA" },
+ { 4611, "Unassigned" },
+ { 4612, "Unassigned" },
{ 4613, "WNT Telecommunication" },
+ { 4614, "Unassigned" },
{ 4615, "Telekom Austria TA" },
{ 4616, "Telekom Austria TA" },
{ 4617, "Mobilkom Austria" },
{ 4618, "Telekom Austria TA" },
{ 4619, "Mobilkom Austria" },
{ 4620, "Mobilkom Austria" },
+ { 4621, "Unassigned" },
{ 4622, "Mobilkom Austria" },
{ 4623, "Tele2 Telecommunication" },
{ 4624, "T-Mobile Austria" },
{ 4625, "T-Mobile Austria" },
+ { 4626, "Unassigned" },
{ 4627, "Orange Austria Telecommunication" },
+ { 4628, "Unassigned" },
{ 4629, "Tele2 Telecommunication" },
{ 4630, "1012-Festnetz-Service" },
+ { 4631, "Unassigned" },
{ 4632, "Orange Business Austria" },
{ 4633, "Orange Business Austria" },
{ 4634, "T-Systems Austria" },
+ { 4635, "Unassigned" },
+ { 4636, "Unassigned" },
+ { 4637, "Unassigned" },
+ { 4638, "Unassigned" },
{ 4639, "UPC Telekabel Wien" },
{ 4640, "Communications Networking Services (UK)" },
{ 4641, "Communications Networking Services (UK)" },
@@ -6949,19 +7719,37 @@ static const value_string q708_ispc_operator_name[] = {
{ 4702, "Jersey Telecom" },
{ 4703, "Jersey Telecom" },
{ 4704, "TDC A/S" },
+ { 4705, "Unassigned" },
{ 4706, "TDC A/S" },
+ { 4707, "Unassigned" },
{ 4708, "TDC A/S" },
+ { 4709, "Unassigned" },
{ 4710, "TDC A/S" },
+ { 4711, "Unassigned" },
{ 4712, "Sonofon A/S" },
{ 4713, "Sonofon A/S" },
{ 4714, "Global One Communication A/S" },
{ 4715, "Sonofon A/S" },
+ { 4716, "Unassigned" },
+ { 4717, "Unassigned" },
+ { 4718, "Unassigned" },
+ { 4719, "Unassigned" },
{ 4720, "Telia Mobile" },
{ 4721, "TeliaSonera AB" },
+ { 4722, "Unassigned" },
+ { 4723, "Unassigned" },
+ { 4724, "Unassigned" },
{ 4725, "Barablu Mobile Ltd" },
+ { 4726, "Unassigned" },
+ { 4727, "Unassigned" },
+ { 4728, "Unassigned" },
{ 4729, "Telcomnet" },
+ { 4730, "Unassigned" },
+ { 4731, "Unassigned" },
{ 4732, "TeliaSonera AB" },
{ 4733, "Digital Network" },
+ { 4734, "Unassigned" },
+ { 4735, "Unassigned" },
{ 4736, "TeliaSonera Sverige AB" },
{ 4737, "Ventelo Sverige AB" },
{ 4738, "Tele2 Sverige AB" },
@@ -7021,6 +7809,7 @@ static const value_string q708_ispc_operator_name[] = {
{ 4792, "Jernbaneverket" },
{ 4793, "Port IT AS" },
{ 4794, "TDC Norge AS" },
+ { 4795, "Unassigned" },
{ 4796, "Taide Network AS" },
{ 4797, "Maritime Communications Partner AS" },
{ 4798, "Nordisk Mobiltelefon AS" },
@@ -7032,24 +7821,37 @@ static const value_string q708_ispc_operator_name[] = {
{ 4804, "Fonecta Oy" },
{ 4805, "TeliaSonera Finland Oyj" },
{ 4806, "TeliaSonera Finland Oyj" },
+ { 4807, "Unassigned" },
+ { 4808, "Unassigned" },
{ 4809, "TeliaSonera Finland Oyj" },
+ { 4810, "Unassigned" },
{ 4811, "TeliaSonera Finland Oyj" },
{ 4812, "TeliaSonera Finland Oyj" },
+ { 4813, "Unassigned" },
+ { 4814, "Unassigned" },
{ 4815, "TeliaSonera Finland Oyj" },
{ 4816, "Alands Mobiltelefon Ab" },
{ 4817, "Alands Mobiltelefon Ab" },
+ { 4818, "Unassigned" },
+ { 4819, "Unassigned" },
{ 4820, "Elisa Oyj" },
{ 4821, "Elisa Oyj" },
+ { 4822, "Unassigned" },
+ { 4823, "Unassigned" },
+ { 4824, "Unassigned" },
{ 4825, "Elisa Oyj" },
{ 4826, "TDC Song Oy" },
{ 4827, "TDC Song Oy" },
{ 4828, "TDC Song Oy" },
+ { 4829, "Unassigned" },
+ { 4830, "Unassigned" },
{ 4831, "X-Phone-Com Oy" },
{ 4832, "Elion Ettevotted AS" },
{ 4833, "Elion Ettevotted AS" },
{ 4834, "Tele2 Eesti AS" },
{ 4835, "Tele2 Eesti AS" },
{ 4836, "Elisa Andmesidesttnused AS" },
+ { 4837, "Unassigned" },
{ 4838, "Oy Top Connect" },
{ 4839, "Oy Top Connect" },
{ 4840, "Elinet S.p.A." },
@@ -7087,18 +7889,27 @@ static const value_string q708_ispc_operator_name[] = {
{ 4872, "Mobistar" },
{ 4873, "Mobistar" },
{ 4874, "Versatel Telecom Belgium" },
+ { 4875, "Unassigned" },
{ 4876, "BASE sa/nv" },
{ 4877, "BASE sa/nv" },
{ 4878, "KPN Belgium NV" },
{ 4879, "Telenet" },
+ { 4880, "Unassigned" },
+ { 4881, "Unassigned" },
+ { 4882, "Unassigned" },
{ 4883, "KPN Orange Belgium" },
{ 4884, "KPN Orange Belgium" },
{ 4885, "Tele2 Belgium" },
{ 4886, "GC Pan European Crossing Belgie" },
{ 4887, "Dolphin Telecom N.V." },
+ { 4888, "Unassigned" },
{ 4889, "M-Link Teleport S.A." },
+ { 4890, "Unassigned" },
+ { 4891, "Unassigned" },
{ 4892, "MOBISTAR s.a." },
{ 4893, "MOBISTAR s.a." },
+ { 4894, "Unassigned" },
+ { 4895, "Unassigned" },
{ 4896, "OJSC Rostelecom" },
{ 4897, "OJSC Rostelecom" },
{ 4898, "OJSC Rostelecom" },
@@ -7110,6 +7921,9 @@ static const value_string q708_ispc_operator_name[] = {
{ 4904, "OJSC Multiregional TransitTelecom" },
{ 4905, "OJSC Multiregional TransitTelecom" },
{ 4906, "OJSC Multiregional TransitTelecom" },
+ { 4907, "Unassigned" },
+ { 4908, "Unassigned" },
+ { 4910, "Unassigned" },
{ 4911, "OJSC Multiregional TransitTelecom" },
{ 4912, "Mobile TeleSystems" },
{ 4913, "North-West Branch of OJSC Megafon" },
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index e745fc2124..e1fb8d48f5 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -864,7 +864,10 @@ get_sccp_assoc(packet_info* pinfo, guint offset, guint32 src_lr, guint32 dst_lr,
{
/* CR contains the opc,dpc,dlr key of backward messages swapped as dpc,opc,slr */
emem_tree_key_t bw_key[] = {
- {1, &dpck}, {1, &opck}, {1, &src_lr}, {0, NULL}
+ {1, &dpck},
+ {1, &opck},
+ {1, &src_lr},
+ {0, NULL}
};
if (! ( assoc = se_tree_lookup32_array(assocs,bw_key) ) && ! pinfo->fd->flags.visited ) {
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index 6f5afaeaeb..de32e43bab 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -5924,115 +5924,115 @@ proto_register_smb2(void)
NULL, 0, "Time when this object was last changed", HFILL }},
{ &hf_smb2_file_all_info,
- { "SMB2_FILE_ALL_INFO", "smb2.smb2_file_all_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_ALL_INFO", "smb2.file_all_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_ALL_INFO structure", HFILL }},
{ &hf_smb2_file_allocation_info,
- { "SMB2_FILE_ALLOCATION_INFO", "smb2.smb2_file_allocation_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_ALLOCATION_INFO", "smb2.file_allocation_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_ALLOCATION_INFO structure", HFILL }},
{ &hf_smb2_file_endoffile_info,
- { "SMB2_FILE_ENDOFFILE_INFO", "smb2.smb2_file_endoffile_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_ENDOFFILE_INFO", "smb2.file_endoffile_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_ENDOFFILE_INFO structure", HFILL }},
{ &hf_smb2_file_alternate_name_info,
- { "SMB2_FILE_ALTERNATE_NAME_INFO", "smb2.smb2_file_alternate_name_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_ALTERNATE_NAME_INFO", "smb2.file_alternate_name_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_ALTERNATE_NAME_INFO structure", HFILL }},
{ &hf_smb2_file_stream_info,
- { "SMB2_FILE_STREAM_INFO", "smb2.smb2_file_stream_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_STREAM_INFO", "smb2.file_stream_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_STREAM_INFO structure", HFILL }},
{ &hf_smb2_file_pipe_info,
- { "SMB2_FILE_PIPE_INFO", "smb2.smb2_file_pipe_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_PIPE_INFO", "smb2.file_pipe_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_PIPE_INFO structure", HFILL }},
{ &hf_smb2_file_compression_info,
- { "SMB2_FILE_COMPRESSION_INFO", "smb2.smb2_file_compression_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_COMPRESSION_INFO", "smb2.file_compression_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_COMPRESSION_INFO structure", HFILL }},
{ &hf_smb2_file_basic_info,
- { "SMB2_FILE_BASIC_INFO", "smb2.smb2_file_basic_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_BASIC_INFO", "smb2.file_basic_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_BASIC_INFO structure", HFILL }},
{ &hf_smb2_file_standard_info,
- { "SMB2_FILE_STANDARD_INFO", "smb2.smb2_file_standard_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_STANDARD_INFO", "smb2.file_standard_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_STANDARD_INFO structure", HFILL }},
{ &hf_smb2_file_internal_info,
- { "SMB2_FILE_INTERNAL_INFO", "smb2.smb2_file_internal_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_INTERNAL_INFO", "smb2.file_internal_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_INTERNAL_INFO structure", HFILL }},
{ &hf_smb2_file_mode_info,
- { "SMB2_FILE_MODE_INFO", "smb2.smb2_file_mode_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_MODE_INFO", "smb2.file_mode_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_MODE_INFO structure", HFILL }},
{ &hf_smb2_file_alignment_info,
- { "SMB2_FILE_ALIGNMENT_INFO", "smb2.smb2_file_alignment_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_ALIGNMENT_INFO", "smb2.file_alignment_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_ALIGNMENT_INFO structure", HFILL }},
{ &hf_smb2_file_position_info,
- { "SMB2_FILE_POSITION_INFO", "smb2.smb2_file_position_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_POSITION_INFO", "smb2.file_position_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_POSITION_INFO structure", HFILL }},
{ &hf_smb2_file_access_info,
- { "SMB2_FILE_ACCESS_INFO", "smb2.smb2_file_access_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_ACCESS_INFO", "smb2.file_access_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_ACCESS_INFO structure", HFILL }},
{ &hf_smb2_file_ea_info,
- { "SMB2_FILE_EA_INFO", "smb2.smb2_file_ea_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_EA_INFO", "smb2.file_ea_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_EA_INFO structure", HFILL }},
{ &hf_smb2_file_network_open_info,
- { "SMB2_FILE_NETWORK_OPEN_INFO", "smb2.smb2_file_network_open_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_NETWORK_OPEN_INFO", "smb2.file_network_open_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_NETWORK_OPEN_INFO structure", HFILL }},
{ &hf_smb2_file_attribute_tag_info,
- { "SMB2_FILE_ATTRIBUTE_TAG_INFO", "smb2.smb2_file_attribute_tag_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_ATTRIBUTE_TAG_INFO", "smb2.file_attribute_tag_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_ATTRIBUTE_TAG_INFO structure", HFILL }},
{ &hf_smb2_file_disposition_info,
- { "SMB2_FILE_DISPOSITION_INFO", "smb2.smb2_file_disposition_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_DISPOSITION_INFO", "smb2.file_disposition_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_DISPOSITION_INFO structure", HFILL }},
{ &hf_smb2_file_info_0f,
- { "SMB2_FILE_INFO_0f", "smb2.smb2_file_info_0f", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_INFO_0f", "smb2.file_info_0f", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_INFO_0f structure", HFILL }},
{ &hf_smb2_file_rename_info,
- { "SMB2_FILE_RENAME_INFO", "smb2.smb2_file_rename_info", FT_NONE, BASE_NONE,
+ { "SMB2_FILE_RENAME_INFO", "smb2.file_rename_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FILE_RENAME_INFO structure", HFILL }},
{ &hf_smb2_fs_info_01,
- { "SMB2_FS_INFO_01", "smb2.smb2_fs_info_01", FT_NONE, BASE_NONE,
+ { "SMB2_FS_INFO_01", "smb2.fs_info_01", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FS_INFO_01 structure", HFILL }},
{ &hf_smb2_fs_info_03,
- { "SMB2_FS_INFO_03", "smb2.smb2_fs_info_03", FT_NONE, BASE_NONE,
+ { "SMB2_FS_INFO_03", "smb2.fs_info_03", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FS_INFO_03 structure", HFILL }},
{ &hf_smb2_fs_info_04,
- { "SMB2_FS_INFO_04", "smb2.smb2_fs_info_04", FT_NONE, BASE_NONE,
+ { "SMB2_FS_INFO_04", "smb2.fs_info_04", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FS_INFO_04 structure", HFILL }},
{ &hf_smb2_fs_info_05,
- { "SMB2_FS_INFO_05", "smb2.smb2_fs_info_05", FT_NONE, BASE_NONE,
+ { "SMB2_FS_INFO_05", "smb2.fs_info_05", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FS_INFO_05 structure", HFILL }},
{ &hf_smb2_fs_info_06,
- { "SMB2_FS_INFO_06", "smb2.smb2_fs_info_06", FT_NONE, BASE_NONE,
+ { "SMB2_FS_INFO_06", "smb2.fs_info_06", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FS_INFO_06 structure", HFILL }},
{ &hf_smb2_fs_info_07,
- { "SMB2_FS_INFO_07", "smb2.smb2_fs_info_07", FT_NONE, BASE_NONE,
+ { "SMB2_FS_INFO_07", "smb2.fs_info_07", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FS_INFO_07 structure", HFILL }},
{ &hf_smb2_fs_objectid_info,
- { "SMB2_FS_OBJECTID_INFO", "smb2.smb2_fs_objectid_info", FT_NONE, BASE_NONE,
+ { "SMB2_FS_OBJECTID_INFO", "smb2.fs_objectid_info", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_FS_OBJECTID_INFO structure", HFILL }},
{ &hf_smb2_sec_info_00,
- { "SMB2_SEC_INFO_00", "smb2.smb2_sec_info_00", FT_NONE, BASE_NONE,
+ { "SMB2_SEC_INFO_00", "smb2.sec_info_00", FT_NONE, BASE_NONE,
NULL, 0, "SMB2_SEC_INFO_00 structure", HFILL }},
{ &hf_smb2_disposition_delete_on_close,
diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c
index 5923dc172f..43182ce78e 100644
--- a/epan/dissectors/packet-tn3270.c
+++ b/epan/dissectors/packet-tn3270.c
@@ -6613,7 +6613,7 @@ proto_register_tn3270(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_tn3270_tn3270e_header_data,
- { "TN3270E Header Data", "tn3270..tn3270e_header_data",
+ { "TN3270E Header Data", "tn3270.tn3270e_header_data",
FT_EBCDIC, BASE_NONE, NULL, 0x0,
NULL, HFILL }}
};
diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c
index 7a2fed9f1f..d6146e0dde 100644
--- a/epan/dissectors/packet-wassp.c
+++ b/epan/dissectors/packet-wassp.c
@@ -1240,11 +1240,11 @@ proto_register_wassp(void)
0x0, NULL, HFILL }},
{ &hf_wassp_vlan_tag,
- { "WASSP-VLAN-TAG", "wassp.wassp.vlan.tag", FT_INT32, BASE_DEC, NULL,
+ { "WASSP-VLAN-TAG", "wassp.vlan.tag", FT_INT32, BASE_DEC, NULL,
0x0, NULL, HFILL }},
{ &hf_wassp_tunnel_type,
- { "WASSP-TUNNEL-TYPE", "wassp.wassp.tunnel.type", FT_UINT32, BASE_DEC, NULL,
+ { "WASSP-TUNNEL-TYPE", "wassp.tunnel.type", FT_UINT32, BASE_DEC, NULL,
0x0, NULL, HFILL }},
{ &hf_ap_dhcp_mode,
diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c
index 5876351db0..0559fb2755 100644
--- a/epan/dissectors/packet-who.c
+++ b/epan/dissectors/packet-who.c
@@ -265,7 +265,7 @@ proto_register_who(void)
NULL, HFILL }},
{ &hf_who_whoent,
- { "Who utmp Entry", "who.whoent", FT_NONE, BASE_NONE, NULL, 0x0,
+ { "Who utmp Entry", "who.entry", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_who_tty,
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c
index 2edc791ac6..a07dc1f2c3 100644
--- a/epan/dissectors/packet-wlccp.c
+++ b/epan/dissectors/packet-wlccp.c
@@ -3600,56 +3600,56 @@ proto_register_wlccp(void)
},
{ &hf_wlccp_null_tlv,
- { "NULL TLV", "wlccp.wlccp_null_tlv",
+ { "NULL TLV", "wlccp.null_tlv",
FT_BYTES, BASE_NONE, NULL ,
0, NULL, HFILL }
},
{ &hf_wlccp_tlv_type,
- { "TLV Type", "wlccp.wlccp_tlv_type",
+ { "TLV Type", "wlccp.tlv_type",
FT_UINT16, BASE_DEC, NULL ,
TLV_TYPE_ID, "TLV Type ID", HFILL }
},
{ &hf_wlccp_tlv_type0,
- { "TLV Type", "wlccp.wlccp_tlv_type",
+ { "TLV Type", "wlccp.tlv_type",
FT_UINT16, BASE_DEC, VALS(wlccp_tlv_typeID_0),
TLV_TYPE_ID, "TLV Type ID", HFILL }
},
{ &hf_wlccp_tlv_type1,
- { "TLV Type", "wlccp.wlccp_tlv_type",
+ { "TLV Type", "wlccp.tlv_type",
FT_UINT16, BASE_DEC, VALS(wlccp_tlv_typeID_1),
TLV_TYPE_ID, "TLV Type ID", HFILL }
},
{ &hf_wlccp_tlv_type2,
- { "TLV Type", "wlccp.wlccp_tlv_type",
+ { "TLV Type", "wlccp.tlv_type",
FT_UINT16, BASE_DEC, VALS(wlccp_tlv_typeID_2),
TLV_TYPE_ID, "TLV Type ID", HFILL }
},
{ &hf_wlccp_tlv_type3,
- { "TLV Type", "wlccp.wlccp_tlv_type",
+ { "TLV Type", "wlccp.tlv_type",
FT_UINT16, BASE_DEC, VALS(wlccp_tlv_typeID_3),
TLV_TYPE_ID, "TLV Type ID", HFILL }
},
{ &hf_wlccp_tlv_type4,
- { "TLV Type", "wlccp.wlccp_tlv_type",
+ { "TLV Type", "wlccp.tlv_type",
FT_UINT16, BASE_DEC, VALS(wlccp_tlv_typeID_4),
TLV_TYPE_ID, "TLV Type ID", HFILL }
},
{ &hf_wlccp_tlv_type5,
- { "TLV Type", "wlccp.wlccp_tlv_type",
+ { "TLV Type", "wlccp.tlv_type",
FT_UINT16, BASE_DEC, VALS(wlccp_tlv_typeID_5),
TLV_TYPE_ID, "TLV Type ID", HFILL }
},
{ &hf_wlccp_tlv_group,
- { "TLV Group", "wlccp.wlccp_tlv_group",
+ { "TLV Group", "wlccp.tlv_group",
FT_UINT16, BASE_DEC, VALS(wlccp_tlv_group_vs) ,
TLV_GROUP_ID, "TLV Group ID", HFILL }
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 03:09:37 +0000