DIS: update enumerations to SISO-REF-010-00v20-0

Change-Id: I99cd075bef5b8d3f2546032cc6ce9774bcf8efc1
Reviewed-on: https://code.wireshark.org/review/1695
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 468 insertions, 172 deletions

diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c
index 24d2a15862..5a3843a004 100644
--- a/epan/dissectors/packet-dis.c
+++ b/epan/dissectors/packet-dis.c
@@ -337,175 +337,173 @@ static const value_string DIS_PDU_Domain_Strings[] =
     { 0,                     NULL }
 };
 
-typedef enum
-{
-    DIS_CATEGORY_LANDPLATFORM_OTHER                                      = 0,
-    DIS_CATEGORY_LANDPLATFORM_TANK                                       = 1,
-    DIS_CATEGORY_LANDPLATFORM_ARMORED_FIGHTING_VEHICLE                   = 2,
-    DIS_CATEGORY_LANDPLATFORM_ARMORED_UTILITY_VEHICLE                    = 3,
-    DIS_CATEGORY_LANDPLATFORM_SELF_PROPELLED_ARTILLERY                   = 4,
-    DIS_CATEGORY_LANDPLATFORM_TOWED_ARTILLERY                            = 5,
-    DIS_CATEGORY_LANDPLATFORM_SMALL_WHEELED_UTILITY_VEHICLE              = 6,
-    DIS_CATEGORY_LANDPLATFORM_LARGE_WHEELED_UTILITY_VEHICLE              = 7,
-    DIS_CATEGORY_LANDPLATFORM_SMALL_TRACKED_UTILITY_VEHICLE              = 8,
-    DIS_CATEGORY_LANDPLATFORM_LARGE_TRACKED_UTILITY_VEHICLE              = 9,
-    DIS_CATEGORY_LANDPLATFORM_MORTAR                                     = 10,
-    DIS_CATEGORY_LANDPLATFORM_MINE_PLOW                                  = 11,
-    DIS_CATEGORY_LANDPLATFORM_MINE_RAKE                                  = 12,
-    DIS_CATEGORY_LANDPLATFORM_MINE_ROLLER                                = 13,
-    DIS_CATEGORY_LANDPLATFORM_CARGO_TRAILER                              = 14,
-    DIS_CATEGORY_LANDPLATFORM_FUEL_TRAILER                               = 15,
-    DIS_CATEGORY_LANDPLATFORM_GENERATOR_TRAILER                          = 16,
-    DIS_CATEGORY_LANDPLATFORM_WATER_TRAILER                              = 17,
-    DIS_CATEGORY_LANDPLATFORM_ENGINEER_EQUIPMENT                         = 18,
-    DIS_CATEGORY_LANDPLATFORM_HEAVY_EQUIPMENT_TRANSPORT_TRAILER          = 19,
-    DIS_CATEGORY_LANDPLATFORM_MAINTENANCE_EQUIPMENT_TRAILER              = 20,
-    DIS_CATEGORY_LANDPLATFORM_LIMBER                                     = 21,
-    DIS_CATEGORY_LANDPLATFORM_CHEMICAL_DECONTAMINATION_TRAILER           = 22,
-    DIS_CATEGORY_LANDPLATFORM_WARNING_SYSTEM                             = 23,
-    DIS_CATEGORY_LANDPLATFORM_TRAIN_ENGINE                               = 24,
-    DIS_CATEGORY_LANDPLATFORM_TRAIN_CAR                                  = 25,
-    DIS_CATEGORY_LANDPLATFORM_TRAIN_CABOOSE                              = 26,
-    DIS_CATEGORY_LANDPLATFORM_CIVILIAN_VEHICLE                           = 27,
-    DIS_CATEGORY_LANDPLATFORM_AIR_DEFENSE_MISSILE_DEFENSE_UNIT_EQUIPMENT = 28,
-    DIS_CATEGORY_LANDPLATFORM_C3I_SYSTEM                                 = 29,
-    DIS_CATEGORY_LANDPLATFORM_OPERATIONS_FACILITY                        = 30,
-    DIS_CATEGORY_LANDPLATFORM_INTELLIGENCE_FACILITY                      = 31,
-    DIS_CATEGORY_LANDPLATFORM_SURVEILLANCE_FACILITY                      = 32,
-    DIS_CATEGORY_LANDPLATFORM_COMMUNICATIONS_FACILITY                    = 33,
-    DIS_CATEGORY_LANDPLATFORM_COMMAND_FACILITY                           = 34,
-    DIS_CATEGORY_LANDPLATFORM_C4I_FACILITY                               = 35,
-    DIS_CATEGORY_LANDPLATFORM_CONTROL_FACILITY                           = 36,
-    DIS_CATEGORY_LANDPLATFORM_FIRE_CONTROL_FACILITY                      = 37,
-    DIS_CATEGORY_LANDPLATFORM_MISSILE_DEFENSE_FACILITY                   = 38,
-    DIS_CATEGORY_LANDPLATFORM_FIELD_COMMAND_POST                         = 39,
-    DIS_CATEGORY_LANDPLATFORM_OBSERVATION_POST                           = 40
-} DIS_PDU_Category_LandPlatform;
-
 static const value_string DIS_PDU_Category_LandPlatform_Strings[] =
 {
-    { DIS_CATEGORY_LANDPLATFORM_OTHER,                                      "Other" },
-    { DIS_CATEGORY_LANDPLATFORM_TANK,                                       "Tank" },
-    { DIS_CATEGORY_LANDPLATFORM_ARMORED_FIGHTING_VEHICLE,                   "Armored fighting vehicle" },
-    { DIS_CATEGORY_LANDPLATFORM_ARMORED_UTILITY_VEHICLE,                    "Armored utility vehicle" },
-    { DIS_CATEGORY_LANDPLATFORM_SELF_PROPELLED_ARTILLERY,                   "Self-propelled artillery" },
-    { DIS_CATEGORY_LANDPLATFORM_TOWED_ARTILLERY,                            "Towed artillery" },
-    { DIS_CATEGORY_LANDPLATFORM_SMALL_WHEELED_UTILITY_VEHICLE,              "Small wheeled utility vehicle" },
-    { DIS_CATEGORY_LANDPLATFORM_LARGE_WHEELED_UTILITY_VEHICLE,              "Large wheeled utility vehicle" },
-    { DIS_CATEGORY_LANDPLATFORM_SMALL_TRACKED_UTILITY_VEHICLE,              "Small tracked utility vehicle" },
-    { DIS_CATEGORY_LANDPLATFORM_LARGE_TRACKED_UTILITY_VEHICLE,              "Large tracked utility vehicle" },
-    { DIS_CATEGORY_LANDPLATFORM_MORTAR,                                     "Mortar" },
-    { DIS_CATEGORY_LANDPLATFORM_MINE_PLOW,                                  "Mine plow" },
-    { DIS_CATEGORY_LANDPLATFORM_MINE_RAKE,                                  "Mine rake" },
-    { DIS_CATEGORY_LANDPLATFORM_MINE_ROLLER,                                "Mine roller" },
-    { DIS_CATEGORY_LANDPLATFORM_CARGO_TRAILER,                              "Cargo trailer" },
-    { DIS_CATEGORY_LANDPLATFORM_FUEL_TRAILER,                               "Fuel trailer" },
-    { DIS_CATEGORY_LANDPLATFORM_GENERATOR_TRAILER,                          "Generator trailer" },
-    { DIS_CATEGORY_LANDPLATFORM_WATER_TRAILER,                              "Water trailer" },
-    { DIS_CATEGORY_LANDPLATFORM_ENGINEER_EQUIPMENT,                         "Engineer equipment" },
-    { DIS_CATEGORY_LANDPLATFORM_HEAVY_EQUIPMENT_TRANSPORT_TRAILER,          "Heavy equipment transport trailer" },
-    { DIS_CATEGORY_LANDPLATFORM_MAINTENANCE_EQUIPMENT_TRAILER,              "Maintenance equipment trailer" },
-    { DIS_CATEGORY_LANDPLATFORM_LIMBER,                                     "Limber" },
-    { DIS_CATEGORY_LANDPLATFORM_CHEMICAL_DECONTAMINATION_TRAILER,           "Chemical decontamination trailer" },
-    { DIS_CATEGORY_LANDPLATFORM_WARNING_SYSTEM,                             "Warning system" },
-    { DIS_CATEGORY_LANDPLATFORM_TRAIN_ENGINE,                               "Train engine" },
-    { DIS_CATEGORY_LANDPLATFORM_TRAIN_CAR,                                  "Train car" },
-    { DIS_CATEGORY_LANDPLATFORM_TRAIN_CABOOSE,                              "Train caboose" },
-    { DIS_CATEGORY_LANDPLATFORM_CIVILIAN_VEHICLE,                           "Civilian vehicle" },
-    { DIS_CATEGORY_LANDPLATFORM_AIR_DEFENSE_MISSILE_DEFENSE_UNIT_EQUIPMENT, "Air defense / missile defense unit equipment" },
-    { DIS_CATEGORY_LANDPLATFORM_C3I_SYSTEM,                                 "C3I system" },
-    { DIS_CATEGORY_LANDPLATFORM_OPERATIONS_FACILITY,                        "Operations facility" },
-    { DIS_CATEGORY_LANDPLATFORM_INTELLIGENCE_FACILITY,                      "Intelligence facility" },
-    { DIS_CATEGORY_LANDPLATFORM_SURVEILLANCE_FACILITY,                      "Surveillance facility" },
-    { DIS_CATEGORY_LANDPLATFORM_COMMUNICATIONS_FACILITY,                    "Communications facility" },
-    { DIS_CATEGORY_LANDPLATFORM_COMMAND_FACILITY,                           "Command facility" },
-    { DIS_CATEGORY_LANDPLATFORM_C4I_FACILITY,                               "C4I facility" },
-    { DIS_CATEGORY_LANDPLATFORM_CONTROL_FACILITY,                           "Control facility" },
-    { DIS_CATEGORY_LANDPLATFORM_FIRE_CONTROL_FACILITY,                      "Fire control facility" },
-    { DIS_CATEGORY_LANDPLATFORM_MISSILE_DEFENSE_FACILITY,                   "Missile defense facility" },
-    { DIS_CATEGORY_LANDPLATFORM_FIELD_COMMAND_POST,                         "Field command post" },
-    { DIS_CATEGORY_LANDPLATFORM_OBSERVATION_POST,                           "Field observation post" },
-    { 0,                                                                    NULL }
+    {  0, "Other" },
+    {  1, "Tank" },
+    {  2, "Armored Fighting Vehicle" },
+    {  3, "Armored Utility Vehicle" },
+    {  4, "Self-propelled Artillery" },
+    {  5, "Towed Artillery" },
+    {  6, "Small Wheeled Utility Vehicle" },
+    {  7, "Large Wheeled Utility Vehicle" },
+    {  8, "Small Tracked Utility Vehicle" },
+    {  9, "Large Tracked Utility Vehicle" },
+    { 10, "Mortar" },
+    { 11, "Mine Plow" },
+    { 12, "Mine Rake" },
+    { 13, "Mine Roller" },
+    { 14, "Cargo Trailer" },
+    { 15, "Fuel Trailer" },
+    { 16, "Generator Trailer" },
+    { 17, "Water Trailer" },
+    { 18, "Engineer Equipment" },
+    { 19, "Heavy Equipment Transport Trailer" },
+    { 20, "Maintenance Equipment Trailer" },
+    { 21, "Limber" },
+    { 22, "Chemical Decontamination Trailer" },
+    { 23, "Warning System" },
+    { 24, "Train - Engine" },
+    { 25, "Train - Car" },
+    { 26, "Train - Caboose" },
+    { 27, "Civilian Vehicle" },
+    { 28, "Air Defense / Missile Defense Unit Equipment" },
+    { 29, "Command, Control, Communications, and Intelligence (C3I) System" },
+    { 30, "Operations Facility" },
+    { 31, "Intelligence Facility" },
+    { 32, "Surveillance Facility" },
+    { 33, "Communications Facility" },
+    { 34, "Command Facility" },
+    { 35, "C4I Facility" },
+    { 36, "Control Facility" },
+    { 37, "Fire Control Facility" },
+    { 38, "Missile Defense Facility" },
+    { 39, "Field Command Post" },
+    { 40, "Observation Post" },
+    { 50, "Unmanned" },
+    { 80, "Motorcycle" },
+    { 81, "Car" },
+    { 82, "Bus" },
+    { 83, "Single Unit Cargo Truck" },
+    { 84, "Single Unit Utility/Emergency Truck" },
+    { 85, "Multiple Unit Cargo Truck" },
+    { 86, "Multiple Unit Utility/Emergency Truck" },
+    { 87, "Construction Specialty Vehicle" },
+    { 88, "Farm Specialty Vehicle" },
+    { 89, "Trailer" },
+    { 90, "Recreational" },
+    { 91, "Non-motorized" },
+    { 92, "Trains" },
+    { 93, "Utility/Emergency Car" },
+    {  0, NULL }
 };
 
 static value_string_ext DIS_PDU_Category_LandPlatform_Strings_Ext = VALUE_STRING_EXT_INIT(DIS_PDU_Category_LandPlatform_Strings);
 
