Commit Graph

54418 Commits

Author SHA1 Message Date
Michael Mann 0cda27c83e "Highly discourage" use of proto_tree_add_text.
Change-Id: I2e8d18df71688c654f7acaff51fae7823c08aa6a
Reviewed-on: https://code.wireshark.org/review/3677
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: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-19 16:20:34 +00:00
AndersBroman d7e4564321 Use dissect_e212_imsi() to dissect IMSI
fix offset in dissect_e212_mcc_mnc_in_address().

Change-Id: I68006ea3e2c79e2549e6f2d2c8a997e44fc3cdf1
Reviewed-on: https://code.wireshark.org/review/3722
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 15:47:24 +00:00
AndersBroman 88e802516b Use e212 function to dissect IMSI.
Remove deprecated APIs

Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf
Reviewed-on: https://code.wireshark.org/review/3721
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 15:01:41 +00:00
AndersBroman 93da6170e3 Remove unused hf and deprecated API
Change-Id: I5196f2be4b15704517ff1dc8bfacc6f9b52ecd71
Reviewed-on: https://code.wireshark.org/review/3720
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:07:06 +00:00
AndersBroman 50413192e3 Use the E212 function to dissect IMSI correct the filter Id string in
E212.

Change-Id: I203502b39d4ef216282d305f90c930aca84241bf
Reviewed-on: https://code.wireshark.org/review/3718
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 13:46:00 +00:00
Jeff Morriss 7cc8b7c16f Don't mark a used parameter as unused.
Also fix up some whitespace.

Change-Id: I7cd78740199ce7b2682902a5687c4f05c2c963b2
Reviewed-on: https://code.wireshark.org/review/3716
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-19 13:36:17 +00:00
AndersBroman 1cdef1d98a Implement a common function to dissect IMSI and use it GSM MAP as a start.
- remove soft deprecated APIs and unused hf.

Change-Id: Id00c3dd35f3fc65f543bc29df6d35515c45fe7e1
Reviewed-on: https://code.wireshark.org/review/3715
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 12:27:29 +00:00
Marian Ďurkovič fc43a8c933 TRILL ISIS: Implement Group IPv4/IPv6 Address Sub-TLVs
Change-Id: If75925224fc487f583635d9a4346fa900cb0d1d1
Reviewed-on: https://code.wireshark.org/review/3703
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 08:52:46 +00:00
Guy Harris a23a4f6334 The error report timer is non-negative; make it FT_UINT16.
This squelches an assertion.

Use %u to print it, while we're at it.

Reformat the generated named fields to match the others.

Use proto_tree_add_item for the beacon type.

Change-Id: I1dcf161141638de8d7314a3733391a63e0608f67
Reviewed-on: https://code.wireshark.org/review/3711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-19 07:10:23 +00:00
Kevin Cox 312858939d Fix Ceph packet length determination.
The authentication string was not being factored in on the length reply.
Also there was an issue with different banners.  Now the banner length
must match what we expect or the packet is rejected.  If the banner
length changes the protocol is different and we won't be able to parse
it anyways.

Change-Id: I0c1a7379edaa203042486a0e6f9ce3642427da99
Reviewed-on: https://code.wireshark.org/review/3710
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-19 01:17:08 +00:00
Evan Huus cf0cb90af3 ceph: use col_add_str instead of col_set_str
The argument is no longer guaranteed to be a const that hangs around.

Bug: 10395
Change-Id: I3c658f6db5927e09a9a38f9ec0fbce153b3e1bc2
Reviewed-on: https://code.wireshark.org/review/3709
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-19 00:32:23 +00:00
Guy Harris 7b7dd1efce Don't use -1 as the length of an integer.
That's not supported.  Put the unknown enterprise number in a a 4-byte
value, as that's what it is, and then just skip to the end of the
packet.

Change-Id: I2cce84bfbb46a114d4809dbc61a021d497eb87a8
Reviewed-on: https://code.wireshark.org/review/3708
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18 19:44:22 +00:00
Guy Harris 9d6d19254c Use expert info to report unknown TLV types.
Unless we plan to fill in all 256 entries in the TLV type table, and
unless that's because all 256 types are valid, we should report unknown
types with an expert info, not a dissector assertion.

Change-Id: Ia6fca37ad6a5969caad3229abaf08a25e20ba992
Reviewed-on: https://code.wireshark.org/review/3707
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18 19:30:12 +00:00
Guy Harris a3cecb2909 Don't use proto_tree_add_expert() with an item rather than a tree.
proto_tree_add_expert() is to be used only on an item that's been
created as a tree (i.e., an interior node, complete with an ett_ value);
to hang expert info off of an *item*, which might *not* have been set up
to take subtree items, use expert_add_info().

Change-Id: Icdcdf39c31c0a03ff80dbb629186e8f6fa82e8ab
Reviewed-on: https://code.wireshark.org/review/3705
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18 19:09:23 +00:00
Guy Harris 4a16ffc324 Fix handling of STRING16.
When part of a ListOfTextItem, show the STRING16 the same way in both
places where its value is shown - hex digits or text string.

If the STRING16 contains only 8-bit characters, treat it as ASCII; the
values 0x20 through 0x7E are *probably* ASCII (although that's not
guaranteed), but the values above 0x7F aren't guaranteed to be anything.
*Don't* use tvb_get_ptr() to fetch the string value; that's not
guaranteed to work with strings.

