2c2fb429f7
Fix indentation.
...
svn path=/trunk/; revision=39634
2011-10-27 15:38:32 +00:00
4d0e343dbf
The comparison with the UAT keys are broken, this is
...
a fix for fetching the IP address.
svn path=/trunk/; revision=39633
2011-10-27 15:35:48 +00:00
75c64294fa
Fix a typo.
...
svn path=/trunk/; revision=39632
2011-10-27 14:50:20 +00:00
7b6f829483
Correct an off-by-one error introduced in r39626.
...
svn path=/trunk/; revision=39631
2011-10-27 14:39:12 +00:00
01de3aea36
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6498 :
...
Initialize cip_req_info_t.ciaData, too.
svn path=/trunk/; revision=39630
2011-10-27 14:30:57 +00:00
8d25051a28
Followup to r39626: It is also necessary to initialize the number of services
...
to 0 (in case we throw an exception decoding the first service).
svn path=/trunk/; revision=39629
2011-10-27 13:30:32 +00:00
c0db24bf4d
Fix cut-and-pasteo that happened not to cause a problem on *P64
...
platforms but failed on *P32 platforms.
Remove the debugging code (the above was the problem in question).
svn path=/trunk/; revision=39628
2011-10-27 03:00:03 +00:00
4de661bb9f
Add a little shell script to export the appropriate variables necessary for
...
running valgrind and then run it on either tshark or (if the user is very
patient) Wireshark.
svn path=/trunk/; revision=39627
2011-10-27 02:32:32 +00:00
3c622f7b80
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6491 :
...
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-27 01:48:39 +00:00
a4e597b545
Add some debugging code; the current code doesn't work when compiled
...
with MSVC on Win32, and the fix will remove the debugging code as well.
svn path=/trunk/; revision=39624
2011-10-26 23:41:15 +00:00
269cc1920f
Fix a [-Wunused-but-set-variable] compiler warning;
...
Also: Remove trailing whitespace from lines.
svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
095c62b66e
The comparison with the UAT keys are broken, this is
...
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-26 21:42:45 +00:00
406678d63b
Declare unused parameters as such. Don't assign them to themselves.
...
svn path=/trunk/; revision=39620
2011-10-26 20:58:05 +00:00
05269a7178
Put the magic number into the aethra_hdr structure, to avoid compiler
...
padding of the structure getting in the way (it should now not require
padding).
svn path=/trunk/; revision=39619
2011-10-26 20:53:27 +00:00
0a1ded8725
Fix proto_tree_add_item() encoding args.
...
svn path=/trunk/; revision=39618
2011-10-26 20:43:58 +00:00
1fff1e1b09
Fix a proto_tree_add_item() encoding areg;
...
Use gboolean instead of int in certain cases.
svn path=/trunk/; revision=39617
2011-10-26 20:25:00 +00:00
e400a0c8cb
Fix proto_tree_add_item() encoding args;
...
Use gboolean instead of int in certain cases.
svn path=/trunk/; revision=39616
2011-10-26 20:06:48 +00:00
f7a3494571
Fix proto_tree_add_item() encoding args.
...
svn path=/trunk/; revision=39615
2011-10-26 19:24:58 +00:00
d6ac27ad42
Fix proto_tree_add_item() encoding args;
...
Also: remove unneeded #include.
svn path=/trunk/; revision=39614
2011-10-26 18:57:02 +00:00
6905e631dc
Fix some proto_tree_add_item() encoding args.
...
svn path=/trunk/; revision=39613
2011-10-26 18:38:09 +00:00
379f083acd
Fix some proto_tree_add_item() encoding args;
...
Remove some unneeded #includes.
svn path=/trunk/; revision=39612
2011-10-26 18:11:24 +00:00
542bf6f9b7
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=39611
2011-10-26 18:02:17 +00:00
4c2317f44d
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=39610
2011-10-26 18:02:01 +00:00
d7c13d0e2d
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=39609
2011-10-26 18:01:42 +00:00
bcefa6c2c3
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=39608
2011-10-26 18:01:25 +00:00
52ba0a20db
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=39607
2011-10-26 18:01:12 +00:00
d9623925e8
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=39606
2011-10-26 18:00:54 +00:00
4b79db3e55
Add missing hf[] entries (and fix proto_tree_add_item() encoding args).
...
svn path=/trunk/; revision=39605
2011-10-26 17:04:26 +00:00
8a00b9a315
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=39604
2011-10-26 15:53:25 +00:00
60bb13e25f
Removed duplicate enip.connection_transport_data entry.
...
This fixes bug 6490.
svn path=/trunk/; revision=39603
2011-10-26 12:15:07 +00:00
c3c789da98
Add a newline at the end of this file.
...
svn path=/trunk/; revision=39602
2011-10-26 10:09:20 +00:00
4a902dca46
Fixed compare functions for 64 bits integers:
...
- Do not cast unsigned values to signed
- Do cast signed values from the internal stored unsigned
svn path=/trunk/; revision=39601
2011-10-26 08:34:10 +00:00
32713e84c0
Try to get rid of defined but not used warnings.
...
svn path=/trunk/; revision=39600
2011-10-26 06:24:05 +00:00
2d9d7449b2
Try to fix
...
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-26 06:14:53 +00:00
7fe61d81e4
White space changes.
...
svn path=/trunk/; revision=39597
2011-10-26 05:07:57 +00:00
a81a945dc0
Extended with VSA:s from Peter Deacon trough
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6486
svn path=/trunk/; revision=39596
2011-10-26 05:03:26 +00:00
4cfaa22784
From Michael Mann:
...
Improved CIP and ENIP dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416
svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
7068d5df0a
Sync up the file format lists, add the Aethra files, and promote pcap-ng
...
to come right after pcap and not to be tagged as experimental.
svn path=/trunk/; revision=39594
2011-10-26 04:53:48 +00:00
986c31ef88
Get rid of the list of capture file formats, so we have one fewer list
...
that we can fail to update. Point the user at the Wireshark man page,
instead.
svn path=/trunk/; revision=39593
2011-10-26 04:51:48 +00:00
d7515bff87
Add the code to read Aethra files.
...
svn path=/trunk/; revision=39592
2011-10-26 04:31:06 +00:00
b4415758bf
Ok, we found what appears to be the capture start time. Use it.
...
Also mark what appear to be strings in the file header.
svn path=/trunk/; revision=39591
2011-10-26 04:05:17 +00:00
12e95e2cda
It appears that the octet in the record header after the record length
...
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-26 03:14:21 +00:00
72a96fc6a6
Avoid warnings.
...
svn path=/trunk/; revision=39589
2011-10-26 02:37:45 +00:00
e9ae3a0fd6
Initial support for .aps files from Aethra Telecommunications' PC108
...
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-26 02:18:55 +00:00
3b0625c340
Fix a spelling mistake. Wrap a few long lines.
...
svn path=/trunk/; revision=39587
2011-10-26 01:42:55 +00:00
601198e4fe
Forward-port r39581 from the 1.6 trunk.
...
svn path=/trunk/; revision=39582
2011-10-25 22:03:54 +00:00
15b6311c01
Fix proto_tree_add_item() encoding args.
...
svn path=/trunk/; revision=39580
2011-10-25 20:16:26 +00:00
ae8165fd4c
Fix some set but not used [-Wunused-but-set-variable] warnings.
...
svn path=/trunk/; revision=39579
2011-10-25 20:08:26 +00:00
54e47c8285
Fix proto_tree_add_item() encoding args.
...
svn path=/trunk/; revision=39578
2011-10-25 19:26:46 +00:00
b5d6e92fa4
Fix an encoding arg
...
svn path=/trunk/; revision=39577
2011-10-25 19:19:01 +00:00
Anders Broman