aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2014-01-03 15:09:24 +0000
committerEvan Huus <eapache@gmail.com>2014-01-03 15:09:24 +0000
commit7af0e2a44669a6baabaa43246c87e3673d86f5b0 (patch)
tree22c2000f283b58eb1eb7375be81631114c5da871 /epan/dissectors
parentc62db3cdc07693856489f01b475cd3bc7fc49720 (diff)
downloadwireshark-7af0e2a44669a6baabaa43246c87e3673d86f5b0.tar.gz
wireshark-7af0e2a44669a6baabaa43246c87e3673d86f5b0.tar.bz2
wireshark-7af0e2a44669a6baabaa43246c87e3673d86f5b0.zip
Add partial dissection of IEC104 M_IT_TB_1.
For https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596 Also add modelines. svn path=/trunk/; revision=54583
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-iec104.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c
index a69b5cfc16..0f601253f0 100644
--- a/epan/dissectors/packet-iec104.c
+++ b/epan/dissectors/packet-iec104.c
@@ -1148,6 +1148,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
case M_ME_TD_1:
case M_ME_TE_1:
case M_ME_TF_1:
+ case M_IT_TB_1:
case C_SC_NA_1:
case C_DC_NA_1:
case C_RC_NA_1:
@@ -1272,6 +1273,10 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
get_QDS(tvb, &offset, trSignal);
get_CP56Time(tvb, &offset, trSignal);
break;
+ case M_IT_TB_1:
+ offset += 5; /* integrated total counter? */
+ get_CP56Time(tvb, &offset, trSignal);
+ break;
case C_SC_NA_1: /* 45 Single command */
get_SCO(tvb, &offset, trSignal);
break;
@@ -1809,3 +1814,15 @@ proto_reg_handoff_iec104(void)
dissector_add_uint("tcp.port", IEC104_PORT, iec104apci_handle);
}
+/*
+ * 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:
+ */