Don't impose an upper limit on the maximum displayed length of a
STRING16.

Change-Id: Ia14812335b9afbff695efe5046dc0ffc2483a351
Reviewed-on: https://code.wireshark.org/review/3704
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-18 18:13:31 +00:00
Marian Ďurkovič 8f0d81d332 TRILL TREE Sub-TLV fixes
1) Fix starting tree number
2) Display Nicknames both in hex and dec

Change-Id: If58d034e98429019d769ebe7be635a296e8ef18d
Reviewed-on: https://code.wireshark.org/review/3687
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-18 16:31:05 +00:00
Anders Broman 3788097ac8 Revert "Fix warning: no previous prototype for ... [-Wmissing-prototypes]"
This reverts commit 9918435ed7.

Change-Id: I122b65ec59f48b8a21e2b43ccdad0ed146b0e78f
Reviewed-on: https://code.wireshark.org/review/3702
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 14:03:11 +00:00
Alexis La Goutte 9918435ed7 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: If41ffdfa15fb24af3e6846f1cfc855eb6cfffb77
Reviewed-on: https://code.wireshark.org/review/3699
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 13:15:57 +00:00
Alexis La Goutte 31f3187c6f Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I8be913c41695177064985848995db2c0a570c612
Reviewed-on: https://code.wireshark.org/review/3698
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 13:14:54 +00:00
Alexis La Goutte 3adbd93771 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I59e744d905a0a13eea4ff649a984b2ed9f1f51e7
Reviewed-on: https://code.wireshark.org/review/3697
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 13:13:43 +00:00
Alexis La Goutte a913bdd490 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Add static before function

Change-Id: I42c5be7a1436160bcb82d0cb4309959802b7b3cb
Reviewed-on: https://code.wireshark.org/review/3696
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 13:12:45 +00:00
Alexis La Goutte 005a49453b Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Add static before function

Change-Id: Ia34e4786d6181c7849094dd0c27445b29dd89f10
Reviewed-on: https://code.wireshark.org/review/3695
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 12:21:30 +00:00
Alexis La Goutte de275db2cc Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Add static before function

Change-Id: I5e112bee776b149ba7390b4aa2c36cb212d2eeb5
Reviewed-on: https://code.wireshark.org/review/3694
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 12:20:30 +00:00
Alexis La Goutte 9911f1fd8f Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Add static before function

Change-Id: Iddf2879407cfc78734719e7ea2a9eb047045c100
Reviewed-on: https://code.wireshark.org/review/3693
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 12:19:27 +00:00
Alexis La Goutte 7b2c3cd141 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Add static before function

Change-Id: I64e50f0b0349a2ba21cd5d8b8c9ea22e6e960eb3
Reviewed-on: https://code.wireshark.org/review/3692
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 12:18:41 +00:00
Alexis La Goutte c8646fa310 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Add static before function

Change-Id: I0d6d2dc5715c15522190132bfdcb2da1245b9ef7
Reviewed-on: https://code.wireshark.org/review/3691
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 12:11:27 +00:00
Alexis La Goutte 940532efdd Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Add static before function

Change-Id: Icb54ccf58e5752892e7217327380a0af7da45647
Reviewed-on: https://code.wireshark.org/review/3690
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 12:10:45 +00:00
Alexis La Goutte 5833d6be14 Corosync : fix encoding args (for proto_tree_add_item)
Change-Id: I908046c04df7f7218627330f64040fafbce6739e
Reviewed-on: https://code.wireshark.org/review/3689
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 11:27:54 +00:00
Irene Ruengeler 82d8877b37 Capture Options: Add functionality to options and output tab
Change-Id: I4a2116fe5b7ae3997dd7b0f2693aa511f9d52061
Reviewed-on: https://code.wireshark.org/review/3688
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 11:25:32 +00:00
AndersBroman f53c6b36a4 Add missing parameter to proto_tree_add_bytes_format_value()
tvb_lenght -> tvb_reported_length

Change-Id: Ibcb4a7caceaa8207877bdec0f770ad77f84dbe56
Reviewed-on: https://code.wireshark.org/review/3701
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 11:24:57 +00:00
Michael Mann 29c4c36105 Remove proto_tree_add_text from gryphon dissector.
Change-Id: If9f85a6cda483c5b89f9bee3524502b888ccb1d1
Reviewed-on: https://code.wireshark.org/review/3676
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 07:54:04 +00:00
Michael Mann 945b371a25 Eliminate proto_tree_add_text from some dissectors.
Other minor cleanup while in the neighborhood.

Change-Id: I77cac916d617f56f92f686e9cd9f15fba058facf
Reviewed-on: https://code.wireshark.org/review/3675
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 07:53:39 +00:00
Marian Ďurkovič 83ad0d063c Fix TRILL LSP display issues
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-18 06:16:49 +00:00
Alexis La Goutte e3779f135f BGP ISIS: Add TLV 14 (Originating LSP Buffer Size)
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-18 04:42:34 +00:00
Eugene Sukhodolin 30f3a71621 Parse client and server blocks of settings data introduced in newer RDP versions
Change-Id: I46b4557623921e1c2c093ca5e3e75908826358e3
Reviewed-on: https://code.wireshark.org/review/3681
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 04:31:19 +00:00
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