Commit Graph

37829 Commits

Author SHA1 Message Date
Guy Harris 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
Bill Meier 0a1ded8725 Fix proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39618
2011-10-26 20:43:58 +00:00
Bill Meier 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
Bill Meier 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
Bill Meier f7a3494571 Fix proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39615
2011-10-26 19:24:58 +00:00
Bill Meier 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
Bill Meier 6905e631dc Fix some proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39613
2011-10-26 18:38:09 +00:00
Bill Meier 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
Alexis La Goutte 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
Alexis La Goutte 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
Alexis La Goutte 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
Alexis La Goutte 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
Alexis La Goutte 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
Alexis La Goutte 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
Bill Meier 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
Alexis La Goutte 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
Stig Bjørlykke 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
Martin Mathieson c3c789da98 Add a newline at the end of this file.
svn path=/trunk/; revision=39602
2011-10-26 10:09:20 +00:00
Stig Bjørlykke 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
Anders Broman 32713e84c0 Try to get rid of defined but not used warnings.
svn path=/trunk/; revision=39600
2011-10-26 06:24:05 +00:00
Anders Broman 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
Anders Broman 7fe61d81e4 White space changes.
svn path=/trunk/; revision=39597
2011-10-26 05:07:57 +00:00
Anders Broman 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
Anders Broman 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
Guy Harris 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
Guy Harris 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
Guy Harris d7515bff87 Add the code to read Aethra files.
svn path=/trunk/; revision=39592
2011-10-26 04:31:06 +00:00
Guy Harris 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
Guy Harris 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
Guy Harris 72a96fc6a6 Avoid warnings.
svn path=/trunk/; revision=39589
2011-10-26 02:37:45 +00:00
Guy Harris 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
Jeff Morriss 3b0625c340 Fix a spelling mistake. Wrap a few long lines.
svn path=/trunk/; revision=39587
2011-10-26 01:42:55 +00:00
Gerald Combs 601198e4fe Forward-port r39581 from the 1.6 trunk.
svn path=/trunk/; revision=39582
2011-10-25 22:03:54 +00:00
Bill Meier 15b6311c01 Fix proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39580
2011-10-25 20:16:26 +00:00
Anders Broman 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
Bill Meier 54e47c8285 Fix proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39578
2011-10-25 19:26:46 +00:00
Bill Meier b5d6e92fa4 Fix an encoding arg
svn path=/trunk/; revision=39577
2011-10-25 19:19:01 +00:00
Anders Broman 05452c11ab From Pascal Quantin.
wrong decoding of Activate default EPS bearer context request message containing a IPv6 interface id.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6484

svn path=/trunk/; revision=39575
2011-10-25 19:15:55 +00:00
Anders Broman 993f5d3ccc Make Custom.nmake usable.
(Should it be Custom_make.common or something like that)

svn path=/trunk/; revision=39574
2011-10-25 19:10:34 +00:00
Gerald Combs 920eaae369 In dist-hook, don't try to copy version.conf if it already exists in the
destination directory.

svn path=/trunk/; revision=39572
2011-10-25 19:04:26 +00:00
Stig Bjørlykke 447de1178d Allow signed integers displayed as BASE_HEX_DEC.
svn path=/trunk/; revision=39571
2011-10-25 19:04:10 +00:00
Bill Meier 0b9a4b16ef Fix proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39570
2011-10-25 18:51:57 +00:00
Stig Bjørlykke 48f714096a Display BASE_DEC_HEX correct for int64/uint64.
svn path=/trunk/; revision=39569
2011-10-25 17:58:08 +00:00
Bill Meier 024230ece0 Update information about 'encoding' arg values for particular field-types.
svn path=/trunk/; revision=39568
2011-10-25 17:27:48 +00:00
Bill Meier 2374c799a6 Add encoding arg fix capability for proto_tree_add_bits_item,...,tvb_get_bits,...ptvcursor_add,...
Add 'find-all' capability.

svn path=/trunk/; revision=39567
2011-10-25 17:04:48 +00:00
Bill Meier 3f5b02de51 Fix encoding arg for ptvcursor_add() and ptvcursor_add_noadvance() function calls.
svn path=/trunk/; revision=39566
2011-10-25 16:04:31 +00:00
Bill Meier ef7f568963 Fix encoding arg for call to tvb_get_unicode_string().
svn path=/trunk/; revision=39565
2011-10-25 15:53:29 +00:00
Chris Maynard c66c5230a2 Fix Coverity CID 432, "Missing Break".
svn path=/trunk/; revision=39564
2011-10-25 14:19:34 +00:00
Stig Bjørlykke 2d62e550b7 Added another Lua warning:
- FT_FRAMENUM can not have a bitmask.

svn path=/trunk/; revision=39563
2011-10-25 11:20:54 +00:00
Stig Bjørlykke 943c8b97ed Added Lua error messages when:
- Adding a INT64/UINT64 field with a value string (currently unsupported).
- Trying to display a signed integer as hexadecimal.

svn path=/trunk/; revision=39562
2011-10-25 11:13:11 +00:00