Commit Graph

34 Commits

Author SHA1 Message Date
Evan Huus 08ce84ebbe Grab-bag of dead initializers and two actual bugs.
All caught by cppcheck. The two (semi)-interesting bugs are:
- in asn1/atn-cpdlc/packet-atn-cpdlc-template.c where the break statement should
  have been inside the brace, causing potential control-flow weirdness with
  exceptions
- in epan/dissectors/packet-ieee80211.c where the bounds check for tag_len did
  not match the expert info given

Change-Id: Ie173fb8d917aabb9b4571435d671d6f16e1c7569
Reviewed-on: https://code.wireshark.org/review/1793
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-25 18:12:00 +00:00
Marko Hrastovec 43bb76a720 Function to calculate twos complement is quicker and hopefully better understandable.
Change-Id: I1948eeaf5fa5aa4a5ccd0f81be894f655907a4dc
Reviewed-on: https://code.wireshark.org/review/1570
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-11 03:17:29 +00:00
Marko Hrastovec e1ce405449 ASTERIX - added dissector for category 023.
Sample file with traffic is the same as for CAT021 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9953). Apply filter "asterix.category == 23" to see only CAT023 packets.
A small change in actual dissecting code was also needed because of strange item I023/101. The first FX bit is in the second byte and then grows only for a byte.

Change-Id: I3f80e6e46b642efc6f2e19e6f931cdef1c39495a
Reviewed-on: https://code.wireshark.org/review/993
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-08 00:38:50 +00:00
Marko Hrastovec a90dfcb325 Bugfix for ASTERIX category 021.
It was found in https://code.wireshark.org/review/#/c/972/ and only commented out.
The bug is now fixed, the variable is used.

Change-Id: I0361b269a06f45f4d36b8bc97c3623618cb5f859
Reviewed-on: https://code.wireshark.org/review/976
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-06 10:15:31 +00:00
Hadriel Kaplan 293b5ea41d Get it compiling again: packet-asterix.c has unused const variable.
Change-Id: I07125f1779063527f24d9195a9999cef4c8fe343
Reviewed-on: https://code.wireshark.org/review/972
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-05 18:18:46 +00:00
Michael Mann f415e23d90 Decoder for category 021 added to ASTERIX dissector. Bug 9953.
Change-Id: If72685f41cd32854d6c0c04716ee640196431f87
Reviewed-on: https://code.wireshark.org/review/961
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-05 02:21:45 +00:00
Marko Hrastovec 3b69de702e Asterix CAT062 fix. Units for cartesian velocity of track were displayed with wrong units.
Change-Id: I716dfeb16b049544e691dcdf75c488758d9e1fa0
Reviewed-on: https://code.wireshark.org/review/707
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-17 09:59:19 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Bill Meier 93fe4d53e2 Remove trailing whitespace.
Change-Id: Ia03a1cd4590aceda30ead4aa93ad413d90c6aea6
Reviewed-on: https://code.wireshark.org/review/372
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25 16:36:38 +00:00
Evan Huus 953d54b120 From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9697

Architectural support for multiple version of the same Asterix categories.
Includes implementation of CAT064 v.0.17.

svn path=/trunk/; revision=54987
2014-01-28 00:48:23 +00:00
Martin Kaiser 0fa16ed92a From Marko Hrastovec
dissect all elements of category 48 messages

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

svn path=/trunk/; revision=54680
2014-01-09 13:45:51 +00:00
Martin Kaiser e830c290da From Marko Hrastovec
rename RE field len to make it generic for all categories
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9624

svn path=/trunk/; revision=54679
2014-01-09 13:02:27 +00:00
Martin Kaiser c05722e316 remove duplicate editor modelines
it's enough to have them at the end of the file

svn path=/trunk/; revision=54665
2014-01-08 18:21:33 +00:00
Martin Kaiser 5460e0960b From Antony Bridle
Added dissection capabilities for ASTERIX Category 062 Reserved
Expansion Field.

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

