use "type function" instead of "field function" in PER CHOICE and SEQUENCE tables

it matches asn2wrs approach and makes generated dissectors source shorter

svn path=/trunk/; revision=18612

10 files changed, 91 insertions, 89 deletions

diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c
index 8ebafc47b3..94efd6565e 100644
--- a/asn1/h235/packet-h235-template.c
+++ b/asn1/h235/packet-h235-template.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/oid_resolv.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -50,7 +51,7 @@ int proto_h235 = -1;
 #include "packet-h235-ett.c"
 
 static guint32
-dissect_xxx_ToBeSigned(tvbuff_t *tvb, guint32 offset, asn_ctx_t *actx, proto_tree *tree, int hf_index _U_) {
+dissect_xxx_ToBeSigned(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index _U_) {
 PER_NOT_DECODED_YET("ToBeSigned");
   return offset;
 }
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index 8f83785427..5f17090e96 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -135,6 +135,7 @@ static dissector_handle_t h4501_handle=NULL;
 static int proto_h4501 = -1;
 
 static int hf_h4501 = -1;
+static int hf_h4501_dummy = -1;
 static int hf_h4501_constrained_invokeId = -1;
 static int hf_h4501_invokeId = -1;
 static int hf_h4501_localOpcode = -1;
@@ -298,7 +299,7 @@ static const value_string localOpcode_vals[] = {
 	{  0, NULL }
 };
 
-static int dissect_h4501_argument(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
+static int dissect_h4501_Argument(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index);
 static int dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_ind _U_);
 
 
@@ -317,9 +318,9 @@ static const value_string InvokeProblem_vals[] = {
    {  0, NULL }
 };
 static int
-dissect_h4501_InvokeProblem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_InvokeProblem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_h4501_InvokeProblem, 0, 7, NULL, FALSE);
+   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0, 7, NULL, FALSE);
    return offset;
 }
 
@@ -331,9 +332,9 @@ static const value_string ReturnResultProblem_vals[] = {
    {  0, NULL }
 };
 static int
-dissect_h4501_ReturnResultProblem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_ReturnResultProblem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_h4501_ReturnResultProblem, 0, 2, NULL, FALSE);
+   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0, 2, NULL, FALSE);
    return offset;
 }
 
@@ -347,9 +348,9 @@ static const value_string ReturnErrorProblem_vals[] = {
    {  0, NULL }
 };
 static int
-dissect_h4501_ReturnErrorProblem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_ReturnErrorProblem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_h4501_ReturnErrorProblem, 0, 4, NULL, FALSE);
+   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0, 4, NULL, FALSE);
    return offset;
 }
 
@@ -360,13 +361,13 @@ static const value_string GeneralProblem_vals[] = {
    {  0, NULL }
 };
 static int
-dissect_h4501_GeneralProblem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_GeneralProblem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_h4501_GeneralProblem, 0, 2, NULL, FALSE);
+   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0, 2, NULL, FALSE);
    return offset;
 }
 static int
-dissect_h4501_ReturnResult_result(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_ReturnResult_result(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    tvbuff_t *result_tvb = NULL;
 
@@ -422,18 +423,18 @@ PER_NOT_DECODED_YET("Unrecognized H.450.x return result");
 }
 
 static int
-dissect_h4501_localOpcode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_LocalOpcode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_integer(tvb, offset, actx, tree, hf_h4501_localOpcode, &localOpcode);
+   offset=dissect_per_integer(tvb, offset, actx, tree, hf_index, &localOpcode);
    is_globalcode = FALSE;
 	return offset;
 }
 
 
 static int
-dissect_h4501_globalCode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_GlobalCode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-	offset=dissect_per_object_identifier_str(tvb, offset, actx, tree, hf_h4501_globalCode, &globalcode_oid_str);
+	offset=dissect_per_object_identifier_str(tvb, offset, actx, tree, hf_index, &globalcode_oid_str);
 	is_globalcode = TRUE;
    return offset;
 }
@@ -445,38 +446,38 @@ static const value_string opcode_vals[] = {
 	{ 0, NULL}
 };
 static const per_choice_t opcode_choice[] = {
-	{ 0, "local", ASN1_NO_EXTENSIONS,
-		dissect_h4501_localOpcode },
-	{ 1, "global", ASN1_NO_EXTENSIONS,
-		dissect_h4501_globalCode },
+	{ 0, &hf_h4501_localOpcode, ASN1_NO_EXTENSIONS,
+		dissect_h4501_LocalOpcode },
+	{ 1, &hf_h4501_globalCode, ASN1_NO_EXTENSIONS,
+		dissect_h4501_GlobalCode },
 	{ 0, NULL, 0, NULL }
 };
 static int
