Commit Graph

54383 Commits

Author SHA1 Message Date
Michael Mann 018b84de84 Refactor "common" hostlist/endpoint table functionality.
This is very similar in architecture to the changes made to the Conversation table functionality.  Since all conversations have endpoints/hostlists, the "registered" list is shared for both.

Change-Id: Ie8c6910a68a1b3f27c5b18c4494f49b9404a7b31
Reviewed-on: https://code.wireshark.org/review/3214
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-18 04:24:39 +00:00
Guy Harris a76c888cd9 Add missing field to the list of fields to register.
Change-Id: I2590bf69f6778deb15f405c0976c9849af5b4a4e
Reviewed-on: https://code.wireshark.org/review/3685
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18 04:12:19 +00:00
Guy Harris 970446faf5 Sort the elements of ett[] to match the definitions, and add a missing entry.
Sorted so that we can find missing entries; fixed so that there aren't
any missing entries.

Change-Id: Ic05e4d30f7b65be5ecbba3ff89b7bd13870aba25
Reviewed-on: https://code.wireshark.org/review/3684
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18 04:07:22 +00:00
Guy Harris e926023a9c Squelch unused parameter warnings.
Change-Id: I3bf3c0500bf27e6f1a3c1df57f3141ea34692304
Reviewed-on: https://code.wireshark.org/review/3683
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18 03:59:24 +00:00
Alexis La Goutte 67682557e6 Kerberos : Fix indent (use tabs) and add modelines info
Change-Id: I7965332ee474d10c90dfb2ef63a66f610cd6fc71
Reviewed-on: https://code.wireshark.org/review/3655
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-18 00:56:56 +00:00
Marian Durkovic 4095bbf9e8 Make TRILL NEIGHBOR TLV (145) known to ISIS dissector
Update RFC references

Change-Id: I977190e6bfce2c27d33f940d058be3be6a5ef3c0
Reviewed-on: https://code.wireshark.org/review/3669
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-18 00:51:45 +00:00
Guy Harris b8293f95ad If we don't find a NetScaler signature, don't report an error.
It's *NOT* an error; it's just a file that isn't a NetScaler file.
Otherwise, we report errors on files that should just be passed on to
other open routines.

Also, NetScaler files are *NOT* text files, and we should *NOT* use
".txt" as the suffix.

Change-Id: If001abbbbc3de3ea27439a44a47ce1d6071d38ae
Reviewed-on: https://code.wireshark.org/review/3678
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18 00:32:59 +00:00
Guy Harris 6a8267270f Return 0, not -1, for "this isn't my type of file".
-1 means "I got an error reading this file, so there's no point in
trying any more open routines".  It doesn't mean "I couldn't find any
matching pattern in the text"; that's 0, for "this isn't my type of
file, but keep trying".

Change-Id: I9d2e8b8fe6720052cacf70f0bacdcbc1175202cc
Reviewed-on: https://code.wireshark.org/review/3674
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-17 23:03:20 +00:00
Marian Durkovic 2d2ecfbab2 Fix TRILL LSP dissector
- correctly compute length/offset in all SubTLVs
- initialize variable before while() loop
- fix VLAN_GROUP SubTLV according to RFC7176 sec. 2.3.7

Change-Id: Ib5cc4ce82f63ad39e83c8b1f4a630708f8a8aa88
Reviewed-on: https://code.wireshark.org/review/3667
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-17 19:08:38 +00:00
Gerald Combs e1449a8060 [Automatic manuf, services and enterprise-numbers update for 2014-08-17]
Change-Id: I81d4f5ea28eb12eb8d32a6d9ba4a61fff3cab86f
Reviewed-on: https://code.wireshark.org/review/3671
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-17 15:05:40 +00:00
Marian Durkovic 95ddeeda0c Fix uninitialized variable and print VLAN numbers in decimal
Change-Id: Icf3b3ea4968d1ed94a11ce8eb4b4fdd09ed69012
Reviewed-on: https://code.wireshark.org/review/3660
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17 14:04:00 +00:00
Marian Durkovic 9de7f5605a Fix incorrect SubTLV values and properly handle both old and new
variant of TRILL Version SubTLV

