ANNOUNCEMENT: Live Wireshark University & Allegro Packets online APAC Wireshark Training Session
July 17th, 2024 | 10:00am-11:55am SGT (UTC+8) | Online

Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] master-1.10 c0978c4: Don't dissect other

From: Guy Harris <guy@xxxxxxxxxxxx>
Date: Wed, 27 May 2015 19:45:31 -0700
On May 27, 2015, at 6:47 PM, Guy Harris <guy@xxxxxxxxxxxx> wrote:

> 
> On May 27, 2015, at 6:36 PM, Jeff Morriss <jeff.morriss.ws@xxxxxxxxx> wrote:
> 
>> On 05/03/2015 06:19 PM, Wireshark code review wrote:
>>> URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c0978c46173992c87e18bfd635bef826835ad1af
>>> Submitter: Guy Harris (guy@xxxxxxxxxxxx)
>>> Changed: branch: master-1.10
>>> Repository: wireshark
>>> 
>>> Commits:
>>> 
>>> c0978c4 by Guy Harris (guy@xxxxxxxxxxxx):
>>> 
>>>    Don't dissect otherwise-undissected data twice.
>>> 
>>>    Also, set decoded to TRUE after we return from a dissector; that makes
>>>    it a bit clearer when we're setting it.
>> 
>> This change (in master-1.10) is dependent on (the packet-atm.c portion of) SVN rev 54503.  Without back porting 54503 the 'decoded' variable is set-but-not-used in this branch.
>> 
>> Any preferences on which way to fix it?  My initial suggestion would be to revert this latest change.
> 
> That change did two things: 1) "Don't dissect otherwise-undissected data twice." and 2) "Also, set decoded to TRUE after we return from a dissector"; either both should be reverted and 1) then re-applied or 2) should be reverted.  1) affects the appearance of the dissection; 2) just makes my head hurt less when I try to read the code. :-)

1) and 2) were a bit intertwined, so I backported some of the rev 54503 changes for packet-atm.c in https://code.wireshark.org/review/8671.