diff options
| author | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-10-22 01:28:12 +0000 |
|---|---|---|
| committer | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-10-22 01:28:12 +0000 |
| commit | d00fa2963f1bed9d75def2aa86b6def8fea77829 (patch) | |
| tree | addc9b1559ea10cda99e15186b4a49017c1c2a0e /packet-per.c | |
| parent | d6bf10e8ed42143da355ccfd2e5830040042386b (diff) | |
Fix to dissection of Mike's problem reported on ethereal-users
We did align to byte a bit too frequently inside dissect_per_octet_string
Also change GroupIP.group from being a FT_BYTES into being FT_STRING
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8744 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-per.c')
| -rw-r--r-- | packet-per.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-per.c b/packet-per.c index fbc87372c6..0c46c0c6b6 100644 --- a/packet-per.c +++ b/packet-per.c @@ -7,7 +7,7 @@ proper helper routines * Routines for dissection of ASN.1 Aligned PER * 2003 Ronnie Sahlberg * - * $Id: packet-per.c,v 1.19 2003/10/09 22:35:07 guy Exp $ + * $Id: packet-per.c,v 1.20 2003/10/22 01:28:12 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1355,13 +1355,13 @@ DEBUG_ENTRY("dissect_per_octet_string"); } - /* aligne to byte */ - if(offset&0x07){ - offset=(offset&0xfffffff8)+8; - } - /* 16.7 if length is fixed and less than to 64k*/ if((min_len==max_len)&&(min_len<65536)){ + /* align to byte */ + if(offset&0x07){ + offset=(offset&0xfffffff8)+8; + } + if (hfi) { if(hfi->type==FT_STRING){ proto_tree_add_string(tree, hf_index, tvb, offset>>3, min_len, tvb_get_ptr(tvb, offset>>3, min_len)); |