Preparations to be able to handle unaligned PER.

svn path=/trunk/; revision=18119

6 files changed, 8 insertions, 2 deletions

diff --git a/asn1/Makefile.nmake b/asn1/Makefile.nmake
index b1363ec8d9..55d3a98d8b 100644
--- a/asn1/Makefile.nmake
+++ b/asn1/Makefile.nmake
@@ -252,6 +252,7 @@ ber: \
 	gnm	\
 	gsmmap	\
 	gsm_ss	\
+	h248	\
 	inap	\
 	ldap \
 	logotype-cert-extn	\
@@ -288,7 +289,6 @@ per: \
 	h225	\
 	h235	\
 	h245	\
-	h248	\
 	h450	\
 	ranap	\
 	rnsap	\
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index f9a342f554..f817d984af 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -227,6 +227,7 @@ 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);
 
+	per_aligment_type_callback(TRUE);
 	offset = dissect_h225_H323_UserInformation(tvb, offset,pinfo, tr, hf_h225_H323_UserInformation);
 
 	if (h245_list.count && check_col(pinfo->cinfo, COL_PROTOCOL)){
@@ -264,6 +265,7 @@ 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);
 
+	per_aligment_type_callback(TRUE);
 	offset = dissect_h225_RasMessage(tvb, 0, pinfo,tr, hf_h225_RasMessage );
 
 	ras_call_matching(tvb, pinfo, tr, h225_pi);
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index 2275e0f4da..3d5350dbad 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -317,6 +317,7 @@ 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);
+		per_aligment_type_callback(TRUE);
 		offset = dissect_h245_MultimediaSystemControlMessage(tvb, offset, pinfo ,tr, hf_h245_pdu_type);
 		tap_queue_packet(h245dg_tap, pinfo, h245_pi);
 		offset = (offset+0x07) & 0xfffffff8;
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index 31ba244d48..f5ace88f1f 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -1075,6 +1075,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, FALSE);
     ranap_tree = proto_item_add_subtree(ranap_item, ett_ranap);
 
+	per_aligment_type_callback(TRUE);
 	offset = dissect_ranap_RANAP_PDU(tvb, offset, pinfo, ranap_tree, hf_ranap_RANAP_PDU);
 
 }
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index 574f978fcd..d8f095b589 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -2282,7 +2282,8 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	/* create the rnsap protocol tree */
 	rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, FALSE);
 	rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap);
-
+	
+	per_aligment_type_callback(TRUE);
 	dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree);
 }
 
diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf
index 2b854ee0c1..970fb08e48 100644
--- a/asn1/ulp/ulp.cnf
+++ b/asn1/ulp/ulp.cnf
@@ -15,6 +15,7 @@ ULP-PDU
 	if (check_col(pinfo->cinfo, COL_INFO))
 		col_clear(pinfo->cinfo, COL_INFO);
 
+  per_aligment_type_callback(FALSE);
   %(DEFAULT_BODY)s
 
 #.FN_BODY StatusCode