aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-08-15Add some missing group addresses.Guy Harris1-0/+11
Bug: 10383 Change-Id: I94c9604824f25347fcd3c7bfd5c18aabdbe0a332 Reviewed-on: https://code.wireshark.org/review/3603 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-15An NLPID of 0xc0 refers to TRILL.Guy Harris2-0/+2
This will, at least, make it show up as the meaning of a field containing an NLPID; whether it's actually used to say "a TRILL packet follows" is another matter. At least partially addresses bug 10382, and fully addresses it if it's never actually used to say "a TRILL packet follows". Change-Id: Ic9dc8ec432532bde692fad3aa9cc97a3109aa634 Reviewed-on: https://code.wireshark.org/review/3602 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-15Update some URLs.Guy Harris1-6/+4
Change-Id: Iaba677670907dbfb028c1112cd11986d859329cb Reviewed-on: https://code.wireshark.org/review/3600 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-14Remove errant #! from powershell scriptGraham Bloice1-1/+0
Change-Id: I6c94ce5983654eba20aa8c852efe300e06c957a5 Reviewed-on: https://code.wireshark.org/review/3599 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-14fix one last reference to textify.shEvan Huus1-1/+1
Change-Id: I2f8bd5a69fd80d6d34a4079cd05a4f4b278274fd Reviewed-on: https://code.wireshark.org/review/3594 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-14Windows: Clean up text file packaging.Gerald Combs8-180/+245
Convert textify.sh to PowerShell. Use PowerShell's built-in line ending conversion so that we don't depend on unix2dos. Only copy the help toc and text files to the staging directory. Add PowerShell to the Developer's Guide. Fixup some other content. (asn1/Makefile.inc.nmake contains a call to u2d. Hopefully that's not a problem.) Change-Id: I61a92aa54820d01015abb9ffa65815558ae31c71 Reviewed-on: https://code.wireshark.org/review/3487 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-08-14Eliminate proto_tree_add_text from some dissectors.Michael Mann35-294/+473
Other minor cleanup while in the neighborhood. Change-Id: If73a029f564219782c313d4154c24c7ce7458b52 Reviewed-on: https://code.wireshark.org/review/3574 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>
2014-08-14Qt: Add note about relaunch Wireshark to apply change about languageAlexis La Goutte1-0/+7
Change-Id: Ibdc7d6b664d681de990608d689170b02439f0ae7 Reviewed-on: https://code.wireshark.org/review/3559 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-14Fix the uninitialized-read error reported in bug 10370.Jeff Morriss1-1/+1
Fix apparent cut-n-pasteo: if offset_e is set then we should be looking at offset_e (instead of offset_s) and ts_end (instead of ts_start). Bug: 10370 Change-Id: I0683ad55ac782c7fd03b7dbdf3f34df713267de5 Reviewed-on: https://code.wireshark.org/review/3589 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-14CMake: More Qt5WinExtras plumbing.Gerald Combs2-0/+7
Change-Id: I7474e8373668ba554d3574193fec59daceafe00d Reviewed-on: https://code.wireshark.org/review/3588 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-14Don't show us the full Python command-line for building register.c.Jeff Morriss1-1/+1
The echo and output of make-dissector-reg.py is sufficient. Change-Id: I89462435e8966012ec057ccd45adb595f692b0fb Reviewed-on: https://code.wireshark.org/review/3587 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-13Windows Qt: Add taskbar progress supportGerald Combs4-4/+50
Add support for the taskbar progress indicator on Windows via QtWinExtras. It is almost as if we're a grown up Windows application. Change-Id: I378206b49510d4bd08f2437d8e9a1b01bc6f1351 Reviewed-on: https://code.wireshark.org/review/3576 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-13Use a wildcard to exclude all Wireshark (GUI) binaries: rpmbuild in RHEL6Jeff Morriss1-4/+2
errors out if you %exclude a file that's not there. Fixes the issue reported by Chris on the -dev list. Change-Id: If8d8b6a9ee69c3d94756b729a809f3c04fc2517f Reviewed-on: https://code.wireshark.org/review/3586 Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Petri-Dish: Christopher Maynard <Christopher.Maynard@gtech.com>
2014-08-13initialize bus_id and deviceMartin Kaiser1-0/+4
Change-Id: I18b6e17091c0f019535a0dc1734e60795339bb04 Reviewed-on: https://code.wireshark.org/review/3584 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-13add the bus_id when we search for an existing conversation to our endpointMartin Kaiser1-0/+2
(the existing code uses bus_id 0 by default and creates a new conversation) Change-Id: I33a105bdf4218ac2dd21cf76825e972ff2dd1b9b Reviewed-on: https://code.wireshark.org/review/3583 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-13dissect as interface general descr for v1.00Martin Kaiser1-0/+44
Change-Id: I338ce8d6eb0865af9d0f5669c44389ade2bf0f49 Reviewed-on: https://code.wireshark.org/review/3582 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-13create audio-specific part of the usb conversationMartin Kaiser1-3/+15
store the major spec version there Change-Id: I55564cbca7fb9faa307f1a684858d2e5d2393fc9 Reviewed-on: https://code.wireshark.org/review/3581 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-13distinguish between different audio descriptor types and subtypesMartin Kaiser1-17/+200
dissect the AC interface header descriptor Change-Id: I10f81e5cbf3837d958b255b5a3405ac2465b171f Reviewed-on: https://code.wireshark.org/review/3580 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-13get conversation info when we parse audio class-specific descriptorsMartin Kaiser1-5/+10
reject the descriptor if the class is not audio Change-Id: Ie07f0fb711884e63cbe86d9417570108edd6b5ab Reviewed-on: https://code.wireshark.org/review/3578 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-13rename the defines to make it clear that these are interface subclassesMartin Kaiser1-9/+9
Change-Id: I0ad2168f89f8c4fbb2d2324f60de1276d023b41c Reviewed-on: https://code.wireshark.org/review/3579 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-13additional parentheses around the macro argumentMartin Kaiser1-1/+1
Change-Id: Idd590dc4d79c1a550d35544b46a79a5cc755f503 Reviewed-on: https://code.wireshark.org/review/3577 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 07:32:25 +0000