-dissect_h4501_opcode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_Opcode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_choice(tvb, offset, actx, tree, hf_h4501_opcode, ett_h4501_opcode, opcode_choice, NULL);
+   offset=dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h4501_opcode, opcode_choice, NULL);
    return offset;
 }
 
 static const per_sequence_t result_sequence[] = {
-	{ "opcode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
-		dissect_h4501_opcode },
-	{ "result", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
+	{ "opcode", &hf_h4501_opcode, ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
+		dissect_h4501_Opcode },
+	{ "result", &hf_h4501_dummy, ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
 		dissect_h4501_ReturnResult_result },
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_result(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_Result(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_h4501_result, ett_h4501_result, result_sequence);
+   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h4501_result, result_sequence);
    return offset;
 }
 
 static int
-dissect_h4501_parameter(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_Parameter(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    /* TODO - decode return error parameter based on localErrorCode */
-   offset=dissect_per_octet_string(tvb, offset, actx, tree, hf_h4501_parameter, NO_BOUND, NO_BOUND, NULL);
+   offset=dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, NULL);
    return offset;
 }
 static const value_string localErrorCode_vals[] = {
@@ -528,9 +529,9 @@ static const value_string localErrorCode_vals[] = {
    {  0, NULL }
 };
 static int
-dissect_h4501_localErrorCode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_LocalErrorCode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_integer(tvb, offset, actx, tree, hf_h4501_localErrorCode, &localErrorCode);
+   offset=dissect_per_integer(tvb, offset, actx, tree, hf_index, &localErrorCode);
 	return offset;
 }
 
@@ -541,16 +542,16 @@ static const value_string errorCode_vals[] = {
 	{ 0, NULL}
 };
 static const per_choice_t errorCode_choice[] = {
-	{ 0, "local", ASN1_NO_EXTENSIONS,
-		dissect_h4501_localErrorCode },
-	{ 1, "global", ASN1_NO_EXTENSIONS,
-		dissect_h4501_globalCode },
+	{ 0, &hf_h4501_localErrorCode, ASN1_NO_EXTENSIONS,
+		dissect_h4501_LocalErrorCode },
+	{ 1, &hf_h4501_globalCode, ASN1_NO_EXTENSIONS,
+		dissect_h4501_GlobalCode },
 	{ 0, NULL, 0, NULL }
 };
 static int
-dissect_h4501_errorCode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_ErrorCode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_choice(tvb, offset, actx, tree, hf_h4501_errorCode, ett_h4501_errorCode, errorCode_choice, NULL);
+   offset=dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h4501_errorCode, errorCode_choice, NULL);
    return offset;
 }
 
