Fixed message 0x12 in itsut (d3a7316c) · Commits · ITS - Intelligent Transport Systems / WIRESHARK_ITS_PLUGINS

itsut/Makefile.in

+3 −3

Original line number	Diff line number	Diff line
		@@ -670,7 +670,7 @@ ut_la_LIBADD = @PLUGIN_LIBS@
		#dist-hook:
		# @rm -f $(distdir)/plugin.c
		CLEANFILES = \
		ut \
		itsut \
		*~

		MAINTAINERCLEANFILES = \
		@@ -697,9 +697,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.common $(srcdir
		exit 1;; \
		esac; \
		done; \
		echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/ut/Makefile'; \
		echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/itsut/Makefile'; \
		$(am__cd) $(top_srcdir) && \
		$(AUTOMAKE) --gnu plugins/ut/Makefile
		$(AUTOMAKE) --gnu plugins/itsut/Makefile
		.PRECIOUS: Makefile
		Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
		@case '$?' in \

itsut/README

+3 −0

Original line number	Diff line number	Diff line
		Changelog:
		==========

		1.2.0: Fixed header name for id 0x12
		1.1.0: Added preference page to change UT port number
		Renamed dissector to itsut
		1.0.0: Initial version.
		UT protocol port number: 12345

itsut/moduleinfo.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,5 +21,5 @@
		#define BUILD_NUMBER 0
		#endif

		#define VERSION "1.1." stringize(BUILD_NUMBER)
		#define VERSION "1.2." stringize(BUILD_NUMBER)

itsut/moduleinfo.nmake

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ PACKAGE=itsut

		# The version
		MODULE_VERSION_MAJOR=1
		MODULE_VERSION_MINOR=1
		MODULE_VERSION_MINOR=2
		MODULE_VERSION_MICRO=0
		MODULE_VERSION_EXTRA=0

itsut/packet-itsut.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -63,8 +63,8 @@
		/* DENM */
		#define ITSUT_DENMTRIGGER 0x10
		#define ITSUT_DENMTRIGGER_RESULT 0x11
		#define ITSUT_DENMEVENT 0x12
		#define ITSUT_DENMEVENT_RESULT 0x13
		#define ITSUT_DENMUPDATE 0x12
		#define ITSUT_DENMUPDATE_RESULT 0x13
		#define ITSUT_TERMINATE_DENMEVENT 0x14
		#define ITSUT_TERMINATE_DENMEVENT_RESULT 0x15
		#define ITSUT_DENMEVENTINDICATION 0x17
		@@ -416,8 +416,8 @@ static const value_string itsut_command_names[] = {
		{ ITSUT_CAMTRIGGER_RESULT, "Cam Trigger Result" },
		{ ITSUT_DENMTRIGGER, "Denm Trigger" },
		{ ITSUT_DENMTRIGGER_RESULT, "Denm Trigger Result" },
		{ ITSUT_DENMEVENT, "Denm Event" },
		{ ITSUT_DENMEVENT_RESULT, "Denm Event Result" },
		{ ITSUT_DENMUPDATE, "Denm Update" },
		{ ITSUT_DENMUPDATE_RESULT, "Denm Update Result" },
		{ ITSUT_TERMINATE_DENMEVENT, "Denm Terminate Event" },
		{ ITSUT_TERMINATE_DENMEVENT_RESULT, "Denm Terminate Event Result" },
		{ ITSUT_DENMEVENTINDICATION, "Denm Event Indication" },
		@@ -1105,8 +1105,8 @@ static int dissect_itsut_denm_trigger(tvbuff_t tvb, proto_tree header_tree, in
		return offset;
		} // End of function dissect_itsut_denm_trigger

		/* Code to build tree for UtDenmEvent command */
		static int dissect_itsut_denm_event(tvbuff_t tvb, proto_tree header_tree, int offset)
		/* Code to build tree for UtDenmUpdate command */
		static int dissect_itsut_denm_update(tvbuff_t tvb, proto_tree header_tree, int offset)
		{
		proto_tree *tree = NULL;
		proto_item *ti = NULL;
		@@ -1123,7 +1123,7 @@ static int dissect_itsut_denm_event(tvbuff_t tvb, proto_tree header_tree, int
		proto_tree_add_item(tree, hf_command, tvb, offset, L_ITSUT_COMMAND, FALSE);
		offset += L_ITSUT_COMMAND;

		/* UtDenmEvent tree */
		/* UtDenmUpdate tree */
		/* flags */
		ti_flags = proto_tree_add_item(tree, hf_denm_event_flags, tvb, offset, L_ITSUT_FLAGS, FALSE);
		tree_flags = proto_item_add_subtree(ti_flags, ett_itsut_flags);
		@@ -1196,7 +1196,7 @@ static int dissect_itsut_denm_event(tvbuff_t tvb, proto_tree header_tree, int
		}

		return offset;
		} // End of function dissect_itsut_denm_event
		} // End of function dissect_itsut_denm_update

		/* Code to build tree for UtTerminateDenmEvent indication */
		static int dissect_itsut_terminate_denm_event(tvbuff_t tvb, proto_tree header_tree, int offset)
		@@ -1647,8 +1647,8 @@ static int dissect_itsut_denm_trigger_result(tvbuff_t tvb, proto_tree header_t
		return offset;
		} // End of function dissect_itsut_denm_trigger_result

		/* Code to build tree for UtDenmEventResult indication */
		static int dissect_itsut_denm_event_result(tvbuff_t tvb, proto_tree header_tree, int offset)
		/* Code to build tree for UtDenmUpdateResult indication */
		static int dissect_itsut_denm_update_result(tvbuff_t tvb, proto_tree header_tree, int offset)
		{
		proto_tree *tree = NULL;
		proto_item *ti = NULL;
		@@ -1658,7 +1658,7 @@ static int dissect_itsut_denm_event_result(tvbuff_t tvb, proto_tree header_tre
		ti = proto_tree_add_item(header_tree, hf_denm_event_result, tvb, offset, L_ITSUT_DENMM_EVENT_RESULT, FALSE);
		tree = proto_item_add_subtree(ti, ett_itsut_command);

		/* UtInitialiseResult */
		/* UtDenmUpdateResult */
		proto_tree_add_item(tree, hf_command, tvb, offset, L_ITSUT_COMMAND, FALSE);
		offset += L_ITSUT_COMMAND;

		@@ -1676,7 +1676,7 @@ static int dissect_itsut_denm_event_result(tvbuff_t tvb, proto_tree header_tre
		offset += L_SEQNUM;

		return offset;
		} // End of function dissect_itsut_denm_event_result
		} // End of function dissect_itsut_denm_update_result

		/* Code to build tree for UtTerminateDenmEventResult indication */
		static int dissect_itsut_terminate_denm_event_result(tvbuff_t tvb, proto_tree header_tree, int offset)
		@@ -1850,11 +1850,11 @@ static int dissect_itsut_packet(tvbuff_t tvb, packet_info pinfo, proto_tree *t
		case (guint8)ITSUT_DENMTRIGGER_RESULT:
		offset = dissect_itsut_denm_trigger_result(tvb, itsut_tree, offset);
		break;
		case (guint8)ITSUT_DENMEVENT:
		offset = dissect_itsut_denm_event(tvb, itsut_tree, offset);
		case (guint8)ITSUT_DENMUPDATE:
		offset = dissect_itsut_denm_update(tvb, itsut_tree, offset);
		break;
		case (guint8)ITSUT_DENMEVENT_RESULT:
		offset = dissect_itsut_denm_event_result(tvb, itsut_tree, offset);
		case (guint8)ITSUT_DENMUPDATE_RESULT:
		offset = dissect_itsut_denm_update_result(tvb, itsut_tree, offset);
		break;
		case (guint8)ITSUT_TERMINATE_DENMEVENT:
		offset = dissect_itsut_terminate_denm_event(tvb, itsut_tree, offset);