s5066sis: Consume transport layer data in S5066sis

S5066 spec describes a transport layer for some
clients like Acp 142 and DMP but not for all of
them. Since RCOP/UDOP header definition are given
in S'5066 specification, consuming these header
bytes in S'5066 SIS dissector may be appropriate

Bug: 10827
Change-Id: Iffdf5d567e1a417ccbafdac919f5a5200159d31b
Reviewed-on: https://code.wireshark.org/review/6292
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>

5 files changed, 634 insertions, 459 deletions

diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 2cf3ce770a..a38a9e78c6 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -1632,6 +1632,7 @@ DISSECTOR_INCLUDES =	\
 	packet-rwall.h	\
 	packet-rx.h		\
 	packet-s1ap.h	\
+	packet-s5066sis.h	\
 	packet-s7comm.h	\
 	packet-s7comm_szl_ids.h	\
 	packet-sccp.h	\
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 30d51fb073..bcb02ce5d9 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -49,6 +49,7 @@
 
 #include "packet-p1.h"
 #include "packet-p22.h"
+#include "packet-s5066sis.h"
 
 void proto_register_dmp(void);
 void proto_reg_handoff_dmp(void);
@@ -5060,6 +5061,7 @@ void proto_reg_handoff_dmp (void)
 
   if (!dmp_prefs_initialized) {
     dmp_prefs_initialized = TRUE;
+    dissector_add_uint ("s5066sis.ctl.appid", S5066_CLIENT_S4406_ANNEX_E_TMI_4_DMP, dmp_handle);
   } else {
     dissector_delete_uint_range ("udp.port", dmp_port_range, dmp_handle);
     g_free (dmp_port_range);
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index 264034cdbe..fd1672034f 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -45,6 +45,7 @@
 
 #include "packet-cdt.h"
 #include "packet-ber.h"
+#include "packet-s5066sis.h"
 
 void proto_register_p_mul(void);
 void proto_reg_handoff_p_mul(void);
@@ -1624,6 +1625,7 @@ void proto_reg_handoff_p_mul (void)
   if (!p_mul_prefs_initialized) {
     p_mul_prefs_initialized = TRUE;
     data_handle = find_dissector ("data");
+    dissector_add_uint ("s5066sis.ctl.appid", S5066_CLIENT_S4406_ANNEX_E_TMI_1_P_MUL, p_mul_handle);
   } else {
     dissector_delete_uint_range ("udp.port", p_mul_port_range, p_mul_handle);
     g_free (p_mul_port_range);
diff --git a/epan/dissectors/packet-s5066sis.c b/epan/dissectors/packet-s5066sis.c
index f54dc81025..d3b18a1c13 100644
--- a/epan/dissectors/packet-s5066sis.c
+++ b/epan/dissectors/packet-s5066sis.c
@@ -28,6 +28,13 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include "packet-tcp.h" /* For tcp_dissect_pdus() */
+#include "packet-s5066sis.h"
+
+
+/* SapIDs for RCOP/UDOP clients */
+# define SAPID_TMMHS	2
+# define SAPID_RCOP	6
+# define SAPID_UDOP	7
 
 /* Forward reference */
 /* Register functions */
@@ -37,6 +44,8 @@ void proto_reg_handoff_s5066(void);
 static int dissect_s5066_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data);
 static guint get_s5066_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset);
 static int dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_);
+/* Client transport layer header dissctor */
+static guint dissect_s5066_client_transport_header(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 sapid, guint *client_app_id);
 /* Service type and address dissectors */
 static guint dissect_s5066_servicetype(tvbuff_t *tvb, guint offset, proto_tree *tree);
 static guint dissect_s5066_address(tvbuff_t *tvb, guint offset, proto_tree *tree, gint source);
@@ -60,18 +69,20 @@ static guint dissect_s5066_14(tvbuff_t *tvb, guint offset, proto_tree *tree);
 /* static guint dissect_s5066_17(tvbuff_t *tvb, guint offset, proto_tree *tree); */
 static guint dissect_s5066_18(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size);
 static guint dissect_s5066_19(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size);
-static guint dissect_s5066_20(tvbuff_t *tvb, guint offset, proto_tree *tree);
-static guint dissect_s5066_21(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size);
-static guint dissect_s5066_22(tvbuff_t *tvb, guint offset, proto_tree *tree);
-static guint dissect_s5066_23(tvbuff_t *tvb, guint offset, proto_tree *tree);
-static guint dissect_s5066_24(tvbuff_t *tvb, guint offset, proto_tree *tree);
-static guint dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size);
-static guint dissect_s5066_26(tvbuff_t *tvb, guint offset, proto_tree *tree);
-static guint dissect_s5066_27(tvbuff_t *tvb, guint offset, proto_tree *tree);
+static guint dissect_s5066_20(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id);
+static guint dissect_s5066_21(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size, guint *client_app_id);
+static guint dissect_s5066_22(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id);
+static guint dissect_s5066_23(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id);
+static guint dissect_s5066_24(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id);
+static guint dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size, guint *client_app_id);
+static guint dissect_s5066_26(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id);
+static guint dissect_s5066_27(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id);
 
 static gint proto_s5066 = -1;
 static dissector_handle_t data_handle;
 
+static dissector_table_t s5066sis_dissector_table;
+
 /* Enable desegmentation of S5066 over TCP */
 static gboolean s5066_desegment = TRUE;
 /* Dissect old 'edition 1' of STANAG 5066 (It lacks the 'version' field.) */
