aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
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-04-14Bluetooth: OBEX: Update to PBAP 1.2, GOEP 2.1, CTN 1.0 and GPP 1.0Michal Labedzki1-193/+1174
Add a lot of fields. Change-Id: If12a30b1840c0dbe934bc6af264a068935912832 Reviewed-on: https://code.wireshark.org/review/8043 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Oops, have to actually comment out the definition, not just the declaration.Guy Harris1-0/+2
Change-Id: Iea588a07f4c559f4455d85d6bf99f9a3b631caed Reviewed-on: https://code.wireshark.org/review/8066 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14Cast away a (non-relevant) warning.Guy Harris1-1/+1
Change-Id: Iee5029dc685561491660a8f711e58a652893bc90 Reviewed-on: https://code.wireshark.org/review/8065 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14That made some *other* routines unused; "#if 0" them out.Guy Harris1-0/+6
Change-Id: I932765f724b6f38afafa8cba7bea6ee210c6b2e5 Reviewed-on: https://code.wireshark.org/review/8064 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14"#if 0" out some unused variables and functions.Guy Harris1-0/+42
This should be checked - why are they being generated by idl2wrs? Change-Id: I35956f95b3679fc06e2c63ddc1313733813e5f3f Reviewed-on: https://code.wireshark.org/review/8062 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14Get rid of extra variable.Guy Harris1-10/+4
That assigns all string members with a g_strdup-family function, making the assignment of the name similar to the other assignments. Change-Id: I5f2a4afbad5173b8428ba1bbe435f851e8cc1a19 Reviewed-on: https://code.wireshark.org/review/8061 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14Change deprecated API tvb_length -> tvb_reported_lengthAndersBroman17-57/+57
Change-Id: I14577dccaed5aa5ed85e94b6810a94b4c8b2e437 Reviewed-on: https://code.wireshark.org/review/8059 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-14GIOP: Reassembly of fragmentsgal2-6/+188
Support for the reassembly of GIOP Fragment message types. A new bool preference (giop.reassemble) is introduced to control reassembly and it is enabled by default. Change-Id: I10ca51f745710dca3b57a03cc89126f7b1dc06b4 Reviewed-on: https://code.wireshark.org/review/7966 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-04-14Geospatial and Imagery Access Service (GIAS) Dissectorgal3-0/+8267
A Corba (GIOP) based protocol for the exchange of Intelligence, Surveillance and Reconnaissance (ISR) products. Defined in STANAG 4559/AEDP-5 "NATO Standard ISR Library Interface (NSILI)" See http://www.nato.int/structur/ac/224/standard/4559/4559.htm for more information. The dissector is generated using idl2wrs using the gias.idl, with some manual corrections, as noted in README.gias. Patch Set 4: Initialise uninitialised variables and no longer mark them as unused. Change-Id: Ieae93a135b30078f2d34e66f8c7b2e476438224e Reviewed-on: https://code.wireshark.org/review/7965 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-04-14Bluetooth: SDP: Update to MAP 1.2 and PBAP 1.2Michal Labedzki1-14/+294
There are some new attributes comparing MAP 1.1 to 1.2 and PBAP 1.1 to 1.2. Change-Id: I4be2691e99d176c22676a00549aa550ea07e77e3 Reviewed-on: https://code.wireshark.org/review/8042 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Bluetooth: OBEX: Fix reassemble at transport layerMichal Labedzki1-54/+79
Transport layer is RFCOMM. OBEX packet may be fragmented over RFCOMM. If so then (Opcode + Final flag + ) Packet Length determines packet length, but whole OBEX packet will be framented over parts/packet that first packet has Packet Length and next packets are sequential parts of whole packet (no header, etc.) Reassemble on this level is simple concatenation of all packet up to Packet Length. Let threat packet shorted than 3 bytes as bad packet. There is still no reasssemble on OBEX level (aka Final flag), so content send over OBEX (vCards, files, XMLs) is still not reassembled. Change-Id: I11882eb07480b34d274a4ca6e504e609dcf982c0 Reviewed-on: https://code.wireshark.org/review/8041 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Bluetooth: OBEX: Add request/response trackingMichal Labedzki1-61/+78
Change-Id: I691d8a89c222208afb3b1bcd924a2331ea58af5b Reviewed-on: https://code.wireshark.org/review/8040 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Bluetooth: GATT/L2CAP: Add support for 6LoWPANMichal Labedzki1-3/+8
6LoWPAN is used by GATT level profile called IPSP. Change-Id: Iff2e1a8d531072d9bba03e7d84b56db59110cb35 Reviewed-on: https://code.wireshark.org/review/8045 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Bluetooth: HFP: Update to HFP 1.7Michal Labedzki1-4/+127
Update to latest Bluetooth specification: 1.7 (previously 1.6) Add +BIND and +BIEV commands, also update +BRSF to support new features. There is still some things to implement, but need more work to do it, like request-response tracking. Change-Id: I195380b9588f3a3e5b07628fbe9d5c66ed46fbfd Reviewed-on: https://code.wireshark.org/review/8046 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Just use g_strdup_printf() to create a g_mallocated formatted string.Guy Harris1-13/+5
And, as it's g_mallocated, we don't need to g_mallocate it again with g_strdup(). The same is true of strings allocated with g_strconcat(). Don't make an extra copy, and don't free up the original. Change-Id: Iea470a4424a811934f7fb8b0ba8dd110d337e420 Reviewed-on: https://code.wireshark.org/review/8058 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14UI: Implementing menus for pluginsRoland Knall4-0/+354
Plugins may utilize the tap interface to provide special tools or analysis options, not otherwise available in Wireshark, or perhaps not allowed to be distributed freely. Up until now, those tools either had to start automatically, or could not be started at all, or had to be started separately. It should be possible, that those tools may be started using a menu entry directly from Wireshark. This interface tries to achieve exactly that. This interface uses a clean interface, which can be implemented in any plugin or dissector. Documentation for this has been added to README.plugins. Separators are only supported for now in the Qt interface, but URLs can now be added as a simple item, and the UI will use the same methods used for other URL calls to open them. Change-Id: I170107dafb66f6badaa864d05a9091e5cbbf52c2 Reviewed-on: https://code.wireshark.org/review/7865 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-04-13More casts.Guy Harris1-3/+3
Change-Id: I0c8969bcb986350fa58f65d8e67394766b734286 Reviewed-on: https://code.wireshark.org/review/8055 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-13Cast away some warnings.Guy Harris1-6/+6
offsetof() doesn't necessarily return an int-sized value; cast it to guint. Change-Id: Ie0072d62de0178f87bc3168e3f8f1a03d9ec69d5 Reviewed-on: https://code.wireshark.org/review/8053 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-13Support for new netscaler 3.5 trace format.anilkumar9111-5/+657
Change-Id: Ica74f3f9239a96486967cf248feb4313bc390734 Reviewed-on: https://code.wireshark.org/review/7751 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-04-13Add more "bitmask grouping" APIs.Michael Mann5-147/+257
Add proto_tree_add_bitmask_value, proto_tree_add_bitmask_value_with_flags and proto_tree_add_bitmask_list to aid in the removal of proto_tree_add_boolean "groupings" as well as "groups" of fields that use proto_tree_add_item with the same offset/len. This may be able to be optimized later, but the first step will be converting dissectors to use it. A sample conversion of each API is also included. Change-Id: I53febc7450ad632482f82615a7fa62174f8472c9 Reviewed-on: https://code.wireshark.org/review/8038 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-04-13GSM A: force display of the bits sequence corresponding to "Degrees of ↵Pascal Quantin1-1/+1
longitude" field It makes the display more consistent with other fields of Location Estimate IE Bug: 11114 Change-Id: Ib31c61a34f419cf97601a660f3b807454b1becd9 Reviewed-on: https://code.wireshark.org/review/8049 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-13Remove deprecated API tvb_lengtRemove deprecated API tvb_lengthAndersBroman6-12/+12
Change-Id: Iea7dd7d13ce1a2ee375a2c4a75f897ba2c936921 Reviewed-on: https://code.wireshark.org/review/8048 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-12[Automatic update for 2015-04-12]Gerald Combs2-19/+219
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ide45514d6fd320962b642ed7c86bca959f2c58f7 Reviewed-on: https://code.wireshark.org/review/8029 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-10Remove depricated API tvb_length -> tvb_reported_lengthAndersBroman17-40/+40
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a Reviewed-on: https://code.wireshark.org/review/8011 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-10MIP6: Remove proto_tree_add_textAlexis La Goutte1-5/+14
Based on packet-ip.c Change-Id: Ibc561b58d5f4b3e3469e1c578e83b3abe3c206f8 Reviewed-on: https://code.wireshark.org/review/8008 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-04-09OCFS2: fix some GCC / Clang warningsAlexis La Goutte1-3/+5
packet-ocfs2.c:249: comma at end of enumerator list [-Wpedantic] packet-ocfs2.c:1171: no previous prototype for 'proto_register_ocfs2' [-Wmissing-prototypes] packet-ocfs2.c:1651: no previous prototype for 'proto_reg_handoff_ocfs2' [-Wmissing-prototypes] packet-ocfs2.c:1678:4: no newline at end of file [-Wnewline-eof] Remove also unneed glib.h include Change-Id: I47a03dbc9f175a0e2453dd90a733144ac9f95fc4 Reviewed-on: https://code.wireshark.org/review/8007 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Replace PROTO_TREE_ADD_XXX_ITEM macro use with real code.Michael Mann1-40/+63
PROTO_TREE_ADD_XXX_ITEM had a bug in it for int values. This was fixed by adding proto_tree_set_ ## ctype ## to the macro, but not all compilers support macros at the end of a function, so just remove the macro entirely and just have the duplicate code. Change-Id: Icf92a6786daa0e84305ba174ce155833f90b6463 Reviewed-on: https://code.wireshark.org/review/8006 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-09Correct macro expansion in PROTO_TREE_ADD_XXX_ITEM for integer fields.Michael Mann1-1/+1
Change-Id: I57e5dcfabc1c1b4c024b9e1cbfd8b9a34c79c330 Reviewed-on: https://code.wireshark.org/review/8003 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Replace deprecated API tvb_length -> tvb_reported_lengthAndersBroman8-42/+51
Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09REplace deprecated API tvb_length -> tvb_reported_lengthAndersBroman6-16/+16
Change-Id: I6090055a9c31f6787626b810de655d1cc71b99de Reviewed-on: https://code.wireshark.org/review/8002 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09802.11: use switch for Aruba typeAlexis La Goutte1-9/+7
Change-Id: I7f0f10ca695fedab613156811fac60e5fa015bee Reviewed-on: https://code.wireshark.org/review/8000 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09802.11: don't return when Wrong Tag LengthAlexis La Goutte1-9/+9
Change-Id: I8de390e273e06620a8cdf62acae076ed6dd10a54 Reviewed-on: https://code.wireshark.org/review/7999 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Replace deprecated API tvb_length... with tvb_reported_length...AndersBroman3-19/+19
Change-Id: I44732d2743ba461d1791bb3795b0aef5a314bc1f Reviewed-on: https://code.wireshark.org/review/8001 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09TRILL: Fix incorrect header lengthMarian Ďurkovič1-1/+2
Change-Id: I508ee3d4143235157f223e5b9cd16d70cdf1fa72 Reviewed-on: https://code.wireshark.org/review/7997 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-09Improve ATH dissector.Michael Mann1-1/+11
Address comments made after initial dissector was submitted. Change-Id: Ic42431d8af1d281dbe6f67a8f3f4d5e0aeea4156 Reviewed-on: https://code.wireshark.org/review/7995 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-04-09zigbee: correct zcl meas sensingJulien STAUB1-7/+7
corrected the relative humidity measurement 0.00 to 100.00 values. Previous version had bug for example 0.01% -> display 0.1% Change-Id: I3955d36d1f2a1334ef7baab4fd854f13950d1951 Reviewed-on: https://code.wireshark.org/review/7983 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-08[IEEE 802.11] fix two potential endless loopsMartin Kaiser1-0/+4
add_tagged_field() may return 0 if the tag length is not what is expected for this particular tag Bug: 11110 Change-Id: Ia2fd6635613fb6d8e1264147d2ddd44162484887 Reviewed-on: https://code.wireshark.org/review/7989 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-08ATH dissectorEugene Adell3-0/+454
Change-Id: Idb51bb15e0e0764bd686cb4e822c313779245a4f Reviewed-on: https://code.wireshark.org/review/7807 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-08802.11: Not showing all 11k subelement fieldsAlexis La Goutte1-1/+55
Add support of Reported Frame Body (subelement of Beacon Report) Bug:11101 Change-Id: I44f313ef081fcba7aaf6208baed81a46152fddb6 Reviewed-on: https://code.wireshark.org/review/7970 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08WiFi P2P: Update to Peer-to-Peer (P2P) Technical Specification Version 1.5Alexis La Goutte1-4/+284
Add new IE 19 Out-of-Band Group Owner Negotiation Channel 21 Service Hash 22 Session Information Data Info 23 Connection Capability Info 24 Advertisement_ID Info 25 Advertised Service Info 26 Session ID Info 27 Feature Capability 28 Persistent Group Info Bug:11074 Change-Id: I627ca5906c1e3235aa7d4abb4ebfa757825b7fbf Reviewed-on: https://code.wireshark.org/review/7914 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: Anders Broman <a.broman58@gmail.com>
2015-04-08Replace deprecated tvb_length with tvb_reported_length.AndersBroman8-28/+28
Change-Id: I45d2ae41da823c50ba383a8e2aaec570ee3ad842 Reviewed-on: https://code.wireshark.org/review/7979 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08Remove RTAC Serial preference that doubled for Decode As.Michael Mann9-90/+12
Just use Decode As directly. Change-Id: Iab03a6ff8a70c3c6b0406f426e622eb52bb34ba7 Reviewed-on: https://code.wireshark.org/review/7902 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-04-08Remove MPLS preference that doubled for Decode As.Michael Mann8-219/+34
Just use Decode As directly. Also replace "registered" dissectors which just the creation of a handle since the dissectors really don't need to be "found" outside of themselves. Change-Id: I1e0c3ae784b71c0145b1f1730a97feae8e9f488f Reviewed-on: https://code.wireshark.org/review/7899 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-08Add proper "Decode As" mechanism for FLIP payload instead of (many) preferences.Michael Mann3-360/+76
Other cleanup with FLIP dissector while in the neighborhood. Change-Id: I0ecdea447979b0ba508a8bb84bd67e4eb4b32a70 Reviewed-on: https://code.wireshark.org/review/7896 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-07ATM: add a cast to pacify the OSX 10.5 x86 buildbotPascal Quantin1-1/+1
Change-Id: I2bff621b46b4811cf60ebaff8fca7429bed3a91e Reviewed-on: https://code.wireshark.org/review/7973 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-07ieee80211.c: "IEEE 802.11 plus Network Monitor radio header" encap: Fix ↵Bill Meier1-3/+4
dissection Specifically: Management/Control frames saved by Microsoft Netmon (3.4?) with "IEEE 802.11 plus Network Monitor radio header" encapsulation may or may not be saved with an FCS. See Bug 11105. Fix: Use "check fcs" preference to specify whether Management & Control frames have an fcs for this encapsulation. Change-Id: Ibd0be7b4765c2df2b959cb2234aeed027266246b Reviewed-on: https://code.wireshark.org/review/7939 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07802.11: don't not showing all 11k subelement fieldsAlexis La Goutte1-0/+1
Missing break for Measurement Report tag Ping-Bug:11101 Change-Id: I570088f1eed756d541be74539774295eb67c2d47 Reviewed-on: https://code.wireshark.org/review/7969 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07SGSAP: fix indent (use 4 spaces)Alexis La Goutte1-1/+1
Change-Id: I0c649d0a799817dea66ad297d47f9f22fdaa32c9 Reviewed-on: https://code.wireshark.org/review/7968 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07[SGSAP] Use the subtree for MCC MNC.AndersBroman1-1/+1
Change-Id: I9913fb0d92193723e8e83a58e0d76782b3d20204 Reviewed-on: https://code.wireshark.org/review/7967 Reviewed-by: Anders Broman <a.broman58@gmail.com>