Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 1128 insertions, 0 deletions

diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c
new file mode 100644
index 00000000..17a3d314
--- /dev/null
+++ b/epan/dissectors/packet-agentx.c
@@ -0,0 +1,1128 @@
+/* packet-agentx.c
+ * Routines for Agent Extensibility (AgentX) Protocol disassembly
+ * RFC 2257
+ *
+ * Copyright (c) 2005 by Oleg Terletsky <oleg.terletsky@comverse.com>
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1999 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "config.h"
+
+#include <epan/packet.h>
+#include <epan/to_str.h>
+#include <wsutil/ws_roundup.h>
+
+#include "packet-tcp.h"
+
+#define AGENTX_TCP_PORT     705
+
+void proto_register_agentx(void);
+void proto_reg_handoff_agentx(void);
+
+static dissector_handle_t agentx_handle;
+
+/* Define the agentx proto */
+static int proto_agentx = -1;
+
+
+static int hf_version = -1;
+static int hf_type   = -1;
+static int hf_flags  = -1;
+static int hf_flags_register  = -1;
+static int hf_flags_newindex  = -1;
+static int hf_flags_anyindex  = -1;
+static int hf_flags_context  = -1;
+static int hf_flags_byteorder  = -1;
+static int hf_session_id = -1;
+static int hf_trans_id = -1;
+static int hf_packet_id = -1;
+static int hf_payload_len = -1;
+static int hf_ostring_len = -1;
+static int hf_ostring  = -1;
+static int hf_oid_sub = -1;
+static int hf_oid_prefix = -1;
+static int hf_oid_include = -1;
+static int hf_oid_str = -1;
+static int hf_resp_uptime = -1;
+static int hf_resp_error = -1;
+static int hf_resp_index = -1;
+static int hf_vtag = -1;
+static int hf_val32 = -1;
+static int hf_val64 = -1;
+static int hf_open_timeout = -1;
+static int hf_close_reason = -1;
+static int hf_reg_timeout = -1;
+static int hf_reg_prio = -1;
+static int hf_reg_rsid = -1;
+static int hf_reg_ubound = -1;
+static int hf_unreg_timeout = -1;
+static int hf_unreg_prio = -1;
+static int hf_unreg_rsid = -1;
+static int hf_unreg_ubound = -1;
+static int hf_gbulk_nrepeat = -1;
+static int hf_gbulk_mrepeat = -1;
+
+
+static gint ett_flags = -1;
+static gint ett_agentx = -1;
+static gint ett_pdu_hdr = -1;
+static gint ett_get = -1;
+static gint ett_getnext = -1;
+static gint ett_search_range = -1;
+static gint ett_obj_ident = -1;
+static gint ett_response = -1;
+static gint ett_valrep = -1;
+static gint ett_open = -1;
+static gint ett_close = -1;
+static gint ett_register = -1;
+static gint ett_unregister = -1;
+static gint ett_getbulk = -1;
+static gint ett_testset = -1;
+static gint ett_commitset = -1;
+static gint ett_undoset = -1;
+static gint ett_cleanupset = -1;
+static gint ett_notify = -1;
+static gint ett_ping = -1;
+static gint ett_idxalloc = -1;
+static gint ett_idxdalloc = -1;
+static gint ett_addcap = -1;
+static gint ett_remcap = -1;
+
+
+#define 	AGENTX_OPEN_PDU 		 1
+#define         AGENTX_CLOSE_PDU   		 2
+#define         AGENTX_REGISTER_PDU		 3
+#define         AGENTX_UNREGISTER_PDU 		 4
+#define         AGENTX_GET_PDU			 5
+#define         AGENTX_GETNEXT_PDU		 6
+#define         AGENTX_GETBULK_PDU		 7
+#define         AGENTX_TESTSET_PDU		 8
+#define         AGENTX_COMMITSET_PDU		 9
+#define         AGENTX_UNDOSET_PDU		10
+#define         AGENTX_CLEANUPSET_PDU		11
+#define         AGENTX_NOTIFY_PDU		12
+#define         AGENTX_PING_PDU			13
+#define         AGENTX_INDEX_ALLOC_PDU		14
+#define         AGENTX_INDEX_DEALLOC_PDU	15
+#define         AGENTX_ADD_AGENT_CAPS_PDU	16
+#define         AGENTX_REM_AGENT_CAPS_PDU	17
+#define         AGENTX_RESPONSE_PDU		18
+
+
+static const value_string type_values [] = {
+	{ AGENTX_OPEN_PDU,		"Open-PDU" },
+	{ AGENTX_CLOSE_PDU,		"Close-PDU" },
+	{ AGENTX_REGISTER_PDU,		"Register-PDU" },
+	{ AGENTX_UNREGISTER_PDU,	"Unregister-PDU" },
+	{ AGENTX_GET_PDU,		"Get-PDU" },
+	{ AGENTX_GETNEXT_PDU,		"GetNext-PDU" },
+	{ AGENTX_GETBULK_PDU,		"GetBulk-PDU" },
+	{ AGENTX_TESTSET_PDU,		"TestSet-PDU" },
+	{ AGENTX_COMMITSET_PDU,		"CommitSet-PDU" },
+	{ AGENTX_UNDOSET_PDU,		"UndoSet-PDU" },
+	{ AGENTX_CLEANUPSET_PDU,	"CleanupSet-PDU" },
+	{ AGENTX_NOTIFY_PDU,		"Notify-PDU" },
+	{ AGENTX_PING_PDU,		"Ping-PDU" },
+	{ AGENTX_INDEX_ALLOC_PDU,	"IndexAllocate-PDU" },
+	{ AGENTX_INDEX_DEALLOC_PDU,	"IndexDeallocate-PDU" },
+	{ AGENTX_ADD_AGENT_CAPS_PDU,	"AddAgentCaps-PDU" },
+	{ AGENTX_REM_AGENT_CAPS_PDU,	"RemoveAgentCaps-PDU" },
+	{ AGENTX_RESPONSE_PDU,		"Response-PDU" },
+	{ 0, NULL }
+};
+static value_string_ext type_values_ext = VALUE_STRING_EXT_INIT(type_values);
+
+/* VarBind types */
+
+#define VB_INT		  2
+#define VB_OSTR		  4
+#define VB_NULL		  5
+#define VB_OID		  6
+#define VB_IPADDR	 64
+#define VB_COUNTER32	 65
+#define VB_GAUGE32	 66
+#define VB_TIMETICK	 67
+#define VB_OPAQUE	 68
+#define VB_COUNTER64	 70
+#define VB_NOSUCHOBJ	128
+#define VB_NOSUCHINST	129
+#define VB_ENDOFMIB	130
+
+
+static const value_string vtag_values [] = {
+	{ VB_INT,		"Integer" },
+ 	{ VB_OSTR,		"Octet String" },
+ 	{ VB_NULL,		"Null" },
+ 	{ VB_OID,		"Object Identifier" },
+ 	{ VB_IPADDR,		"IpAddress" },
+ 	{ VB_COUNTER32,		"Counter32" },
+ 	{ VB_GAUGE32,		"Gauge32" },
+ 	{ VB_TIMETICK,		"TimeTicks" },
+ 	{ VB_OPAQUE,		"Opaque" },
+ 	{ VB_COUNTER64,		"Counter64" },
+ 	{ VB_NOSUCHOBJ,		"noSuchObject" },
+ 	{ VB_NOSUCHINST,	"noSuchInstance" },
+	{ VB_ENDOFMIB,		"endOfMibView" },
+	{ 0, NULL }
+};
+static value_string_ext vtag_values_ext = VALUE_STRING_EXT_INIT(vtag_values);
+
+/* Close reasons */
+#define CREASON_OTHER 		1
+#define CREASON_PARSE_ERROR 	2
+#define CREASON_PROTOCOL_ERROR 	3
+#define CREASON_TIMEOUTS 	4
+#define CREASON_SHUTDOWN 	5
+#define CREASON_BY_MANAGER 	6
+
+
+static const value_string close_reasons[] = {
+	{ CREASON_OTHER, 		"reasonOther" },
+	{ CREASON_PARSE_ERROR, 		"reasonParseError" },
+	{ CREASON_PROTOCOL_ERROR, 	"reasonProtocolError" },
+	{ CREASON_TIMEOUTS, 		"reasonTimeouts" },
+	{ CREASON_SHUTDOWN , 		"reasonShutdown" },
+	{ CREASON_BY_MANAGER, 		"reasonByManager" },
+	{ 0, NULL }
+};
+
+
+/* Response errors */
+#define AGENTX_NO_ERROR		  0
+#define AGENTX_TOO_BIG		  1
+#define AGENTX_NO_SUCH_NAME	  2
+#define AGENTX_BAD_VALUE	  3
+#define AGENTX_READ_ONLY	  4
+#define AGENTX_GEN_ERROR	  5
+#define AGENTX_NO_ACCESS	  6
+#define AGENTX_WRONG_TYPE	  7
+#define AGENTX_WRONG_LEN	  8
+#define AGENTX_WRONG_ENCODE	  9
+#define AGENTX_WRONG_VALUE	 10
+#define AGENTX_NO_CREATION	 11
+#define AGENTX_INCONSIST_VALUE	 12
+#define AGENTX_RES_UNAVAIL	 13
+#define AGENTX_COMMIT_FAILED	 14
+#define AGENTX_UNDO_FAILED	 15
+#define AGENTX_AUTH_ERROR	 16
+#define AGENTX_NOTWRITABLE	 17
+#define AGENTX_INCONSIS_NAME	 18
+#define AGENTX_OPEN_FAILED	256
+#define AGENTX_NOT_OPEN		257
+#define AGENTX_IDX_WRONT_TYPE	258
+#define AGENTX_IDX_ALREAY_ALLOC	259
+#define AGENTX_IDX_NONEAVAIL	260
+#define AGENTX_IDX_NOTALLOC	261
+#define AGENTX_UNSUPP_CONTEXT	262
+#define AGENTX_DUP_REGISTR	263
+#define AGENTX_UNKNOWN_REG	264
+#define AGENTX_UNKNOWN_CAPS	265
+
+
+static const value_string resp_errors[] = {
+	{ AGENTX_NO_ERROR, 	   "noError" },
+	{ AGENTX_TOO_BIG,	   "tooBig" },
+	{ AGENTX_NO_SUCH_NAME,	   "noSuchName" },
+	{ AGENTX_BAD_VALUE,	   "badValue" },
+	{ AGENTX_READ_ONLY,	   "readOnly" },
+	{ AGENTX_GEN_ERROR,	   "genErr" },
+	{ AGENTX_NO_ACCESS,	   "noAccess" },
+	{ AGENTX_WRONG_TYPE, 	   "wrongType" },
+	{ AGENTX_WRONG_LEN, 	   "wrongLength" },
+	{ AGENTX_WRONG_ENCODE,	   "wrongEncoding" },
+	{ AGENTX_WRONG_VALUE,	   "wrongValue" },
+	{ AGENTX_NO_CREATION,	   "noCreation" },
+	{ AGENTX_INCONSIST_VALUE,  "inconsistentValue" },
+	{ AGENTX_RES_UNAVAIL,	   "resourceUnavailable" },
+	{ AGENTX_COMMIT_FAILED,    "commitFailed" },
+	{ AGENTX_UNDO_FAILED ,	   "undoFailed" },
+	{ AGENTX_AUTH_ERROR, 	   "authorizationError" },
+	{ AGENTX_NOTWRITABLE,	   "notWritable" },
+	{ AGENTX_INCONSIS_NAME,    "inconsistentName" },
+	{ AGENTX_OPEN_FAILED,	   "openFailed" },
+	{ AGENTX_NOT_OPEN, 	   "notOpen" },
+	{ AGENTX_IDX_WRONT_TYPE,   "indexWrongType" },
+	{ AGENTX_IDX_ALREAY_ALLOC, "indexAlreadyAllocated" },
+	{ AGENTX_IDX_NONEAVAIL,    "indexNoneAvailable" },
+	{ AGENTX_IDX_NOTALLOC,	   "indexNotAllocated" },
+	{ AGENTX_UNSUPP_CONTEXT,   "unsupportedContext" },
+	{ AGENTX_DUP_REGISTR,	   "duplicateRegistration" },
+	{ AGENTX_UNKNOWN_REG,	   "unknownRegistration" },
+	{ AGENTX_UNKNOWN_CAPS,	   "unknownAgentCaps" },
+	{ 0, NULL }
+};
+static value_string_ext resp_errors_ext = VALUE_STRING_EXT_INIT(resp_errors);
+
+/* OID usage indicators */
+
+enum OID_USAGE { OID_START_RANGE, OID_END_RANGE, OID_EXACT };
+
+/* PDU Header flags */
+
+#define INSTANCE_REGISTRATION 	0x01
+#define NEW_INDEX 		0x02
+#define ANY_INDEX		0x04
+#define NON_DEFAULT_CONTEXT	0x08
+#define NETWORK_BYTE_ORDER	0x10
+
+#define OID_IS_INCLUSIVE 	0x01
+
+#define PDU_HDR_LEN	20
+
+#define NORLEL(flags,var,tvb,offset) \
+	var = (flags & NETWORK_BYTE_ORDER) ? \
+		tvb_get_ntohl(tvb, offset) : \
+		tvb_get_letohl(tvb, offset)
+#define NORLES(flags,var,tvb,offset) \
+	var = (flags & NETWORK_BYTE_ORDER) ? \
+		tvb_get_ntohs(tvb, offset) : \
+		tvb_get_letohs(tvb, offset)
+
+static int
+dissect_octet_string(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 flags)
+{
+	guint32 n_oct, p_noct;
+
+	NORLEL(flags, n_oct, tvb, offset);
+
+	p_noct = WS_ROUNDUP_4(n_oct);
+
+	proto_tree_add_uint(tree, hf_ostring_len, tvb, offset, 4, n_oct);
+	/*
+	 * XXX - an "octet string" is not necessarily a text string, so
+	 * having hf_ostring be FT_STRING is not necessarily appropriate.
+	 */
+	proto_tree_add_item(tree, hf_ostring, tvb, offset + 4, n_oct, ENC_ASCII);
+	return p_noct + 4;
+
+}
+
+/* XXX - Is there a particular reason we're not using oid_encoded2string() here? */
+static int
+convert_oid_to_str(guint32 *oid, int len, char* str, int slen, char prefix)
+{
+	int i, tlen = 0;
+	if(!oid)  return 0;
+	if(!str)  return 0;
+	if(!len)  return 0;
+	if(!slen) return 0;
+	if(slen < len) return 0;
+
+	if(prefix) {
+		tlen += snprintf(str, slen, ".1.3.6.1.%d", prefix);
+	}
+
+	for(i=0; i < len && tlen < slen; i++) {
+		tlen += snprintf(str+tlen, slen-tlen, ".%d", oid[i]);
+	}
+	return tlen;
+}
+
+static int
+dissect_object_id(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 flags, enum OID_USAGE oid_usage)
+{
+	guint8 n_subid;
+	guint8 prefix;
+	guint8 include;
+	proto_tree* subtree;
+	guint32 oid[2048];
+	char str_oid[2048];
+	int i;
+
+	memset(oid, '\0', sizeof(oid));
+	memset(str_oid, '\0', sizeof(str_oid));
+
+	n_subid = tvb_get_guint8(tvb, offset);
+	prefix	= tvb_get_guint8(tvb, offset + 1);
+	include = tvb_get_guint8(tvb, offset + 2);
+	tvb_get_guint8(tvb, offset + 3);
+
+	for(i=0; i<n_subid; i++) {
+		NORLEL(flags, oid[i], tvb, (offset+4) + (i*4));
+	}
+
+	if(!convert_oid_to_str(&oid[0], n_subid, &str_oid[0], 2048, prefix))
+		snprintf(&str_oid[0], 2048, "(null)");
+
+	if(tree) {
+		const char *range = "";
+		const char *inclusion = (include) ? " (Inclusive)" : " (Exclusive)";
+		switch (oid_usage) {
+			case OID_START_RANGE:	range = "(Range Start) ";	break;
+			case OID_END_RANGE:	range = "  (Range End) ";	break;
+			default:		inclusion = "";			break;
+			}
+		subtree = proto_tree_add_subtree_format(tree, tvb, offset, 4 + (n_subid * 4) ,
+				ett_obj_ident, NULL, "Object Identifier: %s%s%s", range, str_oid, inclusion);
+	} else
+		return offset;
+
+	proto_tree_add_uint(subtree, hf_oid_sub, tvb, offset, 1, n_subid);
+	proto_tree_add_uint(subtree, hf_oid_prefix, tvb, offset + 1, 1, prefix);
+	proto_tree_add_boolean(subtree, hf_oid_include, tvb, offset + 2, 1, include);
+	proto_tree_add_string(subtree, hf_oid_str, tvb, offset + 4, (n_subid * 4), str_oid);
+
+	return 4 + (n_subid * 4);
+}
+
+static int
+dissect_search_range(tvbuff_t *tvb, proto_tree *tree, int start_offset, guint8 flags, guint8 pdu_type)
+{
+	int offset = start_offset;
+	offset += dissect_object_id(tvb, tree, offset, flags, (pdu_type == AGENTX_GET_PDU) ? OID_EXACT : OID_START_RANGE);
+	offset += dissect_object_id(tvb, tree, offset, flags, (pdu_type == AGENTX_GET_PDU) ? OID_EXACT : OID_END_RANGE);
+
+	return (offset - start_offset);
+}
+
+static int
+dissect_val64(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 flags)
+{
+	guint encoding = (flags & NETWORK_BYTE_ORDER) ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN;
+
+	proto_tree_add_item(tree, hf_val64, tvb, offset, 8, encoding);
+
+	return 8;
+}
+
+static int
+dissect_val32(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 flags)
+{
+	guint encoding = (flags & NETWORK_BYTE_ORDER) ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN;
+
+	proto_tree_add_item(tree, hf_val32, tvb, offset, 4, encoding);
+
+	return 4;
+}
+
+static int
+dissect_varbind(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	guint16 vtag;
+	int tlen;
+	proto_tree* subtree;
+
+	NORLES(flags, vtag, tvb, offset);
+	/* 2 reserved bytes after this */
+
+	if(tree) {
+		subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_valrep, NULL, "Value Representation");
+	} else return len;
+
+	proto_tree_add_uint(subtree, hf_vtag, tvb, offset, 2, vtag);
+	tlen = dissect_object_id(tvb, subtree, offset + 4, flags, OID_EXACT);
+
+	switch(vtag)
+	{
+		case  VB_OID:
+			tlen += dissect_object_id(tvb, subtree, offset + tlen + 4, flags, OID_EXACT);
+			break;
+
+		case  VB_OPAQUE:
+		case  VB_OSTR:
+		case  VB_IPADDR:
+			tlen += dissect_octet_string(tvb, subtree, offset + tlen + 4, flags);
+			break;
+
+		case  VB_TIMETICK:
+		case  VB_COUNTER32:
+		case  VB_INT:
+		case  VB_GAUGE32:
+			tlen += dissect_val32(tvb, subtree, offset + tlen + 4, flags);
+			break;
+
+		case  VB_COUNTER64:
+			tlen += dissect_val64(tvb, subtree, offset + tlen + 4, flags);
+			break;
+
+		case  VB_NULL:
+		case  VB_NOSUCHOBJ:
+		case  VB_NOSUCHINST:
+		case  VB_ENDOFMIB:
+			break;
+	}
+	return tlen + 4;
+}
+
+static void
+dissect_response_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+	guint encoding = (flags & NETWORK_BYTE_ORDER) ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN;
+	guint32 r_uptime;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_response, NULL, "Response-PDU");
+
+	NORLEL(flags, r_uptime, tvb, offset);
+	proto_tree_add_uint_format(subtree, hf_resp_uptime, tvb, offset, 4, r_uptime,
+			"sysUptime: %s", signed_time_msecs_to_str(pinfo->pool, r_uptime));
+	proto_tree_add_item(subtree, hf_resp_error,  tvb, offset + 4, 2, encoding);
+	proto_tree_add_item(subtree, hf_resp_index,  tvb, offset + 6, 2, encoding);
+	offset += 8;
+
+	len += PDU_HDR_LEN;
+	while(len > offset) {
+		offset += dissect_varbind(tvb, subtree, offset, len, flags);
+	}
+}
+
+static void
+dissect_getnext_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_getnext, NULL, "GetNext-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	len += PDU_HDR_LEN;
+	while(len > offset) {
+		offset += dissect_search_range(tvb, subtree, offset, flags, 0);
+	}
+}
+
+static void
+dissect_get_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_get, NULL, "Get-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	len += PDU_HDR_LEN;
+	while(len > offset) {
+		offset += dissect_search_range(tvb, subtree, offset, flags, AGENTX_GET_PDU);
+	}
+}
+
+static void
+dissect_getbulk_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+	guint encoding = (flags & NETWORK_BYTE_ORDER) ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_getbulk, NULL, "GetBulk-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	proto_tree_add_item(subtree, hf_gbulk_nrepeat,	tvb, offset, 2, encoding);
+	proto_tree_add_item(subtree, hf_gbulk_mrepeat,	tvb, offset + 2, 2, encoding);
+	offset+=4;
+
+	while(len >= offset) {
+		offset += dissect_search_range(tvb, subtree, offset, flags, 0);
+	}
+}
+
+static int
+dissect_open_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+	guint8 timeout;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_open, NULL, "Open-PDU");
+
+	timeout = tvb_get_guint8(tvb, offset);
+	tvb_get_ntoh24(tvb, offset + 1);
+
+	proto_tree_add_uint(subtree, hf_open_timeout, tvb, offset, 1, timeout);
+	offset+=4;
+
+	/* Search Range */
+	offset += dissect_object_id(tvb, subtree, offset, flags, OID_EXACT);
+
+	/* Octet string */
+	offset += dissect_octet_string(tvb, subtree, offset, flags);
+	return offset;
+}
+
+static int
+dissect_close_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_close, NULL, "Close-PDU");
+
+	proto_tree_add_item(subtree, hf_close_reason, tvb, offset, 1, ENC_NA);
+	tvb_get_ntoh24(tvb, offset + 1);
+	offset+=4;
+	return offset;
+}
+
+
+static int
+dissect_register_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+	guint encoding = (flags & NETWORK_BYTE_ORDER) ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_register, NULL, "Register-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	proto_tree_add_item(subtree, hf_reg_timeout, tvb, offset, 1, encoding);
+	proto_tree_add_item(subtree, hf_reg_prio, tvb, offset+1, 1, encoding);
+	proto_tree_add_item(subtree, hf_reg_rsid, tvb, offset+2, 1, encoding);
+	offset+=4;
+
+	/* Region */
+
+	offset += dissect_object_id(tvb, subtree, offset, flags, OID_EXACT);
+
+	len += PDU_HDR_LEN;
+	if(len > offset) {
+		/* Upper bound (opt) */
+		proto_tree_add_item(subtree, hf_reg_ubound, tvb, offset, 4, encoding);
+		offset += 4;
+	}
+	return offset;
+}
+
+
+static int
+dissect_unregister_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+	guint encoding = (flags & NETWORK_BYTE_ORDER) ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_unregister, NULL, "Unregister-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	proto_tree_add_item(subtree, hf_unreg_timeout, tvb, offset, 1, encoding);
+	proto_tree_add_item(subtree, hf_unreg_prio, tvb, offset+1, 1, encoding);
+	proto_tree_add_item(subtree, hf_unreg_rsid, tvb, offset+2, 1, encoding);
+	offset+=4;
+
+	/* Region */
+	offset += dissect_object_id(tvb, subtree, offset, flags, OID_EXACT);
+
+	len += PDU_HDR_LEN;
+	if(len > offset) {
+		/* Upper bound (opt) */
+		proto_tree_add_item(subtree, hf_unreg_ubound, tvb, offset, 4, encoding);
+		offset += 4;
+	}
+
+	return offset;
+}
+
+static void
+dissect_testset_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_testset, NULL, "Testset-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	while(len > offset) {
+		offset += dissect_varbind(tvb, subtree, offset, len, flags);
+	}
+}
+
+static void
+dissect_notify_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_notify, NULL, "Notify-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	while(len > offset) {
+		offset += dissect_varbind(tvb, subtree, offset, len, flags);
+	}
+}
+
+static int
+dissect_ping_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_ping, NULL, "Ping-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+	return offset;
+}
+
+static void
+dissect_idx_alloc_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_idxalloc, NULL, "IndexAllocate-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	while(len > offset) {
+		offset += dissect_varbind(tvb, subtree, offset, len, flags);
+	}
+}
+
+
+static void
+dissect_idx_dealloc_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_idxdalloc, NULL, "IndexDeallocate-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	while(len > offset) {
+		offset += dissect_varbind(tvb, subtree, offset, len, flags);
+	}
+}
+
+static int
+dissect_add_caps_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_addcap, NULL, "AddAgentCaps-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	offset += dissect_object_id(tvb, subtree, offset, flags, OID_EXACT);
+
+	offset += dissect_octet_string(tvb, subtree, offset, flags);
+
+	return offset;
+}
+
+static int
+dissect_rem_caps_pdu(tvbuff_t *tvb, proto_tree *tree, int offset, int len, guint8 flags)
+{
+	proto_tree* subtree;
+
+	subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_remcap, NULL, "RemoveAgentCaps-PDU");
+
+	if(flags & NON_DEFAULT_CONTEXT) {
+		/* show context */
+		offset += dissect_octet_string(tvb, subtree, offset, flags);
+	}
+
+	offset += dissect_object_id(tvb, subtree, offset, flags, OID_EXACT);
+
+	return offset;
+}
+
+
+static guint
+get_agentx_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
+{
+	guint8  flags;
+	guint32 plen;
+
+	/*
+	 * Get the payload length.
+	 */
+	flags = tvb_get_guint8(tvb, offset + 2);
+	NORLEL(flags, plen, tvb, offset + 16);
+
+	/*
+	 * Arbitrarily limit it to 2^24, so we don't have to worry about
+	 * overflow.
+	 */
+	if (plen > 0xFFFFFF)
+		plen = 0xFFFFFF;
+
+	/*
+	 * That length doesn't include the header; add that in.
+	 */
+	return plen + 20;
+}
+
+static int
+dissect_agentx_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+	int offset = 0;
+	proto_tree* agentx_tree, *pdu_hdr_tree;
+	proto_item *t_item;
+	guint8 version;
+	guint8 type;
+	guint8 flags;
+	guint32 session_id;
+	guint32 trans_id;
+	guint32 packet_id;
+	guint32 payload_len;
+	static int * const pdu_flags[] = {
+		&hf_flags_register,
+		&hf_flags_newindex,
+		&hf_flags_anyindex,
+		&hf_flags_context,
+		&hf_flags_byteorder,
+		NULL
+	};
+
+	version = tvb_get_guint8(tvb, 0); offset+=1;
+	type = tvb_get_guint8(tvb, 1); offset+=1;
+	flags = tvb_get_guint8(tvb, 2); offset+=1;
+	/* skip reserved byte */
+	offset+=1;
+
+	NORLEL(flags, session_id, tvb, 4); offset+=4;
+	NORLEL(flags, trans_id, tvb, 8); offset+=4;
+	NORLEL(flags, packet_id, tvb, 12); offset+=4;
+	NORLEL(flags, payload_len, tvb, 16); offset+=4;
+
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, "AgentX");
+
+	col_add_fstr(pinfo->cinfo, COL_INFO, "%s: sid=%d, tid=%d, packid=%d, plen=%d",
+		     val_to_str_ext_const(type, &type_values_ext, "unknown"),
+		     session_id, trans_id, packet_id, payload_len);
+
+
+	if(!tree)
+		return tvb_captured_length(tvb);
+
+	/*t_item = proto_tree_add_item(tree, proto_agentx, tvb, 0, -1, ENC_NA);*/
+	t_item = proto_tree_add_protocol_format(tree, proto_agentx, tvb, 0, -1,
+			"Agent Extensibility (AgentX) Protocol: %s, sid=%d, tid=%d, packid=%d, plen=%d",
+			val_to_str_ext_const(type, &type_values_ext, "unknown"),
+			session_id, trans_id, packet_id, payload_len);
+	agentx_tree = proto_item_add_subtree(t_item, ett_agentx);
+
+	pdu_hdr_tree = proto_tree_add_subtree_format(agentx_tree, tvb, 0, PDU_HDR_LEN,
+			ett_pdu_hdr, NULL, "PDU Header: Type[%u], len=%d, sid=%d, tid=%d, packid=%d",
+			(char)type, payload_len, session_id, trans_id, packet_id);
+
+	proto_tree_add_uint(pdu_hdr_tree, hf_version, tvb, 0, 1, version);
+	proto_tree_add_uint(pdu_hdr_tree, hf_type, tvb, 1, 1, type);
+	proto_tree_add_bitmask(pdu_hdr_tree, tvb, 2, hf_flags, ett_flags, pdu_flags, ENC_NA);
+
+	proto_tree_add_uint(pdu_hdr_tree, hf_session_id, tvb, 4, 4, session_id);
+	proto_tree_add_uint(pdu_hdr_tree, hf_trans_id, tvb, 8, 4, trans_id);
+	proto_tree_add_uint(pdu_hdr_tree, hf_packet_id, tvb, 12, 4, packet_id);
+	proto_tree_add_uint(pdu_hdr_tree, hf_payload_len, tvb, 16, 4, payload_len);
+
+	switch(type) {
+		case AGENTX_OPEN_PDU:
+		dissect_open_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_CLOSE_PDU:
+		dissect_close_pdu(tvb, agentx_tree, offset, payload_len);
+		break;
+
+		case AGENTX_REGISTER_PDU:
+		dissect_register_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_UNREGISTER_PDU:
+		dissect_unregister_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_GET_PDU:
+		dissect_get_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_GETNEXT_PDU:
+		dissect_getnext_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_GETBULK_PDU:
+		dissect_getbulk_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_TESTSET_PDU:
+		dissect_testset_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_COMMITSET_PDU:
+		case AGENTX_UNDOSET_PDU:
+		case AGENTX_CLEANUPSET_PDU:
+			/* there is no parameters */
+		break;
+
+		case AGENTX_NOTIFY_PDU:
+		dissect_notify_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_PING_PDU:
+		dissect_ping_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_INDEX_ALLOC_PDU:
+		dissect_idx_alloc_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_INDEX_DEALLOC_PDU:
+		dissect_idx_dealloc_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_ADD_AGENT_CAPS_PDU:
+		dissect_add_caps_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_REM_AGENT_CAPS_PDU:
+		dissect_rem_caps_pdu(tvb, agentx_tree, offset, payload_len, flags);
+		break;
+
+		case AGENTX_RESPONSE_PDU:
+		dissect_response_pdu(tvb, pinfo, agentx_tree, offset, payload_len, flags);
+		break;
+	}
+
+	return tvb_captured_length(tvb);
+}
+
+static int
+dissect_agentx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
+{
+	tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 20, get_agentx_pdu_len,
+			 dissect_agentx_pdu, data);
+	return tvb_captured_length(tvb);
+}
+
+static const true_false_string tfs_agentx_context	= { "Provided",			"None"	};
+static const true_false_string tfs_agentx_byteorder	= { "MSB (network order)",	"LSB"	};
+
+void
+proto_register_agentx(void)
+{
+	static hf_register_info hf[] = {
+
+		{ &hf_version,
+		  { "Version", "agentx.version", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "header version", HFILL }},
+
+		{ &hf_type,
+		  { "Type", "agentx.type", FT_UINT8, BASE_DEC | BASE_EXT_STRING, &type_values_ext, 0x0,
+		    "header type", HFILL }},
+
+		{ &hf_flags,
+		  { "Flags", "agentx.flags", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "header type", HFILL }},
+
+		{ &hf_flags_register,
+		  { "Register", "agentx.flags.register", FT_BOOLEAN, 8, TFS(&tfs_yes_no),
+		    INSTANCE_REGISTRATION, "Instance Registration",  HFILL }},
+
+		{ &hf_flags_newindex,
+		  { "New Index", "agentx.flags.newindex", FT_BOOLEAN, 8, TFS(&tfs_yes_no),
+		    NEW_INDEX, "New Index Requested",  HFILL }},
+
+		{ &hf_flags_anyindex,
+		  { "Any Index", "agentx.flags.anyindex", FT_BOOLEAN, 8, TFS(&tfs_yes_no),
+		    ANY_INDEX, "Any Index Requested",  HFILL }},
+
+		{ &hf_flags_context,
+		  { "Non-default Context", "agentx.flags.context", FT_BOOLEAN, 8, TFS(&tfs_agentx_context),
+		    NON_DEFAULT_CONTEXT, NULL,  HFILL }},
+
+		{ &hf_flags_byteorder,
+		  { "Byte Order", "agentx.flags.byteorder", FT_BOOLEAN, 8, TFS(&tfs_agentx_byteorder),
+		    NETWORK_BYTE_ORDER, NULL,  HFILL }},
+
+		{ &hf_session_id,
+		  { "sessionID", "agentx.session_id", FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Session ID", HFILL }},
+
+		{ &hf_trans_id,
+		  { "TransactionID", "agentx.transaction_id", FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Transaction ID", HFILL }},
+
+		{ &hf_packet_id,
+		  { "PacketID", "agentx.packet_id", FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Packet ID", HFILL }},
+
+		{ &hf_payload_len,
+		  { "Payload length", "agentx.payload_len", FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_ostring,
+		  { "Octet String", "agentx.ostring", FT_STRING, BASE_NONE, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_ostring_len,
+		  { "OString len", "agentx.ostring_len", FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Octet String Length", HFILL }},
+
+		{ &hf_oid_sub,
+		  { "Number subids", "agentx.n_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_oid_prefix,
+		  { "OID prefix", "agentx.oid_prefix", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_oid_include,
+		  { "OID include", "agentx.oid_include", FT_BOOLEAN, 8, TFS(&tfs_yes_no),
+		    OID_IS_INCLUSIVE, NULL, HFILL }},
+
+		{ &hf_oid_str,
+		  { "OID", "agentx.oid", FT_STRING, BASE_NONE, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_resp_uptime,
+		  { "sysUpTime", "agentx.r.uptime", FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_resp_error,
+		  { "Resp. error", "agentx.r.error", FT_UINT16, BASE_DEC | BASE_EXT_STRING, &resp_errors_ext, 0x0,
+		    "response error", HFILL }},
+
+		{ &hf_resp_index,
+		  { "Resp. index", "agentx.r.index", FT_UINT16, BASE_DEC, NULL, 0x0,
+		    "response index", HFILL }},
+
+		{ &hf_vtag,
+		  { "Variable type", "agentx.v.tag", FT_UINT16, BASE_DEC | BASE_EXT_STRING, &vtag_values_ext, 0x0,
+		    "vtag", HFILL }},
+
+		{ &hf_val32,
+		  { "Value(32)", "agentx.v.val32", FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "val32", HFILL }},
+
+		{ &hf_val64,
+		  { "Value(64)", "agentx.v.val64", FT_UINT64, BASE_DEC, NULL, 0x0,
+		    "val64", HFILL }},
+
+		{ &hf_open_timeout,
+		  { "Timeout", "agentx.o.timeout", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "open timeout", HFILL }},
+
+		{ &hf_close_reason,
+		  { "Reason", "agentx.c.reason", FT_UINT8, BASE_DEC, VALS(close_reasons), 0x0,
+		    "close reason", HFILL }},
+
+		{ &hf_reg_timeout,
+		  { "Timeout", "agentx.r.timeout", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "Register timeout", HFILL }},
+
+		{ &hf_reg_prio,
+		  { "Priority", "agentx.r.priority", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "Register Priority", HFILL }},
+
+		{ &hf_reg_rsid,
+		  { "Range_subid", "agentx.r.range_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "Register range_subid", HFILL }},
+
+		{ &hf_reg_ubound,
+		  { "Upper bound", "agentx.r.upper_bound", FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Register upper bound", HFILL }},
+
+		{ &hf_unreg_timeout,
+		  { "Timeout", "agentx.u.timeout", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "Unregister timeout", HFILL }},
+
+		{ &hf_unreg_prio,
+		  { "Priority", "agentx.u.priority", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "Unregister Priority", HFILL }},
+
+		{ &hf_unreg_rsid,
+		  { "Range_subid", "agentx.u.range_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "Unregister range_subid", HFILL }},
+
+		{ &hf_unreg_ubound,
+		  { "Upper bound", "agentx.u.upper_bound", FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Register upper bound", HFILL }},
+
+		{ &hf_gbulk_nrepeat,
+		  { "Repeaters", "agentx.gb.nrepeat", FT_UINT16, BASE_DEC, NULL, 0x0,
+		    "getBulk Num. repeaters", HFILL }},
+
+		{ &hf_gbulk_mrepeat,
+		  { "Max Repetition", "agentx.gb.mrepeat", FT_UINT16, BASE_DEC, NULL, 0x0,
+		    "getBulk Max repetition", HFILL }},
+
+
+		/* Add more fields here */
+
+	};
+
+	static gint *ett[] = {
+		&ett_agentx,
+		&ett_pdu_hdr,
+		&ett_get,
+		&ett_getnext,
+		&ett_search_range,
+		&ett_obj_ident,
+		&ett_response,
+		&ett_valrep,
+		&ett_open,
+		&ett_close,
+		&ett_register,
+		&ett_unregister,
+		&ett_getbulk,
+		&ett_testset,
+		&ett_commitset,
+		&ett_undoset,
+		&ett_cleanupset,
+		&ett_notify,
+		&ett_ping,
+		&ett_idxalloc,
+		&ett_idxdalloc,
+		&ett_addcap,
+		&ett_remcap,
+		&ett_flags,
+	};
+
+	proto_agentx = proto_register_protocol("AgentX", "AgentX", "agentx");
+
+	proto_register_field_array(proto_agentx, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+
+	agentx_handle = register_dissector("agentx", dissect_agentx, proto_agentx);
+}
+
+/* The registration hand-off routine */
+void
+proto_reg_handoff_agentx(void)
+{
+	dissector_add_uint_with_preference("tcp.port", AGENTX_TCP_PORT, agentx_handle);
+}
+
+/*
+ * Editor modelines  -  https://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:
+ */