Note that the SubTLV values have not changed in RFC7176.

Bug: 10387
Change-Id: I452debb7165e70f31f1a3a19a44c488c5bbdb959
Reviewed-on: https://code.wireshark.org/review/3661
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17 12:43:55 +00:00
Jeff Morriss 0c3e0db5f1 Add a few more NEWS items.
Fix a typo in the generation of top_srcdir NEWS.

Change-Id: I20a140a68b9afca5096d33d99a3ea5d24e776f05
Reviewed-on: https://code.wireshark.org/review/3626
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-17 04:16:52 +00:00
Michael Mann 7b38bc2343 Remove unnecessary includes
Change-Id: Ib1a90a07b2d467a81927c53917e05a1af6ba4ee6
Reviewed-on: https://code.wireshark.org/review/3666
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-17 03:45:31 +00:00
Alexis La Goutte e7853d37f0 prefs.h : fix indent (use 4 spaces) and add modelines info
Change-Id: I319b76973ade38261f40e6120c436de923b5d5bf
Reviewed-on: https://code.wireshark.org/review/3658
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17 02:29:31 +00:00
Alexis La Goutte 721008c708 DCERPC PN IO: Add modelines info
Change-Id: I124c5d38f8f3b4aee6d5dbee0367555742350e55
Reviewed-on: https://code.wireshark.org/review/3657
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17 02:29:30 +00:00
Alexis La Goutte 305f36d711 Wimax Plugins: Fix indent (use tabs) and modelines
Change-Id: I27a976c9cac598be5a90412da171915181a784d3
Reviewed-on: https://code.wireshark.org/review/3656
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17 02:29:29 +00:00
Alexis La Goutte c8cb153ec8 Stats Tree: Add Modelines
Change-Id: Id4b2a2837377d52e9f6c9145f9fbed2465a538df
Reviewed-on: https://code.wireshark.org/review/3654
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17 02:29:26 +00:00
Alexis La Goutte 56738931a9 PCAPNG Block: Add modelines info
Change-Id: I15ddf62318fc8783a2318025fa6ca110b7991ff5
Reviewed-on: https://code.wireshark.org/review/3653
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 22:26:05 +00:00
Alexis La Goutte ef77c1c33e OptoMMP: Add modelines info
Change-Id: Ia9ea6e553d92d1045f022254d714fea5440257a5
Reviewed-on: https://code.wireshark.org/review/3652
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 22:24:58 +00:00
Alexis La Goutte f17dd37c48 LLDP: Fix indent (use 4 spaces)
Change-Id: I392d1d23d590187128f81763a937d35229ed6929
Reviewed-on: https://code.wireshark.org/review/3651
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 22:23:53 +00:00
Alexis La Goutte 1111538200 IUUP: Add modelines info
Change-Id: I6cde1a17d917b9cf4c08ca202571fd07bb9302ba
Reviewed-on: https://code.wireshark.org/review/3650
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 22:22:35 +00:00
Alexis La Goutte ae6c433f0c IPMI Update: Add modelines info
Change-Id: I5edf987e0df4c1d363d29ef4b48d901873c1c817
Reviewed-on: https://code.wireshark.org/review/3649
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 22:21:39 +00:00
Marian Durkovic 762e762668 Fix TRILL ISIS Hellos:
- MT Port Capability TLVs are present in L1 Hellos
- unify texts

Change-Id: I3dade81ad4487620a8e46e0b242bbbffbb6c2d49
Reviewed-on: https://code.wireshark.org/review/3659
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 22:02:19 +00:00
Alexis La Goutte e9135cebbb LINK16: Add modelines info
Change-Id: I4267de691f9b7064b6110eba1c85ddb6b755d3f5
Reviewed-on: https://code.wireshark.org/review/3648
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 21:56:52 +00:00
Alexis La Goutte 71901b6bbf OUI: Fix indent (use 4spaces) and modelines info
Use the same indent like epan/oui.h

Change-Id: I02018788bc3f62d170a87a40bd4495630bded1c5
Reviewed-on: https://code.wireshark.org/review/3647
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 21:56:49 +00:00
Alexis La Goutte af8f962d29 tap-iousers: fix indent and add modelines info
Change-Id: Ia144e016bd7fb0b8d4770d45afa1145057d0a5e9
Reviewed-on: https://code.wireshark.org/review/3646
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 21:56:45 +00:00
Alexis La Goutte 0a8a36ec7e ISIS:LSP : fix indent (remove last tab) and reindent hf
Change-Id: I615e777b4b6af073c174fe0c3554ed0e33f5e68e
Reviewed-on: https://code.wireshark.org/review/3645
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 21:55:45 +00:00
Alexis La Goutte a4c09894bd Fix ISO C does not allow extra ';' outside of a function [-Wpedantic]
Change-Id: I7c0be29b5e5a54e269fec928e6058395ada7e04b
Reviewed-on: https://code.wireshark.org/review/3644
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 21:54:59 +00:00
Alexis La Goutte 9f968427a6 Fix ISO C does not allow extra ';' outside of a function [-Wpedantic]
Change-Id: Ia956c108d3493e54578247f08ac7b167d8b71f0f
Reviewed-on: https://code.wireshark.org/review/3643
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 21:54:46 +00:00
Evan Huus 73959159db rtsp: parse the correct token for the status code
Don't call get_token_len on next_token *and* pass in next_token to store the
subsequent pointer - the token we want to parse is the *current* value of
next_token, not the next next token (which may be beyond the end of the buffer,
if next_token happens to be the *last* token).

Bug: 10381
Change-Id: I9fb27e8bdaf2f9556f61841de30cec04b98ffb96
Reviewed-on: https://code.wireshark.org/review/3663
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 18:01:09 +00:00
Evan Huus 22e10bea0c Revert "create audio-specific part of the usb conversation"
Also revert "dissect as interface general descr for v1.00"

This reverts commit 7cd4e89304 and commit
152c6b06f1 to fix the fuzz failures while we work
out a proper solution.

Ping-Bug:10386
Change-Id: I6302b95c103f17bb2b48d43f8fc06352587b9e95
Reviewed-on: https://code.wireshark.org/review/3662
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 17:39:05 +00:00
Alexis La Goutte fc2d1bdeb5 Fix comma at end of enumerator list [-Wpedantic]
Change-Id: Ib50ddb969471c03cf0ce2f240c3586fe2274965a
Reviewed-on: https://code.wireshark.org/review/3642
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 16:31:51 +00:00
Alexis La Goutte 72229b20aa Fix comma at end of enumerator list [-Wpedantic]
Change-Id: If8b817e8276bb065a257f209bf5b0f566d9f7907
Reviewed-on: https://code.wireshark.org/review/3641
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 16:30:53 +00:00
Alexis La Goutte 3cddcc2ce0 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: Id61288a6abcff44ba813daaa48d403ee5c769da3
Reviewed-on: https://code.wireshark.org/review/3640
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 16:29:52 +00:00
Alexis La Goutte 91e449e147 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I059af62625941e9900b3618aa5721b3b82a2c823
Reviewed-on: https://code.wireshark.org/review/3639
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 16:29:02 +00:00
Alexis La Goutte 5d9709bc1e Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I78f50ade1febc0dcb2231d742e2213f012535bc7
Reviewed-on: https://code.wireshark.org/review/3638
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 16:01:21 +00:00
Alexis La Goutte 0517093794 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I7e935114417712d1101ea2d6f4b236fac44698d0
Reviewed-on: https://code.wireshark.org/review/3637
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 16:00:30 +00:00
Alexis La Goutte 772a7ba45c Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I6790a6c990bd531362171742b938c9f26cb2e1d5
Reviewed-on: https://code.wireshark.org/review/3636
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 15:59:29 +00:00
Alexis La Goutte 53045fab55 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I9dfff8032e8aa4634466fb4cb3b136ff6df1c4b7
Reviewed-on: https://code.wireshark.org/review/3635
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 11:41:17 +00:00
Alexis La Goutte 370bab2bef Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: Idd1cf83809877d12b18362e722c6c37251b02495
Reviewed-on: https://code.wireshark.org/review/3634
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 11:40:25 +00:00
Alexis La Goutte 3f7b762e90 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I4e3e6ffbdae988a37904cba4d43dc5a1c5f66ed6
Reviewed-on: https://code.wireshark.org/review/3633
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 11:39:38 +00:00
Alexis La Goutte fc752f7047 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: Ic3152356c51ebe554e2356a360df5b0c23d89d63
Reviewed-on: https://code.wireshark.org/review/3632
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 11:38:23 +00:00
Alexis La Goutte 9bd79f44ec Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I6e545cb85b6a75cde0ca6c41c57e8c7d69ae4dcb
Reviewed-on: https://code.wireshark.org/review/3631
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 11:36:57 +00:00
Gerald Combs bba8edc392 README.cmake: List more cmake options.
Change-Id: I80b5c82f57c4de55aba9c7ee8044f565c9819d7e
Reviewed-on: https://code.wireshark.org/review/3630
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-15 23:54:36 +00:00
Martin Kaiser e5c1f7b44d get rid of type_2 in most places
type_2 is nothing else but the request type in a setup packet
this is already stored in the conversation / transaction structure

Change-Id: I4dda7aff423eb1b6174a1a630d57e126662abed4
Reviewed-on: https://code.wireshark.org/review/3598
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-15 22:12:57 +00:00
Martin Kaiser 61c038e666 simplify try_dissect_next_protocol()
Change-Id: Idd9690689217bdfc66f9eee1461422358e837774
Reviewed-on: https://code.wireshark.org/review/3597
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-15 22:08:31 +00:00
Gerald Combs f0e6239191 Qt: Disable main menu items that don't do anything.
The functionality associated with Capture → Capture Filters, Analyze
→ Display Filters, Analyze → Display Filter Macros, and Analyze →
Apply As Column haven't been implemented yet. Disable each menu item
for now so that we don't play tricks on our users.

Follow our current action naming convention. Rename "Apply as Column"
to "Create a Column".

Change-Id: I01901db05adc897d877f6a0a699e3049b0149b4a
Reviewed-on: https://code.wireshark.org/review/3629
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-15 18:49:02 +00:00
Gerald Combs 978faf396c NSIS/Qt: Move Qt version logic to windeployqt-to-nsis.
Move Qt version checking from packaging/nsis/Makefile.nmake to
windeployqt-to-nsis.ps1. Get rid of the -Windeployqt parameter since
its absence is a condition we now handle.

Change-Id: Ieba86d5a91e8217ed11dbe57e80bedaccd2e99cf
Reviewed-on: https://code.wireshark.org/review/3595
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-15 16:54:56 +00:00
Gerald Combs 4e267ba9dd Windows: Fix PowerShell 2.0 compatibility.
PowerShell 2.0's Get-ChildItem doesn't support "-File" even though
http://technet.microsoft.com/en-us/library/hh847897.aspx says otherwise.

Add a config.nmake option to test PS 2.0 compatibility.

Change-Id: I8de83cd0841d4ab0b01351c2d39084578a2c84ee
Reviewed-on: https://code.wireshark.org/review/3625
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-15 16:35:41 +00:00