aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tipc.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-10-07 18:32:48 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-10-07 18:32:48 +0000
commit67e98ca737ea96675009c3a1c24c52bab6b05d4e (patch)
tree889c2fbf275f0ddaff6625e91fd209f25e24c52e /epan/dissectors/packet-tipc.c
parent88130d4828f411c693a1dbb9ad3793390ce7c1ee (diff)
From Erik Hugne:
tYN flag in named messages Named messages are both used for connectionless messaging and connection setup requests. A SYN flag is now represented by the previously reserved bit 18 in word 0 to differentiate named messages from connection requests. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9241 svn path=/trunk/; revision=52440
Diffstat (limited to 'epan/dissectors/packet-tipc.c')
-rw-r--r--epan/dissectors/packet-tipc.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index b7bd142b9f..542e2107d6 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -171,9 +171,14 @@ static int hf_tipcv2_dist_scope = -1;
static int hf_tipcv2_name_dist_port_id_node = -1;
static int hf_tipcv2_media_id = -1;
+/* added in minor PV 1 */
+static int hf_tipcv2_syn = -1;
+
+
static gint ett_tipc_msg_fragment = -1;
static gint ett_tipc_msg_fragments = -1;
+
/* Initialize the subtree pointer */
static gint ett_tipc = -1;
static gint ett_tipc_data = -1;
@@ -1642,6 +1647,8 @@ dissect_tipc_v2(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_info *pinfo, i
proto_tree_add_item(tipc_tree, hf_tipc_destdrop, tipc_tvb, offset, 4, ENC_BIG_ENDIAN);
/* Source Droppable: 1 bit */
proto_tree_add_item(tipc_tree, hf_tipcv2_srcdrop, tipc_tvb, offset, 4, ENC_BIG_ENDIAN);
+ /* SYN: 1 bit */
+ proto_tree_add_item(tipc_tree, hf_tipcv2_syn, tipc_tvb, offset, 4, ENC_BIG_ENDIAN);
}
/* Reserved: 1 bits */
@@ -2555,6 +2562,11 @@ proto_register_tipc(void)
FT_UINT32, BASE_DEC, NULL, 0x00040000,
"Destination Droppable Bit", HFILL }
},
+ { &hf_tipcv2_syn,
+ { "Connection request (SYN)", "tipc.syn",
+ FT_UINT32, BASE_DEC, NULL, 0x00020000,
+ "Destination Droppable Bit", HFILL }
+ },
{ &hf_tipcv2_data_msg_type,
{ "Message type", "tipc.data_type",
FT_UINT32, BASE_DEC, VALS(tipc_data_msg_type_values), 0xe0000000,