aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-08-13More INSTALL updates.Jeff Morriss1-41/+36
- We now support Gtk+-3, Gtk+-2, and Qt (Gtk+-1 is long dead). - Sync several of the configure options to what ./configure actually does (don't bother listing features which default to disabled though). - Don't mention sysconfdir since manuf doesn't go there any more (it goes in datadir). - Remove special install instructions for an ancient version of libpcap. - Point users to the Q&A site. Change-Id: I96a9e13fcf4225c526c5d9b536425b2d20e659f6 Reviewed-on: https://code.wireshark.org/review/3566 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-13Fix warning when compiling with -O3Joerg Mayer1-3/+4
/home/jmayer/work/wireshark/git/epan/dissectors/packet-lmp.c: In function ‘dissect_lmp’: /home/jmayer/work/wireshark/git/epan/dissectors/packet-lmp.c:776:13: error: array subscript is below array bounds [-Werror=array-bounds] ti = proto_tree_add_item(lmp_tree, ^ Change-Id: Ie949b4280f71a8f9f480a8e1d6592098ee7e67b5 Reviewed-on: https://code.wireshark.org/review/3573 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-13Fix warning when compiling with -O3:Joerg Mayer2-2/+3
/home/jmayer/work/wireshark/git/epan/dissectors/packet-ipp.c: In function ‘dissect_ipp’: /home/jmayer/work/wireshark/git/epan/dissectors/packet-ipp.c:583:78: error: ‘name_val’ may be used uninitialized in this function [-Werror=maybe-uninitialized] if ((name_length > 5) && name_val && !strcmp(name_val+name_length-5, "-time")) { ^ /home/jmayer/work/wireshark/git/epan/dissectors/packet-ipp.c:557:11: note: ‘name_val’ was declared here char *name_val; ^ Change-Id: I5e49596010572b285e4ca8f210cdcf49d56bfc10 Reviewed-on: https://code.wireshark.org/review/3572 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-13802.11 : 11ac decode update , base on IEEE-11ac-2013Luke Chou1-1/+261
IE193 Extended BSS Load element (8.4.2.162) IE194 Wide Bandwidth Channel Switch element (8.4.2.163) IE199 Operating mode notification And extend capabilities octet 8. Bug:10258 Change-Id: If5ef2b72eec2bdbf1d111eaa2b4d2d5954b7413b Reviewed-on: https://code.wireshark.org/review/2915 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-13SNMP : Continue to fix indent (use tab)Alexis La Goutte3-118/+114
Change-Id: I6b92deb2dbf9b9c4be7fd75d6d788755524a7483 Reviewed-on: https://code.wireshark.org/review/3570 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-13SNMP: Remove some unused hf fieldAlexis La Goutte2-28/+6
Change-Id: I33c89d07af6658569df3a9a094e2865e28ed0acb Reviewed-on: https://code.wireshark.org/review/3569 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-13Fix warning (turning error) when compiling with -O3Joerg Mayer1-1/+3
In file included from /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_glib.c:199:0: /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_algo.h: In function ‘generic_find_func’: /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_algo.h:486:14: error: ‘ud’ may be used uninitialized in this function [-Werror=maybe-uninitialized] TUserdata *ud; ^ /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_algo.h: In function ‘algf_gsub’: /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_algo.h:281:14: error: ‘ud’ may be used uninitialized in this function [-Werror=maybe-uninitialized] TUserdata *ud; ^ Change-Id: I835103ea562ced44bc3cce5fadf6115476a78d0e Reviewed-on: https://code.wireshark.org/review/3568 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-13hip: fix infinite loop in dissect_hip_tlvEvan Huus1-1/+1
We can't use tree_item == NULL to determine which branch of the previous if was hit, since proto_tree_add_item can return NULL when run without tree, which was leading to an infinite loop since we were never advancing the offset. Use the actual locator_type instead. Introduced by either g3635d7bed70 or gebff85fdbb although neither of them directly touch this code path. I'm guess that g3635d7bed70 removed an if (tree) guard in some calling function which would have prevented this, but I haven't checked. The bug would still have been there before, it just wouldn't have been hit because it's only present with a NULL tree. Somebody more familiar with the protocol should probably go over a capture or two and make sure this isn't a symptom of some other decoding gone awry in the recent changes. Change-Id: Ie1ce89b16ef667b437c0d99c25e3f3cb2504347d Reviewed-on: https://code.wireshark.org/review/3564 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-13http2: C90 doesn't permit anonymous structs or unionsEvan Huus1-13/+13
Change-Id: I88d048e4012109957a0b5e7a2480faed9fbe9cc4 Reviewed-on: https://code.wireshark.org/review/3565 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-13http2: Add additional header decoding informationTatsuhiro Tsujikawa1-11/+250
This patch adds additional header decoding information, such as header encoding representation, including header table size update (HPACK draft-09, section 7). Previously when user clicks the decoded header info, it highlights wrong byte sequence in compressed pane. This patch fixes this and now clicking header will highlight the byte sequence it was decoded from. Change-Id: I611a34edef31640c59a1f8bbc26db1c42eb16ce2 Reviewed-on: https://code.wireshark.org/review/3407 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-12Indicate that Python is required to compile Wireshark.Jeff Morriss2-19/+18
Remove some trailing white space at the same time. (The ./configure options in INSTALL are significantly out of date--that will be the subject of a separate commit.) Change-Id: I3c03f90dab099e6d3386a235f35b691e7ff671be Reviewed-on: https://code.wireshark.org/review/3563 Reviewed-by: Daniel Black <danielblack@fedoraproject.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-12Remove make-dissector-reg and require python for autotool builds as wellJoerg Mayer17-314/+59
Change-Id: I6239063a08ba37199a4e95302a3650a80544c750 Reviewed-on: https://code.wireshark.org/review/3562 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-12When checking if a message is Diameter also check for a minimum message length.Jeff Morriss1-16/+33
This improves the detection of Diameter messages within a TCP bytestream (i.e., when the Diameter PDUs don't neatly align with frames). Bug: 10362 Change-Id: I49a6e8cf076a6ab8a14761493aab9f3b11e4756e Reviewed-on: https://code.wireshark.org/review/3557 Petri-Dish: Evan Huus <eapache@gmail.com> Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-12Remove unneeded include of config.hJoerg Mayer2-2/+0
Change-Id: I7688c9a9dc88023d562fb665109185e22f2d06e8 Reviewed-on: https://code.wireshark.org/review/3560 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-12Remove parsing of non-existing TS_UD_SC_SEC1 fieldsEugene Sukhodolin1-6/+0
When RDP encryption method/level is NONE (CredSSP implies this case), TS_UD_SC_SEC1::encryptionLevel is the last present field. Subsequent fields aren't present in this case. Change-Id: I44cfea3ed52fae1ed6c416aeb01c3cf6ff002a3c Reviewed-on: https://code.wireshark.org/review/3545 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-12NSIS: check Windows version before running uninstallerPascal Quantin1-38/+38
Change-Id: Icc8d725bff484c48d14e0a9208c545ca512a9768 Reviewed-on: https://code.wireshark.org/review/3533 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Petri-Dish: Christopher Maynard <Christopher.Maynard@gtech.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-12Remove a bogus make-dissector-reg dependency from UseMakeDissectorReg.cmakeРоман Донченко1-1/+0
The shell script is not used in the CMake build system. Change-Id: I97d3d750f2521c626594200da8fc9a4453414576 Reviewed-on: https://code.wireshark.org/review/3530 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-12Fix generation of wslua taps in out-of-source-tree builds when the source treeJeff Morriss2-8/+7
is a source tarball (rather than git): Don't put the $(srcdir) path (from when the source tarball was made) into the C file: that file isn't regenerated when ./configure is run. (This is a correction to 0996730b91fddbf8aa7c61730a50da28ea1ab6a0). Also change a few dependency paths so they'll work in out-of-source-tree builds. Change-Id: I416f2d3611fb61659b9a7f7285e5f54a354fbe7d Reviewed-on: https://code.wireshark.org/review/3554 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-11Use an explicit path for stats_tree_dialog.cpp.Tim Furlong1-1/+1
Change the entry for stats_tree_dialog.cpp in ui/qt/QtShark.pro to have a relative "../qt/" path, so that Qt Creator can find it from its build...-release temporary directory. Change-Id: I8fa40e15a7fbb643d5565e216ce92f73afcd4871 Reviewed-on: https://code.wireshark.org/review/2340 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11Guard against buffer overflow when copying group key bytes intoDom Gifford1-14/+17
security association structure. Change-Id: I2f573a0626bab44aaca1ac6716bf5ac3d6a9b7ed Reviewed-on: https://code.wireshark.org/review/3553 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11SNMP: fix mixed indent (use tab)Alexis La Goutte2-635/+629
Change-Id: I19fde26bf7d1d2b19fcb56573f6e0814d1a7b8ab Reviewed-on: https://code.wireshark.org/review/3551 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11SNMP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte2-9/+5
Change-Id: I00d66ff57fd3ea1ede692c85b2ae0286c30557b7 Reviewed-on: https://code.wireshark.org/review/3550 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11SNMP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte2-2/+2
Change-Id: Ifd4fef4ff7cc5a3197a802e0da5851370ddcd715 Reviewed-on: https://code.wireshark.org/review/3549 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11Fix modeline (use Wireshark standard with C comment and no C++ comment)Alexis La Goutte6-74/+76
Fix also some indent (tab->4spaces) Change-Id: Ieef26591d405c6abe622f9fa26d2a7117af3c259 Reviewed-on: https://code.wireshark.org/review/3548 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-11Give more information about string encodings.Guy Harris1-13/+50
Fix some indentation while we're at it. Change-Id: I887af6e7507e1cd3c7e2b5bb5124d913aea01f9c Reviewed-on: https://code.wireshark.org/review/3552 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-11Minor typo correctionsEugene Sukhodolin3-6/+6
Change-Id: I5962ba6a9b9285095ddacf00307a3094c697461a Reviewed-on: https://code.wireshark.org/review/3546 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-11Fix the CMake QT buildGraham Bloice2-0/+4
The HAVE_PCAP_REMOTE definition is in config.h, so the .h files that depend on the definition must include it so the MOC compiler will generate the required code. Change-Id: Ifc17db4fc3f0e3323726792308e303d28d8bcc7f Reviewed-on: https://code.wireshark.org/review/3516 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11IAPP: Remove an unused variable.Gerald Combs1-6/+0
Change-Id: Iee584bdb384056afe0f980bf18163b449ccecf59 Reviewed-on: https://code.wireshark.org/review/3544 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-10packet-hislip.c: various minor fixesBill Meier1-208/+211
- Create/use an extended value-string; - Clean up code relating to setting COL_PROTO & COL_INFO; - Use consistent whitespace formatting. Change-Id: I3087d959db09cd90c1a5dd53fe7af7baf999b76c Reviewed-on: https://code.wireshark.org/review/3542 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-10packet-hislip.c: Fix various bugs and deficienciesBill Meier1-70/+60
- Remove an incorrect call to conversation_new() (which messed up TCP sequence number analysis). - hislip Request/Response analysis must be done during 'pass1' (i.e. when 'flags.visited == 0'); Not doing so caused various problems including tshark '1 pass' poor dissection. - Remove 'if (tree)' around a call to expert_...(). - Don't show "unknown" for Async/Sync when the value is actually known. - Simplify some code. - Mark a field as GENERATED. Change-Id: I286c12f52e5f73377bed3a2792f3ff0003e2785f Reviewed-on: https://code.wireshark.org/review/3541 Petri-Dish: Bill Meier <wmeier@newsguy.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-10packet-lg8979.c: Various minor changesBill Meier1-82/+93
- tvb_length() --> tvb_reported_length(); - Add an XXX comment re use of 'get_length' for tcp_dissect_pdus(); - Remove a few unneeded initializers; - Simplify/adjust code in a few places; - Remove some boilerplate comments; - Reformat some whitespace and long-lines. Change-Id: I17b9750cc1bdb5140edc28efbae5bf0f6ec23b6e Reviewed-on: https://code.wireshark.org/review/3538 Petri-Dish: Bill Meier <wmeier@newsguy.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-10packet-epon.c: remove an unneeded #includeBill Meier1-1/+0
Change-Id: Ia8af5d6ff496c099ba3c38d393a622f3a6c8fe67 Reviewed-on: https://code.wireshark.org/review/3540 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-10packet-elmi.c: Remove an unneeded #include.Bill Meier1-2/+1
Change-Id: I55d9fef94467d03f88f5acad6cb6ada3fc873b7c Reviewed-on: https://code.wireshark.org/review/3539 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-10Eliminate proto_tree_add_text from some dissectors.Michael Mann29-543/+779
Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-10ssh.dh_gex.nbits: there's only one numberРоман Донченко1-1/+1
Change-Id: Ia3bd392b2223cf666828d65a61e069c465d3894a Reviewed-on: https://code.wireshark.org/review/3536 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-10SSH: don't display "Payload" if it's emptyРоман Донченко1-1/+3
The "Payload" field only makes sense for packets that have unknown type or are unexpectedly long. For normal traces, it will always be empty, so hide it. Note: this length check used to be implicitly performed by ssh_proto_tree_add_item before 2aa66aa2b2daf0693e405371a5f9037a43896441, so this just restores the former behaviour. Change-Id: I948935bce660018377a004c661b829a19eb0a53b Reviewed-on: https://code.wireshark.org/review/3535 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-10[Automatic manuf, services and enterprise-numbers update for 2014-08-10]Gerald Combs5-4/+284
Change-Id: I052b92f415e7ccfb84db47d0d3102d4bdfcfe25c Reviewed-on: https://code.wireshark.org/review/3531 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-10PIM: fix a copy/paster error introduced in gebff85fPascal Quantin1-1/+1
Bug: 10358 Change-Id: Iddfd5dcd53e80a18cb253834920d9625195b3669 Reviewed-on: https://code.wireshark.org/review/3529 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-10CredSSP: update ASN.1 source file with the change done in gd2396d2Pascal Quantin2-3/+5
Change-Id: I87d0f212f485b9e28fa00101eec9e3c07bc57c67 Reviewed-on: https://code.wireshark.org/review/3528 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-10The version of the CredSSP protocol can be 2 or 3Eugene Sukhodolin1-1/+3
According to Microsoft documentation, valid values for the Version field are 2 and 3. Newer servers (like Windows 2012 R2) respond with Version=3. Change-Id: Ifb0c6f52d09c75bbde2b4a46d13366461736b9c0 Reviewed-on: https://code.wireshark.org/review/3527 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-09ULP: upgrade to approved version 2.0.2Pascal Quantin6-666/+993
Change-Id: Icf09e430a1732708ddd9e7abb49f7b1a6225afde Reviewed-on: https://code.wireshark.org/review/3526 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-09Now that Python is mandatory on Windows, remove checks for it from nmakefilesРоман Донченко17-213/+17
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a Reviewed-on: https://code.wireshark.org/review/3392 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-09Fix regression introduced by gf3b631668bEvan Huus1-1/+1
I made a stupid when simplifying the bit-twiddling, and accidentally reversed two of the bytes which completely broke MAC address name resolution. Bug: 10344 Change-Id: I0720755fb290423150e4d84da9d45cb0b76341e4 Reviewed-on: https://code.wireshark.org/review/3522 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09LTE RRC: fix dissection of CDMA System Time broken in gcd02af5Pascal Quantin3-12/+12
Also put back initial text indentation Change-Id: I6fe207086018a806a258b1de2888ac0b9310aac6 Reviewed-on: https://code.wireshark.org/review/3524 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-09Qt: Fix when build with Qt < 4.8.0Alexis La Goutte2-1/+11
StyleName is not available in Qt < 4.8 Change-Id: Icbfcef7c62b124ce67f1a02ed928a96233ae2d9d Reviewed-on: https://code.wireshark.org/review/3508 Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
2014-08-09Qt: Add missing text to translationAlexis La Goutte1-2/+2
Change-Id: I49d00f73e3e1cf662ead1b01e5d1c0b420c6ccef Reviewed-on: https://code.wireshark.org/review/3504 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-09802.11 BA sequence number decode is brokenMarkPhillips1-1/+1
Bug: 10334 Change-Id: If2da1c5ed63d7e2684a107181d56be38ed921106 Reviewed-on: https://code.wireshark.org/review/3519 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-09Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.Michael Mann90-928/+1566
This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09Update symbol lists.Guy Harris2-1/+7
Change-Id: I55ce6396b943ce9376649a9a8973a6e1cadcced7 Reviewed-on: https://code.wireshark.org/review/3518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-09Clean up Internet checksum handling.Guy Harris31-207/+158
Add macros to set entries of a vec_t, one for use when you have a pointer to private data, and one for use when you have data in a tvbuff. The latter wraps the use of tvb_get_ptr(), so that you're not directly calling it in a dissector. Move ip_checksum() to epan/in_cksum.c, and add an ip_checksum_tvb() that wraps the use of tvb_get_ptr(). In the CARP dissector, give the length variable an unsigned type - there's no benefit to it being signed, and that requires some casts to be thrown around. In the DCCP dissector, check only against the coverage length to see if we have enough data, combine the "should we check the checksum?" check with the "*can* we check the checksum?" check in a single if, and throw a dissector assertion if the source network address type isn't IPv4 or IPv6. Get rid of inclues of <epan/in_cksum.h> in dissectors that don't use any of the Internet checksum routines. In the HIP dissector, make sure we have the data to calculate the checksum before doing so. Change-Id: I2f9674775dbb54c533d33082632809f7d32ec8ae Reviewed-on: https://code.wireshark.org/review/3517 Reviewed-by: Guy Harris <guy@alum.mit.edu>