-typedef enum
-{
-    DIS_CATEGORY_AIRPLATFORM_OTHER                             = 0,
-    DIS_CATEGORY_AIRPLATFORM_FIGHTER_AIR_DEFENSE               = 1,
-    DIS_CATEGORY_AIRPLATFORM_ATTACK_STRIKE                     = 2,
-    DIS_CATEGORY_AIRPLATFORM_BOMBER                            = 3,
-    DIS_CATEGORY_AIRPLATFORM_CARGO_TANKER                      = 4,
-    DIS_CATEGORY_AIRPLATFORM_ASW_PATROL_OBSERVATION            = 5,
-    DIS_CATEGORY_AIRPLATFORM_ELECTRONIC_WARFARE                = 6,
-    DIS_CATEGORY_AIRPLATFORM_RECONNAISSANCE                    = 7,
-    DIS_CATEGORY_AIRPLATFORM_SURVEILLANCE_C2                   = 8,
-    DIS_CATEGORY_AIRPLATFORM_ATTACK_HELICOPTER                 = 20,
-    DIS_CATEGORY_AIRPLATFORM_UTILITY_HELICOPTER                = 21,
-    DIS_CATEGORY_AIRPLATFORM_ANTISUB_WARFARE_PATROL_HELICOPTER = 22,
-    DIS_CATEGORY_AIRPLATFORM_CARGO_HELICOPTER                  = 23,
-    DIS_CATEGORY_AIRPLATFORM_OBSERVATION_HELICOPTER            = 24,
-    DIS_CATEGORY_AIRPLATFORM_SPECIAL_OPERATIONS_HELICOPTER     = 25,
-    DIS_CATEGORY_AIRPLATFORM_TRAINER                           = 40,
-    DIS_CATEGORY_AIRPLATFORM_UNMANNED                          = 50,
-    DIS_CATEGORY_AIRPLATFORM_NON_COMBATANT_COMMERCIAL_AIRCRAFT = 57
-} DIS_PDU_Category_AirPlatform;
-
 static const value_string DIS_PDU_Category_AirPlatform_Strings[] =
 {
-    { DIS_CATEGORY_AIRPLATFORM_OTHER,                             "Other" },
-    { DIS_CATEGORY_AIRPLATFORM_FIGHTER_AIR_DEFENSE,               "Fighter / air defense" },
-    { DIS_CATEGORY_AIRPLATFORM_ATTACK_STRIKE,                     "Attack / strike" },
-    { DIS_CATEGORY_AIRPLATFORM_BOMBER,                            "Bomber" },
-    { DIS_CATEGORY_AIRPLATFORM_CARGO_TANKER,                      "Cargo tanker" },
-    { DIS_CATEGORY_AIRPLATFORM_ASW_PATROL_OBSERVATION,            "ASW / patrol / observation" },
-    { DIS_CATEGORY_AIRPLATFORM_ELECTRONIC_WARFARE,                "Electronic warfare" },
-    { DIS_CATEGORY_AIRPLATFORM_RECONNAISSANCE,                    "Reconnaissance" },
-    { DIS_CATEGORY_AIRPLATFORM_SURVEILLANCE_C2,                   "Surveillance / C2" },
-    { DIS_CATEGORY_AIRPLATFORM_ATTACK_HELICOPTER,                 "Attack helicopter" },
-    { DIS_CATEGORY_AIRPLATFORM_UTILITY_HELICOPTER,                "Utility helicopter" },
-    { DIS_CATEGORY_AIRPLATFORM_ANTISUB_WARFARE_PATROL_HELICOPTER, "Antisubmarine warfare / patrol helicopter" },
-    { DIS_CATEGORY_AIRPLATFORM_CARGO_HELICOPTER,                  "Cargo helicopter" },
-    { DIS_CATEGORY_AIRPLATFORM_OBSERVATION_HELICOPTER,            "Observation helicopter" },
-    { DIS_CATEGORY_AIRPLATFORM_SPECIAL_OPERATIONS_HELICOPTER,     "Special operations helicopter" },
-    { DIS_CATEGORY_AIRPLATFORM_TRAINER,                           "Trainer" },
-    { DIS_CATEGORY_AIRPLATFORM_UNMANNED,                          "Unmanned" },
-    { DIS_CATEGORY_AIRPLATFORM_NON_COMBATANT_COMMERCIAL_AIRCRAFT, "Non-combatant commercial aircraft" },
-    { 0,                                                          NULL }
+    {   0, "Other" },
+    {   1, "Fighter/Air Defense" },
+    {   2, "Attack/Strike" },
+    {   3, "Bomber" },
+    {   4, "Cargo/Tanker" },
+    {   5, "ASW/Patrol/Observation" },
+    {   6, "Electronic Warfare (EW)" },
+    {   7, "Reconnaissance" },
+    {   8, "Surveillance/C2 (Airborne Early Warning)" },
+    {  20, "Attack Helicopter" },
+    {  21, "Utility Helicopter" },
+    {  22, "Antisubmarine Warfare/Patrol Helicopter" },
+    {  23, "Cargo Helicopter" },
+    {  24, "Observation Helicopter" },
+    {  25, "Special Operations Helicopter" },
+    {  40, "Trainer" },
+    {  50, "Unmanned" },
+    {  57, "Non-Combatant Commercial Aircraft" },
+    {  80, "Civilian Ultralight Aircraft, Non-rigid Wing" },
+    {  81, "Civilian Ultralight Aircraft, Rigid Wing" },
+    {  83, "Civilian Fixed Wing Aircraft, Glider" },
+    {  84, "Civilian Fixed Wing Aircraft, Light Sport (up to 1320 lbs / 600 kg)" },
+    {  85, "Civilian Fixed Wing Aircraft, Small (up to 12,500 lbs / 5,670 kg)" },
+    {  86, "Civilian Fixed Wing Aircraft, Medium (up to 41,000 lbs / 18,597 kg)" },
+    {  87, "Civilian Fixed Wing Aircraft, Large (up to 255,000 lbs / 115,666 kg)" },
+    {  88, "Civilian Fixed Wing Aircraft, Heavy (above 255,000 lbs / 115,666 kg)" },
+    {  90, "Civilian Helicopter, Small (up to 7,000 lbs / 3,175 kg)" },
+    {  91, "Civilian Helicopter, Medium (up to 20,000 lbs / 9,072 kg)" },
+    {  92, "Civilian Helicopter, Large (above 20,000 lbs / 9,072 kg)" },
+    {  93, "Civilian Autogyro" },
+    { 100, "Civilian Lighter than Air, Balloon" },
+    { 101, "Civilian Lighter than Air, Airship" },
+    {  0, NULL }
 };
 
