aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-02-20Just have init_progfile_dir() take a void pointer.Guy Harris12-15/+14
dladdr() takes a void * as a code pointer; have init_progfile_dir() do so, and do the casting in the calls. We don't care about the signature of the function whose address we're passing, we just want to pass a pointer to *something* in the main program. Change-Id: I9372620a97b0eb53c2bb3c0c41a238b4408f3709 Reviewed-on: https://code.wireshark.org/review/7270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-20Qt: Fix automatic update status in welcome screen.Gerald Combs2-20/+21
Wait until the application has been initialized before checking prefs.gui_update_enabled. Change-Id: I6e52ba26064b6c5b882992c30c76b65d4a618848 Reviewed-on: https://code.wireshark.org/review/7268 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-19Remove quotes from an Nmake macro.Gerald Combs1-1/+1
Change-Id: Ibe6a544af49c39c12ce13264fb010ccdc54d471b Reviewed-on: https://code.wireshark.org/review/7267 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-19Qt: Add more version and packaging information to the main window.Gerald Combs8-11/+108
Add a "flavor" (for lack of a better word) banner, which can be set at build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to "Development Build" by default. This effectively migrates the "DEVELOPMENT VERSION" logo image text from the GTK+ UI. Add full release and automatic update information at the bottom. Remove the short version from the welcome banner (top left). To do: - Add back support for gui_version_placement. - Move the version and repository branch to the flavor label? - Add update links as appropriate to the bottom. - Clean up layout and spacing. Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057 Reviewed-on: https://code.wireshark.org/review/7071 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-19Rename packet-nbns.c to packet-nbt.c to reflect that it's not just NBNS.Guy Harris3-5/+4
packet-nbt.c handles all of NetBIOS-over-TCP, not just the name service; the file name is historical. Change-Id: I333d331fd9453cea8d1d7595b4fd2650f0a92e98 Reviewed-on: https://code.wireshark.org/review/7259 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-19[bmp] Adding dissector for BGP Monitoring ProtocolEbben Aries5-0/+835
* Support per draft-ietf-grow-bmp-07 Change-Id: Iadb833157e7832077429c048e28e9814da29e2c6 Reviewed-on: https://code.wireshark.org/review/7192 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-19libnl: disable pedantic warning of libnl libAlexis La Goutte2-0/+4
Part 2... Change-Id: I47b74c81ee7b7cd8296ce9da5a60ad6aecef8c78 Reviewed-on: https://code.wireshark.org/review/7239 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-19Qt Wireshark - Once a live capture is stopped the title bar persists in ↵Alexis La Goutte1-1/+1
reporting "Capturing from interface name" With Qt Wireshark the title bar persists in reporting "Capturing from <interface name>" even though capturing has stopped. With GTK Wireshark once a live capture is stopped the title bar is updated to report the interface name(s) used for the unsaved capture file. Issue reported by Jim Young Bug:10948 Change-Id: Ia6099f63f82b6610ade5c81af0cf257236f076ec Reviewed-on: https://code.wireshark.org/review/7050 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19openSAFETY: Merge both CT valuesRoland Knall1-9/+5
Both values mean the same thing and should be found using the same hf_field, as this eases debugging scenarios. Change-Id: I23f675e22623b5e66354708319a41dcf34143e30 Reviewed-on: https://code.wireshark.org/review/7257 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-19patch for PMIPv6 MAG GPS coordinatesOsman Sakalla1-9/+28
Change-Id: I25bbd67775e19c2a0199507538b7dcfe5ce28bf6 Reviewed-on: https://code.wireshark.org/review/7256 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Bugfix in nbns dissector.Dario Lombardo1-3/+3
Change-Id: I5375a1ae2e48fe0c7ff6e3dde24b8d7b02b1f27f Reviewed-on: https://code.wireshark.org/review/7251 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Documentation fix (reported by Richard Sharpe).Dario Lombardo1-4/+4
Change-Id: Ie4979c1be0e325178e3c662e0b2c5bbfc58456d9 Reviewed-on: https://code.wireshark.org/review/7252 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Add some casts to satisfy the various compilers.AndersBroman4-4/+4
Change-Id: I7687fc0b433774fe447757af00bdaa2fc44ac59d Reviewed-on: https://code.wireshark.org/review/7254 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Add some casts to satisfy the various compilers.Jeff Morriss2-4/+5
Change-Id: Ic6a1124da986555d07cfeb71167b74f192c1c062 Reviewed-on: https://code.wireshark.org/review/7253 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-19Add name resolution support to address type.Michael Mann18-147/+292
Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-19Don't put CORBA IDL dissectors in ASN1_ variables.Guy Harris3-11/+28
Put them into separate CORBA_IDL_ variables, to keep the two types of generated dissectors separate. Change-Id: I4eb091a76ba5bc7d73533ef38fb29adc12a8ec42 Reviewed-on: https://code.wireshark.org/review/7250 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-19lupdate for Italian (new strings translated)Vincenzo Reale2-721/+1108
Change-Id: I22ecf6950d47b63d5512c029d745b75be932554d Reviewed-on: https://code.wireshark.org/review/7197 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Add a dissector for Microsoft's SSTP protocol.Hofer Manuel6-4/+554
... with some changes from Jeff Morriss: - Change how SSTP is "registered": rather than trying something complicated, just put the intelligence for recognizing SSTP into the HTTP dissector. (This does mean the SSTP dissector needs to do its own desegmentation now but it makes things much cleaner.) - Use proto_tree_add_subtree_format() instead of proto_tree_add_text() + proto_item_add_subtree(). - The messagetype is 16 bits, use tvb_get_guint16() instead of tvb_get_guint8() (fixes COL_INFO display) - A few other few misc. cleanups (I didn't update NEWS because I can no longer build NEWS without adding UTF8 fancy quotes and so forth.) Bug: 8239 Change-Id: I3631ae65f67bea69815ccf43472fdbcac3ca3499 Reviewed-on: https://code.wireshark.org/review/7227 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19ssl: check for minimal SSLv3/TLS record sizePeter Wu1-0/+15
When a TLS record is fragmented over multiple TCP segments, with its first byte in one segment, and the remainder over the others, ssl_looks_like_sslv3() throws an exception because it tries to access the third byte. This breaks the encryption state, resulting in very weird (scrambled) decrypted data. To fix this, check the record size before using it. Also add TLSv1.1 and TLSv1.2 as known version. Change-Id: Ie0ca78302a5d6c4241ea699d2ef6f7b873dd51ee Reviewed-on: https://code.wireshark.org/review/7234 Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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>
2015-02-19That's not an ASN.1 dissector (and gets warnings).Guy Harris2-2/+2
Change-Id: I55b49080c64a44c1e5752ab986cb6b27772d14db Reviewed-on: https://code.wireshark.org/review/7248 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-19Move some ASN.1 dissectors to the clean list.Guy Harris2-14/+14
Change-Id: If642132eb4a2b77db5e56b150b85f064b4b10b30 Reviewed-on: https://code.wireshark.org/review/7244 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-19Check whether emmintrin.h can be used *without* -msse4.2.Guy Harris2-33/+71
If not, we can't use SSE 4.2, as we need to be able to include it in files that use tvb_pbrk_compile()/tvb_pbrk_exec() even if they're not compiled with -msse4.2 (most files aren't, as we need to isolate SSE 4.2 instructions to a small bit of code that uses them only if running on hardware that supports them). Change-Id: I62262a3c45fa14e200967916ac0ffc283f8e322c Reviewed-on: https://code.wireshark.org/review/7246 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Not all compilers support turning of "format=".Guy Harris1-2/+2
The clang on my machine doesn't; just do "format" instead. (The best way to handle this may be to do the formatting ourselves, so that we can get thousands separators on *all* platforms, regardless of whether its printf formatter supports it.) Change-Id: I1948d1799688cb3cf1d7b0de0696c09f6bf23f1c Reviewed-on: https://code.wireshark.org/review/7241 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Use plain old ASCII for the SimpleDialog delimiter.Gerald Combs1-9/+1
Use a UUID for the SimpleDialog primary delimiter instead of trying to leverage Unicode. Bug: 10953 Change-Id: Ib518b32ef65b50f311b061ab5a267e7d1aa9f01b Reviewed-on: https://code.wireshark.org/review/7240 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18H.248: fix dissection of ServiceChangeReason for version 1Pascal Quantin4-96/+6
My understanding of RFC 3015 is that the encoding of this field was not different in version 1 compared to newer releases Bug: 10879 Change-Id: Iaa81679388860c0df4adc673ca6e56aff6f4591c Reviewed-on: https://code.wireshark.org/review/7195 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-18RADIUS: Add new dicto from FreeRADIUSAlexis La Goutte4-2/+16
commit 6c51e945a73844029f347c3fdaa0de1ec96473f1 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Feb 10 13:22:39 2015 -0500 New dictionary Change-Id: I60ba21dbadd3e35c1b0b01d7cea14b683f7f2a0c Reviewed-on: https://code.wireshark.org/review/7237 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-18Suppress a printf grouping warning.Gerald Combs1-0/+3
Suppress warning: ISO C does not support the ''' printf flag [-Wformat=] We verify that we *do* support it via HAVE_GLIB_PRINTF_GROUPING. Change-Id: Iedcf1d1856238e05babde5fe8ec23f64fbf2cdcf Reviewed-on: https://code.wireshark.org/review/7238 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18Add AddressSanitizer (ASAN) build optionAlexis La Goutte3-0/+30
--enable-asan for autotools -D ENABLE_ASAN:BOOL=TRUE for CMake Need Clang/LLVM >= 3.1 or GCC >= 4.9 More information about ASAN https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer Change-Id: I833d4216d9508b8f7550ebc1dff6326734bdb53a Reviewed-on: https://code.wireshark.org/review/1727 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-18Bugfix in ui/qt/CMakeLists.txt (missing file).Dario Lombardo1-0/+1
Change-Id: I1db046f2e0555c8fc78d71ec6646c18cbb6f31eb Reviewed-on: https://code.wireshark.org/review/7235 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-18libnl: disable pedantic warning of libnl libAlexis La Goutte2-0/+6
/usr/include/libnl3/netlink/types.h:25:15: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/handlers.h:65:9: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/handlers.h:81:18: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/handlers.h:113:18: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/utils.h:43:13: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/attr.h:47:16: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/route/link.h:95:23: warning: comma at end of enumerator list [-Wpedantic] ... Change-Id: I3f14e9d4887569e5d7befe1adb77561c8793437e Reviewed-on: https://code.wireshark.org/review/7201 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-18Eliminate some DIRTY_ file lists.Guy Harris4-26/+6
We don't want to encourage people to add to those lists, we want to encourage people to subtract *from* those lists (either by fixing warnings or, if an infelicitous API, or an infelicitous declaration of an API on some platforms, or a program generator that doesn't take sufficient care to avoid warnings - I'm looking at *you*, Flex - makes it impossible to fix without introducing other problems, using the DIAG_OFF()/DIAG_ON() macros if possible). Eliminate the empty lists, to make it harder to fill them up again. Change-Id: I298d07952c0cb1842a4ea71ba7e07c68e94a04e9 Reviewed-on: https://code.wireshark.org/review/7229 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Uninstall wireshark.appdata.xml.Gerald Combs1-1/+2
Change-Id: Ic955e008b686af448f2091de891f8457623ae7d5 Reviewed-on: https://code.wireshark.org/review/7228 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18Fix various warnings in wireshark-qt.cpp.Gerald Combs4-4/+9
Squelch warnings due to (char *) casts. Use "include_directories(SYSTEM..." in CMakeLists.txt so that we don't get pedantic warnings about things we can't easily fix such as QList loop optimizations. Not sure if there's an easy way to do this in Autotools. Pass get_gui_compiled_info to init_progfile_dir. C++ don't have to show you any stinkin' ::main. warning: ISO C++ forbids taking address of function ‘::main’ [-Wpedantic] Change-Id: If1c77284ab0d1b4786bce4e926a4109dd9b1ae34 Reviewed-on: https://code.wireshark.org/review/7207 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18Update Qt version checks.Gerald Combs2-6/+3
It looks like QPaintDevice::devicePixelRatio() was added in 5.1. Back out some debugging code. Change-Id: I40f19c0d7901ce95f587531983e5c6644daf64f4 Reviewed-on: https://code.wireshark.org/review/7226 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18Add an appdata entry for Wireshark.Jeff Morriss3-0/+60
Based on the one from Richard Hughes. A French translation of the description field is included. Links to two screenshots are provided--they are stored in my home directory on wireshark.org (for lack of a better place that I can put them). Bug: 10479 Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54 Reviewed-on: https://code.wireshark.org/review/4178 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-18Some additional UAT update callback changes.Guy Harris4-21/+25
I guess the signature mismatch must just be a warning with Clang; it's not with MSVC. Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Fix QCustmPlot retina problems.Gerald Combs2-0/+24
Make sure our intermediate pixmaps have the same number of pixels as the screen. A merge request with the same changes has been made upstream. Change-Id: I19950181d52f347e3aa7f5abb6e9ad33a4097abf Reviewed-on: https://code.wireshark.org/review/7224 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18Fix comments to reflect reality.Guy Harris1-5/+0
Change-Id: I63aeb49e442eb6eba5cdf35ded221894c1d0ea6c Reviewed-on: https://code.wireshark.org/review/7223 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Make UAT record update callbacks return a success/failure indication.Guy Harris28-107/+175
Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Add a CF_FUNC macro for casting BASE_CUSTOM functions.Gerald Combs54-954/+964
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid the following warning: warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic] We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be more consistent with the other macros in proto.h. Update each instance of BASE_CUSTOM to use CF_FUNC. Adjust a dummy variable name generated by asn2wrs.py that was triggering an invalid error in checkhf.pl. Fix an encoding arguement in packet-elasticsearch.c found by fix-encoding-args.pl. Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22 Reviewed-on: https://code.wireshark.org/review/7150 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-17Make it a bit more like the way it was before all these changes.Guy Harris1-2/+2
Change-Id: I9fc0ef50574a7e068c32e3f6ffeb3634df9474d4 Reviewed-on: https://code.wireshark.org/review/7212 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-17A UAT's update is expected to set *error; do so.Guy Harris1-1/+3
Its callers treat a non-null error pointer as a failure and a null error pointer as a success, so it has to set *error, even if it's only setting it to NULL. Change-Id: I48b2faa4bc013e4a754180dfae487829c8fe35a6 Reviewed-on: https://code.wireshark.org/review/7211 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-17[zvt] dissect some more fieldsMartin Kaiser1-1/+28
Change-Id: I93ffcfddd59a196a7e4f9f354b99884a7f5a814c Reviewed-on: https://code.wireshark.org/review/7208 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-17STUN : fix indent (use 4spaces)Alexis La Goutte1-45/+45
Change-Id: Ifbaf0f396b24d5506722f0e0df0dd17c1969a435 Reviewed-on: https://code.wireshark.org/review/7202 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-17[Qt] don't clear the display filter when a capture file is closedMartin Kaiser1-6/+0
Bug: 10951 Change-Id: I958aa9e88c30ac20cd7d7971ee903ac97265c1f4 Reviewed-on: https://code.wireshark.org/review/7098 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-17WSUG: Add more dialog guidelines.Gerald Combs1-0/+21
Change-Id: I59a14bf9712c05d75398b8ed2dc103fe3443f7af Reviewed-on: https://code.wireshark.org/review/7203 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-17Set a window icon for WiresharkDialog.Gerald Combs1-0/+1
Otherwise it ends up with a generic icon. Change-Id: I47292c966332073d07ef358316cf8b40bcf1329b Reviewed-on: https://code.wireshark.org/review/7200 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-17802.11: fix no previous prototype for 'wlan_col_filter_str' & ↵Alexis La Goutte1-9/+9
'wlan_bssid_col_filter_str' [-Wmissing-prototypes] Fix also some indent typo (3spaces -> 2spaces) Change-Id: I1aa9df1540e80946b85dde0e6bd87bf39e8d8f19 Reviewed-on: https://code.wireshark.org/review/7199 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-17CMIP: get rid of some evil global variablesPascal Quantin3-100/+67
Fixes an ASAN failure reported by Alexis Note that some global variables remain as I do not know enough on this protocol to safely remove them Change-Id: If392a8f09ef2fc2f2d46871a71149e29fe5e292c Reviewed-on: https://code.wireshark.org/review/7099 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-17Corrected display format for EUI-64Robert Cragie1-1/+1
Change-Id: I0913337a29efac5c39e30897cad7e90195fa984a Reviewed-on: https://code.wireshark.org/review/7198 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 07:05:28 +0000