From c3a3d766308fb56b9d31f23d81784b9a296ed8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Mon, 8 Oct 2007 23:52:21 +0000 Subject: Convert h450 to new Makefile structure. Split h450.ros out into h450-ros. svn path=/trunk/; revision=23102 --- asn1/h450/Makefile | 24 ------ asn1/h450/Makefile.am | 25 ++++++ asn1/h450/Makefile.common | 76 +++++++++++++++++ asn1/h450/Makefile.nmake | 77 +++++------------ asn1/h450/Remote-Operations-Apdus.asn | 152 ---------------------------------- asn1/h450/h450-ros-exp.cnf | 14 ---- asn1/h450/h450-ros.cnf | 105 ----------------------- asn1/h450/h450.cnf | 2 +- asn1/h450/packet-h450-ros-template.c | 107 ------------------------ asn1/h450/packet-h450-ros-template.h | 32 ------- 10 files changed, 124 insertions(+), 490 deletions(-) delete mode 100644 asn1/h450/Makefile create mode 100644 asn1/h450/Makefile.am create mode 100644 asn1/h450/Makefile.common delete mode 100644 asn1/h450/Remote-Operations-Apdus.asn delete mode 100644 asn1/h450/h450-ros-exp.cnf delete mode 100644 asn1/h450/h450-ros.cnf delete mode 100644 asn1/h450/packet-h450-ros-template.c delete mode 100644 asn1/h450/packet-h450-ros-template.h (limited to 'asn1/h450') diff --git a/asn1/h450/Makefile b/asn1/h450/Makefile deleted file mode 100644 index ffd26d795b..0000000000 --- a/asn1/h450/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $Id$ - -PROTOCOL_NAME=h450 -H450_FILES=packet-$(PROTOCOL_NAME).c -H450_ROS_FILES=packet-$(PROTOCOL_NAME)-ros.c packet-$(PROTOCOL_NAME)-ros.h -DISSECTOR_FILES=$(H450_FILES) $(H450_ROS_FILES) -H450_ASN=H4501-Supplementary-ServiceAPDU-Structure.asn Addressing-Data-Elements.asn H225-generic-parameters-definition.asn Manufacturer-specific-service-extension-definition.asn H4501-General-Error-List.asn -H450_OP_ASN=Call-Transfer-Operations.asn Call-Diversion-Operations.asn Call-Hold-Operations.asn Call-Park-Pickup-Operations.asn Call-Waiting-Operations.asn Message-Waiting-Indication-Operations.asn Name-Operations.asn Call-Completion-Operations.asn Call-Offer-Operations.asn Call-Intrusion-Operations.asn Common-Information-Operations.asn -H450_ROS_ASN=../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(H450_FILES): ../../tools/asn2wrs.py $(H450_ASN) $(H450_OP_ASN) packet-h450-template.c h450.cnf - python ../../tools/asn2wrs.py -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(H450_ASN) $(H450_OP_ASN) - -$(H450_ROS_FILES): ../../tools/asn2wrs.py $(H450_ROS_ASN) packet-$(PROTOCOL_NAME)-ros-template.c $(PROTOCOL_NAME)-ros.cnf ../ros/ros-inv.cnf ../ros/ros-res.cnf ../ros/ros-err.cnf ../ros/ros-rej.cnf - python ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME).ros -I ../ros -c $(PROTOCOL_NAME)-ros.cnf -o $(PROTOCOL_NAME)-ros -s packet-$(PROTOCOL_NAME)-ros-template $(H450_ROS_ASN) -clean: - rm -f parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/h450/Makefile.am b/asn1/h450/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/h450/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +include Makefile.common +include ../Makefile.inc + diff --git a/asn1/h450/Makefile.common b/asn1/h450/Makefile.common new file mode 100644 index 0000000000..ea2328c5d9 --- /dev/null +++ b/asn1/h450/Makefile.common @@ -0,0 +1,76 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +PROTOCOL_NAME=h450 + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c + +PROTO_OPT = + +# NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +H450_ASN = \ + H4501-Supplementary-ServiceAPDU-Structure.asn \ + Addressing-Data-Elements.asn \ + H225-generic-parameters-definition.asn \ + Manufacturer-specific-service-extension-definition.asn \ + H4501-General-Error-List.asn + +H450_OP_ASN = \ + Call-Transfer-Operations.asn \ + Call-Diversion-Operations.asn \ + Call-Hold-Operations.asn \ + Call-Park-Pickup-Operations.asn \ + Call-Waiting-Operations.asn \ + Message-Waiting-Indication-Operations.asn \ + Name-Operations.asn \ + Call-Completion-Operations.asn \ + Call-Offer-Operations.asn \ + Call-Intrusion-Operations.asn \ + Common-Information-Operations.asn + +ASN_FILE_LIST = $(H450_ASN) $(H450_OP_ASN) + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= + +EXTRA_CNF=../h225/h225-exp.cnf \ + ../h450-ros/h450-ros-exp.cnf + +../h225/h225-exp.cnf: + (cd ../h225 && $(MAKE) $(MAKEFLAGS)) + +../h450-ros/h450-ros-exp.cnf: + (cd ../h450-ros && $(MAKE) $(MAKEFLAGS)) + diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake index 588166aa80..b3fa922696 100644 --- a/asn1/h450/Makefile.nmake +++ b/asn1/h450/Makefile.nmake @@ -1,61 +1,28 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -include ../../config.nmake - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=h450 -H450_FILES=packet-$(PROTOCOL_NAME).c -H450_ROS_FILES=packet-$(PROTOCOL_NAME)-ros.c packet-$(PROTOCOL_NAME)-ros.h -DISSECTOR_FILES=$(H450_FILES) $(H450_ROS_FILES) -H450_ASN=H4501-Supplementary-ServiceAPDU-Structure.asn Addressing-Data-Elements.asn H225-generic-parameters-definition.asn Manufacturer-specific-service-extension-definition.asn H4501-General-Error-List.asn -H450_OP_ASN=Call-Transfer-Operations.asn Call-Diversion-Operations.asn Call-Hold-Operations.asn Call-Park-Pickup-Operations.asn Call-Waiting-Operations.asn Message-Waiting-Indication-Operations.asn Name-Operations.asn Call-Completion-Operations.asn Call-Offer-Operations.asn Call-Intrusion-Operations.asn Common-Information-Operations.asn -H450_ROS_ASN=../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(H450_FILES): ../../tools/asn2wrs.py $(H450_ASN) $(H450_OP_ASN) packet-$(PROTOCOL_NAME)-template.c $(PROTOCOL_NAME).cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(H450_ASN) $(H450_OP_ASN) -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -$(H450_ROS_FILES): ../../tools/asn2wrs.py $(H450_ROS_ASN) packet-$(PROTOCOL_NAME)-ros-template.c $(PROTOCOL_NAME)-ros.cnf ../ros/ros-inv.cnf ../ros/ros-res.cnf ../ros/ros-err.cnf ../ros/ros-rej.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -e -p $(PROTOCOL_NAME).ros -I ../ros -c $(PROTOCOL_NAME)-ros.cnf -o $(PROTOCOL_NAME)-ros -s packet-$(PROTOCOL_NAME)-ros-template $(H450_ROS_ASN) -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME)-ros.c packet-$(PROTOCOL_NAME)-ros.c.tmp - move packet-$(PROTOCOL_NAME)-ros.h packet-$(PROTOCOL_NAME)-ros.h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME)-ros.c.tmp > packet-$(PROTOCOL_NAME)-ros.c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME)-ros.h.tmp > packet-$(PROTOCOL_NAME)-ros.h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME)-ros.c.tmp packet-$(PROTOCOL_NAME)-ros.h.tmp +include Makefile.common +include ../../config.nmake +include ../Makefile.inc.nmake -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME)-ros.c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME)-ros.h ..\..\epan\dissectors /d /y diff --git a/asn1/h450/Remote-Operations-Apdus.asn b/asn1/h450/Remote-Operations-Apdus.asn deleted file mode 100644 index 72a90352c2..0000000000 --- a/asn1/h450/Remote-Operations-Apdus.asn +++ /dev/null @@ -1,152 +0,0 @@ --- Remote-Operations-Apdus.asn --- --- Taken from ITU ASN.1 database --- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.1/1998/Remote-Operations-Apdus.asn --- --- $Id$ --- - --- Module Remote-Operations-Apdus (H.450.1:02/1998) -Remote-Operations-Apdus {itu-t recommendation h 450 1 version1(0) - remote-operations-apdus(11)} DEFINITIONS AUTOMATIC TAGS ::= -BEGIN - --- exports everything -IMPORTS - OPERATION, ERROR - FROM Remote-Operations-Information-Objects {joint-iso-itu-t - remote-operations(4) informationObjects(5) version1(0)}; - -ROS{InvokeId:InvokeIdSet, OPERATION:Invokable, OPERATION:Returnable} ::= - CHOICE { - invoke [1] Invoke{{InvokeIdSet}, {Invokable}}, - returnResult [2] ReturnResult{{Returnable}}, - returnError [3] ReturnError{{Errors {{Returnable}}}}, - reject [4] Reject -} -(CONSTRAINED BY { -- must conform to the above definition --} ! - RejectProblem:general-unrecognizedPDU) - -Invoke{InvokeId:InvokeIdSet, OPERATION:Operations} ::= SEQUENCE { - invokeId - InvokeId(InvokeIdSet) - (CONSTRAINED BY {-- must be unambiguous -- } ! - RejectProblem:invoke-duplicateInvocation), - linkedId - InvokeId - (CONSTRAINED BY {-- must identify an outstanding operation -- } ! - RejectProblem:invoke-unrecognizedLinkedId) - (CONSTRAINED BY {-- which has one or more linked operations-- } ! - RejectProblem:invoke-linkedResponseUnexpected) OPTIONAL, - opcode - OPERATION.&operationCode - ({Operations} !RejectProblem:invoke-unrecognizedOperation), - argument - OPERATION.&ArgumentType - ({Operations}{@opcode} !RejectProblem:invoke-mistypedArgument) OPTIONAL -} -(CONSTRAINED BY { -- must conform to the above definition --} ! - RejectProblem:general-mistypedPDU) - ---( --- WITH COMPONENTS --- { --- ..., --- linkedId ABSENT --- } --- WITH COMPONENTS { --- ..., --- linkedId PRESENT, --- opcode (CONSTRAINED BY { --- must be in the &Linked field of the associated operation --- } ! RejectProblem : invoke-unexpectedLinkedOperation) --- } ---) -ReturnResult{OPERATION:Operations} ::= SEQUENCE { - invokeId - InvokeId - (CONSTRAINED BY {-- must be that for an outstanding operation -- } ! - RejectProblem:returnResult-unrecognizedInvocation) - (CONSTRAINED BY {-- which returns a result -- } ! - RejectProblem:returnResult-resultResponseUnexpected), - result - SEQUENCE {opcode - OPERATION.&operationCode({Operations}) - (CONSTRAINED BY {-- identified by invokeId -- } ! - RejectProblem:returnResult-unrecognizedInvocation), - result - OPERATION.&ResultType - ({Operations}{@.opcode} ! - RejectProblem:returnResult-mistypedResult)} OPTIONAL -} -(CONSTRAINED BY { -- must conform to the above definition --} ! - RejectProblem:general-mistypedPDU) - -ReturnError{ERROR:Errors} ::= SEQUENCE { - invokeId - InvokeId - (CONSTRAINED BY {-- must be that for an outstanding operation -- } ! - RejectProblem:returnError-unrecognizedInvocation) - (CONSTRAINED BY {-- which returns an error -- } ! - RejectProblem:returnError-errorResponseUnexpected), - errcode - ERROR.&errorCode({Errors} !RejectProblem:returnError-unrecognizedError) - (CONSTRAINED BY {--must be in the &Errors field of the associated operation -- - } !RejectProblem:returnError-unexpectedError), - parameter - ERROR.&ParameterType - ({Errors}{@errcode} !RejectProblem:returnError-mistypedParameter) - OPTIONAL -} -(CONSTRAINED BY { -- must conform to the above definition --} ! - RejectProblem:general-mistypedPDU) - -Reject ::= SEQUENCE { - invokeId InvokeId, - problem - CHOICE {general GeneralProblem, - invoke InvokeProblem, - returnResult ReturnResultProblem, - returnError ReturnErrorProblem} -} -(CONSTRAINED BY { -- must conform to the above definition --} ! - RejectProblem:general-mistypedPDU) - -GeneralProblem ::= INTEGER { - unrecognizedComponent(0), mistypedComponent(1), badlyStructuredComponent(2) -} - -InvokeProblem ::= INTEGER { - duplicateInvocation(0), unrecognizedOperation(1), mistypedArgument(2), - resourceLimitation(3), releaseInProgress(4), unrecognizedLinkedId(5), - linkedResponseUnexpected(6), unexpectedLinkedOperation(7)} - -ReturnResultProblem ::= INTEGER { - unrecognizedInvocation(0), resultResponseUnexpected(1), mistypedResult(2) -} - -ReturnErrorProblem ::= INTEGER { - unrecognizedInvocation(0), errorResponseUnexpected(1), unrecognizedError(2), - unexpectedError(3), mistypedParameter(4)} - -RejectProblem ::= INTEGER { - general-unrecognizedPDU(0), general-mistypedPDU(1), - general-badlyStructuredPDU(2), invoke-duplicateInvocation(10), - invoke-unrecognizedOperation(11), invoke-mistypedArgument(12), - invoke-resourceLimitation(13), invoke-releaseInProgress(14), - invoke-unrecognizedLinkedId(15), invoke-linkedResponseUnexpected(16), - invoke-unexpectedLinkedOperation(17), - returnResult-unrecognizedInvocation(20), - returnResult-resultResponseUnexpected(21), returnResult-mistypedResult(22), - returnError-unrecognizedInvocation(30), - returnError-errorResponseUnexpected(31), returnError-unrecognizedError(32), - returnError-unexpectedError(33), returnError-mistypedParameter(34)} - -InvokeId ::= INTEGER - -Errors{OPERATION:Operations} ERROR ::= {Operations.&Errors} - -END -- end of Remote-Operations-Apdus definitions - --- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D - diff --git a/asn1/h450/h450-ros-exp.cnf b/asn1/h450/h450-ros-exp.cnf deleted file mode 100644 index 80b77a0cc5..0000000000 --- a/asn1/h450/h450-ros-exp.cnf +++ /dev/null @@ -1,14 +0,0 @@ -# Do not modify this file. -# It is created automatically by the ASN.1 to Wireshark dissector compiler -# ./h450-ros-exp.cnf -# ../../tools/asn2wrs.py -e -p h450.ros -I ../ros -c h450-ros.cnf -o h450-ros -s packet-h450-ros-template ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn - -#.MODULE -Remote-Operations-Information-Objects h450.ros -Remote-Operations-Apdus h450.ros -#.END - -#.TYPE_ATTR -ROS TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h450_ros_ROS_vals) BITMASK = 0 -#.END - diff --git a/asn1/h450/h450-ros.cnf b/asn1/h450/h450-ros.cnf deleted file mode 100644 index 9f7fd1963c..0000000000 --- a/asn1/h450/h450-ros.cnf +++ /dev/null @@ -1,105 +0,0 @@ - -#.EXPORTS - -ROS - -#.OMIT_ASSIGNMENT - -Priority -RejectProblem - -#.TYPE_RENAME - -Invoke/argument InvokeArgument -ReturnResult/result/result ResultArgument - -#.FIELD_RENAME - -Invoke/invokeId invokeIdConstrained - -Reject/problem/invoke invokeProblem -Reject/problem/returnError returnErrorProblem -Reject/problem/returnResult returnResultProblem - -ReturnResult/result/result resultArgument - -#--- ROS --- - -#.FN_HDR ROS - DISSECTOR_ASSERT(actx->rose_ctx); - rose_ctx_clean_data(actx->rose_ctx); -#.END - -#--- Code --- - -#.FN_PARS -Code VAL_PTR = &%(ACTX)s->rose_ctx->d.code -Code/local VAL_PTR = &%(ACTX)s->rose_ctx->d.code_local -Code/global FN_VARIANT = _str VAL_PTR = &%(ACTX)s->rose_ctx->d.code_global -#.FN_FTR Code - actx->rose_ctx->d.code_item = actx->created_item; -#.END - -#--- Problem --- - -#.FN_PARS -GeneralProblem VAL_PTR = &problem_val -InvokeProblem VAL_PTR = &problem_val -ReturnResultProblem VAL_PTR = &problem_val -ReturnErrorProblem VAL_PTR = &problem_val -#.FN_FTR GeneralProblem - strcpy(problem_str, val_to_str(problem_val, VALS(h450_ros_GeneralProblem_vals), "")); -#.FN_FTR InvokeProblem - strcpy(problem_str, val_to_str(problem_val, VALS(h450_ros_InvokeProblem_vals), "")); -#.FN_FTR ReturnResultProblem - strcpy(problem_str, val_to_str(problem_val, VALS(h450_ros_ReturnResultProblem_vals), "")); -#.FN_FTR ReturnErrorProblem - strcpy(problem_str, val_to_str(problem_val, VALS(h450_ros_ReturnErrorProblem_vals), "")); -#.END - -#--- INVOKE --- - -# body is impleneted manually as asn2wrs is not able to handle subtype constraint event passed through parameter -#.FN_BODY Invoke/invokeId - offset = dissect_per_constrained_integer(%(TVB)s, %(OFFSET)s, %(ACTX)s, %(TREE)s, %(HF_INDEX)s, - 0U, 65535U, %(VAL_PTR)s, TRUE); -#.END - -#.FIELD_ATTR -Invoke/argument TYPE = FT_BYTES DISPLAY = BASE_HEX - -#.FN_PARS Invoke/argument -FN_VARIANT = _pdu -TYPE_REF_FN = argument_cb -#.END - -#.INCLUDE ros-inv.cnf - -#--- RETURN RESULT --- - -#.FIELD_ATTR -ReturnResult/result/result TYPE = FT_BYTES DISPLAY = BASE_HEX - -#.FN_PARS ReturnResult/result/result -FN_VARIANT = _pdu -TYPE_REF_FN = result_cb - -#.END - -#.INCLUDE ros-res.cnf - -#--- RETURN ERROR --- - -#.FIELD_ATTR -ReturnError/parameter TYPE = FT_BYTES DISPLAY = BASE_HEX - -#.FN_PARS ReturnError/parameter -FN_VARIANT = _pdu -TYPE_REF_FN = error_cb -#.END - -#.INCLUDE ros-err.cnf - -#--- REJECT --- - -#.INCLUDE ros-rej.cnf diff --git a/asn1/h450/h450.cnf b/asn1/h450/h450.cnf index 2daf6fef43..9761f16b1f 100644 --- a/asn1/h450/h450.cnf +++ b/asn1/h450/h450.cnf @@ -11,7 +11,7 @@ GROUP_BY_PROT #.END #.INCLUDE ../h225/h225-exp.cnf -#.INCLUDE h450-ros-exp.cnf +#.INCLUDE ../h450-ros/h450-ros-exp.cnf #.MODULE diff --git a/asn1/h450/packet-h450-ros-template.c b/asn1/h450/packet-h450-ros-template.c deleted file mode 100644 index 8b0f00e4d8..0000000000 --- a/asn1/h450/packet-h450-ros-template.c +++ /dev/null @@ -1,107 +0,0 @@ -/* packet-h450-ros.c - * Routines for H.450 packet dissection - * 2007 Tomas Kukosa - * - * $Id$ - * - * Wireshark - Network traffic analyzer - * By Gerald Combs - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include - -#include -#include -#include -#include -#include - -#include "packet-per.h" - -#define PNAME "H.450 Remote Operations Apdus" -#define PSNAME "H450.ROS" -#define PFNAME "h450.ros" - -/* Initialize the protocol and registered fields */ -int proto_h450_ros = -1; -#include "packet-h450-ros-hf.c" - -/* Initialize the subtree pointers */ -#include "packet-h450-ros-ett.c" - -/* Preferences */ - -/* Subdissectors */ -static dissector_handle_t data_handle = NULL; - -/* Gloabl variables */ -static rose_ctx_t *rose_ctx_tmp; - -static guint32 problem_val; -static gchar problem_str[64]; -static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb; - -static void -argument_cb(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_) { - arg_next_tvb = tvb; -} - -static void -result_cb(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_) { - res_next_tvb = tvb; -} - -static void -error_cb(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_) { - err_next_tvb = tvb; -} - -#include "packet-h450-ros-fn.c" - -/*--- proto_register_h450_ros -----------------------------------------------*/ -void proto_register_h450_ros(void) { - - /* List of fields */ - static hf_register_info hf[] = { -#include "packet-h450-ros-hfarr.c" - }; - - /* List of subtrees */ - static gint *ett[] = { -#include "packet-h450-ros-ettarr.c" - }; - - /* Register protocol and dissector */ - proto_h450_ros = proto_register_protocol(PNAME, PSNAME, PFNAME); - proto_set_cant_toggle(proto_h450_ros); - - /* Register fields and subtrees */ - proto_register_field_array(proto_h450_ros, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); -} - -/*--- proto_reg_handoff_h450_ros --------------------------------------------*/ -void proto_reg_handoff_h450_ros(void) { - data_handle = find_dissector("data"); -} - -/*---------------------------------------------------------------------------*/ diff --git a/asn1/h450/packet-h450-ros-template.h b/asn1/h450/packet-h450-ros-template.h deleted file mode 100644 index 47c2e66dee..0000000000 --- a/asn1/h450/packet-h450-ros-template.h +++ /dev/null @@ -1,32 +0,0 @@ -/* packet-h450-ros.h - * Routines for H.450 packet dissection - * 2007 Tomas Kukosa - * - * $Id$ - * - * Wireshark - Network traffic analyzer - * By Gerald Combs - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef PACKET_H450_ROS_H -#define PACKET_H450_ROS_H - -#include "packet-h450-ros-exp.h" - -#endif /* PACKET_H450_ROS_H */ - -- cgit v1.2.1