@@ -179,6 +190,45 @@ static const value_string s5066_st_extended[] = {
 /* Number of retransmissions when in Non-ARQ: */
 static gint hf_s5066_st_retries = -1;
 
+/* Client transport layer header */
+static gint hf_s5066_ctl_conn_id = -1;
+static gint hf_s5066_ctl_reserved = -1;
+static gint hf_s5066_ctl_updu_id = -1;
+static gint hf_s5066_ctl_updu_segment = -1;
+static gint hf_s5066_ctl_app_id = -1;
+static const value_string s5066_client_application_ids[] = {
+	{ S5066_CLIENT_BFTP,			    "Basic File Transfer Protocol (BFTP) File Transfer Service"},
+	{ S5066_CLIENT_FRAP,			    "File-Receipt/Acknowledgement Protocol"},
+	{ S5066_CLIENT_FRAP_V2,			    "File-Receipt/Acknowledgement Protocol Version 2"},
+	{ S5066_CLIENT_S4406_ANNEX_E_TMI_1_P_MUL,   "STANAG 4406 ANNEX E: Acp 142 (TMI-1)"},
+	{ S5066_CLIENT_S4406_ANNEX_E_TMI_2,	    "STANAG 4406 ANNEX E (TMI-2)"},
+	{ S5066_CLIENT_S4406_ANNEX_E_TMI_3,	    "STANAG 4406 ANNEX E (TMI-3)"},
+	{ S5066_CLIENT_S4406_ANNEX_E_TMI_4_DMP,	    "STANAG 4406 ANNEX E: DMP (TMI-4)"},
+	{ S5066_CLIENT_S4406_ANNEX_E_TMI_5_ACP_127, "STANAG 4406 ANNEX E: Acp 127 Access Unit (TMI-5)"},
+	{ 0, NULL },
+};
+
+/* SAP ID Assignments from Table F-1 */
+static const value_string s5066_sapid_assignments[] = {
+	{ 0, "Subnet management client"},
+	{ 1, "Character-Oriented Serial Stream (COSS) Client"},
+	{ 2, "STANAG 4406 Annex E - Tactical Military Message Handling (T-MMHS) Client"},
+	{ 3, "HMTP (HF Mail Transfer Protocol)"},
+	{ 4, "HFPOP (HF Post-Office Protocol)"},
+	{ 5, "Operator orderwire (HFCHAT)"},
+	{ 6, "Reliable Connection-Oriented Protocol (RCOP) w/ Extended Client"},
+	{ 7, "Unreliable Datagram Oriented Protocol (UDOP) w/ Extended Client"},
+	{ 8, "ETHER client"},
+	{ 9, "IP client"},
+	{ 10, "RESERVED - for future assignment"},
+	{ 11, "RESERVED - for future assignment"},
+	{ 12, "Compressed File Transport Protocol (CFTP)"},
+	{ 13, "UNASSIGNED - available for arbitrary use"},
+	{ 14, "UNASSIGNED - available for arbitrary use"},
+	{ 15, "UNASSIGNED - available for arbitrary use"},
+	{ 0, NULL },
+};
+
 /* Type  1: S_BIND_REQUEST */
 static gint hf_s5066_01_sapid = -1;
 static gint hf_s5066_01_rank = -1;
@@ -419,406 +469,9 @@ static gint hf_s5066_27_data = -1;
 static gint ett_s5066 = -1;
 static gint ett_s5066_pdu = -1;
 static gint ett_s5066_servicetype = -1;
+static gint ett_s5066_client_transport_header = -1;
 static gint ett_s5066_address = -1;
 
-void
-proto_register_s5066(void)
-{
-	static hf_register_info hf[] = {
-		{ &hf_s5066_sync_word,
-			{ "Sync preamble", "s5066sis.sync", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_version,
-			{ "S5066 version", "s5066sis.version", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_size,
-			{ "S_Primitive size", "s5066sis.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_type,
-			{ "PDU Type", "s5066sis.type", FT_UINT8, BASE_DEC, VALS(s5066_pdu_type), 0x0, NULL, HFILL }
-		},
-		/* STANAG 5066 Address */
-		{ &hf_s5066_ad_size,
-			{ "Address size (1/2 Bytes)", "s5066sis.address.size", FT_UINT8, BASE_HEX, NULL, 0xE0, NULL, HFILL }
-		},
-		{ &hf_s5066_ad_group,
-			{ "Group address", "s5066sis.address.group", FT_UINT8, BASE_HEX, NULL, 0x10, NULL, HFILL }
-		},
-		{ &hf_s5066_ad_address,
-			{ "Address", "s5066sis.address.address", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }
-		},
-		/* Service type */
-		{ &hf_s5066_st_txmode,
-			{ "Transmission mode", "s5066sis.st.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_st_delivery_confirmation,
-			{ "Delivery confirmation", "s5066sis.st.confirm", FT_UINT8, BASE_HEX, VALS(s5066_st_delivery_confirmation),  0x0C, NULL, HFILL }
-		},
-		{ &hf_s5066_st_delivery_order,
-			{ "Delivery order", "s5066sis.st.order", FT_UINT8, BASE_HEX, VALS(s5066_st_delivery_order), 0x02, NULL, HFILL }
-		},
-		{ &hf_s5066_st_extended,
-			{ "Extended field", "s5066sis.st.extended", FT_UINT8, BASE_HEX, VALS(s5066_st_extended), 0x01, NULL, HFILL }
-		},
-		{ &hf_s5066_st_retries,
-			{ "Minimum number of retransmissions", "s5066sis.st.retries", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
-		},
-		/* PDU Type 01: S_BIND_REQUEST */
-		{ &hf_s5066_01_sapid,
-			{ "Sap ID", "s5066sis.01.sapid", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_01_rank,
-			{ "Rank", "s5066sis.01.rank", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_01_unused,
-			{ "(Unused)", "s5066sis.01.unused", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }
-		},
-		/* PDU Type 02: S_UNBIND_REQUEST */
-		/*     --- no subfields ---     */
-		/* PDU Type 03: S_BIND_ACCEPTED */
-		{ &hf_s5066_03_sapid,
-			{ "Sap ID", "s5066sis.03.sapid", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_03_unused,
-			{ "(Unused)", "s5066sis.03.unused", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_03_mtu,
-			{ "MTU", "s5066sis.03.mtu", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		/* PDU Type 04: S_BIND_REJECTED */
-		{ &hf_s5066_04_reason,
-			{ "Reason", "s5066sis.04.reason", FT_UINT8, BASE_DEC, VALS(s5066_04_reason), 0x0, NULL, HFILL }
-		},
-		/* PDU Type 05: S_UNBIND_INDICATION */
-		{ &hf_s5066_05_reason,
-			{ "Reason", "s5066sis.05.reason", FT_UINT8, BASE_DEC, VALS(s5066_05_reason), 0x0, NULL, HFILL }
-		},
-		/* Type  6: S_HARD_LINK_ESTABLISH */
-		{ &hf_s5066_06_link_type,
-			{ "Hardlink type", "s5066sis.06.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
-		},
-		{ &hf_s5066_06_link_priority,
-			{ "Priority", "s5066sis.06.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
-		},
-		{ &hf_s5066_06_sapid,
-			{ "Remote Sap ID", "s5066sis.06.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		/* Type  7: S_HARD_LINK_TERMINATE */
-		/* --- Only remote node address --- */
-		/* Type  8: S_HARD_LINK_ESTABLISHED */
-		{ &hf_s5066_08_remote_status,
-			{ "Remote node status", "s5066sis.08.status", FT_UINT8, BASE_DEC, VALS(s5066_08_remote_status), 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_08_link_type,
-			{ "Hardlink type", "s5066sis.08.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
-		},
-		{ &hf_s5066_08_link_priority,
-			{ "Priority", "s5066sis.08.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
-		},
-		{ &hf_s5066_08_sapid,
-			{ "Remote Sap ID", "s5066sis.08.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		/* Type  9: S_HARD_LINK_REJECTED */
-		{ &hf_s5066_09_reason,
-			{ "Reason", "s5066sis.09.reason", FT_UINT8, BASE_DEC, VALS(s5066_09_reason), 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_09_link_type,
-			{ "Hardlink type", "s5066sis.09.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
-		},
-		{ &hf_s5066_09_link_priority,
-			{ "Priority", "s5066sis.09.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
-		},
-		{ &hf_s5066_09_sapid,
-			{ "Remote Sap ID", "s5066sis.09.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		/* Type 10: S_HARD_LINK_TERMINATED */
-		{ &hf_s5066_10_reason,
-			{ "Reason", "s5066sis.10.reason", FT_UINT8, BASE_DEC, VALS(s5066_10_reason), 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_10_link_type,
-			{ "Hardlink type", "s5066sis.10.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
-		},
-		{ &hf_s5066_10_link_priority,
-			{ "Priority", "s5066sis.10.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
-		},
-		{ &hf_s5066_10_sapid,
-			{ "Remote Sap ID", "s5066sis.10.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		/* Type 11: S_HARD_LINK_INDICATION */
-		{ &hf_s5066_11_remote_status,
-			{ "Remote node status", "s5066sis.11.status", FT_UINT8, BASE_DEC, VALS(s5066_11_remote_status), 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_11_link_type,
-			{ "Hardlink type", "s5066sis.11.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
-		},
-		{ &hf_s5066_11_link_priority,
-			{ "Priority", "s5066sis.11.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
-		},
-		{ &hf_s5066_11_sapid,
-			{ "Remote Sap ID", "s5066sis.11.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		/* Type 12: S_HARD_LINK_ACCEPT */
-		{ &hf_s5066_12_link_type,
-			{ "Hardlink type", "s5066sis.12.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
-		},
-		{ &hf_s5066_12_link_priority,
-			{ "Priority", "s5066sis.12.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
-		},
-		{ &hf_s5066_12_sapid,
-			{ "Remote Sap ID", "s5066sis.12.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		/* Type 13: S_HARD_LINK_REJECT */
-		{ &hf_s5066_13_reason,
-			{ "Reason", "s5066sis.13.reason", FT_UINT8, BASE_DEC, VALS(s5066_13_reason), 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_13_link_type,
-			{ "Hardlink type", "s5066sis.13.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
-		},
-		{ &hf_s5066_13_link_priority,
-			{ "Priority", "s5066sis.13.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
-		},
-		{ &hf_s5066_13_sapid,
-			{ "Remote Sap ID", "s5066sis.13.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		/* Type 14: S_SUBNET_AVAILABILITY */
-		{ &hf_s5066_14_status,
-			{ "Status", "s5066sis.14.status", FT_UINT8, BASE_DEC, VALS(s5066_14_status), 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_14_reason,
-			{ "Reason", "s5066sis.14.reason", FT_UINT8, BASE_DEC, VALS(s5066_14_reason), 0x0, NULL, HFILL }
-		},
-		/* Type 15: S_DATAFLOW_ON */
-		/*   --- no subfields ---   */
-		/* Type 16: S_DATAFLOW_OFF */
-		/*   --- no subfields ---   */
-		/* Type 17: S_KEEP_ALIVE */
-		/*   --- no subfields ---   */
-		/* Type 18: S_MANAGEMENT_MESSAGE_REQUEST */
-		{ &hf_s5066_18_type,
-			{ "Message Type", "s5066sis.18.type", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_18_body,
-			{ "Message Body", "s5066sis.18.body", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
-		},
-		/* Type 19: S_MANAGEMENT_MESSAGE_INDICATION */
-		{ &hf_s5066_19_type,
-			{ "Message Type", "s5066sis.19.type", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_19_body,
-			{ "Message Body", "s5066sis.19.body", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
-		},
-		/* Type 20: S_UNIDATA_REQUEST */
-		{ &hf_s5066_20_priority,
-			{ "Priority", "s5066sis.20.priority", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_20_sapid,
-			{ "Destination Sap ID", "s5066sis.20.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_20_ttl,
-			{ "Time-To-Live (x2 seconds)", "s5066sis.20.ttl", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, NULL, HFILL }
-		},
-		{ &hf_s5066_20_size,
-			{ "U_PDU Size", "s5066sis.20.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		/* Type 21: S_UNIDATA_INDICATION */
-		{ &hf_s5066_21_priority,
-			{ "Priority", "s5066sis.21.priority", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_21_dest_sapid,
-			{ "Destination Sap ID", "s5066sis.21.dest_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_21_tx_mode,
-			{ "Transmission Mode", "s5066sis.21.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_21_src_sapid,
-			{ "Source Sap ID", "s5066sis.21.src_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_21_size,
-			{ "U_PDU Size", "s5066sis.21.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_21_err_blocks,
-			{ "Number of errored blocks", "s5066sis.21.err_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_21_err_ptr,
-			{ "Pointer to error block", "s5066sis.21.err_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_21_err_size,
-			{ "Size of error block", "s5066sis.21.err_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_21_nrx_blocks,
-			{ "Number of non-received blocks", "s5066sis.21.nrx_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_21_nrx_ptr,
-			{ "Pointer to non-received block", "s5066sis.21.nrx_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_21_nrx_size,
-			{ "Size of non-received block", "s5066sis.21.nrx_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		/* Type 22: S_UNIDATA_REQUEST_CONFIRM */
-		{ &hf_s5066_22_unused,
-			{ "(Unused)", "s5066sis.22.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_22_sapid,
-			{ "Destination Sap ID", "s5066sis.22.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_22_size,
-			{ "U_PDU Size", "s5066sis.22.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_22_data,
-			{ "(Part of) Confirmed data", "s5066sis.22.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
-		},
-		/* Type 23: S_UNIDATA_REQUEST_REJECTED */
-		{ &hf_s5066_23_reason,
-			{ "Reason", "s5066sis.23.reason", FT_UINT8, BASE_DEC, VALS(s5066_23_reason), 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_23_sapid,
-			{ "Destination Sap ID", "s5066sis.23.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_23_size,
-			{ "U_PDU Size", "s5066sis.23.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_23_data,
-			{ "(Part of) Rejected data", "s5066sis.23.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
-		},
-		/* Type 24: S_EXPEDITED_UNIDATA_REQUEST */
-		{ &hf_s5066_24_unused,
-			{ "(Unused)", "s5066sis.24.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_24_sapid,
-			{ "Destination Sap ID", "s5066sis.24.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_24_ttl,
-			{ "Time-To-Live (x2 seconds)", "s5066sis.24.ttl", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, NULL, HFILL }
-		},
-		{ &hf_s5066_24_size,
-			{ "U_PDU Size", "s5066sis.24.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		/* Type 25: S_EXPEDITED_UNIDATA_INDICATION */
-		{ &hf_s5066_25_unused,
-			{ "(Unused)", "s5066sis.25.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_25_dest_sapid,
-			{ "Destination Sap ID", "s5066sis.25.dest_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_25_tx_mode,
-			{ "Transmission Mode", "s5066sis.25.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_25_src_sapid,
-			{ "Source Sap ID", "s5066sis.25.src_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_25_size,
-			{ "U_PDU Size", "s5066sis.25.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_25_err_blocks,
-			{ "Number of errored blocks", "s5066sis.25.err_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_25_err_ptr,
-			{ "Pointer to error block", "s5066sis.25.err_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_25_err_size,
-			{ "Size of error block", "s5066sis.25.err_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_25_nrx_blocks,
-			{ "Number of non-received blocks", "s5066sis.25.nrx_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_25_nrx_ptr,
-			{ "Pointer to non-received block", "s5066sis.25.nrx_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_25_nrx_size,
-			{ "Size of non-received block", "s5066sis.25.nrx_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		/* Type 26: S_EXPEDITED_UNIDATA_REQUEST_CONFIRM */
-		{ &hf_s5066_26_unused,
-			{ "(Unused)", "s5066sis.26.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_26_sapid,
-			{ "Destination Sap ID", "s5066sis.26.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_26_size,
-			{ "U_PDU Size", "s5066sis.26.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_26_data,
-			{ "(Part of) Confirmed data", "s5066sis.26.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
-		},
-		/* Type 27: S_EXPEDITED_UNIDATA_REQUEST_REJECTED */
-		{ &hf_s5066_27_reason,
-			{ "Reason", "s5066sis.27.reason", FT_UINT8, BASE_DEC, VALS(s5066_27_reason), 0xF0, NULL, HFILL }
-		},
-		{ &hf_s5066_27_sapid,
-			{ "Destination Sap ID", "s5066sis.27.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
-		},
-		{ &hf_s5066_27_size,
-			{ "U_PDU Size", "s5066sis.27.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
-		},
-		{ &hf_s5066_27_data,
-			{ "(Part of) Rejected data", "s5066sis.27.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
-		},
-
-	};
-
-	/* Setup protocol subtree array */
-	static gint *ett[] = {
-		&ett_s5066,
-		&ett_s5066_pdu,
-		&ett_s5066_servicetype,
-		&ett_s5066_address,
-	};
-
-	module_t *s5066_module;
-
-	proto_s5066 = proto_register_protocol (
-			"STANAG 5066 (SIS layer)",	/* name */
-			"STANAG 5066 SIS",		/* short name*/
-			"s5066sis"			/* abbrev */
-		);
-	proto_register_field_array(proto_s5066, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
-
-	s5066_module = prefs_register_protocol(proto_s5066, proto_reg_handoff_s5066);
-	prefs_register_bool_preference(s5066_module, "desegment_pdus",
-				       "Reassemble S5066 SIS PDUs spanning multiple TCP segments",
-				       "Whether the S5066 SIS dissector should reassemble PDUs spanning multiple TCP segments."
-				       " The default is to use reassembly.",
-				       &s5066_desegment);
-	prefs_register_bool_preference(s5066_module, "edition_one",
-				       "Dissect edition 1.0 of STANAG 5066",
-				       "Whether the S5066 SIS dissector should dissect this edition of the STANAG."
-				       " This edition was never formally approved and is very rare. The common edition is edition 1.2.",
-				       &s5066_edition_one);
-	prefs_register_uint_preference(s5066_module, "tcp.port",
-				       "STANAG 5066 SIS TCP Port",
-				       "Set the port for STANAG 5066 SIS. (If other than the default 5066."
-				       " This number is registered with IANA.)",
-				       10, &global_s5066_port);
-}
-
-void
-proto_reg_handoff_s5066(void)
-{
-	static gboolean Initialized = FALSE;
-	static dissector_handle_t s5066_tcp_handle;
-	static guint saved_s5066_port;
-
-	if (!Initialized) {
-		s5066_tcp_handle = new_create_dissector_handle(dissect_s5066_tcp, proto_s5066);
-		data_handle = find_dissector("data");
-		Initialized = TRUE;
-	} else {
-		dissector_delete_uint("tcp.port", saved_s5066_port, s5066_tcp_handle);
-	}
-
-	dissector_add_uint("tcp.port", global_s5066_port, s5066_tcp_handle);
-	saved_s5066_port = global_s5066_port;
-
-	if (!s5066_edition_one) {
-		s5066_header_size = 5;
-		s5066_size_offset = 3;
-	} else {
-		s5066_header_size = 4;
-		s5066_size_offset = 2;
-	}
-}
-
 static guint
 dissect_s5066_address(tvbuff_t *tvb, guint offset, proto_tree *tree, gint source)
 {
@@ -857,6 +510,31 @@ dissect_s5066_servicetype(tvbuff_t *tvb, guint offset, proto_tree *tree)
 	return offset;
 }
 
+static guint
+dissect_s5066_client_transport_header(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 sapid, guint *client_app_id)
+{
+	proto_tree *s5066_tree_client_transport_header;
+
+	if (!((sapid == SAPID_TMMHS) || (sapid == SAPID_RCOP) || (sapid == SAPID_UDOP))) {
+		return offset;
+	}
+
+	s5066_tree_client_transport_header = proto_tree_add_subtree(tree, tvb, offset, 6, ett_s5066_client_transport_header, NULL, "Client Transport Layer Header");
+
+	proto_tree_add_item(s5066_tree_client_transport_header, hf_s5066_ctl_conn_id, tvb, offset, 1, ENC_BIG_ENDIAN);
+	proto_tree_add_item(s5066_tree_client_transport_header, hf_s5066_ctl_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
+	offset++;
+	proto_tree_add_item(s5066_tree_client_transport_header, hf_s5066_ctl_updu_id, tvb, offset, 1, ENC_BIG_ENDIAN);
+	offset++;
+	proto_tree_add_item(s5066_tree_client_transport_header, hf_s5066_ctl_updu_segment, tvb, offset, 2, ENC_BIG_ENDIAN);
+	offset += 2;
+	*client_app_id = tvb_get_ntohs(tvb, offset);
+	proto_tree_add_item(s5066_tree_client_transport_header, hf_s5066_ctl_app_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+	offset += 2;
+
+	return offset;
+}
+
 /* S_BIND_REQUEST */
 static guint
 dissect_s5066_01(tvbuff_t *tvb, guint offset, proto_tree *tree)
@@ -1056,21 +734,24 @@ dissect_s5066_19(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size)
 
 /* S_UNIDATA_REQUEST */
 static guint
-dissect_s5066_20(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_s5066_20(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id)
 {
+	guint8 sapid;
 	proto_tree_add_item(tree, hf_s5066_20_priority, tvb, offset, 1, ENC_BIG_ENDIAN);
+	sapid = tvb_get_guint8(tvb, offset) & 0x0F;
 	proto_tree_add_item(tree, hf_s5066_20_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
 	offset = dissect_s5066_address(tvb, offset, tree, FALSE);
 	offset = dissect_s5066_servicetype(tvb, offset, tree);
 	proto_tree_add_item(tree, hf_s5066_20_ttl, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3;
 	proto_tree_add_item(tree, hf_s5066_20_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2;
+	offset = dissect_s5066_client_transport_header(tvb, offset, tree, sapid, client_app_id);
 
 	return offset;
 }
 
 /* S_UNIDATA_INDICATION */
 static guint
-dissect_s5066_21(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size)
+dissect_s5066_21(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size, guint *client_app_id)
 {
 	guint i=0;
 	proto_item *ti = NULL;
@@ -1079,8 +760,10 @@ dissect_s5066_21(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size)
 	guint16 no_err_blocks = 0;
 	guint16 no_nrx_blocks = 0;
 	gboolean non_arq_w_errors = FALSE;
+	guint sapid;
 
 	proto_tree_add_item(tree, hf_s5066_21_priority, tvb, offset, 1, ENC_BIG_ENDIAN);
+	sapid = tvb_get_guint8(tvb, offset) & 0x0F;
 	proto_tree_add_item(tree, hf_s5066_21_dest_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
 	offset = dissect_s5066_address(tvb, offset, tree, FALSE);
 
@@ -1119,56 +802,66 @@ dissect_s5066_21(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size)
 			proto_tree_add_item(tree, hf_s5066_21_nrx_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2;
 		}
 	}
+	offset = dissect_s5066_client_transport_header(tvb, offset, tree, sapid, client_app_id);
 	return offset;
 }
 
 /* S_UNIDATA_REQUEST_CONFIRM */
 static guint
-dissect_s5066_22(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_s5066_22(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id)
 {
 	guint pdu_size = 0;
+	guint8 sapid;
 	proto_tree_add_item(tree, hf_s5066_22_unused, tvb, offset, 1, ENC_BIG_ENDIAN);
+	sapid = tvb_get_guint8(tvb, offset) & 0x0F;
 	proto_tree_add_item(tree, hf_s5066_22_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
 	offset = dissect_s5066_address(tvb, offset, tree, FALSE);
 	pdu_size = tvb_get_ntohs(tvb, offset);
 	proto_tree_add_item(tree, hf_s5066_22_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2;
 	proto_tree_add_item(tree, hf_s5066_22_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size;
+	offset = dissect_s5066_client_transport_header(tvb, offset, tree, sapid, client_app_id);
 
 	return offset;
 }
 
 /* S_UNIDATA_REQUEST_REJECTED */
 static guint
-dissect_s5066_23(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_s5066_23(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id)
 {
 	guint pdu_size = 0;
+	guint8 sapid;
 	proto_tree_add_item(tree, hf_s5066_23_reason, tvb, offset, 1, ENC_BIG_ENDIAN);
+	sapid = tvb_get_guint8(tvb, offset) & 0x0F;
 	proto_tree_add_item(tree, hf_s5066_23_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
 	offset = dissect_s5066_address(tvb, offset, tree, FALSE);
 	pdu_size = tvb_get_ntohs(tvb, offset);
 	proto_tree_add_item(tree, hf_s5066_23_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2;
 	proto_tree_add_item(tree, hf_s5066_23_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size;
+	offset = dissect_s5066_client_transport_header(tvb, offset, tree, sapid, client_app_id);
 
 	return offset;
 }
 
 /* S_EXPEDITED_UNIDATA_REQUEST */
 static guint
-dissect_s5066_24(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_s5066_24(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id)
 {
+	guint8 sapid;
 	proto_tree_add_item(tree, hf_s5066_24_unused, tvb, offset, 1, ENC_BIG_ENDIAN);
+	sapid = tvb_get_guint8(tvb, offset) & 0x0F;
 	proto_tree_add_item(tree, hf_s5066_24_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
 	offset = dissect_s5066_address(tvb, offset, tree, FALSE);
 	offset = dissect_s5066_servicetype(tvb, offset, tree);
 	proto_tree_add_item(tree, hf_s5066_24_ttl, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3;
 	proto_tree_add_item(tree, hf_s5066_24_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2;
+	offset = dissect_s5066_client_transport_header(tvb, offset, tree, sapid, client_app_id);
 
 	return offset;
 }
 
 /* S_EXPEDITED_UNIDATA_INDICATION */
 static guint
-dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size)
+dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size, guint *client_app_id)
 {
 	guint i=0;
 	proto_item *ti = NULL;
@@ -1177,8 +870,10 @@ dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size)
 	guint16 no_err_blocks = 0;
 	guint16 no_nrx_blocks = 0;
 	gboolean non_arq_w_errors = FALSE;
+	guint8 sapid;
 
 	proto_tree_add_item(tree, hf_s5066_25_unused, tvb, offset, 1, ENC_BIG_ENDIAN);
+	sapid = tvb_get_guint8(tvb, offset) & 0x0F;
 	proto_tree_add_item(tree, hf_s5066_25_dest_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
 	offset = dissect_s5066_address(tvb, offset, tree, FALSE);
 
@@ -1217,35 +912,42 @@ dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size)
 			proto_tree_add_item(tree, hf_s5066_25_nrx_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2;
 		}
 	}
+	offset = dissect_s5066_client_transport_header(tvb, offset, tree, sapid, client_app_id);
 	return offset;
 }
 
 /* S_EXPEDITED_UNIDATA_REQUEST_CONFIRM */
 static guint
-dissect_s5066_26(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_s5066_26(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id)
 {
 	guint pdu_size = 0;
+	guint8 sapid;
 	proto_tree_add_item(tree, hf_s5066_26_unused, tvb, offset, 1, ENC_BIG_ENDIAN);
+	sapid = tvb_get_guint8(tvb, offset) & 0x0F;
 	proto_tree_add_item(tree, hf_s5066_26_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
 	offset = dissect_s5066_address(tvb, offset, tree, FALSE);
 	pdu_size = tvb_get_ntohs(tvb, offset);
 	proto_tree_add_item(tree, hf_s5066_26_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2;
 	proto_tree_add_item(tree, hf_s5066_26_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size;
+	offset = dissect_s5066_client_transport_header(tvb, offset, tree, sapid, client_app_id);
 
 	return offset;
 }
 
 /* S_EXPEDITED_UNIDATA_REQUEST_REJECTED */
 static guint
-dissect_s5066_27(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_s5066_27(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id)
 {
 	guint pdu_size = 0;
+	guint8 sapid;
 	proto_tree_add_item(tree, hf_s5066_27_reason, tvb, offset, 1, ENC_BIG_ENDIAN);
+	sapid = tvb_get_guint8(tvb, offset) & 0x0F;
 	proto_tree_add_item(tree, hf_s5066_27_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
 	offset = dissect_s5066_address(tvb, offset, tree, FALSE);
 	pdu_size = tvb_get_ntohs(tvb, offset);
 	proto_tree_add_item(tree, hf_s5066_27_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2;
 	proto_tree_add_item(tree, hf_s5066_27_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size;
+	offset = dissect_s5066_client_transport_header(tvb, offset, tree, sapid, client_app_id);
 
 	return offset;
 }
@@ -1290,6 +992,9 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
 	tvbuff_t *next_tvb;
 	gint available_length = 0;
 	gint reported_length = 0;
+	gint client_app_id = 0;
+	proto_tree *s5066_tree = NULL;
+	proto_tree *s5066_tree_pdu = NULL;
 
 	/* Determine PDU type to display in INFO column */
 	guint8 pdu_type = tvb_get_guint8(tvb, s5066_header_size);
@@ -1298,51 +1003,46 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
 	/* Clear out stuff in the info column, the add PDU type */
 	col_add_fstr(pinfo->cinfo, COL_INFO, "PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)"));
 
-	if (tree) { /* We are being asked for details */
-		proto_tree *s5066_tree = NULL;
-		proto_tree *s5066_tree_pdu = NULL;
+	pdu_size = tvb_get_ntohs(tvb, s5066_size_offset) + s5066_header_size;
 
-		pdu_size = tvb_get_ntohs(tvb, s5066_size_offset) + s5066_header_size;
-
-		ti_s5066 = proto_tree_add_item(tree, proto_s5066, tvb, 0, -1, ENC_NA);
-		proto_item_append_text(ti_s5066, ", PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)"));
-		s5066_tree = proto_item_add_subtree(ti_s5066, ett_s5066);
-		proto_tree_add_item(s5066_tree, hf_s5066_sync_word, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2;
-		if (!s5066_edition_one) {
-			proto_tree_add_item(s5066_tree, hf_s5066_version,   tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
-		}
-		proto_tree_add_item(s5066_tree, hf_s5066_size,      tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2;
-		ti_pdu = proto_tree_add_item(s5066_tree, hf_s5066_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
-		s5066_tree_pdu = proto_item_add_subtree(ti_pdu, ett_s5066_pdu);
-		switch (pdu_type) {
-		case  1: offset = dissect_s5066_01(tvb, offset, s5066_tree_pdu); break;
-		/* case  2: offset = dissect_s5066_02(tvb, offset, s5066_tree_pdu); break; */
-		case  3: offset = dissect_s5066_03(tvb, offset, s5066_tree_pdu); break;
-		case  4: offset = dissect_s5066_04(tvb, offset, s5066_tree_pdu); break;
-		case  5: offset = dissect_s5066_05(tvb, offset, s5066_tree_pdu); break;
-		case  6: offset = dissect_s5066_06(tvb, offset, s5066_tree_pdu); break;
-		case  7: offset = dissect_s5066_07(tvb, offset, s5066_tree_pdu); break;
-		case  8: offset = dissect_s5066_08(tvb, offset, s5066_tree_pdu); break;
-		case  9: offset = dissect_s5066_09(tvb, offset, s5066_tree_pdu); break;
-		case 10: offset = dissect_s5066_10(tvb, offset, s5066_tree_pdu); break;
-		case 11: offset = dissect_s5066_11(tvb, offset, s5066_tree_pdu); break;
-		case 12: offset = dissect_s5066_12(tvb, offset, s5066_tree_pdu); break;
-		case 13: offset = dissect_s5066_13(tvb, offset, s5066_tree_pdu); break;
-		case 14: offset = dissect_s5066_14(tvb, offset, s5066_tree_pdu); break;
-		/* case 15: offset = dissect_s5066_15(tvb, offset, s5066_tree_pdu); break; */
-		/* case 16: offset = dissect_s5066_16(tvb, offset, s5066_tree_pdu); break; */
-		/* case 17: offset = dissect_s5066_17(tvb, offset, s5066_tree_pdu); break; */
-		case 18: offset = dissect_s5066_18(tvb, offset, s5066_tree_pdu, pdu_size); break;
-		case 19: offset = dissect_s5066_19(tvb, offset, s5066_tree_pdu, pdu_size); break;
-		case 20: offset = dissect_s5066_20(tvb, offset, s5066_tree_pdu); break;
-		case 21: offset = dissect_s5066_21(tvb, offset, s5066_tree_pdu, pdu_size); break;
-		case 22: offset = dissect_s5066_22(tvb, offset, s5066_tree_pdu); break;
-		case 23: offset = dissect_s5066_23(tvb, offset, s5066_tree_pdu); break;
-		case 24: offset = dissect_s5066_24(tvb, offset, s5066_tree_pdu); break;
-		case 25: offset = dissect_s5066_25(tvb, offset, s5066_tree_pdu, pdu_size); break;
-		case 26: offset = dissect_s5066_26(tvb, offset, s5066_tree_pdu); break;
-		case 27: offset = dissect_s5066_27(tvb, offset, s5066_tree_pdu); break;
-		}
+	ti_s5066 = proto_tree_add_item(tree, proto_s5066, tvb, 0, -1, ENC_NA);
+	proto_item_append_text(ti_s5066, ", PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)"));
+	s5066_tree = proto_item_add_subtree(ti_s5066, ett_s5066);
+	proto_tree_add_item(s5066_tree, hf_s5066_sync_word, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2;
+	if (!s5066_edition_one) {
+		proto_tree_add_item(s5066_tree, hf_s5066_version,   tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
+	}
+	proto_tree_add_item(s5066_tree, hf_s5066_size,      tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2;
+	ti_pdu = proto_tree_add_item(s5066_tree, hf_s5066_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
+	s5066_tree_pdu = proto_item_add_subtree(ti_pdu, ett_s5066_pdu);
+	switch (pdu_type) {
+	case  1: offset = dissect_s5066_01(tvb, offset, s5066_tree_pdu); break;
+	/* case  2: offset = dissect_s5066_02(tvb, offset, s5066_tree_pdu); break; */
+	case  3: offset = dissect_s5066_03(tvb, offset, s5066_tree_pdu); break;
+	case  4: offset = dissect_s5066_04(tvb, offset, s5066_tree_pdu); break;
+	case  5: offset = dissect_s5066_05(tvb, offset, s5066_tree_pdu); break;
+	case  6: offset = dissect_s5066_06(tvb, offset, s5066_tree_pdu); break;
+	case  7: offset = dissect_s5066_07(tvb, offset, s5066_tree_pdu); break;
+	case  8: offset = dissect_s5066_08(tvb, offset, s5066_tree_pdu); break;
+	case  9: offset = dissect_s5066_09(tvb, offset, s5066_tree_pdu); break;
+	case 10: offset = dissect_s5066_10(tvb, offset, s5066_tree_pdu); break;
+	case 11: offset = dissect_s5066_11(tvb, offset, s5066_tree_pdu); break;
+	case 12: offset = dissect_s5066_12(tvb, offset, s5066_tree_pdu); break;
+	case 13: offset = dissect_s5066_13(tvb, offset, s5066_tree_pdu); break;
+	case 14: offset = dissect_s5066_14(tvb, offset, s5066_tree_pdu); break;
+	/* case 15: offset = dissect_s5066_15(tvb, offset, s5066_tree_pdu); break; */
+	/* case 16: offset = dissect_s5066_16(tvb, offset, s5066_tree_pdu); break; */
+	/* case 17: offset = dissect_s5066_17(tvb, offset, s5066_tree_pdu); break; */
+	case 18: offset = dissect_s5066_18(tvb, offset, s5066_tree_pdu, pdu_size); break;
+	case 19: offset = dissect_s5066_19(tvb, offset, s5066_tree_pdu, pdu_size); break;
+	case 20: offset = dissect_s5066_20(tvb, offset, s5066_tree_pdu, &client_app_id); break;
+	case 21: offset = dissect_s5066_21(tvb, offset, s5066_tree_pdu, pdu_size, &client_app_id); break;
+	case 22: offset = dissect_s5066_22(tvb, offset, s5066_tree_pdu, &client_app_id); break;
+	case 23: offset = dissect_s5066_23(tvb, offset, s5066_tree_pdu, &client_app_id); break;
+	case 24: offset = dissect_s5066_24(tvb, offset, s5066_tree_pdu, &client_app_id); break;
+	case 25: offset = dissect_s5066_25(tvb, offset, s5066_tree_pdu, pdu_size, &client_app_id); break;
+	case 26: offset = dissect_s5066_26(tvb, offset, s5066_tree_pdu, &client_app_id); break;
+	case 27: offset = dissect_s5066_27(tvb, offset, s5066_tree_pdu, &client_app_id); break;
 	}
 	proto_item_set_len(ti_s5066, offset);
 
@@ -1351,11 +1051,433 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
 	available_length = tvb_length(tvb) - offset;
 
 	next_tvb = tvb_new_subset(tvb, offset, MIN(available_length, reported_length), reported_length);
-	call_dissector(data_handle, next_tvb, pinfo, tree);
+
+	if(dissector_try_uint(s5066sis_dissector_table, client_app_id, next_tvb, pinfo, tree) == 0) {
+		call_dissector(data_handle, next_tvb, pinfo, tree);
+	}
 
 	return tvb_length(tvb);
 }
 
+void
+proto_register_s5066(void)
+{
+	static hf_register_info hf[] = {
+		{ &hf_s5066_sync_word,
+			{ "Sync preamble", "s5066sis.sync", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_version,
+			{ "S5066 version", "s5066sis.version", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_size,
+			{ "S_Primitive size", "s5066sis.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_type,
+			{ "PDU Type", "s5066sis.type", FT_UINT8, BASE_DEC, VALS(s5066_pdu_type), 0x0, NULL, HFILL }
+		},
+		/* STANAG 5066 Address */
+		{ &hf_s5066_ad_size,
+			{ "Address size (1/2 Bytes)", "s5066sis.address.size", FT_UINT8, BASE_HEX, NULL, 0xE0, NULL, HFILL }
+		},
+		{ &hf_s5066_ad_group,
+			{ "Group address", "s5066sis.address.group", FT_UINT8, BASE_HEX, NULL, 0x10, NULL, HFILL }
+		},
+		{ &hf_s5066_ad_address,
+			{ "Address", "s5066sis.address.address", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }
+		},
+		/* Service type */
+		{ &hf_s5066_st_txmode,
+			{ "Transmission mode", "s5066sis.st.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_st_delivery_confirmation,
+			{ "Delivery confirmation", "s5066sis.st.confirm", FT_UINT8, BASE_HEX, VALS(s5066_st_delivery_confirmation),  0x0C, NULL, HFILL }
+		},
+		{ &hf_s5066_st_delivery_order,
+			{ "Delivery order", "s5066sis.st.order", FT_UINT8, BASE_HEX, VALS(s5066_st_delivery_order), 0x02, NULL, HFILL }
+		},
+		{ &hf_s5066_st_extended,
+			{ "Extended field", "s5066sis.st.extended", FT_UINT8, BASE_HEX, VALS(s5066_st_extended), 0x01, NULL, HFILL }
+		},
+		{ &hf_s5066_st_retries,
+			{ "Minimum number of retransmissions", "s5066sis.st.retries", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
+		},
+		/* Client transport layer header */
+		{ &hf_s5066_ctl_conn_id,
+			{ "Connection ID number", "s5066sis.ctl.conn_id", FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_ctl_reserved,
+			{ "Reserved", "s5066sis.ctl.reserved", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_ctl_updu_id,
+			{ "UPDU ID number", "s5066sis.ctl.updu_id", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_ctl_updu_segment,
+			{ "UPDU segment number", "s5066sis.ctl.updu_segment", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_ctl_app_id,
+			{ "Application identifier", "s5066sis.ctl.app_id", FT_UINT16, BASE_HEX, VALS(s5066_client_application_ids), 0x0, NULL, HFILL }
+		},
+		/* PDU Type 01: S_BIND_REQUEST */
+		{ &hf_s5066_01_sapid,
+			{ "Sap ID", "s5066sis.01.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_01_rank,
+			{ "Rank", "s5066sis.01.rank", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_01_unused,
+			{ "(Unused)", "s5066sis.01.unused", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }
+		},
+		/* PDU Type 02: S_UNBIND_REQUEST */
+		/*     --- no subfields ---     */
+		/* PDU Type 03: S_BIND_ACCEPTED */
+		{ &hf_s5066_03_sapid,
+			{ "Sap ID", "s5066sis.03.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_03_unused,
+			{ "(Unused)", "s5066sis.03.unused", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_03_mtu,
+			{ "MTU", "s5066sis.03.mtu", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		/* PDU Type 04: S_BIND_REJECTED */
+		{ &hf_s5066_04_reason,
+			{ "Reason", "s5066sis.04.reason", FT_UINT8, BASE_DEC, VALS(s5066_04_reason), 0x0, NULL, HFILL }
+		},
+		/* PDU Type 05: S_UNBIND_INDICATION */
+		{ &hf_s5066_05_reason,
+			{ "Reason", "s5066sis.05.reason", FT_UINT8, BASE_DEC, VALS(s5066_05_reason), 0x0, NULL, HFILL }
+		},
+		/* Type  6: S_HARD_LINK_ESTABLISH */
+		{ &hf_s5066_06_link_type,
+			{ "Hardlink type", "s5066sis.06.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
+		},
+		{ &hf_s5066_06_link_priority,
+			{ "Priority", "s5066sis.06.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
+		},
+		{ &hf_s5066_06_sapid,
+			{ "Remote Sap ID", "s5066sis.06.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		/* Type  7: S_HARD_LINK_TERMINATE */
+		/* --- Only remote node address --- */
+		/* Type  8: S_HARD_LINK_ESTABLISHED */
+		{ &hf_s5066_08_remote_status,
+			{ "Remote node status", "s5066sis.08.status", FT_UINT8, BASE_DEC, VALS(s5066_08_remote_status), 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_08_link_type,
+			{ "Hardlink type", "s5066sis.08.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
+		},
+		{ &hf_s5066_08_link_priority,
+			{ "Priority", "s5066sis.08.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
+		},
+		{ &hf_s5066_08_sapid,
+			{ "Remote Sap ID", "s5066sis.08.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		/* Type  9: S_HARD_LINK_REJECTED */
+		{ &hf_s5066_09_reason,
+			{ "Reason", "s5066sis.09.reason", FT_UINT8, BASE_DEC, VALS(s5066_09_reason), 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_09_link_type,
+			{ "Hardlink type", "s5066sis.09.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
+		},
+		{ &hf_s5066_09_link_priority,
+			{ "Priority", "s5066sis.09.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
+		},
+		{ &hf_s5066_09_sapid,
+			{ "Remote Sap ID", "s5066sis.09.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		/* Type 10: S_HARD_LINK_TERMINATED */
+		{ &hf_s5066_10_reason,
+			{ "Reason", "s5066sis.10.reason", FT_UINT8, BASE_DEC, VALS(s5066_10_reason), 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_10_link_type,
+			{ "Hardlink type", "s5066sis.10.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
+		},
+		{ &hf_s5066_10_link_priority,
+			{ "Priority", "s5066sis.10.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
+		},
+		{ &hf_s5066_10_sapid,
+			{ "Remote Sap ID", "s5066sis.10.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		/* Type 11: S_HARD_LINK_INDICATION */
+		{ &hf_s5066_11_remote_status,
+			{ "Remote node status", "s5066sis.11.status", FT_UINT8, BASE_DEC, VALS(s5066_11_remote_status), 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_11_link_type,
+			{ "Hardlink type", "s5066sis.11.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
+		},
+		{ &hf_s5066_11_link_priority,
+			{ "Priority", "s5066sis.11.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
+		},
+		{ &hf_s5066_11_sapid,
+			{ "Remote Sap ID", "s5066sis.11.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		/* Type 12: S_HARD_LINK_ACCEPT */
+		{ &hf_s5066_12_link_type,
+			{ "Hardlink type", "s5066sis.12.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
+		},
+		{ &hf_s5066_12_link_priority,
+			{ "Priority", "s5066sis.12.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
+		},
+		{ &hf_s5066_12_sapid,
+			{ "Remote Sap ID", "s5066sis.12.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		/* Type 13: S_HARD_LINK_REJECT */
+		{ &hf_s5066_13_reason,
+			{ "Reason", "s5066sis.13.reason", FT_UINT8, BASE_DEC, VALS(s5066_13_reason), 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_13_link_type,
+			{ "Hardlink type", "s5066sis.13.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
+		},
+		{ &hf_s5066_13_link_priority,
+			{ "Priority", "s5066sis.13.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
+		},
+		{ &hf_s5066_13_sapid,
+			{ "Remote Sap ID", "s5066sis.13.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		/* Type 14: S_SUBNET_AVAILABILITY */
+		{ &hf_s5066_14_status,
+			{ "Status", "s5066sis.14.status", FT_UINT8, BASE_DEC, VALS(s5066_14_status), 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_14_reason,
+			{ "Reason", "s5066sis.14.reason", FT_UINT8, BASE_DEC, VALS(s5066_14_reason), 0x0, NULL, HFILL }
+		},
+		/* Type 15: S_DATAFLOW_ON */
+		/*   --- no subfields ---   */
+		/* Type 16: S_DATAFLOW_OFF */
+		/*   --- no subfields ---   */
+		/* Type 17: S_KEEP_ALIVE */
+		/*   --- no subfields ---   */
+		/* Type 18: S_MANAGEMENT_MESSAGE_REQUEST */
+		{ &hf_s5066_18_type,
+			{ "Message Type", "s5066sis.18.type", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_18_body,
+			{ "Message Body", "s5066sis.18.body", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
+		},
+		/* Type 19: S_MANAGEMENT_MESSAGE_INDICATION */
+		{ &hf_s5066_19_type,
+			{ "Message Type", "s5066sis.19.type", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_19_body,
+			{ "Message Body", "s5066sis.19.body", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
+		},
+		/* Type 20: S_UNIDATA_REQUEST */
+		{ &hf_s5066_20_priority,
+			{ "Priority", "s5066sis.20.priority", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_20_sapid,
+			{ "Destination Sap ID", "s5066sis.20.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_20_ttl,
+			{ "Time-To-Live (x2 seconds)", "s5066sis.20.ttl", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, NULL, HFILL }
+		},
+		{ &hf_s5066_20_size,
+			{ "U_PDU Size", "s5066sis.20.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		/* Type 21: S_UNIDATA_INDICATION */
+		{ &hf_s5066_21_priority,
+			{ "Priority", "s5066sis.21.priority", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_21_dest_sapid,
+			{ "Destination Sap ID", "s5066sis.21.dest_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_21_tx_mode,
+			{ "Transmission Mode", "s5066sis.21.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_21_src_sapid,
+			{ "Source Sap ID", "s5066sis.21.src_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_21_size,
+			{ "U_PDU Size", "s5066sis.21.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_21_err_blocks,
+			{ "Number of errored blocks", "s5066sis.21.err_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_21_err_ptr,
+			{ "Pointer to error block", "s5066sis.21.err_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_21_err_size,
+			{ "Size of error block", "s5066sis.21.err_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_21_nrx_blocks,
+			{ "Number of non-received blocks", "s5066sis.21.nrx_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_21_nrx_ptr,
+			{ "Pointer to non-received block", "s5066sis.21.nrx_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_21_nrx_size,
+			{ "Size of non-received block", "s5066sis.21.nrx_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		/* Type 22: S_UNIDATA_REQUEST_CONFIRM */
+		{ &hf_s5066_22_unused,
+			{ "(Unused)", "s5066sis.22.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_22_sapid,
+			{ "Destination Sap ID", "s5066sis.22.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_22_size,
+			{ "U_PDU Size", "s5066sis.22.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_22_data,
+			{ "(Part of) Confirmed data", "s5066sis.22.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
+		},
+		/* Type 23: S_UNIDATA_REQUEST_REJECTED */
+		{ &hf_s5066_23_reason,
+			{ "Reason", "s5066sis.23.reason", FT_UINT8, BASE_DEC, VALS(s5066_23_reason), 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_23_sapid,
+			{ "Destination Sap ID", "s5066sis.23.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_23_size,
+			{ "U_PDU Size", "s5066sis.23.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_23_data,
+			{ "(Part of) Rejected data", "s5066sis.23.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
+		},
+		/* Type 24: S_EXPEDITED_UNIDATA_REQUEST */
+		{ &hf_s5066_24_unused,
+			{ "(Unused)", "s5066sis.24.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_24_sapid,
+			{ "Destination Sap ID", "s5066sis.24.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_24_ttl,
+			{ "Time-To-Live (x2 seconds)", "s5066sis.24.ttl", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, NULL, HFILL }
+		},
+		{ &hf_s5066_24_size,
+			{ "U_PDU Size", "s5066sis.24.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		/* Type 25: S_EXPEDITED_UNIDATA_INDICATION */
+		{ &hf_s5066_25_unused,
+			{ "(Unused)", "s5066sis.25.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_25_dest_sapid,
+			{ "Destination Sap ID", "s5066sis.25.dest_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_25_tx_mode,
+			{ "Transmission Mode", "s5066sis.25.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_25_src_sapid,
+			{ "Source Sap ID", "s5066sis.25.src_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_25_size,
+			{ "U_PDU Size", "s5066sis.25.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_25_err_blocks,
+			{ "Number of errored blocks", "s5066sis.25.err_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_25_err_ptr,
+			{ "Pointer to error block", "s5066sis.25.err_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_25_err_size,
+			{ "Size of error block", "s5066sis.25.err_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_25_nrx_blocks,
+			{ "Number of non-received blocks", "s5066sis.25.nrx_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_25_nrx_ptr,
+			{ "Pointer to non-received block", "s5066sis.25.nrx_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_25_nrx_size,
+			{ "Size of non-received block", "s5066sis.25.nrx_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		/* Type 26: S_EXPEDITED_UNIDATA_REQUEST_CONFIRM */
+		{ &hf_s5066_26_unused,
+			{ "(Unused)", "s5066sis.26.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_26_sapid,
+			{ "Destination Sap ID", "s5066sis.26.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+		},
+		{ &hf_s5066_26_size,
+			{ "U_PDU Size", "s5066sis.26.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_26_data,
+			{ "(Part of) Confirmed data", "s5066sis.26.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
+		},
+		/* Type 27: S_EXPEDITED_UNIDATA_REQUEST_REJECTED */
+		{ &hf_s5066_27_reason,
+			{ "Reason", "s5066sis.27.reason", FT_UINT8, BASE_DEC, VALS(s5066_27_reason), 0xF0, NULL, HFILL }
+		},
+		{ &hf_s5066_27_sapid,
+			{ "Destination Sap ID", "s5066sis.27.sapid", FT_UINT8, BASE_DEC, VALS(s5066_sapid_assignments), 0x0F, NULL, HFILL }
+
+		},
+		{ &hf_s5066_27_size,
+			{ "U_PDU Size", "s5066sis.27.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
+		},
+		{ &hf_s5066_27_data,
+			{ "(Part of) Rejected data", "s5066sis.27.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
+		},
+
+	};
+
+	/* Setup protocol subtree array */
+	static gint *ett[] = {
+		&ett_s5066,
+		&ett_s5066_pdu,
+		&ett_s5066_servicetype,
+		&ett_s5066_address,
+		&ett_s5066_client_transport_header,
+	};
+
+	module_t *s5066_module;
+
+	proto_s5066 = proto_register_protocol (
+			"STANAG 5066 (SIS layer)",	/* name */
+			"STANAG 5066 SIS",		/* short name*/
+			"s5066sis"			/* abbrev */
+		);
+	proto_register_field_array(proto_s5066, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+
+	s5066_module = prefs_register_protocol(proto_s5066, proto_reg_handoff_s5066);
+	prefs_register_bool_preference(s5066_module, "desegment_pdus",
+				       "Reassemble S5066 SIS PDUs spanning multiple TCP segments",
+				       "Whether the S5066 SIS dissector should reassemble PDUs spanning multiple TCP segments."
+				       " The default is to use reassembly.",
+				       &s5066_desegment);
+	prefs_register_bool_preference(s5066_module, "edition_one",
+				       "Dissect edition 1.0 of STANAG 5066",
+				       "Whether the S5066 SIS dissector should dissect this edition of the STANAG."
+				       " This edition was never formally approved and is very rare. The common edition is edition 1.2.",
+				       &s5066_edition_one);
+	prefs_register_uint_preference(s5066_module, "tcp.port",
+				       "STANAG 5066 SIS TCP Port",
+				       "Set the port for STANAG 5066 SIS. (If other than the default 5066."
+				       " This number is registered with IANA.)",
+				       10, &global_s5066_port);
+
+	s5066sis_dissector_table = register_dissector_table("s5066sis.ctl.appid", "STANAG 5066 Application Identifier", FT_UINT16, BASE_DEC);
+
+}
+
+void
+proto_reg_handoff_s5066(void)
+{
+	static gboolean Initialized = FALSE;
+	static dissector_handle_t s5066_tcp_handle;
+	static guint saved_s5066_port;
+
+	if (!Initialized) {
+		s5066_tcp_handle = new_create_dissector_handle(dissect_s5066_tcp, proto_s5066);
+		data_handle = find_dissector("data");
+		Initialized = TRUE;
+	} else {
+		dissector_delete_uint("tcp.port", saved_s5066_port, s5066_tcp_handle);
+	}
+
+	dissector_add_uint("tcp.port", global_s5066_port, s5066_tcp_handle);
+	saved_s5066_port = global_s5066_port;
+
+	if (!s5066_edition_one) {
+		s5066_header_size = 5;
+		s5066_size_offset = 3;
+	} else {
+		s5066_header_size = 4;
+		s5066_size_offset = 2;
+	}
+}
+
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
diff --git a/epan/dissectors/packet-s5066sis.h b/epan/dissectors/packet-s5066sis.h
new file mode 100644
index 0000000000..fecdc72c9a
--- /dev/null
+++ b/epan/dissectors/packet-s5066sis.h
@@ -0,0 +1,48 @@
+/* packet-s5066sis.h
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __PACKET_S5066SIS_H__
+#define __PACKET_S5066SIS_H__
+
+/* S5066 Client Application IDs */
+#define S5066_CLIENT_BFTP				0x1002
+#define S5066_CLIENT_FRAP				0x100B
+#define S5066_CLIENT_FRAP_V2				0x100C
+#define S5066_CLIENT_S4406_ANNEX_E_TMI_1_P_MUL		0x2000
+#define S5066_CLIENT_S4406_ANNEX_E_TMI_2		0x2001
+#define S5066_CLIENT_S4406_ANNEX_E_TMI_3		0x2002
+#define S5066_CLIENT_S4406_ANNEX_E_TMI_4_DMP		0x2003 /* TMI-4 is updated with DMP spec. */
+#define S5066_CLIENT_S4406_ANNEX_E_TMI_5_ACP_127	0x2004
+
+#endif /* PACKET_S5066SIS_H */
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */