Commit Graph

54569 Commits

Author SHA1 Message Date
oyv 8ef6f589e3 btle advertising header flags (RxAdd/TxAdd) dissected incorrectly
bug:10384
Signed-off-by: oyv <ronningstad@gmail.com>

Change-Id: Ic31772c551f36fc8d144a5eaeae987a1e5f3e3f1
Reviewed-on: https://code.wireshark.org/review/3601
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 9337e7962df8bc12f27019b20dedbb2311669949)
Change-Id: Ic31772c551f36fc8d144a5eaeae987a1e5f3e3f1
Reviewed-on: https://code.wireshark.org/review/3609
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-15 11:40:06 +00:00
Guy Harris 50c8cc61bf Regenerate manuf with the updated wka.tmpl.
Bug: 10383
Change-Id: I5ab14ecd0e460e39c2ec5f9259a8b9dd93c3eeb6
Reviewed-on: https://code.wireshark.org/review/3604
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-15 10:35:13 +00:00
Guy Harris 47bb34a43a Add some missing group addresses.
Bug: 10383
Change-Id: I94c9604824f25347fcd3c7bfd5c18aabdbe0a332
Reviewed-on: https://code.wireshark.org/review/3603
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-15 10:26:40 +00:00
Guy Harris 2cab8766c3 An NLPID of 0xc0 refers to TRILL.
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-15 10:16:03 +00:00
Guy Harris 480fcfd702 Update some URLs.
Change-Id: Iaba677670907dbfb028c1112cd11986d859329cb
Reviewed-on: https://code.wireshark.org/review/3600
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-15 01:29:13 +00:00
Graham Bloice 02187b0b8f Remove errant #! from powershell script
Change-Id: I6c94ce5983654eba20aa8c852efe300e06c957a5
Reviewed-on: https://code.wireshark.org/review/3599
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-14 21:42:36 +00:00
Evan Huus 297237b4c2 fix one last reference to textify.sh
Change-Id: I2f8bd5a69fd80d6d34a4079cd05a4f4b278274fd
Reviewed-on: https://code.wireshark.org/review/3594
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-14 13:40:27 +00:00
Gerald Combs 673247f04f Windows: Clean up text file packaging.
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-14 10:26:31 +00:00
Michael Mann d68d0e88b4 Eliminate proto_tree_add_text from some dissectors.
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-14 04:21:05 +00:00
Alexis La Goutte f64421df3f Qt: Add note about relaunch Wireshark to apply change about language
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-14 04:18:45 +00:00
Jeff Morriss 44698259b1 Fix the uninitialized-read error reported in bug 10370.
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-14 02:09:13 +00:00
Gerald Combs 4388b5608a CMake: More Qt5WinExtras plumbing.
Change-Id: I7474e8373668ba554d3574193fec59daceafe00d
Reviewed-on: https://code.wireshark.org/review/3588
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-14 00:49:51 +00:00
Jeff Morriss e99bbef405 Don't show us the full Python command-line for building register.c.
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-14 00:32:42 +00:00
Gerald Combs e3978271df Windows Qt: Add taskbar progress support
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-13 23:00:25 +00:00
Jeff Morriss a83f67cb85 Use a wildcard to exclude all Wireshark (GUI) binaries: rpmbuild in RHEL6
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-13 22:29:29 +00:00
Martin Kaiser e21fbd1397 initialize bus_id and device
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-13 21:04:08 +00:00
Martin Kaiser 797d28634f add the bus_id when we search for an existing conversation to our endpoint
(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-13 21:03:52 +00:00
Martin Kaiser 152c6b06f1 dissect as interface general descr for v1.00
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-13 21:03:37 +00:00
Martin Kaiser 7cd4e89304 create audio-specific part of the usb conversation
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-13 21:03:17 +00:00
Martin Kaiser a2e99f5699 distinguish between different audio descriptor types and subtypes
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-13 21:03:00 +00:00
Martin Kaiser b7c02da1f3 get conversation info when we parse audio class-specific descriptors
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-13 21:02:42 +00:00
Martin Kaiser 2952daa2bd rename the defines to make it clear that these are interface subclasses
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-13 21:02:23 +00:00
Martin Kaiser cef38a7637 additional parentheses around the macro argument
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-13 21:02:06 +00:00
Jeff Morriss 3e1fec0db2 More INSTALL updates.
- 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-13 16:00:24 +00:00
Joerg Mayer 9e560bc3f0 Fix warning when compiling with -O3
/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-13 12:34:53 +00:00
Joerg Mayer 633f1562ad Fix warning when compiling with -O3:
/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-13 12:19:29 +00:00
Luke Chou ea8738306e 802.11 : 11ac decode update , base on IEEE-11ac-2013
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-13 10:13:29 +00:00
Alexis La Goutte acf39ff724 SNMP : Continue to fix indent (use tab)
Change-Id: I6b92deb2dbf9b9c4be7fd75d6d788755524a7483
Reviewed-on: https://code.wireshark.org/review/3570
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-13 07:40:08 +00:00
Alexis La Goutte 38418210e3 SNMP: Remove some unused hf field
Change-Id: I33c89d07af6658569df3a9a094e2865e28ed0acb
Reviewed-on: https://code.wireshark.org/review/3569
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-13 07:38:09 +00:00
Joerg Mayer f59e69489d Fix warning (turning error) when compiling with -O3
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-13 06:05:48 +00:00
Evan Huus d9e5021fe7 hip: fix infinite loop in dissect_hip_tlv
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-13 02:47:32 +00:00
Evan Huus 20721cbcbf http2: C90 doesn't permit anonymous structs or unions
Change-Id: I88d048e4012109957a0b5e7a2480faed9fbe9cc4
Reviewed-on: https://code.wireshark.org/review/3565
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-13 00:40:19 +00:00
Tatsuhiro Tsujikawa a5405e0304 http2: Add additional header decoding information
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-13 00:01:23 +00:00
Jeff Morriss 61d522ffee Indicate that Python is required to compile Wireshark.
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-12 23:59:12 +00:00
Joerg Mayer 65ac652a07 Remove make-dissector-reg and require python for autotool builds as well
Change-Id: I6239063a08ba37199a4e95302a3650a80544c750
Reviewed-on: https://code.wireshark.org/review/3562
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-12 21:31:34 +00:00
Jeff Morriss 433eeda109 When checking if a message is Diameter also check for a minimum message length.
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-12 18:31:35 +00:00
Joerg Mayer b698426c1c Remove unneeded include of config.h
Change-Id: I7688c9a9dc88023d562fb665109185e22f2d06e8
Reviewed-on: https://code.wireshark.org/review/3560
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-12 17:02:49 +00:00
Eugene Sukhodolin 7b05f6cf33 Remove parsing of non-existing TS_UD_SC_SEC1 fields
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-12 15:19:06 +00:00
Pascal Quantin ddada16e68 NSIS: check Windows version before running uninstaller
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-12 08:15:38 +00:00
Роман Донченко 0ea25a6ddf Remove a bogus make-dissector-reg dependency from UseMakeDissectorReg.cmake
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-12 04:19:31 +00:00
Jeff Morriss 4fd9809a78 Fix generation of wslua taps in out-of-source-tree builds when the source tree
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 0996730b91).

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-12 04:14:12 +00:00
Tim Furlong 50c7d8ef96 Use an explicit path for stats_tree_dialog.cpp.
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-11 21:14:55 +00:00
Dom Gifford f022e15494 Guard against buffer overflow when copying group key bytes into
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-11 16:50:36 +00:00
Alexis La Goutte cb44442dfc SNMP: fix mixed indent (use tab)
Change-Id: I19fde26bf7d1d2b19fcb56573f6e0814d1a7b8ab
Reviewed-on: https://code.wireshark.org/review/3551
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11 14:44:08 +00:00
Alexis La Goutte 4c131ced56 SNMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I00d66ff57fd3ea1ede692c85b2ae0286c30557b7
Reviewed-on: https://code.wireshark.org/review/3550
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11 14:43:32 +00:00
Alexis La Goutte db7143d906 SNMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ifd4fef4ff7cc5a3197a802e0da5851370ddcd715
Reviewed-on: https://code.wireshark.org/review/3549
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11 14:42:20 +00:00
Alexis La Goutte aaeedcb108 Fix modeline (use Wireshark standard with C comment and no C++ comment)
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-11 11:28:10 +00:00
Guy Harris a2090cd205 Give more information about string encodings.
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-11 09:41:02 +00:00
Eugene Sukhodolin 9deb769096 Minor typo corrections
Change-Id: I5962ba6a9b9285095ddacf00307a3094c697461a
Reviewed-on: https://code.wireshark.org/review/3546
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-11 06:37:56 +00:00
Graham Bloice 9c799212ac Fix the CMake QT build
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-11 01:54:13 +00:00