Commit Graph

55333 Commits

Author SHA1 Message Date
AndersBroman 58304b9e3e S1AP: Add an S1AP context to be able to determine which message and
message type an IE was sent in. Needed to dissect proprietarry data.

Change-Id: Ie75a2f6a544cb33e22c42457b0edd83e6456bfe5
Reviewed-on: https://code.wireshark.org/review/4910
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-22 14:17:37 +00:00
Sergey Avseyev 589db1c35b Add Couchbase dissector (binary protocol)
Include new Couchbase Server 3.0 DCP support

Change-Id: I38d0edd7d135a92c130a60dab650aef0ab1205be
Reviewed-on: https://code.wireshark.org/review/2956
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-22 13:48:17 +00:00
Pascal Quantin 2dbc85291d Add packet-adb_service.h to epan/dissectors/Makefile.common
Change-Id: Idfcd18d09cc5aa2572a47117d3788bc3c0368fb3
Reviewed-on: https://code.wireshark.org/review/4908
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-22 13:14:59 +00:00
Michal Labedzki fc4471f061 Bluetooth: A2DP: APT-X does not use RTP while there is no content protection
Change-Id: I5ff8ffdda827b08ee7e284c15e70dadc368b009e
Reviewed-on: https://code.wireshark.org/review/4906
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-10-22 13:07:57 +00:00
Michal Labedzki c2f58d3962 Android: Add ADB dissector
Previoulsy added "adb_cs" is only for adb client <-> adb daemon communication
by loopback interface (by TCP). But there is also communication between
adb daemon and device (by TCP or USB). This transport protocol is different, but
now support is done.

ADB services are shared between ADB and ADB_CS so put them into "adb_service"
dissector. There is still some services to be added.

Change-Id: I754331d3dc6ccf3c17445f5563d01cf2fe1489c7
Reviewed-on: https://code.wireshark.org/review/4651
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-10-22 11:25:06 +00:00
Michael Mann 0ce3640cab Replace pinfo->circuit_id will passing data through functions.
Change-Id: I5b35ad57c5c40a1393cbc174384b8a275abd763c
Reviewed-on: https://code.wireshark.org/review/4903
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-22 05:00:19 +00:00
Michael Mann 527796b4ff Refactor pinfo->circuit_id behavior for ISUP dissector
Change-Id: Idf6e68c53a0a2126f3906bbfa16166821735fc1b
Reviewed-on: https://code.wireshark.org/review/4904
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-22 04:53:49 +00:00
Gerald Combs 0c444f315f OS X: Fix osx-dmg.sh bundle binary path.
Change-Id: Ia7c59de4f8b59dda9dbc484b8fa9ae0c3d88d594
Reviewed-on: https://code.wireshark.org/review/4905
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-22 04:02:45 +00:00
Alexis La Goutte fc75085cd0 libnghttp2: Update to 0.6.4
Change-Id: Ic8878f818a89ebc1056777a5b0838e8a5b1215d5
Reviewed-on: https://code.wireshark.org/review/4834
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-22 02:55:03 +00:00
Gerald Combs 9ddbc8de77 Qt: Fill in time display menu items. Other fixes and updates.
Reselect the current packet when we redraw the packet list.

Don't crash if we try to mark when no frame is selected. Try to
invalidate cached packet list strings when needed. Rename
PacketList::updateAll to redrawVisiblePackets so that its purpose is
more clear. When changing the font size, call redrawVisiblePackets
instead of rebuilding the entire list of visible rows.

Change-Id: I6e7a15067e7063d0efc26082170e1795ae3c0779
Reviewed-on: https://code.wireshark.org/review/4901
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21 23:32:21 +00:00
Gerald Combs e5d967bbb4 osx-app.sh: Add verbosity.
Change-Id: I3cd1c49909af34badd0d5c5f29bfcddb753ef2bf
Reviewed-on: https://code.wireshark.org/review/4902
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21 23:31:43 +00:00
Michael Tüxen 24f0888b31 Fix the condition for an expert info
The condition triggering an expert info if the reliability
parameter is non-zero, but a reliable data channel is
negotiated was wrong. Now the type field is considered
correctly.
While there, update the reference.

Change-Id: I1f2f78861d6a44c5334fd44e2038bbfdc52fa919
Reviewed-on: https://code.wireshark.org/review/4900
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-10-21 20:29:51 +00:00
Martin Kaiser 4664ac6e20 fix wrong offset for ID Capability Flags 1
reported by Jean-Marc Lamond

