aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-10-27Fix proto_tree_add_item( encoding args;Bill Meier12-7803/+7810
Do whitespace cleanup (for a few files). svn path=/trunk/; revision=39640
2011-10-27..Filter is not used any more.Anders Broman1-20/+14
svn path=/trunk/; revision=39639
2011-10-27Fix comparison with UAT keys.Anders Broman1-4/+4
svn path=/trunk/; revision=39637
2011-10-27Fix some proto_tree_add_item() encoding args;Bill Meier10-305/+299
In some files: Remove a few unneeded #includes; Do some whitespace/indentation cleanup svn path=/trunk/; revision=39635
2011-10-27Fix indentation.Anders Broman1-1027/+1027
svn path=/trunk/; revision=39634
2011-10-27The comparison with the UAT keys are broken, this isAnders Broman1-90/+8
a fix for fetching the IP address. svn path=/trunk/; revision=39633
2011-10-27Fix a typo.Bill Meier1-1/+1
svn path=/trunk/; revision=39632
2011-10-27Correct an off-by-one error introduced in r39626.Jeff Morriss1-1/+1
svn path=/trunk/; revision=39631
2011-10-27Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6498 :Jeff Morriss1-0/+1
Initialize cip_req_info_t.ciaData, too. svn path=/trunk/; revision=39630
2011-10-27Followup to r39626: It is also necessary to initialize the number of servicesJeff Morriss1-0/+1
to 0 (in case we throw an exception decoding the first service). svn path=/trunk/; revision=39629
2011-10-27Fix cut-and-pasteo that happened not to cause a problem on *P64Guy Harris1-22/+1
platforms but failed on *P32 platforms. Remove the debugging code (the above was the problem in question). svn path=/trunk/; revision=39628
2011-10-27Add a little shell script to export the appropriate variables necessary forJeff Morriss2-11/+51
running valgrind and then run it on either tshark or (if the user is very patient) Wireshark. svn path=/trunk/; revision=39627
2011-10-27Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6491 :Jeff Morriss1-1/+9
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
2011-10-26Add some debugging code; the current code doesn't work when compiledGuy Harris1-0/+21
with MSVC on Win32, and the fix will remove the debugging code as well. svn path=/trunk/; revision=39624
2011-10-26Fix a [-Wunused-but-set-variable] compiler warning;Bill Meier1-60/+58
Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26The comparison with the UAT keys are broken, this isAnders Broman1-2/+3
a fix for the SPI the src and dst IP address strings needs fixing too. I'll look into that tomorrow if no one beats me too it. svn path=/trunk/; revision=39621
2011-10-26Declare unused parameters as such. Don't assign them to themselves.Michael Tüxen1-7/+2
svn path=/trunk/; revision=39620
2011-10-26Put the magic number into the aethra_hdr structure, to avoid compilerGuy Harris1-11/+13
padding of the structure getting in the way (it should now not require padding). svn path=/trunk/; revision=39619
2011-10-26Fix proto_tree_add_item() encoding args.Bill Meier1-5/+5
svn path=/trunk/; revision=39618
2011-10-26Fix a proto_tree_add_item() encoding areg;Bill Meier1-19/+19
Use gboolean instead of int in certain cases. svn path=/trunk/; revision=39617
2011-10-26Fix proto_tree_add_item() encoding args;Bill Meier1-63/+63
Use gboolean instead of int in certain cases. svn path=/trunk/; revision=39616
2011-10-26Fix proto_tree_add_item() encoding args.Bill Meier1-24/+24
svn path=/trunk/; revision=39615
2011-10-26Fix proto_tree_add_item() encoding args;Bill Meier1-8/+8
Also: remove unneeded #include. svn path=/trunk/; revision=39614
2011-10-26Fix some proto_tree_add_item() encoding args.Bill Meier1-9/+9
svn path=/trunk/; revision=39613
2011-10-26Fix some proto_tree_add_item() encoding args;Bill Meier1-13/+16
Remove some unneeded #includes. svn path=/trunk/; revision=39612
2011-10-26Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=39611
2011-10-26Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-11/+17
svn path=/trunk/; revision=39610
2011-10-26Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=39609
2011-10-26Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+3
svn path=/trunk/; revision=39608
2011-10-26Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-6/+6
svn path=/trunk/; revision=39607
2011-10-26Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-110/+104
svn path=/trunk/; revision=39606
2011-10-26Add missing hf[] entries (and fix proto_tree_add_item() encoding args).Bill Meier1-11/+53
svn path=/trunk/; revision=39605
2011-10-26Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+4
svn path=/trunk/; revision=39604
2011-10-26Removed duplicate enip.connection_transport_data entry.Stig Bjørlykke1-5/+0
This fixes bug 6490. svn path=/trunk/; revision=39603
2011-10-26Add a newline at the end of this file.Martin Mathieson1-1/+1
svn path=/trunk/; revision=39602
2011-10-26Fixed compare functions for 64 bits integers:Stig Bjørlykke1-8/+8
- Do not cast unsigned values to signed - Do cast signed values from the internal stored unsigned svn path=/trunk/; revision=39601
2011-10-26Try to get rid of defined but not used warnings.Anders Broman2-1523/+149
svn path=/trunk/; revision=39600
2011-10-26Try to fixAnders Broman1-3/+3
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
2011-10-26White space changes.Anders Broman1-9/+9
svn path=/trunk/; revision=39597
2011-10-26Extended with VSA:s from Peter Deacon troughAnders Broman1-7/+21
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6486 svn path=/trunk/; revision=39596
2011-10-26From Michael Mann:Anders Broman5-3303/+4229
Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26Sync up the file format lists, add the Aethra files, and promote pcap-ngGuy Harris2-4/+32
to come right after pcap and not to be tagged as experimental. svn path=/trunk/; revision=39594
2011-10-26Get rid of the list of capture file formats, so we have one fewer listGuy Harris1-32/+4
that we can fail to update. Point the user at the Wireshark man page, instead. svn path=/trunk/; revision=39593
2011-10-26Add the code to read Aethra files.Guy Harris1-0/+1
svn path=/trunk/; revision=39592
2011-10-26Ok, we found what appears to be the capture start time. Use it.Guy Harris1-5/+38
Also mark what appear to be strings in the file header. svn path=/trunk/; revision=39591
2011-10-26It appears that the octet in the record header after the record lengthGuy Harris1-27/+42
might be a record type, with 0 being a "Stop Monitor" record and 1 being a packet. Ignore records other than packet records. svn path=/trunk/; revision=39590
2011-10-26Avoid warnings.Guy Harris1-1/+3
svn path=/trunk/; revision=39589
2011-10-26Initial support for .aps files from Aethra Telecommunications' PC108Guy Harris5-1/+259
software. More work is needed: we don't know where the capture start time is yet; we aren't handling the "stop capture" record; we don't know where the ISDN channel is; there might be non-ISDN file formats; but this at least is easier than trying to text2pcap hex dumps from that software into pcap files. svn path=/trunk/; revision=39588
2011-10-26Fix a spelling mistake. Wrap a few long lines.Jeff Morriss1-13/+14
svn path=/trunk/; revision=39587
2011-10-25Forward-port r39581 from the 1.6 trunk.Gerald Combs1-1/+4
svn path=/trunk/; revision=39582