aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-08-18Fix TRILL LSP display issuesMarian Ďurkovič1-8/+8
1) Sub-TLVs unknown to wireshark are not necessarily invalid 2) Properly show Root Bridge ID 3) Unify Nickname format to HEX_DEC Change-Id: Ib62f2e2a23f27221b303eaf544868746f56ff6df Reviewed-on: https://code.wireshark.org/review/3686 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18BGP ISIS: Add TLV 14 (Originating LSP Buffer Size)Alexis La Goutte1-1/+54
Need more work for TLV 149 Ping-Bug: 10304 Change-Id: I3953b8d1fdee33253601aa7b443edd37417046e4 Reviewed-on: https://code.wireshark.org/review/3336 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18Parse client and server blocks of settings data introduced in newer RDP versionsEugene Sukhodolin1-17/+176
Change-Id: I46b4557623921e1c2c093ca5e3e75908826358e3 Reviewed-on: https://code.wireshark.org/review/3681 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18Refactor "common" hostlist/endpoint table functionality.Michael Mann43-1918/+1029
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-18Add missing field to the list of fields to register.Guy Harris1-0/+1
Change-Id: I2590bf69f6778deb15f405c0976c9849af5b4a4e Reviewed-on: https://code.wireshark.org/review/3685 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18Sort the elements of ett[] to match the definitions, and add a missing entry.Guy Harris1-41/+66
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-18Squelch unused parameter warnings.Guy Harris1-2/+2
Change-Id: I3bf3c0500bf27e6f1a3c1df57f3141ea34692304 Reviewed-on: https://code.wireshark.org/review/3683 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18Kerberos : Fix indent (use tabs) and add modelines infoAlexis La Goutte2-626/+648
Change-Id: I7965332ee474d10c90dfb2ef63a66f610cd6fc71 Reviewed-on: https://code.wireshark.org/review/3655 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-18Make TRILL NEIGHBOR TLV (145) known to ISIS dissectorMarian Durkovic2-8/+24
Update RFC references Change-Id: I977190e6bfce2c27d33f940d058be3be6a5ef3c0 Reviewed-on: https://code.wireshark.org/review/3669 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-18If we don't find a NetScaler signature, don't report an error.Guy Harris2-8/+9
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-17Return 0, not -1, for "this isn't my type of file".Guy Harris1-1/+1
-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-17Fix TRILL LSP dissectorMarian Durkovic1-28/+17
- 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[Automatic manuf, services and enterprise-numbers update for 2014-08-17]Gerald Combs4-17/+230
Change-Id: I81d4f5ea28eb12eb8d32a6d9ba4a61fff3cab86f Reviewed-on: https://code.wireshark.org/review/3671 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-17Fix uninitialized variable and print VLAN numbers in decimalMarian Durkovic1-2/+4
Change-Id: Icf3b3ea4968d1ed94a11ce8eb4b4fdd09ed69012 Reviewed-on: https://code.wireshark.org/review/3660 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17Fix incorrect SubTLV values and properly handle both old and newMarian Durkovic1-9/+8
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-17Add a few more NEWS items.Jeff Morriss3-5/+11
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-17Remove unnecessary includesMichael Mann5-10/+0
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-17prefs.h : fix indent (use 4 spaces) and add modelines infoAlexis La Goutte1-28/+34
Change-Id: I319b76973ade38261f40e6120c436de923b5d5bf Reviewed-on: https://code.wireshark.org/review/3658 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17DCERPC PN IO: Add modelines infoAlexis La Goutte1-0/+13
Change-Id: I124c5d38f8f3b4aee6d5dbee0367555742350e55 Reviewed-on: https://code.wireshark.org/review/3657 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17Wimax Plugins: Fix indent (use tabs) and modelinesAlexis La Goutte10-1992/+2109
Change-Id: I27a976c9cac598be5a90412da171915181a784d3 Reviewed-on: https://code.wireshark.org/review/3656 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17Stats Tree: Add ModelinesAlexis La Goutte1-0/+13
Change-Id: Id4b2a2837377d52e9f6c9145f9fbed2465a538df Reviewed-on: https://code.wireshark.org/review/3654 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16PCAPNG Block: Add modelines infoAlexis La Goutte1-0/+13
Change-Id: I15ddf62318fc8783a2318025fa6ca110b7991ff5 Reviewed-on: https://code.wireshark.org/review/3653 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16OptoMMP: Add modelines infoAlexis La Goutte1-2/+13
Change-Id: Ia9ea6e553d92d1045f022254d714fea5440257a5 Reviewed-on: https://code.wireshark.org/review/3652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16LLDP: Fix indent (use 4 spaces)Alexis La Goutte1-100/+100
Change-Id: I392d1d23d590187128f81763a937d35229ed6929 Reviewed-on: https://code.wireshark.org/review/3651 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16IUUP: Add modelines infoAlexis La Goutte1-0/+12
Change-Id: I6cde1a17d917b9cf4c08ca202571fd07bb9302ba Reviewed-on: https://code.wireshark.org/review/3650 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16IPMI Update: Add modelines infoAlexis La Goutte1-0/+13
Change-Id: I5edf987e0df4c1d363d29ef4b48d901873c1c817 Reviewed-on: https://code.wireshark.org/review/3649 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix TRILL ISIS Hellos:Marian Durkovic1-1/+7
- 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-16LINK16: Add modelines infoAlexis La Goutte1-0/+13
Change-Id: I4267de691f9b7064b6110eba1c85ddb6b755d3f5 Reviewed-on: https://code.wireshark.org/review/3648 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16OUI: Fix indent (use 4spaces) and modelines infoAlexis La Goutte1-43/+56
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-16tap-iousers: fix indent and add modelines infoAlexis La Goutte1-4/+17
Change-Id: Ia144e016bd7fb0b8d4770d45afa1145057d0a5e9 Reviewed-on: https://code.wireshark.org/review/3646 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16ISIS:LSP : fix indent (remove last tab) and reindent hfAlexis La Goutte1-274/+610
Change-Id: I615e777b4b6af073c174fe0c3554ed0e33f5e68e Reviewed-on: https://code.wireshark.org/review/3645 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16Fix ISO C does not allow extra ';' outside of a function [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: I7c0be29b5e5a54e269fec928e6058395ada7e04b Reviewed-on: https://code.wireshark.org/review/3644 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16Fix ISO C does not allow extra ';' outside of a function [-Wpedantic]Alexis La Goutte1-2/+2
Change-Id: Ia956c108d3493e54578247f08ac7b167d8b71f0f Reviewed-on: https://code.wireshark.org/review/3643 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16rtsp: parse the correct token for the status codeEvan Huus1-4/+4
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-16Revert "create audio-specific part of the usb conversation"Evan Huus1-59/+3
Also revert "dissect as interface general descr for v1.00" This reverts commit 7cd4e8930454b3afa8e73eacd62bafc6f029022b and commit 152c6b06f1bb8193b6d2682ae40c61a1d642b7c1 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-16Fix comma at end of enumerator list [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: Ib50ddb969471c03cf0ce2f240c3586fe2274965a Reviewed-on: https://code.wireshark.org/review/3642 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix comma at end of enumerator list [-Wpedantic]Alexis La Goutte1-4/+4
Change-Id: If8b817e8276bb065a257f209bf5b0f566d9f7907 Reviewed-on: https://code.wireshark.org/review/3641 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+3
Change-Id: Id61288a6abcff44ba813daaa48d403ee5c769da3 Reviewed-on: https://code.wireshark.org/review/3640 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+3
Change-Id: I059af62625941e9900b3618aa5721b3b82a2c823 Reviewed-on: https://code.wireshark.org/review/3639 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+3
Change-Id: I78f50ade1febc0dcb2231d742e2213f012535bc7 Reviewed-on: https://code.wireshark.org/review/3638 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+2
Change-Id: I7e935114417712d1101ea2d6f4b236fac44698d0 Reviewed-on: https://code.wireshark.org/review/3637 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte7-0/+14
Change-Id: I6790a6c990bd531362171742b938c9f26cb2e1d5 Reviewed-on: https://code.wireshark.org/review/3636 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+1
Change-Id: I9dfff8032e8aa4634466fb4cb3b136ff6df1c4b7 Reviewed-on: https://code.wireshark.org/review/3635 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+1
Change-Id: Idd1cf83809877d12b18362e722c6c37251b02495 Reviewed-on: https://code.wireshark.org/review/3634 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte2-0/+2
Change-Id: I4e3e6ffbdae988a37904cba4d43dc5a1c5f66ed6 Reviewed-on: https://code.wireshark.org/review/3633 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte2-6/+12
Change-Id: Ic3152356c51ebe554e2356a360df5b0c23d89d63 Reviewed-on: https://code.wireshark.org/review/3632 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+1
Change-Id: I6e545cb85b6a75cde0ca6c41c57e8c7d69ae4dcb Reviewed-on: https://code.wireshark.org/review/3631 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-15README.cmake: List more cmake options.Gerald Combs1-4/+20
Change-Id: I80b5c82f57c4de55aba9c7ee8044f565c9819d7e Reviewed-on: https://code.wireshark.org/review/3630 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-15get rid of type_2 in most placesMartin Kaiser1-17/+7
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-15simplify try_dissect_next_protocol()Martin Kaiser1-104/+136
Change-Id: Idd9690689217bdfc66f9eee1461422358e837774 Reviewed-on: https://code.wireshark.org/review/3597 Reviewed-by: Michael Mann <mmann78@netscape.net>