From Glenn Matthews via bug 6319:

Add dissector for XMCP protocol.

From me:
- Fixed an obvious bug setting transaction_id_key[2].key = NULL,
  where transaction_id_key is defined with only 2 elements.
- Only register heur_dissector once.
- Only find media_type_dissector_table once.
- Added packet-xmcp.c to CMakeLists.txt

svn path=/trunk/; revision=39131

epan/CMakeLists.txt

@@ -1093,6 +1093,7 @@ set(DISSECTOR_SRC
 	dissectors/packet-xcsl.c
 	dissectors/packet-xdmcp.c
 	dissectors/packet-xml.c
+	dissectors/packet-xmcp.c
 	dissectors/packet-xmpp.c
 	dissectors/packet-xot.c
 	dissectors/packet-xtp.c

epan/dissectors/Makefile.common

@@ -1011,6 +1011,7 @@ DISSECTOR_SRC = \
 	packet-xcsl.c		\
 	packet-xdmcp.c		\
 	packet-xml.c		\
+	packet-xmcp.c		\
 	packet-xmpp.c		\
 	packet-xot.c		\
 	packet-xtp.c		\

epan/dissectors/packet-classicstun.c

@@ -242,7 +242,8 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	msg_type = tvb_get_ntohs(tvb, 0);
 
-	if (msg_type & 0xC000 || tvb_get_ntohl(tvb, 4) == 0x2112a442)
+	if (msg_type & 0xC000 || tvb_get_ntohl(tvb, 4) == 0x2112a442 /* New STUN */
+	    || tvb_get_ntohl(tvb, 4) == 0x7f5a9bc7) /* XMCP */
 		return 0;
 
 	/* check if message type is correct */