More conversions and updates to existing Makefile stuff

svn path=/trunk/; revision=23127

8 files changed, 101 insertions, 466 deletions

diff --git a/asn1/q932/Facility-Information-Element-Components.asn b/asn1/q932/Facility-Information-Element-Components.asn
deleted file mode 100644
index b05a26e4b5..0000000000
--- a/asn1/q932/Facility-Information-Element-Components.asn
+++ /dev/null
@@ -1,165 +0,0 @@
--- Facility-Information-Element-Components.asn
---
--- Taken from ITU ASN.1 database
--- http://www.itu.int/ITU-T/asn1/database/itu-t/q/q932/1998-Amd1/Facility-Information-Element-Components.asn
---
--- $Id$
---
-
--- Module Facility-Information-Element-Components (Q.932:05/1998)
-Facility-Information-Element-Components {itu-t recommendation q 932
-  facility-information-element-component(3)} DEFINITIONS IMPLICIT 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
-    CHOICE {present  [0] IMPLICIT present < InvokeId,
-            absent   [1] IMPLICIT NULL
-  }
-  (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} !
-                   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       [0]  GeneralProblem,
-            invoke        [1]  InvokeProblem,
-            returnResult  [2]  ReturnResultProblem,
-            returnError   [3]  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 ::= CHOICE {present  INTEGER,
-                     absent   NULL
-}
-
-noInvokeId InvokeId ::= absent:NULL
-
-NoInvokeId InvokeId ::= {noInvokeId}
-
-Errors{OPERATION:Operations} ERROR ::= {Operations.&Errors}
-
--- the Range of the Invoke-Id's must be restricted to -32768..32767 
-Components{OPERATION:Invokable, OPERATION:Returnable} ::= CHOICE {
-  gfpROS  ROS{{GFPInvokeIDSet}, {Invokable}, {Returnable}}
-}
-
-GFPInvokeIDSet ::= InvokeId(WITH COMPONENTS {
-                              present  (-32768..32767)
-                            })
-
-END -- end of generic ROS PDU definitions
-
--- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D
-
diff --git a/asn1/q932/Makefile b/asn1/q932/Makefile
deleted file mode 100644
index 1fa6c0cae6..0000000000
--- a/asn1/q932/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id$
-
-PROTOCOL_NAME=q932
-Q932_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h 
-Q932_ROS_FILES=packet-$(PROTOCOL_NAME)-ros.c 
-DISSECTOR_FILES=$(Q932_FILES) $(Q932_ROS_FILES)
-Q932_ASN=Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn
-Q932_ROS_ASN=../ros/Remote-Operations-Information-Objects.asn Facility-Information-Element-Components.asn 
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(Q932_FILES): ../../tools/asn2wrs.py $(Q932_ASN) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
-	python ../../tools/asn2wrs.py -b -T -X -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(Q932_ASN)
-
-$(Q932_ROS_FILES): ../../tools/asn2wrs.py $(Q932_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 -b -T -X -e -p $(PROTOCOL_NAME).ros -I ../ros -c $(PROTOCOL_NAME)-ros.cnf -o $(PROTOCOL_NAME)-ros -s packet-$(PROTOCOL_NAME)-ros-template $(Q932_ROS_ASN)
-
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/q932/Makefile.am b/asn1/q932/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/q932/Makefile.am
@@ -0,0 +1,25 @@
+# $Id$
+#
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+include Makefile.common
+include ../Makefile.inc
+
diff --git a/asn1/q932/Makefile.common b/asn1/q932/Makefile.common
new file mode 100644
index 0000000000..5a4500cd3c
--- /dev/null
+++ b/asn1/q932/Makefile.common
@@ -0,0 +1,53 @@
+# $Id$
+#
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+PROTOCOL_NAME=q932
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+	packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+	Addressing-Data-Elements.asn \
+	Network-Facility-Extension.asn \
+	Network-Protocol-Profile-component.asn \
+	Interpretation-component.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 \
+	packet-$(PROTOCOL_NAME)-template.h \
+	$(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+	$(EXTRA_DIST) \
+	$(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b -T -X -e
+
+EXTRA_CNF=
+
diff --git a/asn1/q932/Makefile.nmake b/asn1/q932/Makefile.nmake
index 404d1cd809..b3fa922696 100644
--- a/asn1/q932/Makefile.nmake
+++ b/asn1/q932/Makefile.nmake
@@ -1,60 +1,28 @@
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
 # $Id$
+#
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-include ../../config.nmake
-
-UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
-
-PROTOCOL_NAME=q932
-Q932_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h 
-Q932_ROS_FILES=packet-$(PROTOCOL_NAME)-ros.c
-DISSECTOR_FILES=$(Q932_FILES) $(Q932_ROS_FILES)
-Q932_ASN=Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn
-Q932_ROS_ASN=../ros/Remote-Operations-Information-Objects.asn Facility-Information-Element-Components.asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(Q932_FILES): ../../tools/asn2wrs.py $(Q932_ASN) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -T -X -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(Q932_ASN)
-!ELSE
-	@echo Error: You need Python to use asn2wrs.py
-	@exit 1
-!ENDIF
-
-$(Q932_ROS_FILES): ../../tools/asn2wrs.py $(Q932_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" -b -T -X -p $(PROTOCOL_NAME).ros -I ../ros -c $(PROTOCOL_NAME)-ros.cnf -o $(PROTOCOL_NAME)-ros -s packet-$(PROTOCOL_NAME)-ros-template $(Q932_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).h packet-$(PROTOCOL_NAME).h.tmp
-	move packet-$(PROTOCOL_NAME)-ros.c packet-$(PROTOCOL_NAME)-ros.c.tmp
-	$(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c
-	$(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h
-	$(UNIX2DOS) < packet-$(PROTOCOL_NAME)-ros.c.tmp > packet-$(PROTOCOL_NAME)-ros.c
-	del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp  packet-$(PROTOCOL_NAME)-ros.c.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).h ..\..\epan\dissectors /d /y
-	xcopy packet-$(PROTOCOL_NAME)-ros.c ..\..\epan\dissectors /d /y
diff --git a/asn1/q932/packet-q932-ros-template.c b/asn1/q932/packet-q932-ros-template.c
deleted file mode 100644
index 30805fece4..0000000000
--- a/asn1/q932/packet-q932-ros-template.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* packet-q932-ros.c
- * Routines for Q.932 packet dissection
- * 2007  Tomas Kukosa
- *
- * $Id$
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-
-#include <epan/packet.h>
-#include <epan/strutil.h>
-#include <epan/emem.h>
-#include <epan/asn1.h>
-
-#include "packet-ber.h"
-
-#define PNAME  "Q.932 Operations Service Element"
-#define PSNAME "Q932.ROS"
-#define PFNAME "q932.ros"
-
-/* Initialize the protocol and registered fields */
-int proto_q932_ros = -1;
-#include "packet-q932-ros-hf.c" 
-
-/* Initialize the subtree pointers */
-#include "packet-q932-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;
-
-
-#include "packet-q932-ros-fn.c" 
-
-/*--- dissect_q932_ros -----------------------------------------------------*/
-static int dissect_q932_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
-  rose_ctx_tmp = get_rose_ctx(pinfo->private_data);
-  DISSECTOR_ASSERT(rose_ctx_tmp);
-  return dissect_ROS_PDU(tvb, pinfo, tree);
-}
-
-/*--- proto_register_q932_ros -----------------------------------------------*/
-void proto_register_q932_ros(void) {
-
-  /* List of fields */
-  static hf_register_info hf[] = {
-#include "packet-q932-ros-hfarr.c" 
-  };
-
-  /* List of subtrees */
-  static gint *ett[] = {
-#include "packet-q932-ros-ettarr.c" 
-  };
-
-  /* Register protocol and dissector */
-  proto_q932_ros = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  proto_set_cant_toggle(proto_q932_ros);
-
-  /* Register fields and subtrees */
-  proto_register_field_array(proto_q932_ros, hf, array_length(hf));
-  proto_register_subtree_array(ett, array_length(ett));
-
-  new_register_dissector(PFNAME, dissect_q932_ros, proto_q932_ros);
-}
-
-/*--- proto_reg_handoff_q932_ros --------------------------------------------*/
-void proto_reg_handoff_q932_ros(void) {
-  data_handle = find_dissector("data");
-}
-
-/*---------------------------------------------------------------------------*/
diff --git a/asn1/q932/q932-exp.cnf b/asn1/q932/q932-exp.cnf
index 4bfb46add0..127fa1fa9c 100644
--- a/asn1/q932/q932-exp.cnf
+++ b/asn1/q932/q932-exp.cnf
@@ -1,7 +1,7 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # ./q932-exp.cnf
-# ../../tools/asn2wrs.py -b -T -X -e -p q932 -c q932.cnf -s packet-q932-template Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn
+# ../../tools/asn2wrs.py -b -T -X -e -p q932 -c ./q932.cnf -s ./packet-q932-template -D . Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn
 
 #.MODULE
 Addressing-Data-Elements            q932
diff --git a/asn1/q932/q932-ros.cnf b/asn1/q932/q932-ros.cnf
deleted file mode 100644
index e97fd83e5c..0000000000
--- a/asn1/q932/q932-ros.cnf
+++ /dev/null
@@ -1,121 +0,0 @@
-
-#.PDU_NEW
-
-ROS
-
-#.OMIT_ASSIGNMENT
-
-Priority
-RejectProblem
-Components
-GFPInvokeIDSet
- 
-#.TYPE_RENAME
-
-Invoke/argument             InvokeArgument
-ReturnResult/result/result  ResultArgument
-
-#.FIELD_RENAME
-
-Invoke/linkedId/present     linkedIdPresent
-
-Reject/problem/invoke       invokeProblem
-Reject/problem/returnError  returnErrorProblem
-Reject/problem/returnResult returnResultProblem
-
-ReturnResult/result/result  resultArgument
-
-#--- ROS ---
-
-#.FN_HDR ROS
-  /* will be moved to ROS_PDU when PDU function can be alternated from conformance file */
-  actx->rose_ctx = rose_ctx_tmp;
-  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(q932_ros_GeneralProblem_vals), ""));
-#.FN_FTR InvokeProblem
-  strcpy(problem_str, val_to_str(problem_val, VALS(q932_ros_InvokeProblem_vals), ""));
-#.FN_FTR ReturnResultProblem
-  strcpy(problem_str, val_to_str(problem_val, VALS(q932_ros_ReturnResultProblem_vals), ""));
-#.FN_FTR ReturnErrorProblem
-  strcpy(problem_str, val_to_str(problem_val, VALS(q932_ros_ReturnErrorProblem_vals), ""));
-#.END
-
-#--- INVOKE ---
-
-#.FIELD_ATTR
-Invoke/argument  TYPE = FT_BYTES  DISPLAY = BASE_HEX
-
-#.FN_BODY Invoke/argument
-  gint len;
-
-  len = tvb_length_remaining(tvb, offset);
-  if (len)
-    proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE);
-  arg_next_tvb = tvb_new_subset(tvb, offset, len, len);
-
-  offset += tvb_length_remaining(tvb, offset);
-#.END
-
-#.INCLUDE ros-inv.cnf
-
-#--- RETURN RESULT ---
-
-#.FIELD_ATTR
-ReturnResult/result/result  TYPE = FT_BYTES  DISPLAY = BASE_HEX
-
-#.FN_BODY ReturnResult/result/result
-  gint len;
-
-  len = tvb_length_remaining(tvb, offset);
-  if (len)
-    proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE);
-  res_next_tvb = tvb_new_subset(tvb, offset, len, len);
-
-  offset += tvb_length_remaining(tvb, offset);
-
-#.END
-
-#.INCLUDE ros-res.cnf
-
-#--- RETURN ERROR ---
-
-#.FIELD_ATTR
-ReturnError/parameter  TYPE = FT_BYTES  DISPLAY = BASE_HEX
-
-#.FN_BODY ReturnError/parameter
-
-  gint len;
-
-  len = tvb_length_remaining(tvb, offset);
-  if (len)
-    proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE);
-  err_next_tvb = tvb_new_subset(tvb, offset, len, len);
-
-  offset += tvb_length_remaining(tvb, offset);
-#.END
-
-#.INCLUDE ros-err.cnf
-
-#--- REJECT ---
-
-#.INCLUDE ros-rej.cnf