Bug: 10597
Change-Id: I481fad9cd0b8d55e3dd3af00cde2897105547f13
Reviewed-on: https://code.wireshark.org/review/4898
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-21 18:05:53 +00:00
Martin Kaiser 1463db37d9 tn5220: prevent another potential endless loop
exit the loop if dissect_unknown_data() returns 0

Change-Id: I681d170d4daf8efb06231790652ff7c941b46d89
Reviewed-on: https://code.wireshark.org/review/4882
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-21 17:54:22 +00:00
Martin Kaiser b757038160 no need for if(tree)
Change-Id: I529a601ce83c446247cee1e87386622462f24f56
Reviewed-on: https://code.wireshark.org/review/4896
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-21 17:46:21 +00:00
Martin Kaiser 5f6be84c18 no need for continue at the end of a while loop, we loop anyway
Change-Id: I96ff9ee0967fcdb2c8122649a2363a36ea2a2882
Reviewed-on: https://code.wireshark.org/review/4884
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-21 17:45:46 +00:00
Gerald Combs 86386243cd Make the "-qt" option the default in the OS X packaging scripts.
Change-Id: I1e404c342d06381be71735ff6fbc47e9b2b13899
Reviewed-on: https://code.wireshark.org/review/4895
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21 16:16:56 +00:00
AndersBroman 39b631da4d Add OID callback for private IEs making it possible to call a dissector
for the private OID.

Change-Id: Ibb86d8523f1aee14ba1a843ec3ad4becc7729013
Reviewed-on: https://code.wireshark.org/review/4893
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-21 10:38:32 +00:00
AndersBroman 750d377b30 Add OID dissector table for PER based dissection.
Change-Id: Iaf789017e997eddf7d6dc596eb40fdef413bfd68
Reviewed-on: https://code.wireshark.org/review/4778
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-21 08:32:12 +00:00
Guy Harris c4dc9eda80 Handle an hfindex of -1.
Code generated by the current version of Pidl dissects bitset fields
twice - once with proto_tree_add_item(), which puts the actual item into
the tree, so that we can create a subtree under it, and once with a
dissect_dcerpc_{type}() routine, to fetch the value and step past the
field.  The second call passes an hf_ index value of -1; interpret that
as meaning "don't put this into the protocol tree", rather than just
blindly calling proto_tree_add_XXX with -1 and getting a dissector
assertion.

Change-Id: I42fc023e77514a8a8a25d5c9db11fa3ef053babf
Reviewed-on: https://code.wireshark.org/review/4892
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-21 07:52:13 +00:00
Guy Harris 7522497b67 With CMake, define WANT_PACKET_EDITOR in config.h.
Just as we do with autotools and nmake, define it in config.h, so it's
defined the same for every single file, rather than defining it in one
particular directory's Makefiles, so that it's defined for some code but
not all.

Change-Id: Ic41cd10f2b502e0be76c134cbeaad94dff7623f8
Reviewed-on: https://code.wireshark.org/review/4891
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-21 05:29:48 +00:00
Guy Harris 8dd032e84a file.c isn't in a DLL, so what it exports shouldn't be WS_DLL_PUBLIC.
Change-Id: I1fcd0422703d21ce3d0764a23bd491708ffc6785
Reviewed-on: https://code.wireshark.org/review/4890
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-21 01:25:51 +00:00
Guy Harris 8868cf175a Fix the earlier checkin.
Remove some trailing white space while we're at it.

Change-Id: If399077a799e24302640776760b4388687ecad4f
Reviewed-on: https://code.wireshark.org/review/4889
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-21 01:23:59 +00:00
Guy Harris 29ab9673f9 Fix a number of what appear to be errors.
Add checks for too-short length fields.

Increment the offset after some proto_tree_add_item() calls to skip past
the item.

Make some other length calculations use the start of the item to which
the length applies, not the start of the *list* of items.

Fix a double-digit field to be 2 bytes long (as the documentation says
it is).

Add a comment about a field that isn't always present but that's
specified in a tn5250_add_hf_items() list.

Fix DEFINE PITCH TABLE to match what the documentation appears to say it
is.

Change-Id: Ibcdc580045c68e8d0d8f35011dfe72b9c245e157
Reviewed-on: https://code.wireshark.org/review/4888
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-21 00:57:43 +00:00
Gerald Combs a19825b45d CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.
Have FindWSWinLibs check for WIRESHARK_LIB_DIR before WIRESHARK_BASE_DIR
to match the behavior of config.nmake and the Windows buildbots, which
set the former but not the latter.

