diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt

index 11d2c89cd0..3c313d2c5e 100644

--- a/epan/dissectors/CMakeLists.txt

+++ b/epan/dissectors/CMakeLists.txt

@@ -1745,7 +1745,7 @@ set(DISSECTOR_SRC

 	${CMAKE_CURRENT_SOURCE_DIR}/packet-smb-direct.c

 	${CMAKE_CURRENT_SOURCE_DIR}/packet-smb.c

 	${CMAKE_CURRENT_SOURCE_DIR}/packet-smb2.c

-	${CMAKE_CURRENT_SOURCE_DIR}/packet-smcr.c

+	${CMAKE_CURRENT_SOURCE_DIR}/packet-smc.c

 	${CMAKE_CURRENT_SOURCE_DIR}/packet-sml.c

 	${CMAKE_CURRENT_SOURCE_DIR}/packet-smp.c

 	${CMAKE_CURRENT_SOURCE_DIR}/packet-smpp.c

diff --git a/epan/dissectors/packet-smcr.c b/epan/dissectors/packet-smc.c

similarity index 56%

rename from epan/dissectors/packet-smcr.c

rename to epan/dissectors/packet-smc.c

index 7096d1b0b0..bbfa9c07ef 100644

--- a/epan/dissectors/packet-smcr.c

+++ b/epan/dissectors/packet-smc.c

@@ -1,7 +1,8 @@

-/* packet-smcr.c

- * SMC-R dissector for wireshark

+/* packet-smc.c

+ * SMC dissector for wireshark

  * By Joe Fowler <fowlerja@us.ibm.com>

- * (c) Copyright IBM Corporation 2014

+ * By Guvenc Gulce <guvenc@linux.ibm.com>

+ * (c) Copyright IBM Corporation 2014,2020

  * LICENSE: GNU General Public License, version 2, or (at your option) any

  * version. http://opensource.org/licenses/gpl-2.0.php

  *

@@ -13,6 +14,7 @@

  *

  * Please refer to the following specs for protocol:

  * - ietf - draft-fox-tcpm-shared-memory-rdma-05

+ * - https://www.ibm.com/support/pages/node/6326337

  */

 #include "config.h"

@@ -20,25 +22,33 @@

 #include <epan/packet.h>

 #include "packet-tcp.h"

+#include <stdbool.h>

-#define SMCR_TCP_MIN_HEADER_LENGTH 7

-#define CLC_MSG_START_OFFSET 7

+#define SMC_TCP_MIN_HEADER_LENGTH 7

+#define CLC_MSG_START_OFFSET 5

 #define LLC_MSG_START_OFFSET 3

 #define RMBE_CTRL_START_OFFSET 2

 #define MAC_ADDR_LEN 6

+#define SMC_V2 2

 #define GID_LEN 16

 #define PEERID_LEN 8

+#define DIAG_INFO_LEN 4

+#define EID_LEN 32

+#define ISM_GID_LEN 8

+#define ISM_CHID_LEN 2

 #define IPV4_SUBNET_MASK_LEN 4

-#define IPV6_PREFIX_LEN 4

+#define IPV6_PREFIX_LEN 16

 #define ONE_BYTE_RESERVED 1

 #define TWO_BYTE_RESERVED 2

 #define QP_LEN 3

 #define RKEY_LEN 4

 #define VIRTUAL_ADDR_LEN 8

 #define FLAG_BYTE_LEN 1

+#define LENGTH_BYTE_LEN 2

 #define SEQNO_LEN 2

 #define CURSOR_LEN 4

 #define ALERT_TOKEN_LEN 4

+#define DMB_TOKEN_LEN 8

 #define PSN_LEN 3

 #define CONN_INDEX_LEN 1

 #define SMCR_MSG_BYTE_0 0

@@ -52,6 +62,7 @@

 #define LLC_CMD_RSP_OFFSET 3

 #define ACCEPT_CONFIRM_QP_OFFSET 38

 #define SMCR_CLC_ID 0xe2d4c3d9 /*EBCDIC 'SMCR' */

+#define SMCD_CLC_ID 0xe2d4c3c4 /*EBCDIC 'SMCD' */

 #define SMC_CLC_V1    0x10

 #define SMC_CLC_SMC_R 0x01

@@ -66,6 +77,52 @@ typedef enum {

 	SMC_CLC_DECLINE = 4

 } clc_message;

+typedef enum {

+	SMC_CLC_SMCR = 0,

+	SMC_CLC_SMCD = 1,

+	SMC_CLC_NONE = 2,

+	SMC_CLC_BOTH = 3,

+} clc_type_message;

+

+typedef enum {

+	SMC_CLC_OS_ZOS = 1,

+	SMC_CLC_OS_LINUX = 2,

+	SMC_CLC_OS_AIX = 3,

+	SMC_CLC_OS_UNKOWN = 15,

+} clc_os_message;

+

+static const value_string smc_clc_os_message_txt[] = {

+	{ SMC_CLC_OS_ZOS,      "z/OS" },

+	{ SMC_CLC_OS_LINUX,    "Linux" },

+	{ SMC_CLC_OS_AIX,      "AIX" },

+	{ SMC_CLC_OS_UNKOWN,   "Unknown" },

+	{ 0, NULL }

+};

+

+static const value_string smc_clc_type_message_txt[] = {

+	{ SMC_CLC_SMCR,     "SMC-R" },

+	{ SMC_CLC_SMCD,     "SMC-D"   },

+	{ SMC_CLC_NONE,     "NONE"  },

+	{ SMC_CLC_BOTH,     "SMC-R/SMC-D"  },

+	{ 0, NULL }

+};

+

+

+static const value_string smcv2_clc_col_info_message_txt[] = {

+	{ SMC_CLC_SMCR,     "[SMC-R-Proposal]" },

+	{ SMC_CLC_SMCD,     "[SMC-Dv2-Proposal]"   },

+	{ SMC_CLC_NONE,     "[NONE]"  },

+	{ SMC_CLC_BOTH,     "[SMC-Dv2/SMC-R-Proposal]"  },

+	{ 0, NULL }

+};

+

+static const value_string smc_clc_col_info_message_txt[] = {

+        { SMC_CLC_SMCR,     "[SMC-R-Proposal]" },

+        { SMC_CLC_SMCD,     "[SMC-D-Proposal]"   },

+        { SMC_CLC_NONE,     "[NONE]"  },

+        { SMC_CLC_BOTH,     "[SMC-D/SMC-R-Proposal]"  },

+        { 0, NULL }

+};

 static const value_string smcr_clc_message_txt[] = {

 	{ SMC_CLC_PROPOSAL,     "Proposal" },

@@ -104,22 +161,35 @@ static const value_string smcr_llc_message_txt[] = {

 	{ 0, NULL }

 };

-static int proto_smcr = -1;

+static int proto_smc = -1;

 static int ett_smcr = -1;

 static int hf_smcr_clc_msg = -1;

 static int hf_smcr_llc_msg = -1;

-/* SMC-R Proposal */

+/* SMC Proposal for both SMC-D and SMC-R */

 static int ett_proposal_flag = -1;

+static int ett_proposal_ext_flag2 = -1;

+static int hf_proposal_smc_version_release_number = -1;

+static int hf_proposal_smc_version_seid = -1;

 static int hf_proposal_smc_version = -1;

-static int hf_smcr_proposal_flags = -1;

-static int hf_smcr_proposal_client_peer_id = -1;

-static int hf_smcr_proposal_client_preferred_gid = -1;

-static int hf_smcr_proposal_client_preferred_mac = -1;

-static int hf_smcr_proposal_outgoing_interface_subnet_mask = -1;

-static int hf_smcr_proposal_outgoing_subnet_mask_signifcant_bits = -1;

-static int hf_smcr_proposal_ipv6_prefix = -1;

-static int hf_smcr_proposal_ipv6_prefix_length = -1;

+static int hf_proposal_smc_type = -1;

+static int hf_proposal_smc_v2_type = -1;

+static int hf_smc_length = -1;

+static int hf_smc_proposal_smc_chid = -1;

+static int hf_smc_proposal_flags = -1;

+static int hf_smc_proposal_eid = -1;

+static int hf_smc_proposal_system_eid = -1;

+static int hf_smc_proposal_ext_flags = -1;

+static int hf_smc_proposal_client_peer_id = -1;

+static int hf_smc_proposal_ism_gid = -1;

+static int hf_smc_proposal_client_preferred_gid = -1;

+static int hf_smc_proposal_client_preferred_mac = -1;

+static int hf_smc_proposal_outgoing_interface_subnet_mask = -1;

+static int hf_smc_proposal_rocev2_gid_ipv4_addr = -1;

+static int hf_smc_proposal_rocev2_gid_ipv6_addr = -1;

+static int hf_smc_proposal_outgoing_subnet_mask_signifcant_bits = -1;

+static int hf_smc_proposal_ipv6_prefix = -1;

+static int hf_smc_proposal_ipv6_prefix_length = -1;

 /* SMC-R Accept */

 static int ett_accept_flag = -1;

@@ -158,10 +228,57 @@ static int hf_confirm_smc_version = -1;

 static int hf_confirm_rmb_buffer_size = -1;

 static int hf_confirm_qp_mtu_value = -1;

+/* SMC-D Accept */

+static int hf_accept_smc_type = -1;

+static int ett_smcd_accept_flag = -1;

+static int ett_smcd_accept_fce_flag = -1;

+static int ett_smcd_accept_flag2 = -1;

+static int hf_smcd_accept_smc_version = -1;

+static int hf_accept_os_type = -1;

+static int hf_accept_smc_version_release_number = -1;

+static int hf_smcd_accept_first_contact = -1;

+static int hf_accept_dmb_buffer_size = -1;

+static int hf_smcd_accept_flags = -1;

+static int hf_smcd_accept_fce_flags = -1;

+static int hf_smcd_accept_flags2 = -1;

+static int hf_smcd_accept_server_peer_id = -1;

+static int hf_smcd_accept_dmbe_conn_index = -1;

+static int hf_smcd_accept_dmb_token = -1;

+static int hf_smcd_accept_server_link_id = -1;

+static int hf_smcd_accept_smc_chid = -1;

+static int hf_smcd_accept_eid = -1;

+static int hf_smcd_accept_peer_name = -1;

+

+/* SMC-D Confirm */

+static int hf_confirm_smc_type = -1;

+static int ett_smcd_confirm_flag = -1;

+static int ett_smcd_confirm_fce_flag = -1;

+static int ett_smcd_confirm_flag2 = -1;

+static int hf_smcd_confirm_smc_version = -1;

+static int hf_confirm_os_type = -1;

+static int hf_smcd_confirm_flags = -1;

+static int hf_smcd_confirm_flags2 = -1;

+static int hf_smcd_confirm_first_contact = -1;

+static int hf_smcd_confirm_client_peer_id = -1;

+static int hf_smcd_confirm_dmb_token = -1;

+static int hf_smcd_confirm_dmbe_conn_index = -1;

+static int hf_smcd_confirm_client_link_id = -1;

+static int hf_confirm_smc_version_release_number = -1;

+static int hf_smcd_confirm_dmb_buffer_size = -1;

+static int hf_smcd_confirm_smc_chid = -1;

+static int hf_smcd_confirm_eid = -1;

+static int hf_smcd_confirm_peer_name = -1;

+

 /* SMC-R Decline */

-static int hf_smcr_decline_flags = -1;

-static int hf_smcr_decline_peer_id = -1;

-static int hf_smcr_decline_diag_info = -1;

+static int ett_decline_flag = -1;

+static int ett_decline_flag2 = -1;

+static int hf_smc_decline_flags = -1;

+static int hf_smc_decline_flags2 = -1;

+static int hf_smc_decline_peer_id = -1;

+static int hf_smc_decline_diag_info = -1;

+static int hf_decline_os_type = -1;

+static int hf_decline_smc_version = -1;

+static int hf_decline_out_of_sync = -1;

 /* SMC-R Confirm Link*/

 static int ett_confirm_link_flag = -1;

@@ -256,55 +373,300 @@ static int hf_smcr_rmbe_ctrl_peer_abnormal_close = -1;

 void proto_register_smcr(void);

 void proto_reg_handoff_smcr(void);

-static dissector_handle_t smcr_tcp_handle;

+static dissector_handle_t smc_tcp_handle;

 static void

-disect_smcr_proposal(tvbuff_t *tvb, proto_tree *tree)

+disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6)

 {

-	guint offset;

-	guint16 mask_offset;

-	guint8 ipv6_prefix_count;

+	guint offset, suboffset;

+	guint16 mask_offset, v2_ext_offset;

+	guint16 v2_ext_pos = 0, smcd_v2_ext_offset = 0;

+	guint16 smcd_v2_ext_pos = 0;

+	guint8 ipv6_prefix_count, smc_version;

+	guint8 smc_type, num_of_gids = 0, num_of_eids = 0;

+	guint8 smc_type_v1 = 0, smc_type_v2 = 0;

+	bool is_smc_v2, is_smcdv1, is_smcdv2;

 	proto_item *proposal_flag_item;

 	proto_tree *proposal_flag_tree;

+

 	offset = CLC_MSG_START_OFFSET;

-	proposal_flag_item = proto_tree_add_item(tree, hf_smcr_proposal_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	proto_tree_add_item(tree, hf_smc_length, tvb, offset,

+		LENGTH_BYTE_LEN, ENC_BIG_ENDIAN);

+	offset += LENGTH_BYTE_LEN;

+	proposal_flag_item = proto_tree_add_item(tree, hf_smc_proposal_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

 	proposal_flag_tree = proto_item_add_subtree(proposal_flag_item, ett_proposal_flag);

 	proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	smc_version = tvb_get_guint8(tvb, offset);

+	smc_type = tvb_get_guint8(tvb, offset);

+	smc_version = ((smc_version >> 4) & 0x0F);

+	is_smc_v2 = (smc_version >= SMC_V2);

+	smc_type_v2 = ((smc_type >> 2) & 0x03);

+	smc_type_v1 = (smc_type & 0x03);

+	is_smcdv1 = ((smc_type_v1 == SMC_CLC_SMCD) || (smc_type_v1 == SMC_CLC_BOTH));

+	is_smcdv2 = ((smc_type_v2 == SMC_CLC_SMCD) || (smc_type_v2 == SMC_CLC_BOTH));

+

+	if (is_smc_v2)

+		proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_v2_type, tvb,

+				offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+

+	proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_type, tvb,

+			offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+

 	offset += FLAG_BYTE_LEN;

-	proto_tree_add_item(tree, hf_smcr_proposal_client_peer_id, tvb, offset,

+	proto_tree_add_item(tree, hf_smc_proposal_client_peer_id, tvb, offset,

 			    PEERID_LEN, ENC_BIG_ENDIAN);

 	offset += PEERID_LEN;

-	proto_tree_add_item(tree, hf_smcr_proposal_client_preferred_gid, tvb,

+	proto_tree_add_item(tree, hf_smc_proposal_client_preferred_gid, tvb,

 			    offset, GID_LEN, ENC_NA);

 	offset += GID_LEN;

-	proto_tree_add_item(tree, hf_smcr_proposal_client_preferred_mac, tvb,

+	proto_tree_add_item(tree, hf_smc_proposal_client_preferred_mac, tvb,

 			    offset, MAC_ADDR_LEN, ENC_NA);

 	offset += MAC_ADDR_LEN;

 	mask_offset = tvb_get_ntohs(tvb, offset);

-	offset += 2 + mask_offset;

-	proto_tree_add_item(tree, hf_smcr_proposal_outgoing_interface_subnet_mask, tvb,

-			offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN);

+

+	if (mask_offset != 0) {

+		suboffset = offset;

+		suboffset += TWO_BYTE_RESERVED;

+		if (is_smcdv1 || is_smcdv2) {

+			proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb,

+					suboffset, ISM_GID_LEN, ENC_NA);

+		}

+		suboffset += ISM_GID_LEN;

+		if (is_smc_v2) {

+			if (is_smcdv2) {

+				proto_tree_add_item(tree, hf_smc_proposal_smc_chid, tvb, suboffset,

+						LENGTH_BYTE_LEN, ENC_BIG_ENDIAN);

+			}

+			suboffset += LENGTH_BYTE_LEN;

+			v2_ext_offset = tvb_get_ntohs(tvb, suboffset);

+			v2_ext_pos = suboffset + TWO_BYTE_RESERVED + v2_ext_offset;

+		}

+	}

+	offset += TWO_BYTE_RESERVED + mask_offset;

+

+	proto_tree_add_item(tree, hf_smc_proposal_outgoing_interface_subnet_mask, tvb,

+		offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN);

 	offset += IPV4_SUBNET_MASK_LEN;

-	proto_tree_add_item(tree, hf_smcr_proposal_outgoing_subnet_mask_signifcant_bits, tvb,

-			offset, 1, ENC_BIG_ENDIAN);

+	proto_tree_add_item(tree, hf_smc_proposal_outgoing_subnet_mask_signifcant_bits, tvb,

+		offset, 1, ENC_BIG_ENDIAN);

 	offset += 1;

 	/* Bump past reserved bytes */

 	offset += TWO_BYTE_RESERVED;

 	ipv6_prefix_count = tvb_get_guint8(tvb, offset);

-	offset += 2;

+	offset += 1;

 	while (ipv6_prefix_count != 0) {

-		proto_tree_add_item(tree, hf_smcr_proposal_ipv6_prefix, tvb,

+		proto_tree_add_item(tree, hf_smc_proposal_ipv6_prefix, tvb,

 			offset, IPV6_PREFIX_LEN, ENC_NA);

 		offset += IPV6_PREFIX_LEN;

-		proto_tree_add_item(tree, hf_smcr_proposal_ipv6_prefix_length, tvb,

+		proto_tree_add_item(tree, hf_smc_proposal_ipv6_prefix_length, tvb,

 			offset, 1, ENC_BIG_ENDIAN);

 		offset += 1;

 		ipv6_prefix_count--;

 	}

+

+	if (v2_ext_pos >= offset) {

+		offset = v2_ext_pos;

+		num_of_eids = tvb_get_guint8(tvb, offset);

+		offset += FLAG_BYTE_LEN;

+		num_of_gids = tvb_get_guint8(tvb, offset);

+		offset += FLAG_BYTE_LEN;

+		/*Skip reserved flag 1*/

+		offset += 1;

+		proposal_flag_item = proto_tree_add_item(tree, hf_smc_proposal_ext_flags, tvb,

+							offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+		proposal_flag_tree = proto_item_add_subtree(proposal_flag_item, ett_proposal_ext_flag2);

+		proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version_release_number,

+				tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+		proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version_seid, tvb,

+				offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+		offset += FLAG_BYTE_LEN;

+		/*Skip not used 2 bytes*/

+		offset += 2;

+		smcd_v2_ext_offset = tvb_get_ntohs(tvb, offset);

+		offset += 2;

+		smcd_v2_ext_pos = offset + smcd_v2_ext_offset;

+

+		if (is_ipv6) {

+			proto_tree_add_item(tree, hf_smc_proposal_rocev2_gid_ipv6_addr, tvb,

+				offset, GID_LEN, ENC_NA);

+			offset += GID_LEN;

+		}

+		else {

+			offset += 12;

+			proto_tree_add_item(tree, hf_smc_proposal_rocev2_gid_ipv4_addr, tvb,

+				offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN);

+			offset += IPV4_SUBNET_MASK_LEN;

+		}

+		/*Skip reserved 16 bytes*/

+		offset += 16;

+		while (num_of_eids != 0) {

+			proto_tree_add_item(tree, hf_smc_proposal_eid, tvb,

+					offset, EID_LEN, ENC_ASCII | ENC_NA);

+			offset += EID_LEN;

+			num_of_eids--;

+		}

+		if (smcd_v2_ext_pos >= offset) {

+			offset = smcd_v2_ext_pos;

+			proto_tree_add_item(tree, hf_smc_proposal_system_eid, tvb,

+					offset, EID_LEN, ENC_ASCII | ENC_NA);

+			offset += EID_LEN;

+			/*Skip reserved 16 bytes*/

+			offset += 16;

+			while (num_of_gids != 0) {

+				proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb,

+					offset, ISM_GID_LEN, ENC_NA);

+				offset += ISM_GID_LEN;

+				proto_tree_add_item(tree, hf_smc_proposal_smc_chid, tvb, offset,

+						ISM_CHID_LEN, ENC_BIG_ENDIAN);

+				offset += ISM_CHID_LEN;

+				num_of_gids--;

+			}

+		}

+

+	}

+}

+

+static void

+disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree)

+{

+	guint offset;

+	proto_item* accept_flag_item;

+	proto_tree* accept_flag_tree;

+	proto_item* accept_flag2_item;

+	proto_tree* accept_flag2_tree;

+	guint8 smc_version, first_contact = 0;

+

+	offset = CLC_MSG_START_OFFSET;

+	proto_tree_add_item(tree, hf_smc_length, tvb, offset,

+		LENGTH_BYTE_LEN, ENC_BIG_ENDIAN);

+	offset += LENGTH_BYTE_LEN;

+	accept_flag_item = proto_tree_add_item(tree, hf_smcd_accept_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_smcd_accept_flag);

+	proto_tree_add_item(accept_flag_tree, hf_smcd_accept_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	proto_tree_add_item(accept_flag_tree, hf_smcd_accept_first_contact, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	proto_tree_add_item(accept_flag_tree, hf_accept_smc_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	smc_version = tvb_get_guint8(tvb, offset);

+	first_contact = tvb_get_guint8(tvb, offset);

+	smc_version = ((smc_version >> 4) & 0x0F);

+	first_contact = ((first_contact >> 3) & 0x01);

+	offset += FLAG_BYTE_LEN;

+	proto_tree_add_item(tree, hf_smcd_accept_server_peer_id, tvb, offset,

+		PEERID_LEN, ENC_BIG_ENDIAN);

+	offset += PEERID_LEN;

+

+	proto_tree_add_item(tree, hf_smcd_accept_dmb_token, tvb,

+		offset, DMB_TOKEN_LEN, ENC_NA);

+	offset += DMB_TOKEN_LEN;

+

+	proto_tree_add_item(tree, hf_smcd_accept_dmbe_conn_index, tvb,

+		offset, CONN_INDEX_LEN, ENC_BIG_ENDIAN);

+	offset += CONN_INDEX_LEN;

+

+	accept_flag2_item = proto_tree_add_item(tree, hf_smcd_accept_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	accept_flag2_tree = proto_item_add_subtree(accept_flag2_item, ett_smcd_accept_flag2);

+	proto_tree_add_item(accept_flag2_tree, hf_accept_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	offset += FLAG_BYTE_LEN;

+	offset += TWO_BYTE_RESERVED;

+	proto_tree_add_item(tree, hf_smcd_accept_server_link_id, tvb,

+		offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN);

+	offset += ALERT_TOKEN_LEN;

+

+	if (smc_version >= SMC_V2) {

+		proto_tree_add_item(tree, hf_smcd_accept_smc_chid, tvb, offset,

+			LENGTH_BYTE_LEN, ENC_BIG_ENDIAN);

+		offset += LENGTH_BYTE_LEN;

+

+		proto_tree_add_item(tree, hf_smcd_accept_eid, tvb, offset, 32, ENC_ASCII | ENC_NA);

+		offset += 32;

+		/* Reserved bytes */

+		offset += 8;

+

+		if (first_contact) {

+			offset += ONE_BYTE_RESERVED;

+			accept_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+			accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_smcd_accept_fce_flag);

+			proto_tree_add_item(accept_flag_tree, hf_accept_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+			proto_tree_add_item(accept_flag_tree, hf_accept_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+			offset += FLAG_BYTE_LEN;

+			offset += TWO_BYTE_RESERVED;

+			proto_tree_add_item(tree, hf_smcd_accept_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA);

+			offset += 32;

+		}

+	}

+}

+

+static void

+disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree)

+{

+	guint offset;

+	proto_item* confirm_flag_item;

+	proto_tree* confirm_flag_tree;

+	proto_item* confirm_flag2_item;

+	proto_tree* confirm_flag2_tree;

+	guint8 smc_version, first_contact = 0;

+

+	offset = CLC_MSG_START_OFFSET;

+	proto_tree_add_item(tree, hf_smc_length, tvb, offset,

+		LENGTH_BYTE_LEN, ENC_BIG_ENDIAN);

+	offset += LENGTH_BYTE_LEN;

+	confirm_flag_item = proto_tree_add_item(tree, hf_smcd_confirm_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_smcd_confirm_flag);

+	proto_tree_add_item(confirm_flag_tree, hf_smcd_confirm_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	proto_tree_add_item(confirm_flag_tree, hf_smcd_confirm_first_contact, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	smc_version = tvb_get_guint8(tvb, offset);

+	first_contact = tvb_get_guint8(tvb, offset);

+	smc_version = ((smc_version >> 4) & 0x0F);

+	first_contact = ((first_contact >> 3) & 0x01);

+	offset += FLAG_BYTE_LEN;

+	proto_tree_add_item(tree, hf_smcd_confirm_client_peer_id, tvb, offset,

+		PEERID_LEN, ENC_BIG_ENDIAN);

+	offset += PEERID_LEN;

+

+	proto_tree_add_item(tree, hf_smcd_confirm_dmb_token, tvb,

+		offset, DMB_TOKEN_LEN, ENC_NA);

+	offset += DMB_TOKEN_LEN;

+

+	proto_tree_add_item(tree, hf_smcd_confirm_dmbe_conn_index, tvb,

+		offset, CONN_INDEX_LEN, ENC_BIG_ENDIAN);

+	offset += CONN_INDEX_LEN;

+

+	confirm_flag2_item = proto_tree_add_item(tree, hf_smcd_confirm_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_smcd_confirm_flag2);

+	proto_tree_add_item(confirm_flag2_tree, hf_smcd_confirm_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	offset += FLAG_BYTE_LEN;

+	offset += TWO_BYTE_RESERVED;

+	proto_tree_add_item(tree, hf_smcd_confirm_client_link_id, tvb,

+		offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN);

+	offset += ALERT_TOKEN_LEN;

+

+	if (smc_version >= SMC_V2) {

+		proto_tree_add_item(tree, hf_smcd_confirm_smc_chid, tvb, offset,

+			LENGTH_BYTE_LEN, ENC_BIG_ENDIAN);

+		offset += LENGTH_BYTE_LEN;

+

+		proto_tree_add_item(tree, hf_smcd_confirm_eid, tvb, offset, 32, ENC_ASCII | ENC_NA);

+		offset += 32;

+		/* Reserved bytes */

+		offset += 8;

+

+		if (first_contact) {

+			offset += ONE_BYTE_RESERVED;

+			confirm_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+			confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_smcd_confirm_fce_flag);

+			proto_tree_add_item(confirm_flag_tree, hf_confirm_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+			proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+			offset += FLAG_BYTE_LEN;

+			offset += TWO_BYTE_RESERVED;

+			proto_tree_add_item(tree, hf_smcd_confirm_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA);

+			offset += 32;

+		}

+	}

 }

+

 static void

 disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree)

 {

@@ -315,6 +677,9 @@ disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree)

 	proto_tree *accept_flag2_tree;

 	offset = CLC_MSG_START_OFFSET;

+	proto_tree_add_item(tree, hf_smc_length, tvb, offset,

+		LENGTH_BYTE_LEN, ENC_BIG_ENDIAN);

+	offset += LENGTH_BYTE_LEN;

 	accept_flag_item = proto_tree_add_item(tree, hf_smcr_accept_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

 	accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_accept_flag);

 	proto_tree_add_item(accept_flag_tree, hf_accept_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

@@ -367,6 +732,9 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree)

 	proto_tree *confirm_flag2_tree;

 	offset = CLC_MSG_START_OFFSET;

+	proto_tree_add_item(tree, hf_smc_length, tvb, offset,

+		LENGTH_BYTE_LEN, ENC_BIG_ENDIAN);

+	offset += LENGTH_BYTE_LEN;

 	confirm_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

 	confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_confirm_flag);

 	proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

@@ -411,17 +779,41 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree)

 static void

 disect_smcr_decline(tvbuff_t *tvb, proto_tree *tree)

 {

-	guint offset;

+	proto_item* decline_flag_item;

+	proto_tree* decline_flag_tree;

+	proto_item* decline_flag2_item;

+	proto_tree* decline_flag2_tree;

+	guint offset, smc_version;

 	offset = CLC_MSG_START_OFFSET;

-	proto_tree_add_item(tree, hf_smcr_decline_flags, tvb, offset,

+	proto_tree_add_item(tree, hf_smc_length, tvb, offset,

+		LENGTH_BYTE_LEN, ENC_BIG_ENDIAN);

+	offset += LENGTH_BYTE_LEN;

+

+	decline_flag_item = proto_tree_add_item(tree, hf_smc_decline_flags, tvb, offset,

+		FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	decline_flag_tree = proto_item_add_subtree(decline_flag_item, ett_decline_flag);

+	proto_tree_add_item(decline_flag_tree, hf_decline_smc_version, tvb, offset,

+		FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	proto_tree_add_item(decline_flag_tree, hf_decline_out_of_sync, tvb, offset,

 			FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	smc_version = tvb_get_guint8(tvb, offset);

+	smc_version = ((smc_version >> 4) & 0x0F);

+

 	offset += FLAG_BYTE_LEN;

-	proto_tree_add_item(tree, hf_smcr_decline_peer_id, tvb, offset,

+	proto_tree_add_item(tree, hf_smc_decline_peer_id, tvb, offset,

 			PEERID_LEN, ENC_BIG_ENDIAN);

 	offset += PEERID_LEN;

-	proto_tree_add_item(tree, hf_smcr_decline_diag_info, tvb, offset,

-			4, ENC_BIG_ENDIAN);

+	proto_tree_add_item(tree, hf_smc_decline_diag_info, tvb, offset,

+			DIAG_INFO_LEN, ENC_BIG_ENDIAN);

+	offset += DIAG_INFO_LEN;

+	if (smc_version >= SMC_V2) {

+		decline_flag2_item = proto_tree_add_item(tree, hf_smc_decline_flags2, tvb, offset,

+			FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+		decline_flag2_tree = proto_item_add_subtree(decline_flag2_item, ett_decline_flag2);

+		proto_tree_add_item(decline_flag2_tree, hf_decline_os_type, tvb, offset,

+			FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

+	}

 }

 static void

@@ -730,50 +1122,126 @@ disect_smcr_rmbe_ctrl(tvbuff_t *tvb, proto_tree *tree)

 			tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);

 }

+static guint8 get_mixed_type(guint8 v1_type, guint8 v2_type)

+{

+	if (v1_type == SMC_CLC_BOTH)

+		return v1_type;

+

+	if (v1_type == SMC_CLC_NONE)

+		return v2_type;

+

+	if (((v2_type == SMC_CLC_SMCD) && (v1_type == SMC_CLC_SMCR)) ||

+	    ((v2_type == SMC_CLC_SMCR) && (v1_type == SMC_CLC_SMCD)))

+		return SMC_CLC_BOTH;

+

+	return v2_type;

+}

+

 static int

-dissect_smcr_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,

+dissect_smc_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,

 		void *data _U_)

 {

 	gint offset;

 	guint16 msg_len;

+	guint8 smc_type, smc_v2_type = 0, smc_v1_type = 0, smc_version = 0;

+	guint8 mixed_type;

 	clc_message clc_msgid;

 	proto_item *ti;

-	proto_tree *smcr_tree;

+	proto_tree *smc_tree;

+	bool is_ipv6, is_smc_v2, is_smcd = false;

-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMC-R");

 	msg_len = tvb_get_ntohs(tvb, CLC_MSG_LEN_OFFSET);

 	offset = 4;

-	clc_msgid = (clc_message) tvb_get_guint8(tvb, offset);

-	col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-R-%s],",

-			val_to_str_const((guint32)clc_msgid,

-			smcr_clc_message_txt, "Unknown Command"));

+	clc_msgid = (clc_message)tvb_get_guint8(tvb, offset);

-	if ((clc_msgid == SMC_CLC_ACCEPT) ||

-	    (clc_msgid == SMC_CLC_CONFIRMATION)) {

+	smc_version = tvb_get_guint8(tvb, offset + 3);

+	smc_version = ((smc_version >> 4) & 0x0F);

+	smc_type = tvb_get_guint8(tvb, offset + 3);

+	is_smc_v2 = (smc_version >= SMC_V2);

+

+	if (is_smc_v2 && (clc_msgid == SMC_CLC_PROPOSAL)) {

+		smc_v1_type = (smc_type & 0x03);

+		smc_v2_type = ((smc_type >> 2) & 0x03);

+	}

+	else if (clc_msgid != SMC_CLC_DECLINE) {

+		smc_v2_type = (smc_type & 0x03);

+		smc_v1_type = (smc_type & 0x03);

+	}

+

+	is_ipv6 = (pinfo->src.type == AT_IPv6);

+

+	if (is_smc_v2)

+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMCv2");

+	else

+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMC");

+

+	if (clc_msgid == SMC_CLC_PROPOSAL) {

+		if (is_smc_v2 && (smc_v2_type != SMC_CLC_NONE)) {

+			mixed_type = get_mixed_type(smc_v1_type, smc_v2_type);

+			col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s,",

+					val_to_str_const((guint32)mixed_type,

+					smcv2_clc_col_info_message_txt, "Unknown Command"));

+		} else {

+			col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s,",

+					val_to_str_const((guint32)smc_v1_type,

+					smc_clc_col_info_message_txt, "Unknown Command"));

+		}

+	} else if ((smc_v2_type == SMC_CLC_SMCR) && ((clc_msgid == SMC_CLC_ACCEPT) ||

+		   (clc_msgid == SMC_CLC_CONFIRMATION))) {

+		col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-R-%s],",

+			val_to_str_const((guint32)clc_msgid,

+				smcr_clc_message_txt, "Unknown Command"));

 		col_append_fstr(pinfo->cinfo, COL_INFO, " QP=0x%06x",

 				tvb_get_ntoh24(tvb, ACCEPT_CONFIRM_QP_OFFSET));

 	}

+	else if ((smc_v2_type == SMC_CLC_SMCD) && ((clc_msgid == SMC_CLC_ACCEPT) ||

+		(clc_msgid == SMC_CLC_CONFIRMATION))) {

+		is_smcd = true;

+		if (is_smc_v2)