Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] rev 41283: /trunk/epan/dissectors/ /trunk/epan/dissectors/:

Date: Fri, 02 Mar 2012 03:39:16 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=41283

User: morriss
Date: 2012/03/01 07:39 PM

Log:
 From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 :
 
 The attached patches fix the following issues:
 
 1. CIP-Motion shouldn't be a heuristic dissector.  CIP-Motion packets are
 determined by specific fields in a CIP ForwardOpen.  I ran into situations
 where CIP-Motion's "vague" heuristics incorrectly dissected packets meant for
 CIP-Safety.  Of course this requires the ForwardOpen to be in the trace, but it
 is the most deterministic way to have CIP-Motion packets.
 
 2. Minor bugfix to the CIP-Safety dissector.  A couple of fields were
 "missing", causing errant malformed packets.

Directory: /trunk/epan/dissectors/
  Changes    Path                  Action
  +21 -19    packet-cip.c          Modified
  +2 -1      packet-cip.h          Modified
  +2 -28     packet-cipmotion.c    Modified
  +46 -60    packet-cipsafety.c    Modified
  +46 -39    packet-enip.c         Modified