It looks like the latest GLib DLL contains GThread. Adjust
FindGTHREAD2.cmake accordingly.

Change-Id: I0232b1819eca9ba2c39ae6834daddf65af979d7d
Reviewed-on: https://code.wireshark.org/review/4887
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-20 23:42:11 +00:00
Guy Harris f66e45b112 Export cf_set_frame_edited().
Change-Id: I6569b020ff00d6748840a00ca418653d9e3fdb9b
Reviewed-on: https://code.wireshark.org/review/4886
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 23:37:28 +00:00
Evan Huus 43a21c810a kafka: summarize number of messages in a set
Change-Id: I62873a147426079aa4890289320c43ef7f1b26dc
Reviewed-on: https://code.wireshark.org/review/4877
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-20 21:49:25 +00:00
Guy Harris 77f969958c Fix support for writing out edited records.
Add a cf_set_frame_edited() routine to set the record header and data
for a record; have it do all the non-GUI work, and have it set the
file's "unsaved changes" flag.

Have the GUI code just call that routine and then update the title bar
to reflect the unsaved changes.

While we're at it, unmark a no-longer-unused argument to save_record().

Change-Id: Ieb513fdf423b388519527621ecec4cf634b98caf
Reviewed-on: https://code.wireshark.org/review/4885
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 21:37:41 +00:00
Stig Bjørlykke 0bbe48304a Proto: Fixed proto_unregister_field()
This function did not work after svn revision 51396.
This fix affects http, imf and ldap preferences.

Change-Id: I6fcb24c968d03c7d1fdc018cfa907f9cfd8809bb
Reviewed-on: https://code.wireshark.org/review/4881
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-20 20:57:45 +00:00
Martin Kaiser bc27265781 tn5250: fix an endless loop, exit when offset is not incremented
Bug: 10596
Change-Id: I64509aa49fce4893dee4e7a74a560e09a98830f6
Reviewed-on: https://code.wireshark.org/review/4878
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-20 20:47:28 +00:00
Gerald Combs a2508bda19 OS X: Add retina / hidpi support to Info.plist.
This should partially fix the problem described at
https://ask.wireshark.org/questions/37177/pixelated-ui-on-mac-os-x-with-development-1990

Change-Id: I436aae0d5b681e9ff549d257c2244ee67448ab07
Reviewed-on: https://code.wireshark.org/review/4876
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-20 18:46:00 +00:00
Evan Huus d86b308fd4 kafka: compression codec is unsigned
Change-Id: I238e93dd035caa359fed768aa2aac4df5a0ef47e
Reviewed-on: https://code.wireshark.org/review/4875
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-20 15:04:30 +00:00
Guy Harris c3f14ab3d4 Don't use toupper() in the test program.
We're not including ctype.h in the test program, so don't use toupper().
The test program might not be built with GLib, so don't use
g_ascii_toupper(), either.  Just compare against both 'Y' and 'y'.

Change-Id: Iabc04a5fecb04110c0d16b24a047de72eabbb2bc
Reviewed-on: https://code.wireshark.org/review/4870
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 09:04:44 +00:00
Guy Harris 991743b0b1 Get rid of another toupper() call in favor of g_ascii_toupper().
Change-Id: If527af69ec96a91c4127c95307c3b93b79b53e2f
Reviewed-on: https://code.wireshark.org/review/4865
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 08:49:34 +00:00
Guy Harris 9eb0080e05 Sign, Flex strikes again; it generates code that produces warnings.
Change-Id: Ibd92bd07e537a4ac19e2a5b159ece0e25aa366b1
Reviewed-on: https://code.wireshark.org/review/4861
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 08:09:04 +00:00
Guy Harris 091aea8c3c And some more comment cleanup.
Change-Id: Idfc541a08de2ed9e1ca8bccca366612830213ead
Reviewed-on: https://code.wireshark.org/review/4858
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 08:00:00 +00:00
Guy Harris 700bfdcba6 More comment cleanup.
Change-Id: Ifa65c3090e204b93ec526358b863fdf9bafc6a03
Reviewed-on: https://code.wireshark.org/review/4857
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 07:46:09 +00:00
Guy Harris 9ffb72b8cf Clean up some comments.
Change-Id: Ibe96878ba9ae94f9f22a221797fb36d713286d32
Reviewed-on: https://code.wireshark.org/review/4856
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 07:42:37 +00:00
Guy Harris 80e6f6251e Get rid of calls to ctype.h functions.
They don't handle values outside the range -1 to 127, and their behavior
is locale-dependent.  Use g_ascii_isXXX() and g_ascii_toXXX() instead of
isXXX() and toXXX().