@@ -562,96 +563,96 @@ static const value_string problem_vals[] = {
 	{ 0, NULL}
 };
 static const per_choice_t problem_choice[] = {
-	{ 0, "general", ASN1_NO_EXTENSIONS,
+	{ 0, &hf_h4501_GeneralProblem, ASN1_NO_EXTENSIONS,
 		dissect_h4501_GeneralProblem },
-	{ 1, "invoke", ASN1_NO_EXTENSIONS,
+	{ 1, &hf_h4501_InvokeProblem, ASN1_NO_EXTENSIONS,
 		dissect_h4501_InvokeProblem },
-	{ 2, "returnResult", ASN1_NO_EXTENSIONS,
+	{ 2, &hf_h4501_ReturnResultProblem, ASN1_NO_EXTENSIONS,
 		dissect_h4501_ReturnResultProblem },
-	{ 3, "returnError", ASN1_NO_EXTENSIONS,
+	{ 3, &hf_h4501_ReturnErrorProblem, ASN1_NO_EXTENSIONS,
 		dissect_h4501_ReturnErrorProblem },
 	{ 0, NULL, 0, NULL }
 };
 static int
-dissect_h4501_problem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_Problem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_choice(tvb, offset, actx, tree, hf_h4501_problem, ett_h4501_problem, problem_choice, NULL);
+   offset=dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h4501_problem, problem_choice, NULL);
    return offset;
 }
 static int
-dissect_h4501_constrained_invokeId(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_Constrained_invokeId(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_h4501_constrained_invokeId, 0, 65535, NULL, FALSE);
+   offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0, 65535, NULL, FALSE);
 	return offset;
 }
 
 
 static int
-dissect_h4501_invokeId(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_InvokeId(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_integer(tvb, offset, actx, tree, hf_h4501_invokeId, NULL);
+   offset=dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL);
 	return offset;
 }
 
 static const per_sequence_t Reject_sequence[] = {
-	{ "invokeID", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_h4501_invokeId },
-	{ "problem", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_h4501_problem },
+	{ "invokeID", &hf_h4501_invokeId, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
+		dissect_h4501_InvokeId },
+	{ "problem", &hf_h4501_problem, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
+		dissect_h4501_Problem },
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_Reject(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_Reject(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_h4501_Reject, ett_h4501_Reject, Reject_sequence);
+   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h4501_Reject, Reject_sequence);
    return offset;
 }
 
 static const per_sequence_t ReturnError_sequence[] = {
-	{ "invokeID", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_h4501_invokeId },
-	{ "errorCode", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_h4501_errorCode },
-	{ "parameter", ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
-		dissect_h4501_parameter },
+	{ "invokeID", &hf_h4501_invokeId, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
+		dissect_h4501_InvokeId },
+	{ "errorCode", &hf_h4501_errorCode, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
+		dissect_h4501_ErrorCode },
+	{ "parameter", &hf_h4501_parameter, ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
+		dissect_h4501_Parameter },
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_ReturnError(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_ReturnError(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_h4501_ReturnError, ett_h4501_ReturnError, ReturnError_sequence);
+   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h4501_ReturnError, ReturnError_sequence);
    return offset;
 }
 
 static const per_sequence_t ReturnResult_sequence[] = {
-	{ "invokeID", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_h4501_invokeId },
-	{ "result", ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
-		dissect_h4501_result },
+	{ "invokeID", &hf_h4501_invokeId, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
+		dissect_h4501_InvokeId },
+	{ "result", &hf_h4501_result, ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
+		dissect_h4501_Result },
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_ReturnResult(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_ReturnResult(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_h4501_ReturnResult, ett_h4501_ReturnResult, ReturnResult_sequence);
+   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h4501_ReturnResult, ReturnResult_sequence);
    return offset;
 }
 
 static const per_sequence_t Invoke_sequence[] = {
-	{ "invokeID", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_h4501_constrained_invokeId },
-	{ "linkedId", ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
-		dissect_h4501_invokeId },
-	{ "opcode", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_h4501_opcode },
-	{ "argument", ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
-		dissect_h4501_argument },
+	{ "invokeID", &hf_h4501_constrained_invokeId, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
+		dissect_h4501_Constrained_invokeId },
+	{ "linkedId", &hf_h4501_invokeId, ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
+		dissect_h4501_InvokeId },
+	{ "opcode", &hf_h4501_opcode, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
+		dissect_h4501_Opcode },
+	{ "argument", &hf_h4501_dummy, ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
+		dissect_h4501_Argument },
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_Invoke(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_Invoke(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
-   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_h4501_Invoke, ett_h4501_Invoke, Invoke_sequence);
+   offset=dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h4501_Invoke, Invoke_sequence);
    return offset;
 }
 
@@ -663,13 +664,13 @@ static const value_string ROS_vals[] = {
 	{ 0, NULL}
 };
 static const per_choice_t ROS_choice[] = {
-	{ 1, "invoke", ASN1_NO_EXTENSIONS,
+	{ 1, &hf_h4501_Invoke, ASN1_NO_EXTENSIONS,
 		dissect_h4501_Invoke },
-	{ 2, "returnResult", ASN1_NO_EXTENSIONS,
+	{ 2, &hf_h4501_ReturnResult, ASN1_NO_EXTENSIONS,
 		dissect_h4501_ReturnResult },
-	{ 3, "returnError", ASN1_NO_EXTENSIONS,
+	{ 3, &hf_h4501_ReturnError, ASN1_NO_EXTENSIONS,
 		dissect_h4501_ReturnError },
-	{ 4, "reject", ASN1_NO_EXTENSIONS,
+	{ 4, &hf_h4501_Reject, ASN1_NO_EXTENSIONS,
 		dissect_h4501_Reject },
 	{ 0, NULL, 0, NULL }
 };
@@ -681,7 +682,7 @@ dissect_h4501_ROS(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
 }
 
 static int
-dissect_h4501_argument(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_Argument(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    tvbuff_t *argument_tvb = NULL;
 
diff --git a/asn1/nbap/Makefile b/asn1/nbap/Makefile
index 9961051631..e0c56c10ab 100644
--- a/asn1/nbap/Makefile
+++ b/asn1/nbap/Makefile
@@ -7,7 +7,7 @@ all: generate_dissector
 generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py nbap.asn packet-nbap-template.c packet-nbap-template.h nbap.cnf
-	python ../../tools/asn2wrs.py -e -p nbap -c nbap.cnf -s packet-nbap-template  nbap.asn
+	python ../../tools/asn2wrs.py -e -F -p nbap -c nbap.cnf -s packet-nbap-template  nbap.asn
 
 clean:
 	rm -f parsetab.py $(DISSECTOR_FILES)
diff --git a/asn1/nbap/Makefile.nmake b/asn1/nbap/Makefile.nmake
index 45515433ea..2edf412692 100644
--- a/asn1/nbap/Makefile.nmake
+++ b/asn1/nbap/Makefile.nmake
@@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py nbap.asn packet-nbap-template.c packet-nbap-template.h nbap.cnf
 !IFDEF PYTHON
-	$(PYTHON) ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME) -c nbap.cnf -s packet-nbap-template nbap.asn
+	$(PYTHON) ../../tools/asn2wrs.py -e -F -p $(PROTOCOL_NAME) -c nbap.cnf -s packet-nbap-template nbap.asn
 !ELSE
 	@echo Error: You need Python to use asn2wrs.py
 	@exit 1
diff --git a/asn1/ranap/Makefile b/asn1/ranap/Makefile
index b98b1316b9..44e8c83194 100644
--- a/asn1/ranap/Makefile
+++ b/asn1/ranap/Makefile
@@ -7,7 +7,7 @@ all: generate_dissector
 generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-ranap-template.c packet-ranap-template.h ranap.cnf
-	python ../../tools/asn2wrs.py -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn
+	python ../../tools/asn2wrs.py -e -F -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn
 
 clean:
 	rm -f parsetab.py $(DISSECTOR_FILES)
diff --git a/asn1/ranap/Makefile.nmake b/asn1/ranap/Makefile.nmake
index f1407881bf..893453eafd 100644
--- a/asn1/ranap/Makefile.nmake
+++ b/asn1/ranap/Makefile.nmake
@@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py ranap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h ranap.cnf 
 !IFDEF PYTHON
-	$(PYTHON) ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME) -c ranap.cnf -s packet-$(PROTOCOL_NAME)-template ranap.asn
+	$(PYTHON) ../../tools/asn2wrs.py -e -F -p $(PROTOCOL_NAME) -c ranap.cnf -s packet-$(PROTOCOL_NAME)-template ranap.asn
 !ELSE
 	@echo Error: You need Python to use asn2wrs.py
 	@exit 1
diff --git a/asn1/ranap/ranap-exp.cnf b/asn1/ranap/ranap-exp.cnf
index 7e91b42b33..1dcb0185f2 100644
--- a/asn1/ranap/ranap-exp.cnf
+++ b/asn1/ranap/ranap-exp.cnf
@@ -1,7 +1,7 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # .\ranap-exp.cnf
-# ../../tools/asn2wrs.py -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn
+# ../../tools/asn2wrs.py -e -F -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn
 
 #.MODULE
 RANAP-PDU-Descriptions  ranap
diff --git a/asn1/rnsap/Makefile b/asn1/rnsap/Makefile
index 881372a1a9..5f2009a5cb 100644
--- a/asn1/rnsap/Makefile
+++ b/asn1/rnsap/Makefile
@@ -7,7 +7,7 @@ all: generate_dissector
 generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py rnsap.asn packet-rnsap-template.c packet-rnsap-template.h rnsap.cnf
-	python ../../tools/asn2wrs.py -e -p rnsap -c rnsap.cnf -s packet-rnsap-template  rnsap.asn
+	python ../../tools/asn2wrs.py -e -F -p rnsap -c rnsap.cnf -s packet-rnsap-template  rnsap.asn
 
 clean:
 	rm -f parsetab.py $(DISSECTOR_FILES)
diff --git a/asn1/rnsap/Makefile.nmake b/asn1/rnsap/Makefile.nmake
index 29667bb6e5..d7818143ac 100644
--- a/asn1/rnsap/Makefile.nmake
+++ b/asn1/rnsap/Makefile.nmake
@@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py rnsap.asn packet-rnsap-template.c packet-rnsap-template.h rnsap.cnf
 !IFDEF PYTHON
-	$(PYTHON) ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME) -c rnsap.cnf -s packet-rnsap-template rnsap.asn
+	$(PYTHON) ../../tools/asn2wrs.py -e -F -p $(PROTOCOL_NAME) -c rnsap.cnf -s packet-rnsap-template rnsap.asn
 !ELSE
 	@echo Error: You need Python to use asn2wrs.py
 	@exit 1
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index d398cfc0b4..eb956df70a 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -42,7 +42,7 @@
 #include "packet-ber.h"
 #include "packet-per.h"
 #include "packet-rnsap.h"
-#include "packet-umts_rrc.h"
+/*#include "packet-umts_rrc.h"*/
 
 #define PNAME  "UTRAN Iur interface Radio Network Subsystem Application Part"
 #define PSNAME "RNSAP"