summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-01-01Clean up response matching type preference.Guy Harris2-23/+33
Add #defines for all the value types and use them. Make the preference static, as it's not used outside this module. Change-Id: I3ed715701f77d5ea6cc45c8f978d6e2da7b38671 Reviewed-on: https://code.wireshark.org/review/12988 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01Clean up response matching type preference.Guy Harris2-23/+29
Add #defines for all the value types and use them. Make the preference static, as it's not used outside this module. Change-Id: Ibd04274b4160d18a55b10f47ce866ac97a76309e Reviewed-on: https://code.wireshark.org/review/12987 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01Get rid of trailing whitespace.Guy Harris1-3/+3
Change-Id: If6347938525194c08465b9b383edf8fb7eaf1e49 Reviewed-on: https://code.wireshark.org/review/12986 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01No need for toolkit-dependent color initialization.Guy Harris15-120/+127
We're not allocating colors ourselves in GTK+ (and haven't been doing so since at least 1.12), and all color_t values are valid colors, so we don't need any toolkit-specific processing to fill in a color_t. While we're at it, catch read errors when reading color filter files. Change-Id: Ieb520d141cf15e371a31a01459d466c95ba2209b Reviewed-on: https://code.wireshark.org/review/12985 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01Get rid of the "pixel" member of a color_t.Guy Harris6-30/+7
Now that we're letting GTK+/GDK allocate colors behind the scenes, if it allocates them at all, there's no reason to save the allocated color in the toolkit-independent color value. Change-Id: I99df32bd6b07924f41f3d855d2ddecb3dc8d5201 Reviewed-on: https://code.wireshark.org/review/12983 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01Remove more unused stuff.Guy Harris1-3/+0
Change-Id: I65f8497605cf8534227c85dd2094eeab3e77b4b9 Reviewed-on: https://code.wireshark.org/review/12982 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01No, you don't have to allocate colors.Guy Harris5-104/+1
That code's been unused since at least 1.12, so apparently it's not needed. To the extent that it needs to be allocated at all - which is the case only if a colormap is being used - it's apparently all done under the covers. Change-Id: Ib25bfba618b0af4a60ce991a974de1e3f2f89158 Reviewed-on: https://code.wireshark.org/review/12981 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01CPack: WiX updates.Gerald Combs2-11/+137
WiX prefers rich text license files. Add an RTF version of the GPLv2. It was created by converting the "standalone HTML" version of the license at http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html to RTF using Pandoc 1.11. Start splitting CPackConfig.txt into Win32 and non-Win32 sections. Add a WiX section. Change-Id: Ifcb233053c8a2158f087b69c69de7df869af65aa Reviewed-on: https://code.wireshark.org/review/12980 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-12-31uat: Fix warnings [-Wcast-qual]João Valverde5-22/+22
uat_fld_tostr_cb_t callback *out_ptr argument is g_mallocated and is to be freed by the caller so drop constness requirement to fix the corresponding g_free warnings. Change-Id: I1be25fa3e2f54fb32058ac0b5c1631b193b07701 Reviewed-on: https://code.wireshark.org/review/12943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't allocate something until we know we need it.Guy Harris1-5/+3
From change I1be25fa3e2f54fb32058ac0b5c1631b193b07701. Change-Id: Iad01cd4c5920afcdc1f8329937f4141cf8bc0ab4 Reviewed-on: https://code.wireshark.org/review/12979 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-3/+4
Save a non-const pointer and use it when freeing. Fix some indentation while we're at it. Change-Id: Iad2451130c4d1f252ad9f63b12205cd1aae70eb7 Reviewed-on: https://code.wireshark.org/review/12978 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Squelch a compiler warning.Guy Harris1-1/+1
Change-Id: I8933cbc250e3d1a3c6867f8166bc5b584b82211c Reviewed-on: https://code.wireshark.org/review/12977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-4/+3
Change-Id: I37a1923c2e463346244cd5e56daf22122d119d78 Reviewed-on: https://code.wireshark.org/review/12976 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-1/+1
Change-Id: I14130b4be91f36a4dbc187f2eef6d6c438a75774 Reviewed-on: https://code.wireshark.org/review/12975 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-11/+51
Change-Id: I529d37e57b12fa7515f2bd18a013618b50300231 Reviewed-on: https://code.wireshark.org/review/12974 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-13/+11
Change-Id: I6339381a052547944cfdb6c0c4d93fabf1cbd1ae Reviewed-on: https://code.wireshark.org/review/12973 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-33/+33
Change-Id: I6b5a6099cd90f2e148625c1a1eb3fb36262e8c39 Reviewed-on: https://code.wireshark.org/review/12972 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-3/+3
Change-Id: I8ca89bea19d7d014b81713455c85d2253f906058 Reviewed-on: https://code.wireshark.org/review/12971 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Use wmem_strdup_printf().Guy Harris1-2/+1
Change-Id: Ifb9dd16ab4435c23ea2914e16a65a17f9c61c0cb Reviewed-on: https://code.wireshark.org/review/12970 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Clean up setting the port and address.Guy Harris1-8/+13
Change-Id: I2384424c410e83d299e810467734bfc5428d1182 Reviewed-on: https://code.wireshark.org/review/12969 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-1/+1
Change-Id: I75c782185b8847abf8c985572d8280271ba00a5a Reviewed-on: https://code.wireshark.org/review/12968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Get rid of unused #defines.Guy Harris1-18/+0
Change-Id: I589d8c9b99425eb1893d61e4730864f0b2718acf Reviewed-on: https://code.wireshark.org/review/12967 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Use wmem_memdup() instead of wmem_alloc() followed by memcpy().Guy Harris1-2/+1
This also fixes a case where, if nfs_fh->len wasn't a multiple of 4, the allocated buffer was too short, by the difference between the next lower multiple of 4 and nfs_fh->len, so the memcpy() went past the end of the buffer. (And, yes, an NFSv3 file handle can have a byte count that's not a multiple of 4 - it's a variable-length opaque type - even if the marshalled data is padded with 0s to a multiple of 4 bytes, as with other XDR types.) Change-Id: I689d4b365e8a1547428a1580884f66177dc5841b Reviewed-on: https://code.wireshark.org/review/12964 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't throw away constness.Guy Harris1-3/+3
Change-Id: Ia0b014c3d9e4fcaa6f81cdb23dc76f9d384b782b Reviewed-on: https://code.wireshark.org/review/12963 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Use wmem_memdup() instead of wmem_alloc() followed by memcpy().Guy Harris1-8/+4
Change-Id: Ia937fe15a371a3109178ba619dbdb3a6db3897ee Reviewed-on: https://code.wireshark.org/review/12962 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31lemon: Fix warnings [-Wcast-qual]João Valverde1-8/+8
Change-Id: I2b9efa50cf6385622601d2a80f4cc51691d080a1 Reviewed-on: https://code.wireshark.org/review/12960 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31[iso14443] continue dissection of the ATSMartin Kaiser1-4/+62
display the individual bytes the next step is to dissect the meaning of their bits Change-Id: Id93bcdb3913886365dbd0fb3fdedc7ed0c63be93 Reviewed-on: https://code.wireshark.org/review/12957 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-30Revert "CPack: Use COPYTING.txt as the license file."Gerald Combs1-1/+2
Looks like we need to fix a dependency. This reverts commit 61cde08a95ddbeaeda32111f4469cbfc48dc95c3. Change-Id: I490b826f20fbefbf169b63816916bfe784609610 Reviewed-on: https://code.wireshark.org/review/12956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-30CPack: Use COPYTING.txt as the license file.Gerald Combs1-2/+1
Otherwise The WiX generator complains with CPack Error: unsupported WiX License file extension '' Change-Id: I4f3aeaf1babaf814c05cc96c4d07a84bd9dbc2a5 Reviewed-on: https://code.wireshark.org/review/12955 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-30CPack: Fixup plugin paths on Windows.Gerald Combs1-4/+2
Fix the per-configuration output directories for plugins. Fixes the following when running CPack: ---- CMake Error at C:/Development/wireshark/cmbuild/plugins/docsis/cmake_install.cmake:32 (file): file INSTALL cannot find "C:/Development/wireshark/cmbuild/run/$(Configuration)/plugins/docsis.dll". Call Stack (most recent call first): C:/Development/wireshark/cmbuild/cmake_install.cmake:329 (include) ---- Change-Id: I8d97722cc0d54e9ef26aeaeb311522e161c428e5 Reviewed-on: https://code.wireshark.org/review/12953 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-12-30GTP: fix Dual Stack with one static and one Dynamic IP dissectionPascal Quantin1-4/+18
Bug: 11945 Change-Id: I759baec7c9af6d2502c5d3c151cb5c6adcf3d25f Reviewed-on: https://code.wireshark.org/review/12950 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-30Docbook: Use cyg-get for download PackagesAlexis La Goutte2-4/+10
Chocolatey don't support --source cygwin on 0.9.9.x ... https://github.com/chocolatey/choco/wiki/CommandsInstall#alternative-sources Change-Id: Ifa3f0fa0a6cbb88537c727bf64e06dce9916dbb2 Reviewed-on: https://code.wireshark.org/review/12069 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-30LBM: No need to cast to 'void *' [-Wcast-qual]João Valverde1-1/+1
Change-Id: Ib179fdbdfe8edf8a83b3ff0de323bd26b4bb8362 Reviewed-on: https://code.wireshark.org/review/12945 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-30extcap: Fix NMake build issueRoland Knall1-0/+2
The new source was not added to the project file. Change-Id: I58d65bcab1d1b468f14c224cc8a4ae15e9fbbbf8 Reviewed-on: https://code.wireshark.org/review/12947 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-30extcap: Add file extension checkRoland Knall5-3/+37
The file-open dialog can now be set with file extensions, allowing the exclusion of unwanted file types. The syntax is the same as for the Qt QFileDialog, e.g.: "Wireshark (*.pcap *.pcapng)" Also, the mustexist option is now considered correctly Change-Id: I9d4efbb5089ce1af640b2a894de07ed79520271e Reviewed-on: https://code.wireshark.org/review/12913 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-30extcap: Add Required and cleanupRoland Knall14-165/+436
An option may now use the "required=true" argument (see sshdump.c) which will ensure, that the capture can only be started via the dialog, if the option has been provided. To ensure, that this is working properly, multiselect has been moved to a separate source file. Renamed one method so it may not interfere with a future save functionality, and cleaned up the interface to use only default buttons and roles ONLY the Qt interface is being supported. Change-Id: Ie1c9a63c1bba2e557d55b1de6f4775d8b9fce515 Reviewed-on: https://code.wireshark.org/review/12912 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-30Zbee (ZCL Closures): Fix Dead Store (Dead assignement/Dead increment) ↵Alexis La Goutte1-1/+1
Warning found by Clang Change-Id: Ic9dbdfbce7a1a3e29d1b59e9d1c56ee695a532ff Reviewed-on: https://code.wireshark.org/review/12917 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-30Zbee (Zcl Closures): fix FT_BOOLEAN with a bitmask must specify a 'parent ↵Alexis La Goutte1-2/+2
field width' for 'display' found by checkAPIs Change-Id: Ie2a77896f50b438cee1226c9702b0932acaefb84 Reviewed-on: https://code.wireshark.org/review/12926 Reviewed-by: Aditya Jain <aditya.jain@samsung.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-30Qt: Show physical interfaces first.Gerald Combs1-9/+22
List physical interfaces before virtual (extcap) interfaces in the main window. As cool and interesting as the randpkt interface is, I'm not sure it should come before interfaces with live traffic. Resize our columns once instead of each time we add an interface. Change-Id: I917532ab1d76b48c3e307d1f5a1c6c02def4e8aa Reviewed-on: https://code.wireshark.org/review/12933 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-30Netflow/Ipfix: Decode TCP Flags fieldUli Heilmeier1-5/+139
Patch to decode the TCP Flags field (tcpControlBits, ID 6) in Netflow/Ipfix data to see the used TCP Flags of a flow. Documentation can be found at http://tools.ietf.org/html/rfc5102#section-5.8.7 and https://www.iana.org/assignments/ipfix/ipfix.xhtml Unfortunately I can't provide a sanitized pcap. Change-Id: I1674ff926525124902518fc4b1cebc2d6f38fc6c Reviewed-on: https://code.wireshark.org/review/12927 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: Anders Broman <a.broman58@gmail.com>
2015-12-30Prevent infinite loop in DNP3 dissector.Michael Mann1-0/+2
Bug: 11938 Change-Id: Icd59092a3139b8c22f3866017a093a8b1270f1b2 Reviewed-on: https://code.wireshark.org/review/12940 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: Anders Broman <a.broman58@gmail.com>
2015-12-30802.11 (radio): fix no previous prototype for function 'ieee80211_vhtrate' ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: I863668e98de1eaeff8e2360070881fffc972ad8a Reviewed-on: https://code.wireshark.org/review/12916 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-30Expand a comment.Guy Harris1-5/+5
Also fix the capitalization of "Qt", and don't have a commented-out definition of GTK_VERSION to 3.5.2; if you want GTK+ 3.5.2, you'd do it by setting the environment variable GTK_VERSION to 3.5.2 when running the script. Change-Id: I71a5d8caf87c08a5f98730aea65f994aff611590 Reviewed-on: https://code.wireshark.org/review/12939 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-30cmake: do not fail if help/faq.txt already existsPeter Wu1-2/+8
The glob pattern should not catch the generated faq.txt file. Fix this by explicitly listing all source .txt files. Bug: 11896 Change-Id: I3904a0e094b5dba3808dacaaabd4db298a8f14cb Reviewed-on: https://code.wireshark.org/review/12930 Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-30ZigBee NWK: fix Info column for NWK Rejoin Resp.dsrsupport1-2/+4
Fixed ZigBee NWK Rejoin Response info column to display an address which parent gave to the rejoining child. Bug: 11940 Change-Id: I886b9fd6c7e99b097b297f351a84b95b3ffc5a94 Reviewed-on: https://code.wireshark.org/review/12911 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: Michael Mann <mmann78@netscape.net>
2015-12-30improved the developer documentationBarbu Paul - Gheorghe4-27/+43
* tvb_*_length mentioned in README.dissector * fixed typos in README.dissector * using stats_tree_register_plugin in the stats_tree examples both in README.stats_tree and the dev guide * removed the version information and the #endif from the stats tree section in README.dissector Change-Id: I27df0b5dfd66a7c0ac5b0fe1bdc882b3e9ffda74 Reviewed-on: https://code.wireshark.org/review/12908 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-29VINES: fix no previous prototype for function 'capture_vines' ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: I55dbc6c49bdc12540e06d2cf4415789ec1577d17 Reviewed-on: https://code.wireshark.org/review/12915 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-29CMake updatesJoerg Mayer1-3/+3
- make CMAKE_VERSION configurable via environment variable - Fix download URL (no www. and httpS) Change-Id: Id347b2f837d26063d889667f69bb1b4418e8e86d Reviewed-on: https://code.wireshark.org/review/12934 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-12-29Fix compile problems on OS X.Guy Harris1-1/+1
Apparently, the C++ compilers on the OS X buildbots don't realize that a reference cannot be null and therefore that there's nothing ambiguous about QString(NULL) - the NULL must be a "const char *". Instead, use a constructed null QString. Change-Id: Ibc56ea7f84c5e49cf3b1974c3de905bf23e90ff0 Reviewed-on: https://code.wireshark.org/review/12928 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-29Allow overriding of the GTK and QT versions without modifying the script.Joerg Mayer1-8/+8
Change-Id: I6e43845ee199232b53887d970996ca273564338c Reviewed-on: https://code.wireshark.org/review/12923 Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-03 06:45:12 +0000