few formal changes in PER dissector (rename asn_* types to asn1_* ones)

svn path=/trunk/; revision=18652

7 files changed, 64 insertions, 64 deletions

diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 5171504532..88e5e901ec 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -142,7 +142,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 	proto_item *it;
 	proto_tree *tr;
 	int offset = 0;
-	asn_ctx_t asn_ctx;
+	asn1_ctx_t asn1_ctx;
 
     pi_current++;
     if(pi_current==5){
@@ -167,8 +167,8 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 	it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS");
 	tr=proto_item_add_subtree(it, ett_h225);
 
-	asn_ctx_init(&asn_ctx, ASN_ENC_PER, TRUE, pinfo);
-	offset = dissect_h225_H323_UserInformation(tvb, offset, &asn_ctx, tr, hf_h225_H323_UserInformation);
+	asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+	offset = dissect_h225_H323_UserInformation(tvb, offset, &asn1_ctx, tr, hf_h225_H323_UserInformation);
 
 	if (h245_list.count && check_col(pinfo->cinfo, COL_PROTOCOL)){
 		col_append_str(pinfo->cinfo, COL_PROTOCOL, "/");
@@ -187,7 +187,7 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 	proto_item *it;
 	proto_tree *tr;
 	guint32 offset=0;
-	asn_ctx_t asn_ctx;
+	asn1_ctx_t asn1_ctx;
 
     pi_current++;
     if(pi_current==5){
@@ -206,8 +206,8 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 	it=proto_tree_add_protocol_format(tree, proto_h225, tvb, offset, tvb_length(tvb), PSNAME" RAS");
 	tr=proto_item_add_subtree(it, ett_h225);
 
-	asn_ctx_init(&asn_ctx, ASN_ENC_PER, TRUE, pinfo);
-	offset = dissect_h225_RasMessage(tvb, 0, &asn_ctx, tr, hf_h225_RasMessage );
+	asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+	offset = dissect_h225_RasMessage(tvb, 0, &asn1_ctx, tr, hf_h225_RasMessage );
 
 	ras_call_matching(tvb, pinfo, tr, h225_pi);
 
diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c
index 94efd6565e..7c966b9394 100644
--- a/asn1/h235/packet-h235-template.c
+++ b/asn1/h235/packet-h235-template.c
@@ -51,7 +51,7 @@ int proto_h235 = -1;
 #include "packet-h235-ett.c"
 
 static guint32
-dissect_xxx_ToBeSigned(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index _U_) {
+dissect_xxx_ToBeSigned(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) {
 PER_NOT_DECODED_YET("ToBeSigned");
   return offset;
 }
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index a91625a033..2c659d1f11 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -303,7 +303,7 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	proto_item *it;
 	proto_tree *tr;
 	guint32 offset=0;
-	asn_ctx_t asn_ctx;
+	asn1_ctx_t asn1_ctx;
 
 	if (check_col(pinfo->cinfo, COL_PROTOCOL)){
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
@@ -317,8 +317,8 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 		CLEANUP_PUSH(reset_h245_pi, NULL);
 		h245_pi=ep_alloc(sizeof(h245_packet_info));
 		init_h245_packet_info(h245_pi);
-		asn_ctx_init(&asn_ctx, ASN_ENC_PER, TRUE, pinfo);
-		offset = dissect_h245_MultimediaSystemControlMessage(tvb, offset, &asn_ctx, tr, hf_h245_pdu_type);
+		asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+		offset = dissect_h245_MultimediaSystemControlMessage(tvb, offset, &asn1_ctx, tr, hf_h245_pdu_type);
 		tap_queue_packet(h245dg_tap, pinfo, h245_pi);
 		offset = (offset+0x07) & 0xfffffff8;
 		CLEANUP_CALL_AND_POP;
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index 4c5604e79c..27c77d812a 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -299,8 +299,8 @@ 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, int hf_index);
-static int dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_ind _U_);
+static int dissect_h4501_Argument(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index);
+static int dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_ind _U_);
 
 
 
@@ -318,7 +318,7 @@ 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, int hf_index)
+dissect_h4501_InvokeProblem(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0, 7, NULL, FALSE);
    return offset;
@@ -332,7 +332,7 @@ 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, int hf_index)
+dissect_h4501_ReturnResultProblem(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0, 2, NULL, FALSE);
    return offset;
@@ -348,7 +348,7 @@ 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, int hf_index)
+dissect_h4501_ReturnErrorProblem(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0, 4, NULL, FALSE);
    return offset;
