Replace the current ranap dissector with an asn2eth generated one.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16191 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 7 insertions, 2 deletions

diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index 89b9abf9bc..e32fb3593f 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -47,6 +47,10 @@
 #define PSNAME "RANAP"
 #define PFNAME "ranap"
 
+#define BYTE_ALIGN_OFFSET(offset)		\
+	if(offset&0x07){			\
+		offset=(offset&0xfffffff8)+8;	\
+	}
 
 
 
@@ -567,8 +571,7 @@ static int dissect_ranap_FirstValue_ies(tvbuff_t *tvb, int offset, packet_info *
 			break;
 	}
 	/* We might not stop on a byte boundary */
-	if ( offset < (start_offset + length))
-		offset = start_offset + length;
+	BYTE_ALIGN_OFFSET(offset);
 	return offset;
 }
 
@@ -585,6 +588,8 @@ static int dissect_ranap_SecondValue_ies(tvbuff_t *tvb, int offset, packet_info
 		default:
 			break;
 	}
+	/* We might not stop on a byte boundary */
+	BYTE_ALIGN_OFFSET(offset);
 	return offset;
 }