-typedef enum
-{
-    DIS_CATEGORY_SURFACEPLATFORM_OTHER = 0
-} DIS_PDU_Category_SurfacePlatform;
-
 static const value_string DIS_PDU_Category_SurfacePlatform_Strings[] =
 {
-    { DIS_CATEGORY_SURFACEPLATFORM_OTHER, "Other" },
-    { 0,                                  NULL}
+    {  0, "Other" },
+    {  1, "Carrier" },
+    {  2, "Command Ship/Cruiser" },
+    {  3, "Guided Missile Cruiser" },
+    {  4, "Guided Missile Destroyer (DDG)" },
+    {  5, "Destroyer (DD)" },
+    {  6, "Guided Missile Frigate (FFG)" },
+    {  7, "Light/Patrol Craft" },
+    {  8, "Mine Countermeasure Ship/Craft" },
+    {  9, "Dock Landing Ship" },
+    { 10, "Tank Landing Ship" },
+    { 11, "Landing Craft" },
+    { 12, "Light Carrier" },
+    { 13, "Cruiser/Helicopter Carrier" },
+    { 14, "Hydrofoil" },
+    { 15, "Air Cushion/Surface Effect" },
+    { 16, "Auxiliary" },
+    { 17, "Auxiliary, Merchant Marine" },
+    { 18, "Utility" },
+    { 50, "Frigate (including Corvette)" },
+    { 51, "Battleship" },
+    { 52, "Heavy Cruiser" },
+    { 53, "Destroyer Tender" },
+    { 54, "Amphibious Assault Ship" },
+    { 55, "Amphibious Cargo Ship" },
+    { 56, "Amphibious Transport Dock" },
+    { 57, "Ammunition Ship" },
+    { 58, "Combat Stores Ship" },
+    { 59, "Surveillance Towed Array Sonar System (SURTASS)" },
+    { 60, "Fast Combat Support Ship" },
+    { 61, "Non-Combatant Ship" },
+    { 62, "Coast Guard Cutters" },
+    { 63, "Coast Guard Boats" },
+    { 80, "Passenger Vessel (Group 1 Merchant)" },
+    { 81, "Dry Cargo Ship (Group 2 Merchant)" },
+    { 82, "Tanker (Group 3 Merchant)" },
+    { 83, "Support Vessel" },
+    { 84, "Private Motorboat" },
+    { 85, "Private Sailboat" },
+    { 86, "Fishing Vessel" },
+    { 87, "Other Vessels" },
+    {  0, NULL }
 };
 
