Add partial dissection of IEC104 M_IT_TB_1.
authoreapache <eapache@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 3 Jan 2014 15:09:24 +0000 (15:09 +0000)
committereapache <eapache@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 3 Jan 2014 15:09:24 +0000 (15:09 +0000)
For https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596

Also add modelines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54583 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/packet-iec104.c

index a69b5cfc16ed2de4e84e02055887d104fcdbdd22..0f601253f05d4b84ee61e0d31bdaf430c79daef7 100644 (file)
@@ -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:
+ */