If you're checking for printable ASCII, don't use isascii() and don't
use iscntrl(), use g_ascii_isprint().  If you're checking for graphical
ASCII, i.e. printable ASCII except for a space, use g_ascii_isgraph().

Use ws_xton() to convert a hex digit character to the corresponding
numeric value.

Change-Id: Id3039bc586fbf66d8736c2df248c790c0d7a2330
Reviewed-on: https://code.wireshark.org/review/4851
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 06:15:19 +00:00
Guy Harris 0b9eb9f4b7 Get rid of unnecessary includes of ctype.h.
Change-Id: I2cf49f808558147ce77e7d086558966cfb2defca
Reviewed-on: https://code.wireshark.org/review/4850
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 06:02:51 +00:00
Stig Bjørlykke 39c3a794d8 Check if mask_greatest_bit_offset is within limits.
The result of the '>>' expression is undefined if mask_greatest_bit_offset = 0.

Change-Id: I15b094a5220a5075878bad65ab0b8c5279e80e8a
Reviewed-on: https://code.wireshark.org/review/4723
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-20 01:45:28 +00:00
Michael Mann 4963d99c4a Eliminate proto_tree_add_text from packet-cdp.c
Change-Id: I77e1f5788e0567dcaef9f75e1f45e61c63d54b4e
Reviewed-on: https://code.wireshark.org/review/4849
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-10-20 01:20:34 +00:00
Guy Harris c9b84a5cca This appears to be clean with my build; see if it needs work with others.
Change-Id: I2c3e3ce8e29b26958d42b66eca3c7539b65695ab
Reviewed-on: https://code.wireshark.org/review/4848
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19 23:09:20 +00:00
Guy Harris 4d6b3db5d4 Eliminate a use of a ctype.h function.
That way, we avoid locale-dependent behavior.

Change-Id: I429fde961dc7cb61013756a663d6cd511f19ca70
Reviewed-on: https://code.wireshark.org/review/4845
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19 23:01:15 +00:00
Guy Harris 2b6c267a57 Eliminate use of ctype.h routines.
That way, we don't do locale-sensitive case-insensitivity (yes, the
locale can affect case-mapping - in a Turkish locale, "I" isn't the
upper-case version of "i", for example).

Change-Id: I5f7663e85160558ff3769617f924e45049c9c384
Reviewed-on: https://code.wireshark.org/review/4843
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19 22:45:27 +00:00
Guy Harris ac55a6d2f5 Get rid of unnecessary include of ctype.h.
Change-Id: I30c4d75e16e1816c4a792e023ffe04f5a970b6d3
Reviewed-on: https://code.wireshark.org/review/4842
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19 22:40:08 +00:00
Michael Mann 5e4e17ca5e Remove unnecessary tvb_ensure_bytes_exist calls.
All of the calls removed are followed by proto_tree_add_xxx calls of the same offset/length of the tvb_ensure_bytes_exist call.  The proto_tree_add_xxx calls should throw the exception, so we don't need the "double check".
There are probably more calls that can be removed, these were just obvious as first glance, spurred mostly by noticing the (ab)use in packet-wsp.c

Change-Id: I37cee347c8cf8ab0559e21562c802d3b37f4871e
Reviewed-on: https://code.wireshark.org/review/4833
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-19 15:26:43 +00:00
Gerald Combs 1427a8e986 [Automatic manuf, services and enterprise-numbers update for 2014-10-19]
Change-Id: Ifc13fdb5898cad85ba7cd35c28024f3d4fefe70a
Reviewed-on: https://code.wireshark.org/review/4839
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-19 15:06:03 +00:00
Alexis La Goutte db316c9d9f TDS: Make buildbot happy
Fix Field 'Server Version' (tds.server_version) is an integral value (FT_UINT32) but is being displayed as BASE_NONE

Change-Id: I601e71ac8e7928ef90fdd16956af3a34bca269a9
Reviewed-on: https://code.wireshark.org/review/4836
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-19 14:21:28 +00:00
Bill Meier 8def8ef9c4 packet-amqp.c: Temporary/preliminary fix for Bug #10582 (crash)
This is a temporary/preliminary fix to prevent the buildbot fuzz-test
 failures seen when testing the capture file attached to Bug #10582.

As noted in the bug, a complete fix will require some reworking of
  the amqp dissector.

Change-Id: I2571f1eeb46a7eede04b8d809e87b95f1ff529df
Reviewed-on: https://code.wireshark.org/review/4835
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-19 14:14:22 +00:00