-typedef enum
-{
-    DIS_CATEGORY_SUBSURFACEPLATFORM_OTHER = 0
-} DIS_PDU_Category_SubsurfacePlatform;
-
 static const value_string DIS_PDU_Category_SubsurfacePlatform_Strings[] =
 {
-    { DIS_CATEGORY_SUBSURFACEPLATFORM_OTHER, "Other" },
-    { 0,                                     NULL }
+    {  0, "Other" },
+    {  1, "SSBN (Nuclear Ballistic Missile)" },
+    {  2, "SSGN (Nuclear Guided Missile)" },
+    {  3, "SSN (Nuclear Attack - Torpedo)" },
+    {  4, "SSG (Conventional Guided Missile)" },
+    {  5, "SS (Conventional Attack - Torpedo, Patrol)" },
+    {  6, "SSAN (Nuclear Auxiliary)" },
+    {  7, "SSA (Conventional Auxiliary)" },
+    {  8, "Unmanned Underwater Vehicle (UUV)" },
+    {  0, NULL }
 };
 
-typedef enum
-{
-    DIS_CATEGORY_SPACEPLATFORM_OTHER = 0
-} DIS_PDU_Category_SpacePlatform;
-
 static const value_string DIS_PDU_Category_SpacePlatform_Strings[] =
 {
-    { DIS_CATEGORY_SPACEPLATFORM_OTHER, "Other" },
-    { 0,                                NULL }
+    {  0, "Other" },
+    {  1, "Manned" },
+    {  2, "Unmanned" },
+    {  3, "Booster" },
+    {  0, NULL }
 };
 
 typedef enum
