aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-10-22Qt: Show / hide main widgets.Gerald Combs4-75/+171
Remove existing code which uses the visibilityChanged signal. It exists in QToolbar but not QWidget. Use the actions to drive visibility instead. Update MainWindow::layoutPanes to respect "recent" settings. Move the show / hide actions to the top of the View menu to match GTK+. Change-Id: I670682e2a094945dbd36c80f43cd14515bbca5a6 Reviewed-on: https://code.wireshark.org/review/4911 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-22Couchbase: fix FSF address and reorder opcode_vals arrayPascal Quantin1-14/+14
Change-Id: I41448f9a111dde24c29984d8e4f053fc2a668c9e Reviewed-on: https://code.wireshark.org/review/4912 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-22S1AP: Add an S1AP context to be able to determine which message andAndersBroman4-20/+64
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-22Add Couchbase dissector (binary protocol)Sergey Avseyev4-0/+1135
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-22Add packet-adb_service.h to epan/dissectors/Makefile.commonPascal Quantin1-0/+1
Change-Id: Idfcd18d09cc5aa2572a47117d3788bc3c0368fb3 Reviewed-on: https://code.wireshark.org/review/4908 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-22Bluetooth: A2DP: APT-X does not use RTP while there is no content protectionMichal Labedzki1-4/+6
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-22Android: Add ADB dissectorMichal Labedzki8-624/+1888
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-22Replace pinfo->circuit_id will passing data through functions.Michael Mann3-44/+41
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-22Refactor pinfo->circuit_id behavior for ISUP dissectorMichael Mann3-16/+16
Change-Id: Idf6e68c53a0a2126f3906bbfa16166821735fc1b Reviewed-on: https://code.wireshark.org/review/4904 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-22OS X: Fix osx-dmg.sh bundle binary path.Gerald Combs1-1/+1
Change-Id: Ia7c59de4f8b59dda9dbc484b8fa9ae0c3d88d594 Reviewed-on: https://code.wireshark.org/review/4905 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-22libnghttp2: Update to 0.6.4Alexis La Goutte8-355/+815
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-21Qt: Fill in time display menu items. Other fixes and updates.Gerald Combs11-70/+452
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-21osx-app.sh: Add verbosity.Gerald Combs1-1/+1
Change-Id: I3cd1c49909af34badd0d5c5f29bfcddb753ef2bf Reviewed-on: https://code.wireshark.org/review/4902 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21Fix the condition for an expert infoMichael Tüxen1-3/+3
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-21fix wrong offset for ID Capability Flags 1Martin Kaiser1-1/+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-21tn5220: prevent another potential endless loopMartin Kaiser1-1/+6
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-21no need for if(tree)Martin Kaiser1-8/+4
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-21no need for continue at the end of a while loop, we loop anywayMartin Kaiser1-1/+0
Change-Id: I96ff9ee0967fcdb2c8122649a2363a36ea2a2882 Reviewed-on: https://code.wireshark.org/review/4884 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-21Make the "-qt" option the default in the OS X packaging scripts.Gerald Combs3-12/+24
Change-Id: I1e404c342d06381be71735ff6fbc47e9b2b13899 Reviewed-on: https://code.wireshark.org/review/4895 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21Add OID callback for private IEs making it possible to call a dissectorAndersBroman3-85/+120
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-21Add OID dissector table for PER based dissection.AndersBroman2-2/+53
Change-Id: Iaf789017e997eddf7d6dc596eb40fdef413bfd68 Reviewed-on: https://code.wireshark.org/review/4778 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-21Handle an hfindex of -1.Guy Harris1-10/+10
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-21With CMake, define WANT_PACKET_EDITOR in config.h.Guy Harris2-6/+3
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-21file.c isn't in a DLL, so what it exports shouldn't be WS_DLL_PUBLIC.Guy Harris1-1/+0
Change-Id: I1fcd0422703d21ce3d0764a23bd491708ffc6785 Reviewed-on: https://code.wireshark.org/review/4890 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-21Fix the earlier checkin.Guy Harris1-3/+3
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-21Fix a number of what appear to be errors.Guy Harris1-8/+63
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-20CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.Gerald Combs3-10/+24
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-20Export cf_set_frame_edited().Guy Harris1-0/+1
Change-Id: I6569b020ff00d6748840a00ca418653d9e3fdb9b Reviewed-on: https://code.wireshark.org/review/4886 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20kafka: summarize number of messages in a setEvan Huus1-0/+3
Change-Id: I62873a147426079aa4890289320c43ef7f1b26dc Reviewed-on: https://code.wireshark.org/review/4877 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-20Fix support for writing out edited records.Guy Harris3-25/+61
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-20Proto: Fixed proto_unregister_field()Stig Bjørlykke1-4/+4
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-20tn5250: fix an endless loop, exit when offset is not incrementedMartin Kaiser1-0/+2
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-20OS X: Add retina / hidpi support to Info.plist.Gerald Combs1-64/+66
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-20kafka: compression codec is unsignedEvan Huus1-1/+1
Change-Id: I238e93dd035caa359fed768aa2aac4df5a0ef47e Reviewed-on: https://code.wireshark.org/review/4875 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-20Don't use toupper() in the test program.Guy Harris1-1/+1
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-20Get rid of another toupper() call in favor of g_ascii_toupper().Guy Harris1-1/+1
Change-Id: If527af69ec96a91c4127c95307c3b93b79b53e2f Reviewed-on: https://code.wireshark.org/review/4865 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20Sign, Flex strikes again; it generates code that produces warnings.Guy Harris1-3/+6
Change-Id: Ibd92bd07e537a4ac19e2a5b159ece0e25aa366b1 Reviewed-on: https://code.wireshark.org/review/4861 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20And some more comment cleanup.Guy Harris1-2/+2
Change-Id: Idfc541a08de2ed9e1ca8bccca366612830213ead Reviewed-on: https://code.wireshark.org/review/4858 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20More comment cleanup.Guy Harris2-6/+7
Change-Id: Ifa65c3090e204b93ec526358b863fdf9bafc6a03 Reviewed-on: https://code.wireshark.org/review/4857 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20Clean up some comments.Guy Harris1-3/+2
Change-Id: Ibe96878ba9ae94f9f22a221797fb36d713286d32 Reviewed-on: https://code.wireshark.org/review/4856 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20Get rid of calls to ctype.h functions.Guy Harris30-209/+114
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-20Get rid of unnecessary includes of ctype.h.Guy Harris19-26/+0
Change-Id: I2cf49f808558147ce77e7d086558966cfb2defca Reviewed-on: https://code.wireshark.org/review/4850 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20Check if mask_greatest_bit_offset is within limits.Stig Bjørlykke1-1/+1
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-20Eliminate proto_tree_add_text from packet-cdp.cMichael Mann1-251/+245
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-19This appears to be clean with my build; see if it needs work with others.Guy Harris1-6/+3
Change-Id: I2c3e3ce8e29b26958d42b66eca3c7539b65695ab Reviewed-on: https://code.wireshark.org/review/4848 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19Eliminate a use of a ctype.h function.Guy Harris1-2/+1
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-19Eliminate use of ctype.h routines.Guy Harris2-4/+6
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-19Get rid of unnecessary include of ctype.h.Guy Harris1-1/+0
Change-Id: I30c4d75e16e1816c4a792e023ffe04f5a970b6d3 Reviewed-on: https://code.wireshark.org/review/4842 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19Remove unnecessary tvb_ensure_bytes_exist calls.Michael Mann12-312/+20
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[Automatic manuf, services and enterprise-numbers update for 2014-10-19]Gerald Combs4-12/+206
Change-Id: Ifc13fdb5898cad85ba7cd35c28024f3d4fefe70a Reviewed-on: https://code.wireshark.org/review/4839 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 19:08:18 +0000