svn path=/trunk/; revision=54664
2014-01-08 18:16:36 +00:00
Bill Meier c00f8779f5 Don't use 'L' as a constant modifier.
svn path=/trunk/; revision=54358
2013-12-22 14:47:16 +00:00
Jakub Zawadzki c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Bill Meier 1b55ee144e Whitespace fixes: Replace some tabs by spaces & etc
svn path=/trunk/; revision=52950
2013-10-29 15:00:32 +00:00
Jeff Morriss 37a66d9e0b From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9347 :
Asterix dissector had two #if 0 ... #endif blocks because it obviously did not
compile on some systems.

Blocks were created because of mistyped variable names and variable not used
warning/error.

The errors were corrected.

svn path=/trunk/; revision=52949
2013-10-29 14:48:08 +00:00
Bill Meier 9874da2fcb #if 0 numerous "unused const variables" (mostly value-string-arrays);
Also; fix a few "set but not used" warnings.

svn path=/trunk/; revision=52780
2013-10-23 06:29:11 +00:00
Bill Meier a3a15ff90b Remove instances of unused 'data_handle' (and of one other handle).
svn path=/trunk/; revision=52767
2013-10-22 16:13:32 +00:00
Evan Huus 1370003bee From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9239

Add dissection of Asterix category 008.

svn path=/trunk/; revision=52496
2013-10-10 16:07:20 +00:00
Jakub Zawadzki f4bcbeb9f2 Keep result of [new_]register_dissector in some dissectors. [2 of x]
(don't create new dissector handle if we can use already existing one)

svn path=/trunk/; revision=51159
2013-08-05 19:09:44 +00:00
Stig Bjørlykke 9c58664956 From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8994

Adjusts field lengths to display values properly.

svn path=/trunk/; revision=51025
2013-07-30 08:49:32 +00:00
Jeff Morriss 38c4986b4b From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8926 :
A better fix for this bug (as compared to r50532): this version takes into
account the scaling factors.

svn path=/trunk/; revision=50732
2013-07-18 20:11:55 +00:00
Jeff Morriss 7ad38c4c9c From Dirk De Schepper via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8926 :
The dissector defines some one-byte fields as UFLOAT. Defining them as UINT
fixes the decoding error for CAT48 version 1.21.

svn path=/trunk/; revision=50532
2013-07-12 13:01:17 +00:00
Evan Huus 5633f7ffd5 From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8886

Fix an error in the scaling factor of field I062/380 subfield #28 in the Asterix
dissector.

svn path=/trunk/; revision=50424
2013-07-06 22:03:52 +00:00
Chris Maynard 6394e93dcb Fix Coverity CID 1025626 (Unintentional integer overflow) by declaring 1 as a 64-bit unsigned integer using G_GUINT64_CONSTANT().
svn path=/trunk/; revision=50289
2013-07-01 06:35:28 +00:00
Evan Huus 05eab3a2e6 From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8737
Add dissection of Category 009 to the ASTERIX dissector.

svn path=/trunk/; revision=49734
2013-06-03 23:27:01 +00:00
Jeff Morriss 8730b3e8c5 Fix:
Error: the blurb for hf_048_030_WE ("asterix.048_030_WE") matches the field name in epan/dissectors/packet-asterix.c

Also remove a few blurbs which aren't exact matches but are basically the same.

svn path=/trunk/; revision=49468
2013-05-20 23:23:34 +00:00
Evan Huus 5484210e11 More compiler warning fixes...
svn path=/trunk/; revision=49461
2013-05-20 20:45:52 +00:00
Evan Huus 0a0b6bf6c2 Third time lucky, hopefully fix the last of the compiler warnings...
svn path=/trunk/; revision=49460
2013-05-20 20:30:23 +00:00
Evan Huus 148d363586 Use doubles and FT_DOUBLE for better precision and to avoid a large
number of compiler warnings for systems where floats are 32 bits, but
floating-point literals default to 64-bit doubles.

svn path=/trunk/; revision=49459
2013-05-20 20:16:03 +00:00
Evan Huus 98d005506a Fix some compile warnings, and spread a struct definition over multiple
lines to make it obvious where the 32-bit cast is needed, since it's not
at all obvious to me...

svn path=/trunk/; revision=49458
2013-05-20 19:56:04 +00:00
Evan Huus 230205de79 From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8579
Dissector for ASTERIX (a radar data and air traffic controller protocol).

svn path=/trunk/; revision=49457
2013-05-20 19:23:41 +00:00