@@ -525,27 +523,21 @@ static const value_string DIS_PDU_Encoding_Class_Strings[] =
     { 0,                                   NULL }
 };
 
-typedef enum
-{
-    DIS_ENCODING_TYPE_OTHER                        = 0,
-    DIS_ENCODING_TYPE_MU_LAW                       = 1,
-    DIS_ENCODING_TYPE_CVSD                         = 2,
-    DIS_ENCODING_TYPE_ADPCM_G721                   = 3,
-    DIS_ENCODING_TYPE_16BIT_LINEAR_PCM             = 4,
-    DIS_ENCODING_TYPE_8BIT_LINEAR_PCM              = 5,
-    DIS_ENCODING_TYPE_VECTOR_QUANTIZATION          = 6
-} DIS_PDU_Encoding_Type;
-
 static const value_string DIS_PDU_Encoding_Type_Strings[] =
 {
-    { DIS_ENCODING_TYPE_OTHER,               "Other" },
-    { DIS_ENCODING_TYPE_MU_LAW,              "8-bit mu-law" },
-    { DIS_ENCODING_TYPE_CVSD,                "CVSD per MIL-STD-188-113" },
-    { DIS_ENCODING_TYPE_ADPCM_G721,          "ADPCM per CCITT G.721" },
-    { DIS_ENCODING_TYPE_16BIT_LINEAR_PCM,    "16-bit linear PCM" },
-    { DIS_ENCODING_TYPE_8BIT_LINEAR_PCM,     "8-bit linear PCM" },
-    { DIS_ENCODING_TYPE_VECTOR_QUANTIZATION, "VQ (Vector Quantization" },
-    { 0,                                NULL }
+    {  1, "8-bit mu-law (ITU-T G.711)" },
+    {  2, "CVSD (MIL-STD-188-113)" },
+    {  3, "ADPCM (ITU-T G.726)" },
+    {  4, "16-bit Linear PCM 2's complement, Big Endian" },
+    {  5, "8-bit Linear PCM, unsigned" },
+    {  6, "VQ (Vector Quantization)" },
+    {  7, "(unavailable for use)" },
+    {  8, "GSM Full-Rate (ETSI 06.10)" },
+    {  9, "GSM Half-Rate (ETSI 06.20)" },
+    { 10, "Speex Narrow Band" },
+    {100, "16-bit Linear PCM 2's complement, Little Endian" },
+    {255, "(unavailable for use)" },
+    {  0, NULL }
 };
 
 typedef enum
@@ -622,7 +614,13 @@ typedef enum
     DIS_TDL_TYPE_LINK16_EDR                   = 101,
     DIS_TDL_TYPE_JTIDS_NET_DATA_LOAD          = 102,
     DIS_TDL_TYPE_LINK22                       = 103,
