Commit Graph

51 Commits

Author SHA1 Message Date
Michael Mann 2eb7b05b8c Convert most UDP dissectors to use "auto" preferences.
Similar to the "tcp.port" changes in I99604f95d426ad345f4b494598d94178b886eb67,
convert dissectors that use "udp.port".

More cleanup done on dissectors that use both TCP and UDP dissector
tables, so that less preference callbacks exist.

Change-Id: If07be9b9e850c244336a7069599cd554ce312dd3
Reviewed-on: https://code.wireshark.org/review/18120
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-13 02:51:18 +00:00
Martin Kaiser f3d91fb58c asterix: remove unused hf entry
Change-Id: I17dc7cfb8144dbfe3e36ff1902ce91241c5629ed
Reviewed-on: https://code.wireshark.org/review/16536
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-19 05:53:29 +00:00
João Valverde ecb4dc396e Include ws_diag_control.h in config.h
Change-Id: Ia394071710ecda3b0e6686a51fbca45a8ff20317
Reviewed-on: https://code.wireshark.org/review/14749
Petri-Dish: João Valverde <j@v6e.pt>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04 23:05:31 +00:00
Andrew Hoag 7b3bfb80d8 ASTERIX: Add CAT025 dissection
The CAT025 type of ASTERIX messages is "CNS/ATM Ground System Status Report".

Change-Id: Icf39d595cef8663357a487b799bf32e738236757
Reviewed-on: https://code.wireshark.org/review/14590
Tested-by: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26 18:59:28 +00:00
Marko Hrastovec e7a24dc484 ASTERIX: fix for wrong RE and SP fields in CAT048.
Bug: 12267
Change-Id: I4871da19cb8b11e2df0de13993350a71168f7ab4
Reviewed-on: https://code.wireshark.org/review/14502
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-17 18:26:45 +00:00
Michael Mann 31a54708f4 new_register_dissector -> register_dissector for dissector directory.
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c
Reviewed-on: https://code.wireshark.org/review/12485
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 12:38:06 +00:00
Michael Mann 0aa9e98647 Convert some UDP subdissectors to "new" style.
Change-Id: I3c1ee97f68af4539b97d50b75c03ff82147dbc5e
Reviewed-on: https://code.wireshark.org/review/11649
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-09 15:59:42 +00:00
Pascal Quantin 05554f80f4 Asterix: field array must be NULL terminated
Bug: 11287
Change-Id: Iffcaa1cd2663768f616aedb550a101b7196e456b
Reviewed-on: https://code.wireshark.org/review/8975
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-18 10:33:10 +00:00
Andrew Hoag d5f1ae709b Asterix dissector support for category 021 v2.3
- Add item 040 field LLC
- Add item 200 field ME
- Edit item 271 field LW

Change-Id: I13b3774b248731f208b3b950f7ae0736398edbe4
Reviewed-on: https://code.wireshark.org/review/8892
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Marko Hrastovec <marko.hrastovec@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-17 21:34:30 +00:00
Marko Hrastovec 6fe0751a53 Asterix dissector can now dissect ASTERIX Category 004.
The code was added to dissect CAT004.

Change-Id: I7be543468d7df959db6bcef53d21d49846d29990
Reviewed-on: https://code.wireshark.org/review/8883
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-12 04:47:51 +00:00
Gerald Combs e56f34e200 Suppress more pedantic warnings.
Suppress

    warning: initialization of a flexible array member [-Wpedantic]

Change-Id: I49c2cf8b97539660742ef1b19752a0f56404d78a
Reviewed-on: https://code.wireshark.org/review/7155
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-16 03:27:44 +00:00
Marko Hrastovec f8fa70f4e8 Decoding of Asterix categories 063 and 065 extended to item decoding.
Categories 063 and 065 were decoded only partially. Now the dissector
dissects all the items in these two categories.

Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2
Reviewed-on: https://code.wireshark.org/review/6714
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-22 09:01:03 +00:00
Martin Mathieson 596669f921 First batch of unincludes. Last attempt...
Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9
Reviewed-on: https://code.wireshark.org/review/5997
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-22 21:03:13 +00:00
Bill Meier b5d7b7ab6e Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
   config.h and "system" #includes.
   packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
   packet.h. E.g., glib.h.
   (Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
   before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.

Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21 05:46:22 +00:00
Bill Meier f412c9a01a Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
(for some dissectors which fetch all other integral fields using
   ENC_BIG_ENDIAN).

Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56
Reviewed-on: https://code.wireshark.org/review/5748
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 18:45:56 +00:00
Marko Hrastovec 0415df8951 Asterix: fix Coverity scan (1025624 & 1025625: Missing break in switch)
Two comments are added to the code to notify Coverity scan that breaks are not put in switch statement intentionally.

Change-Id: Ie391790ee7365da56ddf0bf7b19042c9a11efddd
Reviewed-on: https://code.wireshark.org/review/5554
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-01 08:54:35 +00:00
Bill Meier c28f280c1d Fix a number of dup hf[] filter-names probably resulting from cut/paste errs.
Change-Id: I9242300b2ace3155c1506b584a90f073100a305e
Reviewed-on: https://code.wireshark.org/review/5512
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-26 23:27:31 +00:00
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