aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-02-17STUN : fix indent (use 4spaces)Alexis La Goutte1-45/+45
Change-Id: Ifbaf0f396b24d5506722f0e0df0dd17c1969a435 Reviewed-on: https://code.wireshark.org/review/7202 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-17802.11: fix no previous prototype for 'wlan_col_filter_str' & ↵Alexis La Goutte1-9/+9
'wlan_bssid_col_filter_str' [-Wmissing-prototypes] Fix also some indent typo (3spaces -> 2spaces) Change-Id: I1aa9df1540e80946b85dde0e6bd87bf39e8d8f19 Reviewed-on: https://code.wireshark.org/review/7199 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-17CMIP: get rid of some evil global variablesPascal Quantin1-69/+47
Fixes an ASAN failure reported by Alexis Note that some global variables remain as I do not know enough on this protocol to safely remove them Change-Id: If392a8f09ef2fc2f2d46871a71149e29fe5e292c Reviewed-on: https://code.wireshark.org/review/7099 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-17Corrected display format for EUI-64Robert Cragie1-1/+1
Change-Id: I0913337a29efac5c39e30897cad7e90195fa984a Reviewed-on: https://code.wireshark.org/review/7198 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-17PCP: updated protocol dissection for new PDU typesRyan Doyle1-124/+278
Introduce basic dissection for AUTH PDU type as well as detecting if a conversation is about to initiate a secure sockets connection (kind of like STARTTLS) and then pass all packets through the SSL dissector if that is the case. Also clean up some duplication with constants. Change-Id: I66f663ca6ab4291f8d0321430e3e126a0be77a93 Reviewed-on: https://code.wireshark.org/review/7109 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-17Give users a more helpful error message if they enter an SSL protocol we don'tJeff Morriss1-3/+9
know. First, if we know the protocol (by filter name) tell them that the dissector just isn't set up to run over SSL but it could be--if they contact the Wireshark developers. Second, don't tell them that the dissectors which have called ssl_dissector_add() are the only ones that are valid; those are just commonly used ones. Change-Id: I1b72bccd4c96c21c73a19fa2d87fe2c0b875a0fa Reviewed-on: https://code.wireshark.org/review/7185 Reviewed-by: Richard Sharpe <realrichardsharpe@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-02-17Don't send an effectively empty message (no TVBs) to the SCTP tap.Jeff Morriss1-1/+1
This prevents the tap from crashing (asserting out) because there's no (initialized) TVB to look at. Bug: 9849 Change-Id: I370a49ef32a67e504c30cf1762a2180bf13c56ca Reviewed-on: https://code.wireshark.org/review/7190 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-02-17Added JSON native file support.Dario Lombardo9-645/+32
libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap. Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c Bug: 10878 Reviewed-on: https://code.wireshark.org/review/6716 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-16Fix FSF address.Guy Harris1-4/+3
Change-Id: I3881fcd211bbfbecd92c3a8c2a440da30b20393f Reviewed-on: https://code.wireshark.org/review/7188 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-16Whitespace fix (space before tab)Joerg Mayer1-4/+4
Change-Id: Iccbac2ff5d95639d478437eefa16d1dd2757128b Reviewed-on: https://code.wireshark.org/review/7186 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-02-16Fix declaration and export the routines.Guy Harris1-3/+5
Add a missing semicolon, and export the routines with WS_DLL_PUBLIC, so they can be used by plugins. Change-Id: Iaf52e70ce9fbfce3cfa675c453b7d39a0341dfeb Reviewed-on: https://code.wireshark.org/review/7184 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-16We now get that from common libwireshark code.Guy Harris1-8/+0
Change-Id: If3b15d01689c6bbfad6422c4a30f9ece5e2b3b83 Reviewed-on: https://code.wireshark.org/review/7183 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-16Put the 64-bit hash routines into a common file.Guy Harris7-26/+126
Some or all are used by the Infiniband, MBIM, and RSVD dissectors; put them into a common source file, with a header for them, and just include the header in the dissectors. Change-Id: I724f0c2232ba751ccbd491222af6f03bafd6d63c Reviewed-on: https://code.wireshark.org/review/7182 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-16RSVD: fix compilation with GLib < 2.22.0Pascal Quantin1-0/+8
Change-Id: Ia82d42faa766f68e167b1c1affa5307980909fb8 Reviewed-on: https://code.wireshark.org/review/7181 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-16Fix a portability problem raised by Guy Harris. My first implementation wouldRichard Sharpe1-4/+7
not work on 32-bit platforms because I assumed that pointers were 64-bit items. I have now moved to a slightly different scheme suggested by Evan Huus. Change-Id: I34f4dceea9952d5633603e71a8e8ae8f4b9154cc Signed-of-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/7179 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2015-02-16Get rid of duplicate typedef.Guy Harris1-2/+2
Change-Id: I389132ec27405394ca73fb9c09950d8a91ea32a7 Reviewed-on: https://code.wireshark.org/review/7180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-16[80211ac] Change VHT MIMO Control to use add_bitmaskAnish Bhatt1-27/+18
Change-Id: If3d597dd6dbf746e0f971e52073f9790b6a0ceda Reviewed-on: https://code.wireshark.org/review/7128 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-02-16[80211ac] Add partial beamforming supportAnish Bhatt1-5/+260
Adds support to decode beamforming report, but actual beamforming matrices are not decoded. Requires bit level manipulation of varying lengths of data which is not currently supported, and section spec only seems to mention size and contents, not representation Bug 10169 Change-Id: Icc2188b79f95b5e38b64ded348b7a0696b5504ed Reviewed-on: https://code.wireshark.org/review/7111 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-16[Diameter] Use proto_tree_add_bitmask() to add the diameter flags.AndersBroman1-16/+14
Change-Id: I9cb6e46551b0a25a458311a53365469552d5c195 Reviewed-on: https://code.wireshark.org/review/7177 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-16Make get_manuf_name return a const string.Michael Mann4-49/+89
Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to worry about the wmem_allocator. Change-Id: If976fe7b0c3f9cd053225096c2ac05418f061af6 Reviewed-on: https://code.wireshark.org/review/7081 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-16[STUN] Avoid fetching stuff twice from the tvb.Anders1-33/+55
Change-Id: I923818ea41791b2f41c5bce3c5927014580eb2b7 Reviewed-on: https://code.wireshark.org/review/7174 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-16Complete the RSVD Dissector further by handling SCSI requests.Richard Sharpe1-23/+243
Still have to handle response, but this points the way, I think. Handle responses. Still have to handle sense info. Change-Id: Ic692de15b8178fbe274791ffbc000e8f35b40653 Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/7127 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-16Suppress more pedantic warnings.Gerald Combs1-0/+29
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-16Revert "Revert "Fix duplicate Display Filter Macro check""Guy Harris1-15/+20
This reverts commit 876c322df8b6a944cb4358c313c4fc46afe99719. Wrong branch. It builds in master; it does *not* build in 1.12 or 1.10. Change-Id: I3a2409d5a37f08965d6caac64dc97a48a1c5d1b8 Reviewed-on: https://code.wireshark.org/review/7152 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-16Revert "Fix duplicate Display Filter Macro check"Guy Harris1-20/+15
This reverts commit f5902a677e24ff96869d3c335f4fb8aaa6d0e543. This is not a simple cherry-pick; backporting this fix will have to be done manually. Change-Id: I53efc06a8e35c6b1aa793edf4e702cabee2e929b Reviewed-on: https://code.wireshark.org/review/7151 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-16proto(.h): fix parameter 'offset' not found in the function declaration ↵Alexis La Goutte1-1/+0
[-Wdocumentation] Change-Id: Ib79831e02a9a6457ca49c21536ce46df7d4cafa0 Reviewed-on: https://code.wireshark.org/review/7133 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-15Fix handling of invalid UAT itemsPeter Wu2-5/+29
If the UAT file failed a field check, then the user_data pointer may be empty. As a result uat_save() triggers an invalid write. (Discovered while working with a dfilter_macros file having duplicate names for bug 10957, caught by ASAN.) The second issue fixed in this patch is that the validity of an item is only calculated when a new record is added. So even if the user edits the UAT and makes the entry valid, it would not be saved. This is solved by adding a new uat_update_record() function which got wires up into GTK and Qt. Some open-coded g_array_index and UAT[_USER]_INDEX_PTR are also converted. Even after this patch, Qt has some issues with UAT handling. In particular, it saves new, but empty/invalid, items. It also it does not check individual fields when saving all fields (unlike Gtk). This patch focused on getting Gtk fixed first so ignores those existing issues. Change-Id: Ia35cfe9d2b793c65144ae7e29a1ed706b6668d99 Reviewed-on: https://code.wireshark.org/review/7120 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-15Fix duplicate Display Filter Macro checkPeter Wu1-15/+20
Since commit 4a1bd75b60171d781dc9f2d3ffd6d498acc74b1a (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7471), the data pointer does not match anything from the macros array. This patch fixes a false warning by checking for duplicates before the name is committed. Bug: 10957 Change-Id: Id61110bf63de1de80b85524705a2df6a5e7be33a Reviewed-on: https://code.wireshark.org/review/7119 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-15Handle DLT_LOOP differently from DLT_NULL.Guy Harris2-14/+85
That's a little cleaner, and lets us preserve the LINKTYPE_ value for DLT_LOOP captures. ("Preserve" here doesn't mean "write files with a link-layer header type of 12", as that's ambiguous; we write it with a link-layer header type of LINKTYPE_LOOP, i.e. 108. If programs on OpenBSD don't recognize that as DLT_LOOP, that's a bug in OpenBSD's libpcap or in the program.) Change-Id: I48a2e04aed41c013823ffb5c588d2a8e8b376e15 Reviewed-on: https://code.wireshark.org/review/7143 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-15epan/ftypes/*.[hc]: As needed: Add editor modelines & Fix indentationBill Meier11-1/+144
Change-Id: Ib0bd1ea7801ab450b300a94c4757f16d0dd75760 Reviewed-on: https://code.wireshark.org/review/7137 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-15Only call tvb_get_ptr() once to set src and dst addresses-Anders1-4/+4
Change-Id: I206b25ec512b3665b36307276ab3748e0a5ff73b Reviewed-on: https://code.wireshark.org/review/7135 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-15[Automatic manuf, services and enterprise-numbers update for 2015-02-15]Gerald Combs2-8/+213
Change-Id: Ie7aa5657e123ef609e05fc6f09782cc5d2443308 Reviewed-on: https://code.wireshark.org/review/7130 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-15IS-IS (LSP): Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-3/+3
by Clang Change-Id: I1b68151f0cb09afd6a6aeba2a71a15624c2fbc97 Reviewed-on: https://code.wireshark.org/review/7129 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-14Fix diagnostics macros and squelch a gcc warning.Gerald Combs2-2/+5
Both clang and gcc define __GNUC__. Make sure we account for that when defining diagnostic macros. Use DIAG_OFF + DIAG_ON to suppress gcc -pedantic warnings about frame_data. Get rid of packet_char_enc casts. Change-Id: Idbcc61bcdb35c1d20f185461c69451dcdf73bae9 Reviewed-on: https://code.wireshark.org/review/7106 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-14Remove a duplicate typedef.Gerald Combs1-2/+2
Change-Id: Ie26785cc3577bda84cb4d244aab5a607797b99fb Reviewed-on: https://code.wireshark.org/review/7118 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-14MIP6: Local Mobility Anchor Address mobility option code is treated incorrectlyAlexis La Goutte1-4/+5
The first packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=1. Wireshark parses its address as IPv4 address. The second packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=2. Wireshark parses its address as IPv6 address. According to RFC 5949 (https://tools.ietf.org/html/rfc5949#section-6.2.2), Option-Code=1 means IPv6 and Option-Code=2 means IPv4, exactly the opposite to what Wireshark does. Bug: 10961 Change-Id: I03b76dda8beae211e67e6c9e1f40d122e851b1b5 Reviewed-on: https://code.wireshark.org/review/7113 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-14MIP6: AUTH mobility option parses Mobility SPI and Authentication Data ↵Alexis La Goutte1-1/+1
incorrectly The authentication data in the AUTH option in attached IPv6 packet contains one byte too much. This byte is read beyond the option data. In Wireshark, clicking on the AUTH shows that the option ends at 0xCE while clicking on the Authentication Data shows that it ends at 0xCF. Reported by Boaz Bug:10626 Change-Id: I0bcfd6331bc1de30f25d16590487c0e3bf5c002f Reviewed-on: https://code.wireshark.org/review/7112 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-14"Hide" hashether_t structure.Michael Mann2-10/+22
One use in a GUI function isn't really enough to justify making the structure public. Change-Id: Ic7dee275ba0a2bd4e19c06702a867417c5624c27 Reviewed-on: https://code.wireshark.org/review/7080 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-14Don't check for C89 headers.Guy Harris4-16/+4
1988 called, they want their lack of a C standard back. We don't need to check whether we have stdarg.h, stddef.h, stdlib.h, or string.h, as they're specified by C89 and I don't think there are any platforms we care about that don't have a C89 environment in which we could be built. Change-Id: I447551181284fab7722354b62774625ed8ee94bc Reviewed-on: https://code.wireshark.org/review/7110 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-14We use GLib's directory-reading routines, so we don't need <dire[cn]t.h>.Guy Harris1-4/+0
Change-Id: Id86e5d6d0ab24adb1bfff0688f33a40f2fdaed8d Reviewed-on: https://code.wireshark.org/review/7108 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-13epan/dfilter/*.c: As needed: Add editor modelines & Fix indentationBill Meier13-122/+289
Change-Id: I410839329a98bd806c60961dfb9693d5eeeeb702 Reviewed-on: https://code.wireshark.org/review/7104 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-13wslua*: Add editor modelines; Fix indentation, etc as needed.Bill Meier12-76/+229
Change-Id: I6df5d46f4b263104aa9cb6353cc987087cdb867e Reviewed-on: https://code.wireshark.org/review/7102 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-13Replace tabs by spaces when editor modelines has "expandtab"Bill Meier24-4185/+4185
Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7 Also: tabs-stops should be 8 Reviewed-on: https://code.wireshark.org/review/7100 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-13A dissector for the RSVD Protocol (see [MS-RSVD].pdf).Richard Sharpe4-0/+654
There is still a little more work to do here, especially we should call the SCSI dissector for handling SCSI CDBs etc ... This is a potential fix for bug 10913. Ping-Bug: 10913. Change-Id: Ia8ff1a8207bb5b1cd18079086ff8c472ae3f8736 Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/7022 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-02-13Register the Mongo dissector by name so it can be used with TLS.Jeff Morriss1-0/+6
Change-Id: Ic9d688603747312aa29e5af038363f70c3cbae33 Reviewed-on: https://code.wireshark.org/review/7097 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-13Micro optimization, only do tvb_get_ptr() once for dst and srcAndersBroman1-9/+9
respectivly. Change-Id: I1cdc5742057830a47ea71769fb54ab8dfdd3de14 Reviewed-on: https://code.wireshark.org/review/7096 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-12Qt: Add the "new packet" window^Wdialog^Wwindow.Gerald Combs1-1/+1
Allow persistence across files. Preserve the use of "window" even though we're really a dialog. Update ByteViewTab and ProtoTree to support multiple instances. Remove the need for a cast in frame_data. Add more forward declarations. Change-Id: I50d3d9d1455b8ecc158a37218f9e41fe696d5ae2 Reviewed-on: https://code.wireshark.org/review/7086 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-12Fix crash at startup in SSE4.2 code when running a 32 bits Windows buildPascal Quantin6-17/+17
There is no guarantee that a g_malloc'ed memory block will be aligned on a 128 bits boundary Instead use a static variable definition (at the cost of exposing the HAVE_SSE4_2 compilation flag in ws_mempbrk.h) Change-Id: I661bf479a9d458d64c96bafc940c519d29a4780b Reviewed-on: https://code.wireshark.org/review/7070 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-12BT ATT: memory given to add_new_data_source() must be allocated in pinfo scopePascal Quantin1-1/+1
Bug: 10952 Change-Id: I0eb8e6891c35c70c9d405db87824c442caaa2f30 Reviewed-on: https://code.wireshark.org/review/7085 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-12[IS-IS-LSP] Add support for Prefix-SID subTLVAnish Bhatt1-24/+123
Bug: 10679 Change-Id: I4f2627aa22c64593258121a7e70b3f341e025d2e Reviewed-on: https://code.wireshark.org/review/7048 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>