Commit Graph

54489 Commits

Author SHA1 Message Date
Bill Meier 097401c94e packet-ceph.c: Temporarily comment out the use of DISSECTOR_ASSERT_CMP... macros since they have a bug.
Change-Id: I007931980644a9283083052f8c27d553f052470a
Reviewed-on: https://code.wireshark.org/review/3743
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-20 05:53:11 +00:00
Kevin Cox 41af6dddc7 Add more messages for the Ceph protocol.
New messages:
- Mon Paxos.
- Mon Global ID.
- Mon Get Version
- OSD Ping
- Ping
- OSD Boot
- OSD PG Create.
- PG Stats.

Other updates:
- Documentation for modifying the dissector.
- Update assertions to show values.
- Replace proto_tree_add_text()/expert_add_info...() by proto_tree_add_expert...().
- Fix a bug: misplaced break.
- Do some minor whitespace & other cosmetic changes.
Change-Id: Ib19ce509b67fb5e6fb31e82b5a551a9e952a9c6d
Reviewed-on: https://code.wireshark.org/review/3623
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-20 03:10:54 +00:00
Jeff Morriss b9a94f009e Add a routine to dissect an UTF8-encoded IMSI (as you'd find in Diameter) and use it to decode the User-Name AVP of S6a/S6d messages.
Also clean up some white space/formatting.

Change-Id: Idf2d4cad2af1826b24de7d59407ffeb36100c19b
Reviewed-on: https://code.wireshark.org/review/3742
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-20 02:55:09 +00:00
Jeff Morriss 9d7784dfeb Get it compiling again.
Remove set-but-not-used variable.
Mark a parameter as unused.

Change-Id: I7c3af353da2967e5d611deb2cb027a9e30e54bdf
Reviewed-on: https://code.wireshark.org/review/3741
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-20 02:01:16 +00:00
Pascal Quantin 47b7df8627 NAS EPS: remove a now unused hf entry and convert tabs to spaces
Change-Id: I3d5e91bd0bdb44fe033284aa38bc1f3a1dc35f4f
Reviewed-on: https://code.wireshark.org/review/3740
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-19 22:03:41 +00:00
Martin Kaiser c7da11678b actually store the endpoint in the conversation
this fixes the bugfix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10386
(hopefully)

Change-Id: Ib61e1033cae7516181c3557bf78d01b4249a7393
Reviewed-on: https://code.wireshark.org/review/3738
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 21:40:07 +00:00
Martin Kaiser cdfd6e4a93 handle all combinations of request type and recipient
for USB control messages

Change-Id: I9d2ad2995975e1853c73d712b429a30cead8f473
Reviewed-on: https://code.wireshark.org/review/3737
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 21:39:49 +00:00
AndersBroman 7146999963 Use dissect_e212_imsi() to dissect IMSI
Fix dissection when MCC starts in the high nibble.
Replace deprecated APIs

Change-Id: Ic08a1db9ee7ebb535bf7914191807304e9f88981
Reviewed-on: https://code.wireshark.org/review/3736
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 21:18:17 +00:00
Martin Kaiser e5e8828d1f start simplifying the parsing of USB control URBs
Change-Id: Ie527b89f6be2d100dfd8bc7c96c2f2ac7efa3efc
Reviewed-on: https://code.wireshark.org/review/3735
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:23:34 +00:00
Martin Kaiser 22dc9922f6 remove product_data, protocol_data parameters from try_dissect_next_protocol()
(another small step to make this function understandable)

Change-Id: Ib00aa00af8287969dd2d80a33c1f0ebd0b8f2248
Reviewed-on: https://code.wireshark.org/review/3734
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:23:12 +00:00
Martin Kaiser 74c8ded0d2 reformat dissect_usb_setup_get_descriptor_response()
Change-Id: I8004c4fd6e9cac3615d27b375229a79d01dfcd68
Reviewed-on: https://code.wireshark.org/review/3733
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:22:54 +00:00
Martin Kaiser ea7a54926d remove the usb_trans_info parameter from dissect_usb_hid_get_report_descriptor()
Change-Id: If14357a02a60eff5fc7e50567c2c6bfc6ee3dcc6
Reviewed-on: https://code.wireshark.org/review/3732
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:22:32 +00:00
Martin Kaiser a1b40258dd remove the parameter usb_trans_info from the functions that dissect the
standard descriptors

usb_trans_info is a part of usb_conv_info, there's no need to have it as
a separate parameter

Change-Id: I3608c10543b896ca04c6062de23297d852dae31a
Reviewed-on: https://code.wireshark.org/review/3731
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:22:12 +00:00
Martin Kaiser 543153bc92 interface and endpoint descriptors can't possibly appear in a
get descriptor response on their own, only as part of a configuration
descriptor

Change-Id: I2d70ab1d1adc19cbc0fe8c2c835071153a40ae7d
Reviewed-on: https://code.wireshark.org/review/3730
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:21:52 +00:00
Martin Kaiser 5dc742b35f now that we have a routine to clean up the packet-specific infos in the
usb conversation, there's no need to clean up usb_conv_info after
parsing the configuration descriptor

this wouldn't work anyway if one of the subfunctions throws an exception

Change-Id: Ifd13f320db1ec17c3b706778ce0f5dffa1349770
Reviewed-on: https://code.wireshark.org/review/3729
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:21:29 +00:00
Martin Kaiser d6775dc40e Revert "Revert "create audio-specific part of the usb conversation""
This reverts commit 22e10bea0c.

Now that the fuzz failures are fixed, we can re-enable the
audio-specific extensions.

Change-Id: Id788e10aaa3dbf289df364f7da9ef01e24ba47f9
Reviewed-on: https://code.wireshark.org/review/3728
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:21:05 +00:00
Martin Kaiser 119406192f clear the temporary components of usb_conv_info_t before we dissect a
new packet

this fixes the fuzz failures in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10386

Change-Id: I8c0ba8c8da9af8d7a3ef9cdd7781769b9966f1a2
Reviewed-on: https://code.wireshark.org/review/3727
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:20:38 +00:00
Martin Kaiser 8c84a23049 these two vars are initialized to NULL,
we don't have to set them to NULL again

Change-Id: Iacd01ca207d2b74ebdbd5a7635f00e6d03b13721
Reviewed-on: https://code.wireshark.org/review/3726
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 20:19:59 +00:00
Martin Kaiser 5c554c9c41 fix
packet-gtp.c: In function 'decode_gtp_imsi':
packet-gtp.c:3210:18: error: variable 'imsi_str' set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors
make[5]: *** [libdissectors_la-packet-gtp.lo] Error 1

by commenting out the unused variable

Change-Id: I498595f93423c599f902a1a0cc42b63cef2c4d7c
Reviewed-on: https://code.wireshark.org/review/3725
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 19:06:23 +00:00
Marian Ďurkovič 8670d9fdfe TRILL ISIS: Unify MTID presentation in all cases
Change-Id: I66eb683d6b1f9dccae3e566ad4dd4cfd18b81ddb
Reviewed-on: https://code.wireshark.org/review/3713
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-19 18:34:19 +00:00
Bill Meier 2e3bc5790f packet-PROTOABBREV.c: various minor changes:
- Specify that proto_register...() and proto_reg_handoff...() prototypes are required;
- Indicate that certain #includes should be used only as needed;
- Don't use CamelCase (or CAPS) in variable names;
- Do some reformatting of certain lines;
- Futz hf[] array entry so checkAPIs and checkhf tests don't fail.

Change-Id: Ie03846f4bebd2a9bece464c85cc3c2ef46dd4fe5
Reviewed-on: https://code.wireshark.org/review/3724
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-19 18:30:17 +00:00
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