aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-opensafety.c
AgeCommit message (Collapse)AuthorFilesLines
2018-02-12dissectors: use SPDX identifiers.Dario Lombardo1-13/+1
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-07More [-Wmaybe-uninitialized] fixes with -OgJoão Valverde1-3/+3
There may be some amount of bogosity involved but initialize the variables and add a default case to prevent the noise and the build from breaking with -Werror. Change-Id: I20432ea74a1e5edc28be75a97077c9aa7bc87a35 Reviewed-on: https://code.wireshark.org/review/23426 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-06openSAFETY: Add transport protocol for UDPRoland Knall1-15/+114
Adding a transport protocol for UDP, which replaces the never used current implementation and adding also additional header information for the transport Change-Id: I943ac789bdc7355c114295dd1c8f1c1b475a5f8b Reviewed-on: https://code.wireshark.org/review/23408 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-18OpenSafety: sanity check calculated length.Michael Mann1-14/+14
Original sanity check was missed for fragmentation Bug: 13755 Change-Id: If9e24e01a119c869b02f198456776c8e6c6f2ad0 Reviewed-on: https://code.wireshark.org/review/22193 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-28openSAFETY: Set filter list for nodesRoland Knall1-1/+47
To enhance the possibility for dissections, add a list of nodes, you explicitly want to see and print an info text in the node list for all nodes filtered Change-Id: I08e8a7ddcfd7b78fee24431ffdae75124a8ecddd Reviewed-on: https://code.wireshark.org/review/21383 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-27[OpenSafety] Bugfix invalid length calculation.Michael Mann1-0/+7
Length calculation leads to -1, which will result in a large malloc https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1212 Bug: 13649 Change-Id: Iccb78b8c8ec9ca8e8f97bc12d0d8f41526d1f791 Reviewed-on: https://code.wireshark.org/review/21367 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-03Use col_append_str() for fixed stringsStig Bjørlykke1-2/+2
Change from col_append_fstr() to col_append_str() when appending strings without formatting. Change-Id: I8975704c246f2b9a1301ed5f96273aa9d61c6f44 Reviewed-on: https://code.wireshark.org/review/20857 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-29Register reassembly tablesMichael Mann1-3/+2
Register all reassembly tables with a central unit, allowing the central unit to have the callback that initializes and destroys the reassembly tables, rather than have dissectors do it individually. Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4 Reviewed-on: https://code.wireshark.org/review/19834 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-10Rename tvb_new_subset() to tvb_new_subset_length_caplen().Guy Harris1-4/+4
This emphasizes that there is no such thing as *the* routine to construct a subset tvbuff; you need to choose one of tvb_new_subset_remaining() (if you want a new tvbuff that contains everything past a certain point in an existing tvbuff), tvb_new_subset_length() (if you want a subset that contains everything past a certain point, for some number of bytes, in an existing tvbuff), and tvb_new_subset_length_caplen() (for all other cases). Many of the calls to tvb_new_subset_length_caplen() should really be calling one of the other routines; that's the next step. (This also makes it easier to find the calls that need fixing.) Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b Reviewed-on: https://code.wireshark.org/review/19597 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-31Dissectors don't need a journey of self discovery.Michael Mann1-12/+10
They already know who they are when they register themselves. Saving the handle then to avoid finding it later. Not sure if this will increase unnecessary register_dissector functions (instead of using create_dissector_handle in proto_reg_handoff function) when other dissectors copy/paste, but it should make startup time a few microseconds better. Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43 Reviewed-on: https://code.wireshark.org/review/19481 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-13Adjust proto_tree_add_uint_format_value calls to use unit stringMichael Mann1-25/+12
Several calls to proto_tree_add_uint_format_value could be better served using BASE_UNIT_STRING with a "unit string" in hf_ field. There also a few cases where proto_tree_add_uint_format_value could just be proto_tree_add_uint. Added a few more "common" unit string values to unit_strings.[ch] Change-Id: Iaedff82c515269c9c31ab9100dff19f5563c932d Reviewed-on: https://code.wireshark.org/review/19242 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-13Convert most UDP dissectors to use "auto" preferences.Michael Mann1-0/+1
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-08-04openSAFETY: Remove SCM UDID checkRoland Knall1-20/+0
This leads to too many false-negatives in certain traces Change-Id: Ia081dc802b6f55926beec2383a864173cae6eb51 Reviewed-on: https://code.wireshark.org/review/16883 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-08-03openSAFETY: Add two checks for scm udid validityRoland Knall1-33/+73
This is being done, to prevent false-positives which can not be filtered out using the heuristics, but have to be caught using additional check measurements Change-Id: I2ff2c97decf8a93d43f8f5b54e4d147552970b3f Reviewed-on: https://code.wireshark.org/review/16843 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-07-06openSAFETY: Simplify handling of SN Fail/AckRoland Knall1-47/+61
Also add information about error group/code acknowledged, and additional parameter set missing, if applicable Change-Id: I911d9941a33ff4064649090908e0fcc2bf6e00f8 Reviewed-on: https://code.wireshark.org/review/16319 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-07-05openSAFETY: Add byte offset of frameRoland Knall1-0/+8
Add the absolute byte offset of each openSAFETY frame to dissection, so a change in the offset can be easily detected Change-Id: Ib935eff7ba1e2e1169cb9071a5c9703cc58fc123 Reviewed-on: https://code.wireshark.org/review/16301 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-25openSAFETY: Change verbosity on expert notesRoland Knall1-9/+16
Expert Infos can be a little overwhelming in large traces. This preference will allow any user to enable the PI_NOTE declared expert infos to be shown only when they are really necessary. Fix a bug with SCM UDID validity detection as well Change-Id: I2d197684157f1ea748bfbcc6fa2dfdb348722223 Reviewed-on: https://code.wireshark.org/review/14625 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-17Associate dissector tables and heuristic subdissector lists with a protocol.Michael Mann1-1/+1
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris1-2/+2
That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08Fix a lot of typos and misspellingsmoshekaplan1-1/+1
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3 Reviewed-on: https://code.wireshark.org/review/13069 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09new_register_dissector -> register_dissector for dissector directory.Michael Mann1-3/+3
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-11-07Remove some unnecessary includes.Guy Harris1-1/+0
Either remove them completely, or put them inside an #ifdef. Change-Id: Iceff4909e250c17812f38d94e067f7c37ab72e1b Reviewed-on: https://code.wireshark.org/review/11630 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-30openSAFETY: Remove need for SIII dissector registerRoland Knall1-16/+9
Remove the need for the registration of a dedicated SIII dissector, as this might interfere with "Decode As" handling, as well as being redundant and no longer needed. The udpdata dissector can handle both and gate to the correct sub-dissector if necessary. Change-Id: I756cd845e7e8d64848d9928ad9ff04d571434835 Reviewed-on: https://code.wireshark.org/review/11421 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-08Replace or rename "duplicate" UDP protocols shown in Decode AsMichael Mann1-4/+4
Change-Id: I8cfd1c223c70c7e03728af8b2f7cbf9354d7ad86 Ping-Bug: 3949 Reviewed-on: https://code.wireshark.org/review/10865 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-06openSAFETY: Add Producer ID to info fieldRoland Knall1-8/+28
Cosmetic change, to better distinguish if multiple SPDO packages have been detected. This should also be back-ported to 1.12 and 2.0 Change-Id: I3d0b26ecb6e0cc60b3cdc9861920c5ccaeb70cbd Reviewed-on: https://code.wireshark.org/review/10829 Reviewed-by: Roland Knall <rknall@gmail.com> 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-09-22openSAFETY: Handle SPDO message types differentlyRoland Knall1-1/+13
SPDOs code the 0x04 bit differently, as it is not part of the message type, but rather a flag for connection validation I do not want to introduce a second message type, as this would break compatibility with existing stored filters, also adding the bitmask to the hf field, would alter the byte value, as it would shift the value to the right. Change-Id: I6b70bec29a55dfb556652d9dc940a896b864943b Reviewed-on: https://code.wireshark.org/review/10595 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-03Address "shadow" warnings found by checkAPI script.Michael Mann1-2/+2
These aren't "true" shadow issues, but the script doesn't completely understand C syntax (for things like struct member names "time" and "index"). But fixing them creates less noise. Change-Id: I5a2db1549095824530428529e86cab453c031a04 Reviewed-on: https://code.wireshark.org/review/10368 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-05openSAFETY: Better display of packet infoRoland Knall1-20/+29
If multiple packets of openSAFETY are present in a single network packet, searching for the packet needed is complicated. This patch increases the information along the same lines as the eth and frame subdissectors Change-Id: Id3d237135cfadb35c839208749aeeb1652b29830 Reviewed-on: https://code.wireshark.org/review/9871 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-23openSAFETY: Disable heur dissector & scm bugfixRoland Knall1-72/+63
- Bugfix for the SCM UDID, where the expert info was generated even if not necessary, and a SCM UDID consisting of zeroes was considered to be valid - Using the new method for enabling/disabling heuristic dissectors, this patch reworks the SIII dissection to perform exactly the same as the EPL dissection (which is the expected behavior) Change-Id: Ide559c3e104b77818cef642b34e0076a7c5bd13d Reviewed-on: https://code.wireshark.org/review/9735 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-17Remove all preferences related to enabling/disabling heuristic dissectors.Michael Mann1-4/+4
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector. Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled. Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22 Reviewed-on: https://code.wireshark.org/review/9610 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-12Add "user presentable" and "unique string ids" to heuristic table entries.Michael Mann1-4/+4
This allows better presentation of heuristic dissectors to the end user. Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6 Reviewed-on: https://code.wireshark.org/review/9602 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Split more init routines into init/cleanup functionsPeter Wu1-3/+8
This patch is partially automatically generated, but are modified manually. In particular, assignments and function calls have been audited. Some debugging comments and ifdef'd prints have been removed. The lookup tables of the dcm and sip dissectors are now cleared. It is only called on reopening files anyway. The isakmp dissector is modified to use g_hash_table_new_full for destruction of its keys and values. Fix a memleak in ipsec dissector when libgcrypt is not enabled. Generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=3c6128ee266024d164650955f93c7740484abd68 (with AUDIT = True). Change-Id: I3fd910bdee663842ac0196334fe0189b67e251b0 Reviewed-on: https://code.wireshark.org/review/9225 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-26openSAFETY: Fix various heuristic bugsRoland Knall1-13/+36
- Wrong true-positives if the frame got wrongly detected Change-Id: Ifaaec601bde260f8a38c61aad1e5e79b16003c60 Reviewed-on: https://code.wireshark.org/review/9123 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-10openSAFETY: Fix smaller bugs in detection and tapRoland Knall1-5/+23
- Add b16 counter to SPDO Time Request/Response - Mark generated time fields as generated - Fix +1 addition for frameOffset - Fix CRC2 calculation for subframes with just 5 bytes datalength Change-Id: I59ef7bf445de47c2bd165ae0f94d64d9f11d636b Reviewed-on: https://code.wireshark.org/review/8875 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-03openSAFETY: Fix false-positiveRoland Knall1-1/+4
- The starting offset for a consecutive frame search was off by 1 Change-Id: Ife77f9823e7e6d9a6601dba9c4cca74984e4ed40 Reviewed-on: https://code.wireshark.org/review/8741 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-20OpenSafety: Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-4/+1
by Clang Change-Id: Iccd80450835946abbe68d66fb4ccbc1c799e6065 Reviewed-on: https://code.wireshark.org/review/8137 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-19openSAFETY: Implementing a tap interfaceRoland Knall1-354/+496
Implementing a tap interface as well as a packet structure which contains all necessary information from a single openSAFETY frame. This structure is located in a separate packet-opensafety.h so that plugins and other programs, which want to utilize the tap interface, may benefit from the same defines The 40bit calculation was implemented in a wrong fashion, so that it never calculated the correct UDID Change-Id: I62895f91d0a255a5489b9bf397a40d824a27383f Reviewed-on: https://code.wireshark.org/review/7275 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-14openSAFETY: Replace deprecated APIRoland Knall1-3/+3
Replace deprecated API functions tvb_length and tvb_length_remaining Change-Id: Ibf4c7b12a1a6ea3b1a750dce7faf2f4933b4c470 Reviewed-on: https://code.wireshark.org/review/8063 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-12openSAFETY: Separate definitions into headerRoland Knall1-387/+48
To allow future tap interfaces as well as analysis plugins to use the same definitions the dissector used, all defines are being separated into a header file Change-Id: Iec38e361ded46aab6684c2713ba9a047193a6694 Reviewed-on: https://code.wireshark.org/review/7468 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-02OPENSAFETY: Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-3/+0
by Clang Change-Id: Ie566ae541d0d6cf5ac17150006de4f4498e790d6 Reviewed-on: https://code.wireshark.org/review/7493 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-28openSAFETY: Add support for openSAFETY 1.5Roland Knall1-113/+231
openSAFETY 1.5 will be the next version of the openSAFETY protocol. This will include all renditions necessary for future versions of the IEC 61784-3 specifications. - SNMT service for CT preseeding - 40 bit counter value flag support - Adapt CRC calculation for 40bit counter - Display 40bit counter value Change-Id: Ia9f8e11de813d27bc14437d32ee3d0486810c634 Reviewed-on: https://code.wireshark.org/review/5728 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-24openSAFETY: Remove Macro and clear dissectionRoland Knall1-94/+84
Removing the macros for packet sender/receiver as it makes the code hard to read and maintain. the more generic routine opensafety_packet_node is also used for displaying the time request sender and recipient. Also clearing up the message id field, as it is the wrong size and making the detection for the value an hf_field with an array value. Change-Id: I31cf0f944fe803fb503f4c5d29e106dfae0f6938 Reviewed-on: https://code.wireshark.org/review/7344 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19openSAFETY: Merge both CT valuesRoland Knall1-9/+5
Both values mean the same thing and should be found using the same hf_field, as this eases debugging scenarios. Change-Id: I23f675e22623b5e66354708319a41dcf34143e30 Reviewed-on: https://code.wireshark.org/review/7257 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punctMichael Mann1-2/+2
Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size) Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e Reviewed-on: https://code.wireshark.org/review/6369 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23Deleting unnecessary #includes from dissectors.Martin Mathieson1-3/+0
Fourth batch (packet-mac-lte.c -> packet-rtp.c). Will look at cleaning up and committing script afterwards. Change-Id: Id921f07f4b274f0cfb77ce81abe4a285fdb8b644 Reviewed-on: https://code.wireshark.org/review/6023 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-7/+3
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-11-16Remove ipproto member of packet_info.Michael Mann1-8/+11
All situations can be handled with "shimmed" dissector functions. Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8 Reviewed-on: https://code.wireshark.org/review/5327 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-05opensafety: Use 1<<10 (not 2^10) in a #define;Bill Meier1-1/+1
Comment out the #define since it's not actually used. :) Change-Id: Ia34200d3eb705a74a33cbcf18175a7f780f2d2e2 Reviewed-on: https://code.wireshark.org/review/5128 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-25openSAFETY: Heuristic marks packet as truncatedRoland Knall1-2/+5
- There are cases, where the heuristic detection tries to access bytes, after a correct openSAFETY frame has been detected, leading to "Packet truncated" messages in the correct and complete detected packet Change-Id: Ie389edf82144283ad2c15f0bf975066de01e3409 Reviewed-on: https://code.wireshark.org/review/4237 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-10Various minor changes:Bill Meier1-17/+18
- Create/use some extended value_strings - Remove unneeded #includes; - Do whitespace changes; - Add editor modelines. Change-Id: I2e1ea37dddfd5e8656c90c0d45a6596c4912bb2c Reviewed-on: https://code.wireshark.org/review/4065 Reviewed-by: Bill Meier <wmeier@newsguy.com>