Move /asn1 to /epan/dissectors

Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9
Reviewed-on: https://code.wireshark.org/review/14388
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>

1 files changed, 0 insertions, 352 deletions

diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c
deleted file mode 100644
index c39870676d..0000000000
--- a/asn1/dsp/packet-dsp-template.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* packet-dsp.c
- * Routines for X.518 (X.500 Distributed Operations)  packet dissection
- * Graeme Lunt 2005
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <epan/packet.h>
-#include <epan/expert.h>
-#include <epan/prefs.h>
-#include <epan/oids.h>
-#include <epan/asn1.h>
-
-#include "packet-ber.h"
-#include "packet-acse.h"
-#include "packet-ros.h"
-
-#include "packet-x509if.h"
-#include "packet-x509af.h"
-#include "packet-x509sat.h"
-
-#include "packet-dap.h"
-#include "packet-dsp.h"
-
-
-#define PNAME  "X.519 Directory System Protocol"
-#define PSNAME "DSP"
-#define PFNAME "dsp"
-
-void proto_register_dsp(void);
-void proto_reg_handoff_dsp(void);
-
-static guint global_dsp_tcp_port = 102;
-static dissector_handle_t tpkt_handle;
-static void prefs_register_dsp(void); /* forward declaration for use in preferences registration */
-
-
-/* Initialize the protocol and registered fields */
-static int proto_dsp = -1;
-
-#include "packet-dsp-hf.c"
-
-/* Initialize the subtree pointers */
-static gint ett_dsp = -1;
-#include "packet-dsp-ett.c"
-
-static expert_field ei_dsp_unsupported_opcode = EI_INIT;
-static expert_field ei_dsp_unsupported_errcode = EI_INIT;
-static expert_field ei_dsp_unsupported_pdu = EI_INIT;
-static expert_field ei_dsp_zero_pdu = EI_INIT;
-
-#include "packet-dsp-fn.c"
-
-/*
-* Dissect X518 PDUs inside a ROS PDUs
-*/
-static int
-dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data)
-{
-	int offset = 0;
-	int old_offset;
-	proto_item *item;
-	proto_tree *tree;
-	struct SESSION_DATA_STRUCTURE* session;
-	int (*dsp_dissector)(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) = NULL;
-	const char *dsp_op_name;
-	asn1_ctx_t asn1_ctx;
-
-	/* do we have operation information from the ROS dissector? */
-	if (data == NULL)
-		return 0;
-	session  = (struct SESSION_DATA_STRUCTURE*)data;
-
-	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
-
-	item = proto_tree_add_item(parent_tree, proto_dsp, tvb, 0, -1, ENC_NA);
-	tree = proto_item_add_subtree(item, ett_dsp);
-
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP");
-  	col_clear(pinfo->cinfo, COL_INFO);
-
-	asn1_ctx.private_data = session;
-
-	switch(session->ros_op & ROS_OP_MASK) {
-	case (ROS_OP_BIND | ROS_OP_ARGUMENT):	/*  BindInvoke */
-	  dsp_dissector = dissect_dsp_DSASystemBindArgument;
-	  dsp_op_name = "System-Bind-Argument";
-	  break;
-	case (ROS_OP_BIND | ROS_OP_RESULT):	/*  BindResult */
-	  dsp_dissector = dissect_dsp_DSASystemBindResult;
-	  dsp_op_name = "System-Bind-Result";
-	  break;
-	case (ROS_OP_BIND | ROS_OP_ERROR):	/*  BindError */
-	  dsp_dissector = dissect_dsp_DSASystemBindError;
-	  dsp_op_name = "System-Bind-Error";
-	  break;
-	case (ROS_OP_INVOKE | ROS_OP_ARGUMENT):	/*  Invoke Argument */
-	  switch(session->ros_op & ROS_OP_OPCODE_MASK) {
-	  case 1: /* read */
-	    dsp_dissector = dissect_dsp_ChainedReadArgument;
-	    dsp_op_name = "Chained-Read-Argument";
-	    break;
-	  case 2: /* compare */
-	    dsp_dissector = dissect_dsp_ChainedCompareArgument;
-	    dsp_op_name = "Chained-Compare-Argument";
-	    break;
-	  case 3: /* abandon */
-	    dsp_dissector = dissect_dsp_ChainedAbandonArgument;
-	    dsp_op_name = "Chained-Abandon-Argument";
-	    break;
-	  case 4: /* list */
-	    dsp_dissector = dissect_dsp_ChainedListArgument;
-	    dsp_op_name = "Chained-List-Argument";
-	    break;
-	  case 5: /* search */
-	    dsp_dissector = dissect_dsp_ChainedSearchArgument;
-	    dsp_op_name = "Chained-Search-Argument";
-	    break;
-	  case 6: /* addEntry */
-	    dsp_dissector = dissect_dsp_ChainedAddEntryArgument;
-	    dsp_op_name = "Chained-Add-Entry-Argument";
-	    break;
-	  case 7: /* removeEntry */
-	    dsp_dissector = dissect_dsp_ChainedRemoveEntryArgument;
-	    dsp_op_name = "Chained-Remove-Entry-Argument";
-	    break;
-	  case 8: /* modifyEntry */
-	    dsp_dissector = dissect_dsp_ChainedModifyEntryArgument;
-	    dsp_op_name = "ChainedModify-Entry-Argument";
-	    break;
-	  case 9: /* modifyDN */
-	    dsp_dissector = dissect_dsp_ChainedModifyDNArgument;
-	    dsp_op_name = "ChainedModify-DN-Argument";
-	    break;
-	  default:
-	    proto_tree_add_expert_format(tree, pinfo, &ei_dsp_unsupported_opcode, tvb, offset, -1,
-	        "Unsupported DSP opcode (%d)", session->ros_op & ROS_OP_OPCODE_MASK);
-	    break;
-	  }
-	  break;
-	case (ROS_OP_INVOKE | ROS_OP_RESULT):	/*  Return Result */
-	  switch(session->ros_op & ROS_OP_OPCODE_MASK) {
-	  case 1: /* read */
-	    dsp_dissector = dissect_dsp_ChainedReadResult;
-	    dsp_op_name = "Chained-Read-Result";
-	    break;
-	  case 2: /* compare */
-	    dsp_dissector = dissect_dsp_ChainedCompareResult;
-	    dsp_op_name = "Chained-Compare-Result";
-	    break;
-	  case 3: /* abandon */
-	    dsp_dissector = dissect_dsp_ChainedAbandonResult;
-	    dsp_op_name = "Chained-Abandon-Result";
-	    break;
-	  case 4: /* list */
-	    dsp_dissector = dissect_dsp_ChainedListResult;
-	    dsp_op_name = "Chained-List-Result";
-	    break;
-	  case 5: /* search */
-	    dsp_dissector = dissect_dsp_ChainedSearchResult;
-	    dsp_op_name = "Chained-Search-Result";
-	    break;
-	  case 6: /* addEntry */
-	    dsp_dissector = dissect_dsp_ChainedAddEntryResult;
-	    dsp_op_name = "Chained-Add-Entry-Result";
-	    break;
-	  case 7: /* removeEntry */
-	    dsp_dissector = dissect_dsp_ChainedRemoveEntryResult;
-	    dsp_op_name = "Chained-Remove-Entry-Result";
-	    break;
-	  case 8: /* modifyEntry */
-	    dsp_dissector = dissect_dsp_ChainedModifyEntryResult;
-	    dsp_op_name = "Chained-Modify-Entry-Result";
-	    break;
-	  case 9: /* modifyDN */
-	    dsp_dissector = dissect_dsp_ChainedModifyDNResult;
-	    dsp_op_name = "ChainedModify-DN-Result";
-	    break;
-	  default:
-	    proto_tree_add_expert(tree, pinfo, &ei_dsp_unsupported_opcode, tvb, offset, -1);
-	    break;
-	  }
-	  break;
-	case (ROS_OP_INVOKE | ROS_OP_ERROR):	/*  Return Error */
-	  switch(session->ros_op & ROS_OP_OPCODE_MASK) {
-	  case 1: /* attributeError */
-	    dsp_dissector = dissect_dap_AttributeError;
-	    dsp_op_name = "Attribute-Error";
-	    break;
-	  case 2: /* nameError */
-	    dsp_dissector = dissect_dap_NameError;
-	    dsp_op_name = "Name-Error";
-	    break;
-	  case 3: /* serviceError */
-	    dsp_dissector = dissect_dap_ServiceError;
-	    dsp_op_name = "Service-Error";
-	    break;
-	  case 4: /* referral */
-	    dsp_dissector = dissect_dap_Referral;
-	    dsp_op_name = "Referral";
-	    break;
-	  case 5: /* abandoned */
-	    dsp_dissector = dissect_dap_Abandoned;
-	    dsp_op_name = "Abandoned";
-	    break;
-	  case 6: /* securityError */
-	    dsp_dissector = dissect_dap_SecurityError;
-	    dsp_op_name = "Security-Error";
-	    break;
-	  case 7: /* abandonFailed */
-	    dsp_dissector = dissect_dap_AbandonFailedError;
-	    dsp_op_name = "Abandon-Failed-Error";
-	    break;
-	  case 8: /* updateError */
-	    dsp_dissector = dissect_dap_UpdateError;
-	    dsp_op_name = "Update-Error";
-	    break;
-	  case 9: /* DSAReferral */
-	    dsp_dissector = dissect_dsp_DSAReferral;
-	    dsp_op_name = "DSA-Referral";
-	    break;
-	  default:
-	    proto_tree_add_expert(tree, pinfo, &ei_dsp_unsupported_errcode, tvb, offset, -1);
-	    break;
-	  }
-	  break;
-	default:
-	  proto_tree_add_expert(tree, pinfo, &ei_dsp_unsupported_pdu, tvb, offset, -1);
-	  return tvb_captured_length(tvb);
-	}
-
-	if(dsp_dissector) {
-    col_set_str(pinfo->cinfo, COL_INFO, dsp_op_name);
-
-	  while (tvb_reported_length_remaining(tvb, offset) > 0){
-	    old_offset=offset;
-	    offset=(*dsp_dissector)(FALSE, tvb, offset, &asn1_ctx, tree, -1);
-	    if(offset == old_offset){
-	      proto_tree_add_expert(tree, pinfo, &ei_dsp_zero_pdu, tvb, offset, -1);
-	      break;
-	    }
-	  }
-	}
-
-	return tvb_captured_length(tvb);
-}
-
-
-/*--- proto_register_dsp -------------------------------------------*/
-void proto_register_dsp(void) {
-
-  /* List of fields */
-  static hf_register_info hf[] =
-  {
-#include "packet-dsp-hfarr.c"
-  };
-
-  /* List of subtrees */
-  static gint *ett[] = {
-    &ett_dsp,
-#include "packet-dsp-ettarr.c"
-  };
-  static ei_register_info ei[] = {
-    { &ei_dsp_unsupported_opcode, { "dsp.unsupported_opcode", PI_UNDECODED, PI_WARN, "Unsupported DSP opcode", EXPFILL }},
-    { &ei_dsp_unsupported_errcode, { "dsp.unsupported_errcode", PI_UNDECODED, PI_WARN, "Unsupported DSP errcode", EXPFILL }},
-    { &ei_dsp_unsupported_pdu, { "dsp.unsupported_pdu", PI_UNDECODED, PI_WARN, "Unsupported DSP PDU", EXPFILL }},
-    { &ei_dsp_zero_pdu, { "dsp.zero_pdu", PI_PROTOCOL, PI_ERROR, "Internal error, zero-byte DSP PDU", EXPFILL }},
-  };
-
-  module_t *dsp_module;
-  expert_module_t* expert_dsp;
-
-  /* Register protocol */
-  proto_dsp = proto_register_protocol(PNAME, PSNAME, PFNAME);
-
-  register_dissector("dsp", dissect_dsp, proto_dsp);
-
-  /* Register fields and subtrees */
-  proto_register_field_array(proto_dsp, hf, array_length(hf));
-  proto_register_subtree_array(ett, array_length(ett));
-  expert_dsp = expert_register_protocol(proto_dsp);
-  expert_register_field_array(expert_dsp, ei, array_length(ei));
-
-  /* Register our configuration options for DSP, particularly our port */
-
-  dsp_module = prefs_register_protocol_subtree("OSI/X.500", proto_dsp, prefs_register_dsp);
-
-  prefs_register_uint_preference(dsp_module, "tcp.port", "DSP TCP Port",
-				 "Set the port for DSP operations (if other"
-				 " than the default of 102)",
-				 10, &global_dsp_tcp_port);
-
-
-}
-
-
-/*--- proto_reg_handoff_dsp --- */
-void proto_reg_handoff_dsp(void) {
-  dissector_handle_t dsp_handle;
-
-#include "packet-dsp-dis-tab.c"
-
-  /* APPLICATION CONTEXT */
-
-  oid_add_from_string("id-ac-directory-system","2.5.3.2");
-
-  /* ABSTRACT SYNTAXES */
-
-  /* remember the tpkt handler for change in preferences */
-  tpkt_handle = find_dissector("tpkt");
-
-  /* Register DSP with ROS (with no use of RTSE) */
-  dsp_handle = find_dissector("dsp");
-  register_ros_oid_dissector_handle("2.5.9.2", dsp_handle, 0, "id-as-directory-system", FALSE);
-
-}
-
-static void
-prefs_register_dsp(void)
-{
-  static guint tcp_port = 0;
-
-  /* de-register the old port */
-  /* port 102 is registered by TPKT - don't undo this! */
-  if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
-
-  /* Set our port number for future use */
-  tcp_port = global_dsp_tcp_port;
-
-  if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add_uint("tcp.port", global_dsp_tcp_port, tpkt_handle);
-
-}