Age | Commit message (Collapse) | Author | Files | Lines |
|
svn path=/trunk/; revision=43669
|
|
svn path=/trunk/; revision=43538
|
|
sub-dissector/col_...()/expert...() fcns
svn path=/trunk/; revision=43226
|
|
svn path=/trunk/; revision=42434
|
|
Search instead of Linear Search.
svn path=/trunk/; revision=42418
|
|
344 is registered to KEBA.
(Ref: http://www.odva.org/Home/CIPSUPPLIERDIRECTORY/LicensedVendorList/tabid/86/lng/en-US/Default.aspx)
svn path=/trunk/; revision=42417
|
|
svn path=/trunk/; revision=41999
|
|
svn path=/trunk/; revision=41386
|
|
svn path=/trunk/; revision=41378
|
|
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.
svn path=/trunk/; revision=41283
|
|
a dissector for the ODVA protocol: CIP Safety. More information
about the protocol can be found here:
http://www.odva.org/Home/ODVATECHNOLOGIES/CIP/CIPTechnologyOverview/CIPSafety/CIPSafetyOverview/tabid/131/lng/en-US/Default.aspx
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6862
svn path=/trunk/; revision=41201
|
|
svn path=/trunk/; revision=40372
|
|
Modbus object support for CIP dissector
Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object.
Also included update to Modbus error code per
http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html
svn path=/trunk/; revision=40371
|
|
ENIP dissector - improved I/O connection dissection through "better conversation"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617
svn path=/trunk/; revision=40059
|
|
Bugfixes for both Buildbot issues:
1. seg-fault with multiple_service_packet
2. infinite loop
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519
svn path=/trunk/; revision=39843
|
|
Avoiding the fuzz-test crash, but still allowing for large parts of CIP to be dissected.
ref https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519
svn path=/trunk/; revision=39718
|
|
svn path=/trunk/; revision=39698
|
|
mr_mult_req_info is non-null*! This should fix bug 6514, and possibly a
bunch of other buildbot crashes.
svn path=/trunk/; revision=39667
|
|
svn path=/trunk/; revision=39631
|
|
Initialize cip_req_info_t.ciaData, too.
svn path=/trunk/; revision=39630
|
|
to 0 (in case we throw an exception decoding the first service).
svn path=/trunk/; revision=39629
|
|
Don't set mr_mult_req_info->num_services until we're sure we've
initialized the full structure for that service. Otherwise if we
happen to throw an exception before initializing the whole
structure, we'll core someplace (like dissect_cip_generic_service_rsp())
which expects all num_services entries to be fully initialized.
svn path=/trunk/; revision=39626
|
|
Also: Remove trailing whitespace from lines.
svn path=/trunk/; revision=39623
|
|
svn path=/trunk/; revision=39620
|
|
cc1: warnings being treated as errors
packet-cip.c: In function 'dissect_cip_generic_service_req':
packet-cip.c:3281: warning: format not a string literal and no format arguments
packet-cip.c: In function 'dissect_cip_generic_service_rsp':
packet-cip.c:3631: warning: format not a string literal and no format arguments
packet-cip.c: In function 'dissect_cip_data':
packet-cip.c:4881: warning: comparison between signed and unsigned
svn path=/trunk/; revision=39599
|
|
Improved CIP and ENIP dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416
svn path=/trunk/; revision=39595
|
|
tvb_get_ephemeral_unicode_string();
Fix encoding arg as needed.
svn path=/trunk/; revision=39530
|
|
Also: remove trailing whitespace for a number of files.
svn path=/trunk/; revision=39503
|
|
(previously missed).
57 FT_BOOLEAN: FALSE-->ENC_BIG_ENDIAN
31 FT_BOOLEAN: TRUE-->ENC_LITTLE_ENDIAN
10 FT_BYTES: ENC_BIG_ENDIAN-->ENC_NA
1 FT_BYTES: ENC_LITTLE_ENDIAN-->ENC_NA
21 FT_BYTES: FALSE-->ENC_NA
2 FT_BYTES: TRUE-->ENC_NA
2 FT_IPXNET: ENC_BIG_ENDIAN-->ENC_NA
6 FT_IPv6: ENC_BIG_ENDIAN-->ENC_NA
1 FT_IPv6: FALSE-->ENC_NA
6 FT_NONE: ENC_BIG_ENDIAN-->ENC_NA
19 FT_NONE: FALSE-->ENC_NA
3 FT_NONE: TRUE-->ENC_NA
1 FT_STRING: ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA
1 FT_STRING: ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA
5 FT_STRING: FALSE-->ENC_ASCII|ENC_NA
1 FT_STRING: TRUE-->ENC_ASCII|ENC_NA
4 FT_STRINGZ: ENC_NA-->ENC_ASCII|ENC_NA
8 FT_STRINGZ: FALSE-->ENC_ASCII|ENC_NA
1 FT_INT32: FALSE-->ENC_BIG_ENDIAN
1 FT_INT32: TRUE-->ENC_LITTLE_ENDIAN
11 FT_UINT8: 0-->ENC_BIG_ENDIAN
111 FT_UINT8: FALSE-->ENC_BIG_ENDIAN
17 FT_UINT8: TRUE-->ENC_LITTLE_ENDIAN
1 FT_UINT16: 0-->ENC_BIG_ENDIAN
68 FT_UINT16: FALSE-->ENC_BIG_ENDIAN
18 FT_UINT16: TRUE-->ENC_LITTLE_ENDIAN
4 FT_UINT24: FALSE-->ENC_BIG_ENDIAN
70 FT_UINT32: FALSE-->ENC_BIG_ENDIAN
1 FT_UINT32: TRUE-->ENC_LITTLE_ENDIAN
4 FT_UINT64: FALSE-->ENC_BIG_ENDIAN
1 FT_UINT64: TRUE-->ENC_LITTLE_ENDIAN
1 FT_UINT_STRING: FALSE-->ENC_ASCII|ENC_BIG_ENDIAN
svn path=/trunk/; revision=39442
|
|
FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
then use ENC_ASCII.
2. For all but FT_UINT_STRING, always use ENC_NA
(replacing any existing True/1/FALSE/0
/ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).
svn path=/trunk/; revision=39426
|
|
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5929
From me:
packet-cipmotion.c:
FT_BOOLEAN fields with bitmasks need a bit-fieldwidth in the hf[] entry 'display' field;
Define attribute_size as guint32 since it has to store guint8*guint16;
Use ENC_NA as encoding arg in proto_tree_add_item() for FT_BYTES field types;
Remove trailing whitespace from lines;
Other minor cleanup and reformatting.
packet-enip.c:
Use ENC_NA as encoding arg in proto_tree_add_item() for FT_BYTES field types;
svn path=/trunk/; revision=39396
|
|
non-autogenerated epan/dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
the encoding parameter for proto_tree_add_item() calls which directly reference
an item in hf[] which has a type of:
FT_UINT8
FT_UINT16
FT_UINT24
FT_UINT32
FT_UINT64
FT_INT8
FT_INT16
FT_INT24
FT_INT32
FT_INT64
FT_FLOAT
FT_DOUBLE
svn path=/trunk/; revision=39288
|
|
reference an hf item (in hf[] with types:
FT_NONE
FT_BYTES
FT_IPV6
FT_IPXNET
FT_OID
Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
svn path=/trunk/; revision=39260
|
|
errors, so I'll reopen the bug and log all the warnings that have been
produced, and mark the patch as "rejected".
svn path=/trunk/; revision=39230
|
|
segment size, they just appear to be 2 bytes long.
svn path=/trunk/; revision=39229
|
|
svn path=/trunk/; revision=39227
|
|
svn path=/trunk/; revision=39226
|
|
General improvements to CIP and ENIP dissectors.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416
svn path=/trunk/; revision=39222
|
|
svn path=/trunk/; revision=39147
|
|
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748
svn path=/trunk/; revision=39081
|
|
going to be used. Fixes Coverity CID 863.
svn path=/trunk/; revision=39054
|
|
Added support for the following services of the Connection Manager object:
LargeForwardOpen
GetConnectionOwner
Added support for the following services of the Connection Configuration
Object:
GetAttributeAll
SetAttributeAll
From me:
Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3.
svn path=/trunk/; revision=37404
|
|
Use consistent indentation;
Add editor modelines;
Use #if 0/#endif to comment out code instead of /* */.
svn path=/trunk/; revision=36913
|
|
Some fixes for 'set but not used' errors that GCC 4.6 emits.
svn path=/trunk/; revision=36911
|
|
svn path=/trunk/; revision=35988
|
|
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys. (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)
svn path=/trunk/; revision=35224
|
|
svn path=/trunk/; revision=34546
|
|
Minor whitespace and comments cleanup.
svn path=/trunk/; revision=34477
|
|
svn path=/trunk/; revision=32411
|
|
svn path=/trunk/; revision=32367
|