-    DIS_TDL_TYPE_AFIWC_IADS                   = 104
+    DIS_TDL_TYPE_AFIWC_IADS                   = 104,
+    DIS_TDL_TYPE_IFDL                         = 105,
+    DIS_TDL_TYPE_L_BAND_SATCOM                = 106,
+    DIS_TDL_TYPE_TSAF                         = 107,
+    DIS_TDL_TYPE_ENHANCED_SINCGARS_7_3        = 108,
+    DIS_TDL_TYPE_MADL                         = 109,
+    DIS_TDL_TYPE_CURSOR_ON_TARGET             = 110
 } DIS_PDU_TDL_Type;
 
 static const value_string DIS_PDU_TDL_Type_Strings[] =
@@ -700,6 +698,12 @@ static const value_string DIS_PDU_TDL_Type_Strings[] =
     {DIS_TDL_TYPE_JTIDS_NET_DATA_LOAD,       "JTIDS/MIDS Net Data Load (TIMS/TOMS)" },
     {DIS_TDL_TYPE_LINK22,                    "Link 22" },
     {DIS_TDL_TYPE_AFIWC_IADS,                "AFIWC IADS Communications Links" },
+    {DIS_TDL_TYPE_IFDL,                      "F-22 Intra-Flight Data Link (IFDL)" },
+    {DIS_TDL_TYPE_L_BAND_SATCOM,             "L-Band SATCOM" },
+    {DIS_TDL_TYPE_TSAF,                      "TSAF Communications Link" },
+    {DIS_TDL_TYPE_ENHANCED_SINCGARS_7_3,     "Enhanced SINCGARS 7.3" },
+    {DIS_TDL_TYPE_MADL,                      "F-35 Multifunction Advanced Data Link (MADL)" },
+    {DIS_TDL_TYPE_CURSOR_ON_TARGET,          "Cursor on Target" },
     { 0,                                     NULL }
 };
 
@@ -728,6 +732,16 @@ static const value_string DIS_PDU_RadioCategory_Strings[] =
     {18,    "Non-Directional Beacon (NDB) Receiver" },
     {19,    "Non-Directional Beacon (NDB) with Distance Measuring Equipment (DME) Transmitter" },
     {20,    "Distance Measuring Equipment (DME)" },
+    {21,    "Link 16 Terminal" },
+    {22,    "Link 11 Terminal" },
+    {23,    "Link 11B Terminal" },
+    {24,    "EPLRS/SADL Terminal" },
+    {25,    "F-22 Intra-Flight Data Link (IFDL)" },
+    {26,    "F-35 Multifunction Advanced Data Link (MADL)" },
+    {27,    "SINCGARS Terminal" },
+    {28,    "L-Band SATCOM Terminal" },
+    {29,    "IBS-I/S Terminal" },
+    {30,    "GPS" },
     {0,     NULL }
 };
 
@@ -770,6 +784,10 @@ static const value_string DIS_PDU_RadioInputSource_Strings[] =
     {7,    "Commander" },
     {8,    "Digital Data Device" },
     {9,    "Intercom" },
+    {10,   "Audio Jammer" },
+    {11,   "Data Jammer" },
+    {12,   "GPS Jammer" },
+    {13,   "GPS Meaconer" },
     {0,    NULL }
 };
 
@@ -1198,11 +1216,19 @@ static const value_string DIS_PDU_SystemModulation_Strings[] =
 
 static const value_string DIS_PDU_CryptoSystem_Strings[] =
 {
-    {0,    "Other" },
+    {0,    "No Encryption Device" },
     {1,    "KY-28" },
-    {2,    "VINSON (KY-57, KY-58, SINCGARS ICOM)" },
+    {2,    "KY-58" },
     {3,    "Narrow Spectrum Secure Voice (NSVE)" },
     {4,    "Wide Spectrum Secure Voice (WSVE)" },
+    {5,    "SINCGARS ICOM" },
+    {6,    "KY-75" },
+    {7,    "KY-100" },
+    {8,    "KY-57" },
+    {9,    "KYV-5" },
+    {10,   "Link 11 KG-40A-P (NTDS)" },
+    {11,   "Link 11B KG-40A-S" },
+    {12,   "Link 11 KG-40AR" },
     {0,    NULL }
 };
 
@@ -2982,6 +3008,276 @@ static const value_string DIS_PDU_EmitterName_Strings[] =
 
 static value_string_ext DIS_PDU_EmitterName_Strings_Ext = VALUE_STRING_EXT_INIT(DIS_PDU_EmitterName_Strings);
 