@@ -361,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, int hf_index)
+dissect_h4501_GeneralProblem(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    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, int hf_index)
+dissect_h4501_ReturnResult_result(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    tvbuff_t *result_tvb = NULL;
 
@@ -423,7 +423,7 @@ 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, int hf_index)
+dissect_h4501_LocalOpcode(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_integer(tvb, offset, actx, tree, hf_index, &localOpcode);
    is_globalcode = FALSE;
@@ -432,7 +432,7 @@ dissect_h4501_LocalOpcode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree
 
 
 static int
-dissect_h4501_GlobalCode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_GlobalCode(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
 	offset=dissect_per_object_identifier_str(tvb, offset, actx, tree, hf_index, &globalcode_oid_str);
 	is_globalcode = TRUE;
@@ -453,7 +453,7 @@ static const per_choice_t opcode_choice[] = {
 	{ 0, NULL, 0, NULL }
 };
 static int
-dissect_h4501_Opcode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_Opcode(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h4501_opcode, opcode_choice, NULL);
    return offset;
@@ -467,14 +467,14 @@ static const per_sequence_t result_sequence[] = {
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_Result(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_Result(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    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, int hf_index)
+dissect_h4501_Parameter(tvbuff_t *tvb, int offset, asn1_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_index, NO_BOUND, NO_BOUND, NULL);
@@ -529,7 +529,7 @@ 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, int hf_index)
+dissect_h4501_LocalErrorCode(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_integer(tvb, offset, actx, tree, hf_index, &localErrorCode);
 	return offset;
@@ -549,7 +549,7 @@ static const per_choice_t errorCode_choice[] = {
 	{ 0, NULL, 0, NULL }
 };
 static int
-dissect_h4501_ErrorCode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_ErrorCode(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h4501_errorCode, errorCode_choice, NULL);
    return offset;
@@ -574,13 +574,13 @@ static const per_choice_t problem_choice[] = {
 	{ 0, NULL, 0, NULL }
 };
 static int
-dissect_h4501_Problem(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_Problem(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    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, int hf_index)
+dissect_h4501_Constrained_invokeId(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0, 65535, NULL, FALSE);
 	return offset;
@@ -588,7 +588,7 @@ dissect_h4501_Constrained_invokeId(tvbuff_t *tvb, int offset, asn_ctx_t *actx, p
 
 
 static int
-dissect_h4501_InvokeId(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_InvokeId(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL);
 	return offset;
@@ -602,7 +602,7 @@ static const per_sequence_t Reject_sequence[] = {
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_Reject(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_Reject(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h4501_Reject, Reject_sequence);
    return offset;
@@ -618,7 +618,7 @@ static const per_sequence_t ReturnError_sequence[] = {
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_ReturnError(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_ReturnError(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h4501_ReturnError, ReturnError_sequence);
    return offset;
@@ -632,7 +632,7 @@ static const per_sequence_t ReturnResult_sequence[] = {
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_ReturnResult(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_ReturnResult(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h4501_ReturnResult, ReturnResult_sequence);
    return offset;
@@ -650,7 +650,7 @@ static const per_sequence_t Invoke_sequence[] = {
 	{ NULL, 0, 0, NULL }
 };
 static int
-dissect_h4501_Invoke(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_Invoke(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    offset=dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h4501_Invoke, Invoke_sequence);
    return offset;
@@ -675,14 +675,14 @@ static const per_choice_t ROS_choice[] = {
 	{ 0, NULL, 0, NULL }
 };
 static int
-dissect_h4501_ROS(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree)
+dissect_h4501_ROS(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree)
 {
    offset=dissect_per_choice(tvb, offset, actx, tree, hf_h4501_ROS, ett_h4501_ROS, ROS_choice, NULL);
    return offset;
 }
 
 static int
-dissect_h4501_Argument(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index)
+dissect_h4501_Argument(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
 {
    tvbuff_t *argument_tvb = NULL;
 
@@ -852,7 +852,7 @@ PER_NOT_DECODED_YET("Unrecognized H.450.x operation");
    return offset;
 }
 static int 
-dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_ind _U_){
+dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_ind _U_){
 
 	offset = dissect_h4501_ROS(tvb, offset, actx, tree);
 	return offset;
@@ -864,13 +864,13 @@ dissect_h4501(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree)
    proto_item *it;
    proto_tree *tr;
    guint32 offset=0;
-   asn_ctx_t asn_ctx;
+   asn1_ctx_t asn1_ctx;
 
    it=proto_tree_add_protocol_format(tree, proto_h4501, tvb, 0, -1, "H.450.1");
    tr=proto_item_add_subtree(it, ett_h4501);
 
-   asn_ctx_init(&asn_ctx, ASN_ENC_PER, TRUE, pinfo);
-   dissect_h450_H4501SupplementaryService(tvb, offset, &asn_ctx, tr, hf_h4501);
+   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+   dissect_h450_H4501SupplementaryService(tvb, offset, &asn1_ctx, tr, hf_h4501);
 }
 
 /*--- proto_register_h450 -------------------------------------------*/
diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c
index d9b46ffc18..e6e142346f 100644
--- a/asn1/nbap/packet-nbap-template.c
+++ b/asn1/nbap/packet-nbap-template.c
@@ -730,14 +730,14 @@ static guint32 ddMode;
 #define NBAP_IE_ID_REFERENCE_RECEIVEDTOTALWIDEBANDPOWER								698
 
 
-static int dissect_nbap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
-static int dissect_nbap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
-static int dissect_nbap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
-static int dissect_nbap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
+static int dissect_nbap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
+static int dissect_nbap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
+static int dissect_nbap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
+static int dissect_nbap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
 #include "packet-nbap-fn.c"
 
 
-static int dissect_nbap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_nbap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 	proto_item	*value_item = NULL;
 	proto_tree	*value_tree = NULL;
 	guint length;
@@ -956,7 +956,7 @@ static int dissect_nbap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, a
 	return offset;
 }
 
-static int dissect_nbap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_nbap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 	proto_item	*value_item = NULL;
 	proto_tree	*value_tree = NULL;
 	guint length;
@@ -1052,7 +1052,7 @@ static int dissect_nbap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, a
 	return offset;
 }
 
-static int dissect_nbap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_nbap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 	proto_item	*value_item = NULL;
 	proto_tree	*value_tree = NULL;
 	guint length;
@@ -1135,7 +1135,7 @@ static int dissect_nbap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static int dissect_nbap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_nbap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 	proto_item	*value_item = NULL;
 	proto_tree	*value_tree = NULL;
 	guint length;
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index 6cef14974a..a40ac19cfc 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -77,15 +77,15 @@ static guint type_of_message;
 static guint32 ProcedureCode;
 static guint32 ProtocolIE_ID;
 
-static int dissect_ranap_ies(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
-static int dissect_ranap_FirstValue_ies(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
-static int dissect_ranap_SecondValue_ies(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
-static int dissect_ranap_messages(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
+static int dissect_ranap_ies(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
+static int dissect_ranap_FirstValue_ies(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
+static int dissect_ranap_SecondValue_ies(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
+static int dissect_ranap_messages(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
 #include "packet-ranap-fn.c"
 
 
 
-static int dissect_ranap_ies(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_ranap_ies(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 
 	guint length;
 	
@@ -559,7 +559,7 @@ static int dissect_ranap_ies(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_t
 	return offset;
 }
 
-static int dissect_ranap_FirstValue_ies(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_ranap_FirstValue_ies(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 
 	guint length;
 	int start_offset;
@@ -579,7 +579,7 @@ static int dissect_ranap_FirstValue_ies(tvbuff_t *tvb, int offset, asn_ctx_t *ac
 	return offset;
 }
 
-static int dissect_ranap_SecondValue_ies(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_ranap_SecondValue_ies(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 
 	guint length;
 	
@@ -599,7 +599,7 @@ static int dissect_ranap_SecondValue_ies(tvbuff_t *tvb, int offset, asn_ctx_t *a
 }
 
 
-static int dissect_ranap_messages(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_ranap_messages(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 	guint length;
 
 	offset = dissect_per_length_determinant(tvb, offset, actx, tree, hf_ranap_pdu_length, &length);
@@ -1082,11 +1082,11 @@ static gboolean
 dissect_sccp_ranap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     guint8 temp;
-	asn_ctx_t asn_ctx;
+	asn1_ctx_t asn1_ctx;
 	guint length;
 	int offset;
 
-	asn_ctx_init(&asn_ctx, ASN_ENC_PER, TRUE, pinfo);
+	asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
 
     /* Is it a ranap packet?
      *
@@ -1102,7 +1102,7 @@ dissect_sccp_ranap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (tvb_length(tvb) < 4) { return FALSE; }
     /*if (tvb_get_guint8(tvb, LENGTH_OFFSET) != (tvb_length(tvb) - 4)) { return FALSE; }*/
 	/* Read the length NOTE offset in bits */
-	offset = dissect_per_length_determinant(tvb, LENGTH_OFFSET<<3, &asn_ctx, tree, -1, &length);
+	offset = dissect_per_length_determinant(tvb, LENGTH_OFFSET<<3, &asn1_ctx, tree, -1, &length);
 	offset = offset>>3;
 	if (length!= (tvb_length(tvb) - offset)){
 		return FALSE; 
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index eb956df70a..42341a2e02 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -585,14 +585,14 @@ static guint32 ddMode;
 
 
 
-static int dissect_rnsap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
-static int dissect_rnsap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
-static int dissect_rnsap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
-static int dissect_rnsap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree);
+static int dissect_rnsap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
+static int dissect_rnsap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
+static int dissect_rnsap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
+static int dissect_rnsap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree);
 #include "packet-rnsap-fn.c"
 
 
-static int dissect_rnsap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_rnsap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 	proto_item	*value_item = NULL;
 	proto_tree	*value_tree = NULL;
 	guint length;
@@ -786,7 +786,7 @@ static int dissect_rnsap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static int dissect_rnsap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_rnsap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 	proto_item	*value_item = NULL;
 	proto_tree	*value_tree = NULL;
 	guint length;
@@ -863,7 +863,7 @@ static int dissect_rnsap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static int dissect_rnsap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_rnsap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 	proto_item	*value_item = NULL;
 	proto_tree	*value_tree = NULL;
 	guint length;
@@ -927,7 +927,7 @@ static int dissect_rnsap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset
 	return offset;
 }
 
-static int dissect_rnsap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree){
+static int dissect_rnsap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree){
 	proto_item	*value_item = NULL;
 	proto_tree	*value_tree = NULL;
 	guint length;