From Joan Ramio:

New dissector IEC 60870-5-104.

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

1 files changed, 775 insertions, 0 deletions

diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c
new file mode 100644
index 0000000000..f1ca294d30
--- /dev/null
+++ b/epan/dissectors/packet-iec104.c
@@ -0,0 +1,775 @@
+/* packet-iec104.c
+ * Routines for IEC-60870-5-104 (iec104) Protocol disassembly
+ * 
+ *
+ * $Id$
+ *
+ * Copyright (c) 2008 by Joan Ramio <joan@ramio.cat>
+ * Joan is a masculine catalan name. Search the Internet for Joan Pujol (alias Garbo).
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1999 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <glib.h>
+
+#include <epan/packet.h>
+#include <epan/dissectors/packet-tcp.h>
+#include <epan/prefs.h>
+#include <epan/emem.h>
+
+/* IEC-104 comment: Fields are little endian. */
+
+#define MAXS 256
+
+static dissector_handle_t iec104asdu_handle;
+
+/******* Utility to add to 'value_string.c' *******/
+/* Tries to match val against each element in the value_string array vs.
+   Returns the associated string length on a match.
+   Returns 100, on failure. */
+guint8 val_to_strlen(guint32 val, const value_string *vs);
+
+guint8 val_to_strlen(guint32 val, const value_string *vs) {
+  const gchar *ret;
+  ret = match_strval(val, vs);
+  if (ret != NULL)
+    return strlen(ret);
+
+  return 100;
+}
+
+
+/* the asdu header structure */
+struct asduheader {
+	guint8 AddrLow;
+	guint8 AddrHigh;
+	guint8 OA;
+	guint8 TypeId;
+	guint8 TNCause;
+	guint32 IOA;
+	guint8 NumIx;
+	guint8 SQ;
+};
+
+/* the apci header structure */
+struct apciheader {
+	guint8 ApduLen;
+	guint8 Type;
+	guint8 UType;
+	guint16 Tx;
+	guint16 Rx;
+};
+
+
+
+static guint iec104port = 2404;
+
+void proto_reg_handoff_iec104(void);
+
+
+/* Define the iec104 proto */
+static int proto_iec104apci = -1;
+static int proto_iec104asdu = -1;
+
+/* Protocol constants */
+#define APCI_START	0x68
+#define APCI_LEN	6
+#define APDU_MIN_LEN	4
+#define APDU_MAX_LEN	253
+
+/* ASDU_HEAD_LEN: Includes Asdu head and first IOA */
+#define ASDU_HEAD_LEN	9
+#define F_TEST  0x80
+#define F_NEGA  0x40
+#define F_CAUSE 0x3F
+#define F_SQ    0x80
+
+/* APCI types */
+#define I_TYPE		0
+#define S_TYPE		1
+#define U_TYPE		3
+#define APCI_TYPE_UNKNOWN 4
+static const value_string apci_types [] = {
+	{ I_TYPE,		"I" },
+	{ S_TYPE,		"S" },
+	{ U_TYPE,		"U" },
+	{ 0, NULL }
+};
+
+
+/* Constants relative to the filed, independent of the field position in the byte */
+/* U (Unnombered) constants */
+#define U_STARTDT_ACT 		0x01
+#define U_STARTDT_CON	 	0x02
+#define U_STOPDT_ACT 		0x04
+#define U_STOPDT_CON	 	0x08
+#define U_TESTFR_ACT 		0x10
+#define U_TESTFR_CON	 	0x20
+static const value_string u_types[] = {
+	{ U_STARTDT_ACT,		"STARTDT act" },
+	{ U_STARTDT_CON, 		"STARTDT con" },
+	{ U_STOPDT_ACT,			"STOPDT act" },
+	{ U_STOPDT_CON, 		"STOPDT con" },
+	{ U_TESTFR_ACT, 		"TESTFR act" },
+	{ U_TESTFR_CON, 		"TESTFR con" },
+	{ 0, NULL }
+};
+
+
+/* ASDU types (TypeId) */
+#define M_SP_NA_1  1    /* single-point information 								*/
+#define M_DP_NA_1  3    /* double-point information 								*/
+#define M_ST_NA_1  5    /* step position information 								*/
+#define M_BO_NA_1  7    /* bitstring of 32 bits 								*/	
+#define M_ME_NA_1  9    /* measured value, normalized value 							*/
+#define M_ME_NB_1  11    /* measured value, scaled value 							*/	
+#define M_ME_NC_1  13    /* measured value, short floating point number 					*/	
+#define M_IT_NA_1  15    /* integrated totals 									*/
+#define M_PS_NA_1  20    /* packed single-point information with status change detection 			*/	
+#define M_ME_ND_1  21    /* measured value, normalized value without quality descriptor 			*/	
+#define M_SP_TB_1  30    /* single-point information with time tag CP56Time2a 					*/
+#define M_DP_TB_1  31    /* double-point information with time tag CP56Time2a 					*/
+#define M_ST_TB_1  32    /* step position information with time tag CP56Time2a 					*/
+#define M_BO_TB_1  33    /* bitstring of 32 bit with time tag CP56Time2a 					*/	
+#define M_ME_TD_1  34    /* measured value, normalized value with time tag CP56Time2a 				*/
+#define M_ME_TE_1  35    /* measured value, scaled value with time tag CP56Time2a 				*/	
+#define M_ME_TF_1  36    /* measured value, short floating point number with time tag CP56Time2a 		*/	
+#define M_IT_TB_1  37    /* integrated totals with time tag CP56Time2a 						*/
+#define M_EP_TD_1  38    /* event of protection equipment with time tag CP56Time2a 				*/	
+#define M_EP_TE_1  39    /* packed start events of protection equipment with time tag CP56Time2a 		*/	
+#define M_EP_TF_1  40    /* packed output circuit information of protection equipment with time tag CP56Time2a 	*/
+#define C_SC_NA_1  45    /* single command 									*/	
+#define C_DC_NA_1  46    /* double command 									*/	
+#define C_RC_NA_1  47    /* regulating step command 								*/
+#define C_SE_NA_1  48    /* set point command, normalized value 						*/	
+#define C_SE_NB_1  49    /* set point command, scaled value 							*/
+#define C_SE_NC_1  50    /* set point command, short floating point number 					*/	
+#define C_BO_NA_1  51    /* bitstring of 32 bits 								*/	
+#define C_SC_TA_1  58    /* single command with time tag CP56Time2a 						*/
+#define C_DC_TA_1  59    /* double command with time tag CP56Time2a 						*/
+#define C_RC_TA_1  60    /* regulating step command with time tag CP56Time2a 					*/
+#define C_SE_TA_1  61    /* set point command, normalized value with time tag CP56Time2a 			*/	
+#define C_SE_TB_1  62    /* set point command, scaled value with time tag CP56Time2a 				*/
+#define C_SE_TC_1  63    /* set point command, short floating-point number with time tag CP56Time2a 		*/
+#define C_BO_TA_1  64    /* bitstring of 32 bits with time tag CP56Time2a 					*/	
+#define M_EI_NA_1  70    /* end of initialization 								*/	
+#define C_IC_NA_1  100    /* interrogation command 								*/	
+#define C_CI_NA_1  101    /* counter interrogation command 							*/	
+#define C_RD_NA_1  102    /* read command 									*/	
+#define C_CS_NA_1  103    /* clock synchronization command 							*/	
+#define C_RP_NA_1  105    /* reset process command 								*/	
+#define C_TS_TA_1  107    /* test command with time tag CP56Time2a 						*/	
+#define  P_ME_NA_1  110    /* parameter of measured value, normalized value 					*/	
+#define  P_ME_NB_1  111    /* parameter of measured value, scaled value 					*/	
+#define  P_ME_NC_1  112    /* parameter of measured value, short floating-point number 				*/
+#define  P_AC_NA_1  113    /* parameter activation 								*/	
+#define  F_FR_NA_1  120    /* file ready 									*/	
+#define  F_SR_NA_1  121    /* section ready 									*/	
+#define  F_SC_NA_1  122    /* call directory, select file, call file, call section 				*/	
+#define  F_LS_NA_1  123    /* last section, last segment 							*/	
+#define  F_AF_NA_1  124    /* ack file, ack section 								*/	
+#define  F_SG_NA_1  125    /* segment 										*/
+#define  F_DR_TA_1  126    /* directory 									*/	
+#define  F_SC_NB_1  127    /* Query Log - Request archive file 							*/
+static const value_string asdu_types [] = {
+	{  M_SP_NA_1,		"M_SP_NA_1" },
+	{  M_DP_NA_1,		"M_DP_NA_1" },
+	{  M_ST_NA_1,		"M_ST_NA_1" },
+	{  M_BO_NA_1,		"M_BO_NA_1" },
+	{  M_ME_NA_1,		"M_ME_NA_1" },
+	{  M_ME_NB_1,		"M_ME_NB_1" },
+	{  M_ME_NC_1,		"M_ME_NC_1" },
+	{  M_IT_NA_1,		"M_IT_NA_1" },
+	{  M_PS_NA_1,		"M_PS_NA_1" }, 
+	{  M_ME_ND_1,		"M_ME_ND_1" }, 
+	{  M_SP_TB_1,		"M_SP_TB_1" }, 
+	{  M_DP_TB_1,		"M_DP_TB_1" }, 
+	{  M_ST_TB_1,		"M_ST_TB_1" }, 
+	{  M_BO_TB_1,		"M_BO_TB_1" }, 
+	{  M_ME_TD_1,		"M_ME_TD_1" }, 
+	{  M_ME_TE_1,		"M_ME_TE_1" }, 
+	{  M_ME_TF_1,		"M_ME_TF_1" }, 
+	{  M_IT_TB_1,		"M_IT_TB_1" }, 
+	{  M_EP_TD_1,		"M_EP_TD_1" }, 
+	{  M_EP_TE_1,		"M_EP_TE_1" }, 
+	{  M_EP_TF_1,		"M_EP_TF_1" }, 
+	{  C_SC_NA_1,		"C_SC_NA_1" }, 
+	{  C_DC_NA_1,		"C_DC_NA_1" }, 
+	{  C_RC_NA_1,		"C_RC_NA_1" }, 
+	{  C_SE_NA_1,		"C_SE_NA_1" }, 
+	{  C_SE_NB_1,		"C_SE_NB_1" }, 
+	{  C_SE_NC_1,		"C_SE_NC_1" }, 
+	{  C_BO_NA_1,		"C_BO_NA_1" }, 
+	{  C_SC_TA_1,		"C_SC_TA_1" }, 
+	{  C_DC_TA_1,		"C_DC_TA_1" }, 
+	{  C_RC_TA_1,		"C_RC_TA_1" }, 
+	{  C_SE_TA_1,		"C_SE_TA_1" }, 
+	{  C_SE_TB_1,		"C_SE_TB_1" }, 
+	{  C_SE_TC_1,		"C_SE_TC_1" }, 
+	{  C_BO_TA_1,		"C_BO_TA_1" }, 
+	{  M_EI_NA_1,		"M_EI_NA_1" }, 
+	{  C_IC_NA_1,		"C_IC_NA_1" }, 
+	{  C_CI_NA_1,		"C_CI_NA_1" }, 
+	{  C_RD_NA_1,		"C_RD_NA_1" }, 
+	{  C_CS_NA_1,		"C_CS_NA_1" }, 
+	{  C_RP_NA_1,		"C_RP_NA_1" }, 
+	{  C_TS_TA_1,		"C_TS_TA_1" }, 
+	{  P_ME_NA_1,		"P_ME_NA_1" }, 
+	{  P_ME_NB_1,		"P_ME_NB_1" }, 
+	{  P_ME_NC_1,		"P_ME_NC_1" }, 
+	{  P_AC_NA_1,		"P_AC_NA_1" }, 
+	{  F_FR_NA_1,		"F_FR_NA_1" }, 
+	{  F_SR_NA_1,		"F_SR_NA_1" }, 
+	{  F_SC_NA_1,		"F_SC_NA_1" }, 
+	{  F_LS_NA_1,		"F_LS_NA_1" }, 
+	{  F_AF_NA_1,		"F_AF_NA_1" }, 
+	{  F_SG_NA_1,		"F_SG_NA_1" }, 
+	{  F_DR_TA_1,		"F_DR_TA_1" }, 
+	{  F_SC_NB_1,		"F_SC_NB_1" }, 
+	{ 0, NULL }
+};
+static const value_string asdu_lngtypes [] = {
+	{  M_SP_NA_1,		"single-point information" },
+	{  M_DP_NA_1,		"double-point information" },
+	{  M_ST_NA_1,		"step position information" },
+	{  M_BO_NA_1,		"bitstring of 32 bits" },
+	{  M_ME_NA_1,		"measured value, normalized value" },
+	{  M_ME_NB_1,		"measured value, scaled value" },
+	{  M_ME_NC_1,		"measured value, short floating point number" },
+	{  M_IT_NA_1,		"integrated totals" },
+	{  M_PS_NA_1,		"packed single-point information with status change detection" },
+	{  M_ME_ND_1,		"measured value, normalized value without quality descriptor" },
+	{  M_SP_TB_1,		"single-point information with time tag CP56Time2a" },
+	{  M_DP_TB_1,		"double-point information with time tag CP56Time2a" },
+	{  M_ST_TB_1,		"step position information with time tag CP56Time2a" },
+	{  M_BO_TB_1,		"bitstring of 32 bit with time tag CP56Time2a" },
+	{  M_ME_TD_1,		"measured value, normalized value with time tag CP56Time2a" },
+	{  M_ME_TE_1,		"measured value, scaled value with time tag CP56Time2a" },
+	{  M_ME_TF_1,		"measured value, short floating point number with time tag CP56Time2a" },
+	{  M_IT_TB_1,		"integrated totals with time tag CP56Time2a" },
+	{  M_EP_TD_1,		"event of protection equipment with time tag CP56Time2a" },
+	{  M_EP_TE_1,		"packed start events of protection equipment with time tag CP56Time2a" },
+	{  M_EP_TF_1,		"packed output circuit information of protection equipment with time tag CP56Time2a" },
+	{  C_SC_NA_1,		"single command" },
+	{  C_DC_NA_1,		"double command" },
+	{  C_RC_NA_1,		"regulating step command" },
+	{  C_SE_NA_1,		"set point command, normalized value" },
+	{  C_SE_NB_1,		"set point command, scaled value" },
+	{  C_SE_NC_1,		"set point command, short floating point number" },
+	{  C_BO_NA_1,		"bitstring of 32 bits" },
+	{  C_SC_TA_1,		"single command with time tag CP56Time2a" },
+	{  C_DC_TA_1,		"double command with time tag CP56Time2a" },
+	{  C_RC_TA_1,		"regulating step command with time tag CP56Time2a" },
+	{  C_SE_TA_1,		"set point command, normalized value with time tag CP56Time2a" },
+	{  C_SE_TB_1,		"set point command, scaled value with time tag CP56Time2a" },
+	{  C_SE_TC_1,		"set point command, short floating-point number with time tag CP56Time2a" },
+	{  C_BO_TA_1,		"bitstring of 32 bits with time tag CP56Time2a" },
+	{  M_EI_NA_1,		"end of initialization" },
+	{  C_IC_NA_1,		"interrogation command" },
+	{  C_CI_NA_1,		"counter interrogation command" },
+	{  C_RD_NA_1,		"read command" },
+	{  C_CS_NA_1,		"clock synchronization command" },
+	{  C_RP_NA_1,		"reset process command" },
+	{  C_TS_TA_1,		"test command with time tag CP56Time2a" },
+	{  P_ME_NA_1,		"parameter of measured value, normalized value" },
+	{  P_ME_NB_1,		"parameter of measured value, scaled value" },
+	{  P_ME_NC_1,		"parameter of measured value, short floating-point number" },
+	{  P_AC_NA_1,		"parameter activation" },
+	{  F_FR_NA_1,		"file ready" },
+	{  F_SR_NA_1,		"section ready" },
+	{  F_SC_NA_1,		"call directory, select file, call file, call section" },
+	{  F_LS_NA_1,		"last section, last segment" },
+	{  F_AF_NA_1,		"ack file, ack section" },
+	{  F_SG_NA_1,		"segment" },
+	{  F_DR_TA_1,		"directory" },
+	{  F_SC_NB_1,		"Query Log - Request archive file" },
+	{ 0, NULL }
+};
+
+
+/* Cause of Transmision (CauseTx) */
+#define Per_Cyc         1	
+#define Back            2	
+#define Spont           3	
+#define Init            4	
+#define Req             5	
+#define Act             6	
+#define ActCon          7	
+#define Deact           8	
+#define DeactCon        9	
+#define ActTerm         10	
+#define Retrem          11	
+#define Retloc          12	
+#define File            13	
+#define Inrogen         20	
+#define Inro1           21	
+#define Inro2           22	
+#define Inro3           23	
+#define Inro4           24	
+#define Inro5           25	
+#define Inro6           26	
+#define Inro7           27	
+#define Inro8           28	
+#define Inro9           29	
+#define Inro10          30	
+#define Inro11          31	
+#define Inro12          32	
+#define Inro13          33	
+#define Inro14          34	
+#define Inro15          35	
+#define Inro16          36	
+#define Reqcogen        37	
+#define Reqco1          38	
+#define Reqco2          39	
+#define Reqco3          40	
+#define Reqco4          41	
+#define UkTypeId        44	
+#define UkCauseTx       45	
+#define UkComAdrASDU    46	
+#define UkIOA           47	
+static const value_string causetx_types [] = {
+	{ Per_Cyc         ,"Per/Cyc" },
+	{ Back            ,"Back" },
+	{ Spont           ,"Spont" },
+	{ Init            ,"Init" },
+	{ Req             ,"Req" },
+	{ Act             ,"Act" },
+	{ ActCon          ,"ActCon" },
+	{ Deact           ,"Deact" },
+	{ DeactCon        ,"DeactCon" },
+	{ ActTerm         ,"ActTerm" },
+	{ Retrem          ,"Retrem" },
+	{ Retloc          ,"Retloc" },
+	{ File            ,"File" },
+	{ Inrogen         ,"Inrogen" },
+	{ Inro1           ,"Inro1" },
+	{ Inro2           ,"Inro2" },
+	{ Inro3           ,"Inro3" },
+	{ Inro4           ,"Inro4" },
+	{ Inro5           ,"Inro5" },
+	{ Inro6           ,"Inro6" },
+	{ Inro7           ,"Inro7" },
+	{ Inro8           ,"Inro8" },
+	{ Inro9           ,"Inro9" },
+	{ Inro10          ,"Inro10" },
+	{ Inro11          ,"Inro11" },
+	{ Inro12          ,"Inro12" },
+	{ Inro13          ,"Inro13" },
+	{ Inro14          ,"Inro14" },
+	{ Inro15          ,"Inro15" },
+	{ Inro16          ,"Inro16" },
+	{ Reqcogen        ,"Reqcogen" },
+	{ Reqco1          ,"Reqco1" },
+	{ Reqco2          ,"Reqco2" },
+	{ Reqco3          ,"Reqco3" },
+	{ Reqco4          ,"Reqco4" },
+	{ UkTypeId        ,"UkTypeId" },
+	{ UkCauseTx       ,"UkCauseTx" },
+	{ UkComAdrASDU    ,"UkComAdrASDU" },
+	{ UkIOA           ,"UkIOA" },
+	{ 0, NULL }
+};
+
+
+/* Protocol fields to be filtered */
+static int hf_apdulen = -1;
+static int hf_apcitype = -1;
+static int hf_apciutype    = -1;
+
+static int hf_addr  = -1;
+static int hf_oa  = -1;
+static int hf_typeid   = -1;
+static int hf_causetx  = -1;
+static int hf_nega  = -1;
+static int hf_test  = -1;
+static int hf_ioa  = -1;
+static int hf_numix  = -1;
+static int hf_sq  = -1;
+
+
+static gint ett_apci = -1;
+static gint ett_asdu = -1;
+
+
+/* Find the APDU 104 (APDU=APCI+ASDU) length. 
+Includes possible tvb_length-1 bytes that don't form an APDU */
+static guint get_iec104apdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
+{
+	guint8 Val;
+	guint8 Off;
+
+	for (Off= 0; Off <= tvb_length(tvb)- 2; Off++)  {
+		Val = tvb_get_guint8(tvb, offset+ Off); 
+		if (Val == APCI_START)  {
+			return (guint)(Off+ tvb_get_guint8(tvb, offset+ Off+ 1)+ 2);
+		}
+	}
+	
+	return (guint)(tvb_length(tvb));
+}
+
+
+/* Is is called twice: For 'Packet List' and for 'Packet Details' */
+static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	guint8 Len = tvb_length(tvb);  /* Investigate also: 'reported Length' */
+	guint8 Bytex = 0;
+	guint8 Ind = 0;
+	struct asduheader * asduh;
+	char * res = NULL;
+	proto_item * it104 = NULL;
+	proto_tree * trHead;
+
+	if (!(check_col(pinfo->cinfo, COL_INFO) || tree))   return; /* Be sure that the function is only called twice */
+
+	asduh = ep_alloc(sizeof(struct asduheader));
+	res = ep_alloc(MAXS);
+	res[0] = '\0';
+
+	if (check_col(pinfo->cinfo, COL_PROTOCOL))  {
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu");
+	}
+	if (check_col(pinfo->cinfo, COL_INFO))  {
+		col_clear(pinfo->cinfo, COL_INFO);
+	}
+
+	/*** *** START: Common to 'Packet List' and 'Packet Details' *** ***/
+	if (Len >= ASDU_HEAD_LEN)  {
+		/* Get fields */
+		asduh->AddrLow = tvb_get_guint8(tvb, 4);
+		asduh->AddrHigh = tvb_get_guint8(tvb, 5);
+		asduh->OA = tvb_get_guint8(tvb, 3);
+		asduh->TypeId = tvb_get_guint8(tvb, 0);
+		asduh->TNCause = tvb_get_guint8(tvb, 2);
+		asduh->IOA = tvb_get_letoh24(tvb, 6);
+		Bytex = tvb_get_guint8(tvb, 1);
+		asduh->NumIx = Bytex & 0x7F;
+		asduh->SQ = Bytex & F_SQ;
+		/* Build common string for 'Packet List' and 'Packet Details' */
+		g_snprintf(res, MAXS, "%u,%u%s%u ", asduh->AddrLow, asduh->AddrHigh,  pinfo->srcport == iec104port ? "–>" : "<–", asduh->OA);
+		g_strlcat(res, val_to_str(asduh->TypeId, asdu_types, "<TypeId=%u>"), MAXS);
+		g_strlcat(res, " ", MAXS);
+		g_strlcat(res, val_to_str(asduh->TNCause & F_CAUSE, causetx_types, " <CauseTx=%u>"), MAXS);
+		if (asduh->TNCause & F_NEGA)   g_strlcat(res, "_NEGA", MAXS);
+		if (asduh->TNCause & F_TEST)   g_strlcat(res, "_TEST", MAXS);
+		if (asduh->TNCause & (F_TEST | F_NEGA))  {
+			Bytex = val_to_strlen(asduh->TNCause & F_CAUSE, causetx_types);
+			for (Ind=Bytex; Ind< 7; Ind++)   g_strlcat(res, " ", MAXS);
+		}
+		g_snprintf(res+strlen(res), MAXS-strlen(res), " IOA=%d", asduh->IOA);
+		if (asduh->NumIx > 1)   {
+			if (asduh->SQ == F_SQ)   g_snprintf(res+strlen(res), MAXS-strlen(res), "-%d", asduh->IOA+ asduh->NumIx- 1);
+			else      g_strlcat(res, ",...", MAXS);
+			g_snprintf(res+strlen(res), MAXS-strlen(res), " (%u)", asduh->NumIx);
+		}
+	}
+	else   {
+		g_snprintf(res, MAXS, "<ERR Short Asdu, Len=%u>", Len);
+	}
+	g_strlcat(res, " ", MAXS); /* We add an space to separate possible APCIs/ASDUs in the same packet */
+	/*** *** END: Common to 'Packet List' and 'Packet Details' *** ***/
+
+	/*** *** DISSECT 'Packet List' *** ***/
+	if (check_col(pinfo->cinfo, COL_INFO))  {
+		col_add_str(pinfo->cinfo, COL_INFO, res);
+		col_set_fence(pinfo->cinfo, COL_INFO); 
+	}
+
+	if(!tree)   return;
+
+	/*** *** DISSECT 'Packet Details' *** ***/
+
+	it104 = proto_tree_add_item(tree, proto_iec104asdu, tvb, 0, -1, FALSE);
+
+	/* 'Packet Details': ROOT ITEM */
+	proto_item_append_text(it104, ": %s'%s'", res, Len >= ASDU_HEAD_LEN ? val_to_str(asduh->TypeId, asdu_lngtypes, "<Unknown TypeId>") : "");
+
+	/* 'Packet Details': TREE */
+	if (Len < ASDU_HEAD_LEN)   return;
+	trHead = proto_item_add_subtree(it104, ett_asdu);
+
+	/* Remember: 	add_uint, add_boolean, _add_text: value from last parameter.
+			add_item: value from tvb. */
+	proto_tree_add_uint(trHead, hf_typeid, tvb, 0, 1, asduh->TypeId);	
+	proto_tree_add_uint(trHead, hf_numix, tvb, 1, 1, asduh->NumIx); 
+	proto_tree_add_uint(trHead, hf_causetx, tvb, 2, 1, asduh->TNCause & F_CAUSE); 
+	proto_tree_add_boolean(trHead, hf_nega, tvb, 2, 1, asduh->TNCause); 
+	proto_tree_add_boolean(trHead, hf_test, tvb, 2, 1, asduh->TNCause); 
+	proto_tree_add_uint(trHead, hf_oa, tvb, 3, 1, asduh->OA); 
+	proto_tree_add_uint(trHead, hf_addr, tvb, 4, 2, asduh->AddrLow+ 256* asduh->AddrHigh); 
+	proto_tree_add_uint(trHead, hf_ioa, tvb, 6, 3, asduh->IOA);
+	if (asduh->NumIx > 1)   proto_tree_add_boolean(trHead, hf_sq, tvb, 1, 1, asduh->SQ); 
+}
+
+
+
+/* Is is called twice: For 'Packet List' and for 'Packet Details' */
+static void dissect_iec104apci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	guint8 TcpLen = tvb_length(tvb);
+	guint16 Brossa = 0;
+	guint8 Start;
+	guint8 Off;
+	guint8 Byte1 = 0;
+	struct apciheader * apcih;
+	char * res = NULL;
+	proto_item * it104 = NULL;
+	proto_tree * trHead;
+
+	if (!(check_col(pinfo->cinfo, COL_INFO) || tree))   return; /* Be sure that the function is only called twice */
+
+	apcih = ep_alloc(sizeof(struct apciheader));
+	res = ep_alloc(MAXS);
+	res[0] = '\0';
+
+	if (check_col(pinfo->cinfo, COL_PROTOCOL))  {
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "104apci");
+	}
+	if (check_col(pinfo->cinfo, COL_INFO))  {
+		col_clear(pinfo->cinfo, COL_INFO);
+	}
+
+	/*** *** START: Common to 'Packet List' and 'Packet Details' *** ***/
+	Start = 0;
+	for (Off= 0; Off <= TcpLen- 2; Off++)  {
+		Start = tvb_get_guint8(tvb, Off); 
+		if (Start == APCI_START)  {
+			Brossa = Off;
+			apcih->ApduLen = tvb_get_guint8(tvb, Off+ 1);
+			if (apcih->ApduLen >= APDU_MIN_LEN)  {
+				Byte1 = tvb_get_guint8(tvb, Off+ 2);
+				apcih->Type = Byte1 & 0x03;
+				/* Type I is only lowest bit set to 0 */
+				if (apcih->Type == 2)   apcih->Type = 0;
+				switch(apcih->Type)  {
+				case I_TYPE:
+					apcih->Tx = tvb_get_letohs(tvb, Off+ 2) >> 1;
+				case S_TYPE:
+					apcih->Rx = tvb_get_letohs(tvb, Off+ 4) >> 1;
+					break;
+				case U_TYPE:
+					apcih->UType = (Byte1 & 0xFC); /* Don't shift */
+					break;
+				}	
+			}
+			else   {
+				/* WireShark can crash if we process packets with length less than expected (6). We consider that everything is bad */
+				Brossa = TcpLen;
+			}
+			/* Don't search more the APCI_START */
+			break;
+		}
+	}
+	if (Start != APCI_START)  {
+		/* Everything is bad (no APCI found) */
+		Brossa = TcpLen;
+	}
+	/* Construir string comu a List i Details */
+	if (Brossa > 0)   g_snprintf(res, MAXS, "<ERR %u bytes> ", Brossa);
+	if (Brossa != TcpLen)  {
+		if (apcih->ApduLen <= APDU_MAX_LEN)  {
+			/* APCI in 'Paquet List' */
+			g_snprintf(res+strlen(res), MAXS-strlen(res), "%s%s(", pinfo->srcport == iec104port ? "–>" : "<–", val_to_str(apcih->Type, apci_types, "<ERR>"));
+			switch(apcih->Type) {  /* APCI in 'Packet List' */
+			case I_TYPE:
+				g_snprintf(res+strlen(res), MAXS-strlen(res), "%d,", apcih->Tx);
+			case S_TYPE:
+				g_snprintf(res+strlen(res), MAXS-strlen(res), "%d)", apcih->Rx);
+				/* Align first packets */
+				if (apcih->Tx < 10)  g_strlcat(res, " ", MAXS);
+				if (apcih->Rx < 10)  g_strlcat(res, " ", MAXS);
+				break;
+			case U_TYPE:
+				g_snprintf(res+strlen(res), MAXS-strlen(res), "%s)", val_to_str(apcih->UType >> 2, u_types, "<ERR>"));
+				break;
+			}
+			if (apcih->Type != I_TYPE  &&  apcih->ApduLen > APDU_MIN_LEN)   g_snprintf(res+strlen(res), MAXS-strlen(res), "<ERR %u bytes> ", apcih->ApduLen- APDU_MIN_LEN);
+		}
+		else  {
+			g_snprintf(res+strlen(res), MAXS-strlen(res), "<ERR ApduLen=%u bytes> ", apcih->ApduLen);
+		}	
+	}	
+	g_strlcat(res, " ", MAXS); /* We add an space to separate possible APCIs/ASDUs in the same packet */
+	/*** *** END: Common to 'Packet List' and 'Packet Details' *** ***/
+
+	/*** *** Dissect 'Packet List' *** ***/
+	if (check_col(pinfo->cinfo, COL_INFO))  {
+		col_add_str(pinfo->cinfo, COL_INFO, res);
+		if(apcih->Type == I_TYPE  &&  Brossa != TcpLen)   {
+			call_dissector(iec104asdu_handle, tvb_new_subset(tvb, Off+ APCI_LEN, -1, apcih->ApduLen- APCI_LEN), pinfo, tree);	
+		} else {
+			col_set_fence(pinfo->cinfo, COL_INFO); 
+		}
+	}
+
+	if(!tree)   return;
+
+	/*** *** DISSECT 'Packet Details' *** ***/
+
+	it104 = proto_tree_add_item(tree, proto_iec104apci, tvb, 0, Off+ APCI_LEN, FALSE);
+
+	/* 'Packet Details': ROOT ITEM */
+	proto_item_append_text(it104, ": %s", res);
+
+	if(Brossa == TcpLen)   return; 
+
+	/* Don't call ASDU dissector if it was called before */
+	if(apcih->Type == I_TYPE  &&  (!check_col(pinfo->cinfo, COL_INFO)))   call_dissector(iec104asdu_handle, tvb_new_subset(tvb, Off+ APCI_LEN, -1, apcih->ApduLen- APCI_LEN), pinfo, tree);
+
+	/* 'Packet Details': TREE */
+	trHead = proto_item_add_subtree(it104, ett_apci);
+	/* Remember: 	add_uint, add_boolean, _add_text: value from last parameter.
+			add_item: value from tvb. */
+	proto_tree_add_uint(trHead, hf_apdulen, tvb, Off+ 1, 1, apcih->ApduLen);
+	proto_tree_add_uint(trHead, hf_apcitype, tvb, Off+ 2, 1, apcih->Type);
+	switch(apcih->Type){
+	case U_TYPE:
+		proto_tree_add_uint(trHead, hf_apciutype, tvb, Off+ 2, 1, apcih->UType); /* Don't shift the value */
+		break;
+	}
+
+}
+
+
+
+
+static void dissect_iec104reas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	/* 5th parameter = 6 = minimum bytes received to calculate the length. (Not 2 in order to find more APCIs in case of 'noisy' bytes between the APCIs) */
+	tcp_dissect_pdus(tvb, pinfo, tree, TRUE, APCI_LEN, 
+			get_iec104apdu_len, dissect_iec104apci);
+}
+
+
+/* The protocol has two subprotocols: Register APCI */
+void
+proto_register_iec104apci(void)
+{
+
+static hf_register_info hf_ap[] = {
+
+    { &hf_apdulen,
+      { "ApduLen", "104apci.apdulen", FT_UINT8, BASE_DEC, NULL, 0x0,
+        "APDU Len", HFILL }},
+
+    { &hf_apcitype,
+      { "ApciType", "104apci.type", FT_UINT8, BASE_HEX, VALS(apci_types), 0x03,
+        "APCI type", HFILL }},
+
+    { &hf_apciutype,
+      { "ApciUType", "104apci.utype", FT_UINT8, BASE_HEX, VALS(u_types), 0xFC,
+        "Apci U type", HFILL }},
+
+  };
+
+static gint *ett_ap[] = {
+	&ett_apci,
+};
+
+proto_iec104apci = proto_register_protocol(
+				"IEC 60870-5-104,Apci", 	
+			       	"104apci",		
+				"104apci"			
+				);
+proto_register_field_array(proto_iec104apci, hf_ap, array_length(hf_ap)); 
+proto_register_subtree_array(ett_ap, array_length(ett_ap));
+
+}
+
+
+/* The protocol has two subprotocols: Register ASDU */
+void
+proto_register_iec104asdu(void)
+{
+
+static hf_register_info hf_as[] = {
+
+    { &hf_addr,
+      { "Addr", "104asdu.addr", FT_UINT16, BASE_DEC, NULL, 0x0,
+        "Common Address of Asdu", HFILL }},
+
+    { &hf_oa,
+      { "OA  ", "104asdu.oa", FT_UINT8, BASE_DEC, NULL, 0x0,
+        "Originator Address", HFILL }},
+
+    { &hf_typeid,
+      { "TypeId ", "104asdu.typeid", FT_UINT8, BASE_DEC, VALS(asdu_types), 0x0,
+        "Asdu Type Id", HFILL }},
+
+    { &hf_causetx,
+      { "CauseTx", "104asdu.causetx", FT_UINT8, BASE_DEC, VALS(causetx_types), 0x3F,
+        "Cause of Transmision", HFILL }},
+
+    { &hf_nega,
+      { "Negative", "104asdu.nega", FT_BOOLEAN, 8, NULL, F_NEGA,
+        "Negative", HFILL }},
+
+    { &hf_test,
+      { "Test", "104asdu.test", FT_BOOLEAN, 8, NULL, F_TEST,
+        "Test", HFILL }},
+
+
+    { &hf_ioa,
+      { "IOA  ", "104asdu.ioa", FT_UINT24, BASE_DEC, NULL, 0x0,
+        "Information Object Address", HFILL }},
+
+    { &hf_numix,
+      { "NumIx", "104asdu.numix", FT_UINT8, BASE_DEC, NULL, 0x7F,
+        "Number of Information Objects/Elements", HFILL }},
+
+    { &hf_sq,
+      { "SQ", "104asdu.sq", FT_BOOLEAN, 8, NULL, F_SQ,
+        "Sequence", HFILL }},
+
+  };
+
+static gint *ett_as[] = {
+	&ett_asdu,
+};
+
+proto_iec104asdu = proto_register_protocol(
+				"IEC 60870-5-104,Asdu", 
+			       	"104asdu",		
+				"104asdu"			
+				);
+proto_register_field_array(proto_iec104asdu, hf_as, array_length(hf_as)); 
+proto_register_subtree_array(ett_as, array_length(ett_as));
+
+}
+
+
+
+/* The registration hand-off routine */
+void
+proto_reg_handoff_iec104(void)
+{
+	static dissector_handle_t iec104apci_handle;
+
+        iec104apci_handle = create_dissector_handle(dissect_iec104reas, proto_iec104apci); 
+	iec104asdu_handle = create_dissector_handle(dissect_iec104asdu, proto_iec104asdu); 
+
+	dissector_add("tcp.port", iec104port, iec104apci_handle);
+}
+