+static const value_string DIS_PDU_Country_Strings[] =
+{
+    {   0, "Other" },
+    {   1, "Afghanistan" },
+    {   2, "Albania" },
+    {   3, "Algeria" },
+    {   4, "American Samoa (United States)" },
+    {   5, "Andorra" },
+    {   6, "Angola" },
+    {   7, "Anguilla" },
+    {   8, "Antarctica (International)" },
+    {   9, "Antigua and Barbuda" },
+    {  10, "Argentina" },
+    {  11, "Aruba" },
+    {  12, "Ashmore and Cartier Islands (Australia)" },
+    {  13, "Australia" },
+    {  14, "Austria" },
+    {  15, "Bahamas" },
+    {  16, "Bahrain" },
+    {  17, "Baker Island (United States)" },
+    {  18, "Bangladesh" },
+    {  19, "Barbados" },
+    {  20, "Bassas da India (France)" },
+    {  21, "Belgium" },
+    {  22, "Belize" },
+    {  23, "Benin" },
+    {  24, "Bermuda (United Kingdom)" },
+    {  25, "Bhutan" },
+    {  26, "Bolivia" },
+    {  27, "Botswana" },
+    {  28, "Bouvet Island (Norway)" },
+    {  29, "Brazil" },
+    {  30, "British Indian Ocean Territory (United Kingdom)" },
+    {  31, "British Virgin Islands (United Kingdom)" },
+    {  32, "Brunei" },
+    {  33, "Bulgaria" },
+    {  34, "Burkina Faso" },
+    {  35, "Myanmar" },
+    {  36, "Burundi" },
+    {  37, "Cambodia (aka Kampuchea)" },
+    {  38, "Cameroon" },
+    {  39, "Canada" },
+    {  40, "Cape Verde, Republic of" },
+    {  41, "Cayman Islands (United Kingdom)" },
+    {  42, "Central African Republic" },
+    {  43, "Chad" },
+    {  44, "Chile" },
+    {  45, "China, People's Republic of" },
+    {  46, "Christmas Island (Australia)" },
+    {  47, "Cocos (Keeling) Islands (Australia)" },
+    {  48, "Colombia" },
+    {  49, "Comoros" },
+    {  50, "Congo, Republic of" },
+    {  51, "Cook Islands (New Zealand)" },
+    {  52, "Coral Sea Islands (Australia)" },
+    {  53, "Costa Rica" },
+    {  54, "Cuba" },
+    {  55, "Cyprus" },
+    {  56, "Czechoslovakia (separating into Czech Republic and Slovak Republic)" },
+    {  57, "Denmark" },
+    {  58, "Djibouti" },
+    {  59, "Dominica" },
+    {  60, "Dominican Republic" },
+    {  61, "Ecuador" },
+    {  62, "Egypt" },
+    {  63, "El Salvador" },
+    {  64, "Equatorial Guinea" },
+    {  65, "Ethiopia" },
+    {  66, "Europa Island (France)" },
+    {  67, "Falkland Islands (aka Islas Malvinas) (United Kingdom)" },
+    {  68, "Faroe Islands (Denmark)" },
+    {  69, "Fiji" },
+    {  70, "Finland" },
+    {  71, "France" },
+    {  72, "French Guiana (France)" },
+    {  73, "French Polynesia (France)" },
+    {  74, "French Southern and Antarctic Islands (France)" },
+    {  75, "Gabon" },
+    {  76, "Gambia, The" },
+    {  77, "Gaza Strip (Israel)" },
+    {  78, "Germany" },
+    {  79, "Ghana" },
+    {  80, "Gibraltar (United Kingdom)" },
+    {  81, "Glorioso Islands (France)" },
+    {  82, "Greece" },
+    {  83, "Greenland (Denmark)" },
+    {  84, "Grenada" },
+    {  85, "Guadaloupe (France)" },
+    {  86, "Guam (United States)" },
+    {  87, "Guatemala" },
+    {  88, "Guernsey (United Kingdom)" },
+    {  89, "Guinea" },
+    {  90, "Guinea- Bissau" },
+    {  91, "Guyana" },
+    {  92, "Haiti" },
+    {  93, "Heard Island and McDonald Islands (Australia)" },
+    {  94, "Honduras" },
+    {  95, "Hong Kong (United Kingdom)" },
+    {  96, "Howland Island (United States)" },
+    {  97, "Hungary" },
+    {  98, "Iceland" },
+    {  99, "India" },
+    { 100, "Indonesia" },
+    { 101, "Iran" },
+    { 102, "Iraq" },
+    { 104, "Ireland" },
+    { 105, "Israel" },
+    { 106, "Italy" },
+    { 107, "Cote D'Ivoire (aka Ivory Coast)" },
+    { 107, "Ivory Coast (aka Cote D'Ivoire)" },
+    { 108, "Jamaica" },
+    { 109, "Jan Mayen (Norway)" },
+    { 110, "Japan" },
+    { 111, "Jarvis Island (United States)" },
+    { 112, "Jersey (United Kingdom)" },
+    { 113, "Johnston Atoll (United States)" },
+    { 114, "Jordan" },
+    { 115, "Juan de Nova Island" },
+    { 116, "Kenya" },
+    { 117, "Kingman Reef (United States)" },
+    { 118, "Kiribati" },
+    { 119, "Korea, Democratic People's Republic of (North)" },
+    { 120, "Korea, Republic of (South)" },
+    { 121, "Kuwait" },
+    { 122, "Laos" },
+    { 123, "Lebanon" },
+    { 124, "Lesotho" },
+    { 125, "Liberia" },
+    { 126, "Libya" },
+    { 127, "Liechtenstein" },
+    { 128, "Luxembourg" },
+    { 129, "Madagascar" },
+    { 130, "Macau (Portugal)" },
+    { 131, "Malawi" },
+    { 132, "Malaysia" },
+    { 133, "Maldives" },
+    { 134, "Mali" },
+    { 135, "Malta" },
+    { 136, "Man, Isle of (United Kingdom)" },
+    { 137, "Marshall Islands" },
+    { 138, "Martinique (France)" },
+    { 139, "Mauritania" },
+    { 140, "Mauritius" },
+    { 141, "Mayotte (France)" },
+    { 142, "Mexico" },
+    { 143, "Micronesia, Federative States of" },
+    { 144, "Monaco" },
+    { 145, "Mongolia" },
+    { 146, "Montserrat (United Kingdom)" },
+    { 147, "Morocco" },
+    { 148, "Mozambique" },
+    { 149, "Namibia (South West Africa)" },
+    { 150, "Nauru" },
+    { 151, "Navassa Island (United States)" },
+    { 152, "Nepal" },
+    { 153, "Netherlands" },
+    { 154, "Netherlands Antilles (Curacao, Bonaire, Saba, Sint Maarten Sint Eustatius)" },
+    { 155, "New Caledonia (France)" },
+    { 156, "New Zealand" },
+    { 157, "Nicaragua" },
+    { 158, "Niger" },
+    { 159, "Nigeria" },
+    { 160, "Niue (New Zealand)" },
+    { 161, "Norfolk Island (Australia)" },
+    { 162, "Northern Mariana Islands (United States)" },
+    { 163, "Norway" },
+    { 164, "Oman" },
+    { 165, "Pakistan" },
+    { 166, "Palmyra Atoll (United States)" },
+    { 168, "Panama" },
+    { 169, "Papua New Guinea" },
+    { 170, "Paracel Islands (International - Occupied by China, also claimed by Taiwan and Vietnam)" },
+    { 171, "Paraguay" },
+    { 172, "Peru" },
+    { 173, "Philippines" },
+    { 174, "Pitcairn Islands (United Kingdom)" },
+    { 175, "Poland" },
+    { 176, "Portugal" },
+    { 177, "Puerto Rico (United States)" },
+    { 178, "Qatar" },
+    { 179, "Reunion (France)" },
+    { 180, "Romania" },
+    { 181, "Rwanda" },
+    { 182, "St. Kitts and Nevis" },
+    { 183, "St. Helena (United Kingdom)" },
+    { 184, "St. Lucia" },
+    { 185, "St. Pierre and Miquelon (France)" },
+    { 186, "St. Vincent and the Grenadines" },
+    { 187, "San Marino" },
+    { 188, "Sao Tome and Principe" },
+    { 189, "Saudi Arabia" },
+    { 190, "Senegal" },
+    { 191, "Seychelles" },
+    { 192, "Sierra Leone" },
+    { 193, "Singapore" },
+    { 194, "Solomon Islands" },
+    { 195, "Somalia" },
+    { 196, "South Georgia and the South Sandwich Islands (United Kingdom)" },
+    { 197, "South Africa" },
+    { 198, "Spain" },
+    { 199, "Spratly Islands (International - parts occupied and claimed by China,Malaysia, Philippines, Taiwan, Vietnam)" },
+    { 200, "Sri Lanka" },
+    { 201, "Sudan" },
+    { 202, "Suriname" },
+    { 203, "Svalbard (Norway)" },
+    { 204, "Swaziland" },
+    { 205, "Sweden" },
+    { 206, "Switzerland" },
+    { 207, "Syria" },
+    { 208, "Taiwan" },
+    { 209, "Tanzania" },
+    { 210, "Thailand" },
+    { 211, "Togo" },
+    { 212, "Tokelau (New Zealand)" },
+    { 213, "Tonga" },
+    { 214, "Trinidad and Tobago" },
+    { 215, "Tromelin Island (France)" },
+    { 216, "Pacific Islands, Trust Territory of the (Palau)" },
+    { 217, "Tunisia" },
+    { 218, "Turkey" },
+    { 219, "Turks and Caicos Islands (United Kingdom)" },
+    { 220, "Tuvalu" },
+    { 221, "Uganda" },
+    { 222, "Commonwealth of Independent States" },
+    { 223, "United Arab Emirates" },
+    { 224, "United Kingdom" },
+    { 225, "United States" },
+    { 226, "Uruguay" },
+    { 227, "Vanuatu" },
+    { 228, "Vatican City (Holy See)" },
+    { 229, "Venezuela" },
+    { 230, "Vietnam" },
+    { 231, "Virgin Islands (United States)" },
+    { 232, "Wake Island (United States)" },
+    { 233, "Wallis and Futuna (France)" },
+    { 234, "Western Sahara" },
+    { 235, "West Bank (Israel)" },
+    { 236, "Western Samoa" },
+    { 237, "Yemen" },
+    { 240, "Serbia and Montenegro" },
+    { 241, "Zaire" },
+    { 242, "Zambia" },
+    { 243, "Zimbabwe" },
+    { 244, "Armenia" },
+    { 245, "Azerbaijan" },
+    { 246, "Belarus" },
+    { 247, "Bosnia and Hercegovina" },
+    { 248, "Clipperton Island (France)" },
+    { 249, "Croatia" },
+    { 250, "Estonia" },
+    { 251, "Georgia" },
+    { 252, "Kazakhstan" },
+    { 253, "Kyrgyzstan" },
+    { 254, "Latvia" },
+    { 255, "Lithuania" },
+    { 256, "Macedonia" },
+    { 257, "Midway Islands (United States)" },
+    { 258, "Moldova" },
+    { 259, "Montenegro" },
+    { 260, "Russia" },
+    { 261, "Serbia and Montenegro (Montenegro to separate)" },
+    { 262, "Slovenia" },
+    { 263, "Tajikistan" },
+    { 264, "Turkmenistan" },
+    { 265, "Ukraine" },
+    { 266, "Uzbekistan" },
+    {   0, NULL }
+};
+
+
 /******************************************************************************
 *
 * FIELDS
@@ -6006,7 +6302,7 @@ void proto_register_dis(void)
             },
             { &hf_dis_country,
               { "Country",       "dis.country",
-                FT_UINT16, BASE_DEC, NULL, 0x0,
+                FT_UINT16, BASE_DEC, VALS(DIS_PDU_Country_Strings), 0x0,
                 NULL, HFILL }
             },
             { &hf_dis_emitter_name,