aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-06-17Qt: Fix a compile error occurring on RedHat Enterprise Linux.Jens Kilian1-0/+1
Another missing Qt #include; probably caused by commit 157721c. Change-Id: I8ab4be9f18dffde7159debd842201e2a67230ec8 Reviewed-on: https://code.wireshark.org/review/15995 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-17autotool: Add -Wc99-extensions CFLAGSAlexis La Goutte1-0/+3
See with CMake (ga9070e1a90) Change-Id: If768b663f9ed032503fc121785b078c0107cdadc Reviewed-on: https://code.wireshark.org/review/15909 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-17tshark JSON and Elasticsearch outputMartin Kacer5-9/+672
Added ouput -T for json|ek Added -j switch fo filter EK json|ek fields. Added -x switch to work with json|ek to insert raw fields. Bug: 11754 Change-Id: Iad5a9092b843c074b0b774d1745fa14fca09f6b7 Reviewed-on: https://code.wireshark.org/review/15869 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17idl2wrs: fix more bad strndupsPeter Wu1-11/+11
Fixed another g_strndup case that truncated the name and replaced more by strdups when possible. Change-Id: Id7ce4d82da9fb1d0071bc7a6b4e7c2062bf77f55 Reviewed-on: https://code.wireshark.org/review/15988 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17mswsp: Remove null check (CID1355407)João Valverde1-10/+1
value->type is already asserted as not null (and probably shouldn't be). Change-Id: I574d3e7e0d5c636e6b731c1c817f2e457447afc1 Reviewed-on: https://code.wireshark.org/review/15990 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16Align AUTHORS.src columnJoão Valverde2-4/+4
Change-Id: I17ed5e0be356666e9b29490ce43deb357fe177ff Reviewed-on: https://code.wireshark.org/review/15991 Reviewed-by: João Valverde <j@v6e.pt>
2016-06-16LDSS: Add an assertion (CID280539,CID280540)João Valverde1-0/+2
Change-Id: I18082a4d45f0c320b8ee0e11139295eb1aee2c89 Reviewed-on: https://code.wireshark.org/review/15968 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-16Qt: Add "Copy As…" to VoIP Calls.Gerald Combs3-1/+121
Bug: 4389 Change-Id: I88dba82bd63e8c3be2b6fac3eca88f810c62d8bd Reviewed-on: https://code.wireshark.org/review/15985 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-16CANopen: Check array bounds for untrusted index (CID 1356262)João Valverde1-4/+33
Change-Id: If5ca51e5703fa4137ab9f388a99d613752d3b0d0 Reviewed-on: https://code.wireshark.org/review/15983 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: João Valverde <j@v6e.pt>
2016-06-16Add a sequence analysis wishlist item.Gerald Combs1-0/+1
Change-Id: Idea0bab80c7c05e3ad9f8591904e882df69a17ff Reviewed-on: https://code.wireshark.org/review/15984 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-16lemon: use a define for fseek()'s whence parameterMartin Kaiser1-1/+1
for people who don't immediately understand what fseek(fp, 0, 2) does Change-Id: I297ba6fd718ef0f09c4d0b29bf433262c3c38435 Reviewed-on: https://code.wireshark.org/review/15976 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-16ldap: added modify-increment operation identification in packet dissection ↵Victor Barratault4-1/+4
and generate the modified dissector dissector Change-Id: Iad745b9e0e8ab0bc055da7f26ec0822433897db7 Reviewed-on: https://code.wireshark.org/review/15977 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>
2016-06-16DEC DNART: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-2/+0
Clang Change-Id: Ic2d333b418928351f32673890c9c432c7bfa0f16 Reviewed-on: https://code.wireshark.org/review/15982 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16SITA: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I2565b0bee66f934561df506e87a35fdd14590f92 Reviewed-on: https://code.wireshark.org/review/15981 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_valueMichael Mann6-154/+224
Change-Id: I88398aa1923e86bb83b97cc3904529a5810f6c40 Reviewed-on: https://code.wireshark.org/review/15978 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-16Add Cisco ttag dissectorJaap Keuter5-0/+143
Add dissector for Cisco ttag protocol. Bug: 12518 Change-Id: Id17293a80b2b6827fd2d5c7ead098784c35a28ef Reviewed-on: https://code.wireshark.org/review/15964 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-16Finish getting making the Diameter XML valid XML.Jeff Morriss9-89/+118
... Except for the fact that many AVP names start with "3GPP". Make the AVP names XML IDs again. Fix all the grouped AVPs that reference AVPs (by name) or vice-versa. This includes: * Fixing a bunch of typos (including type mismatches). * Commenting out a number of references to vendor AVPs for which we don't have the specs. * Adding a few missing AVPs. Change-Id: Ic2ddb50cc947877de9086be51f7813e8f9be02b4 Reviewed-on: https://code.wireshark.org/review/15973 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16ssh: set packet lengths correctlyKenny Root1-1/+6
Each SSH packet was being set to be the remaining length of the frame. This change sets the packet lengths correctly for each SSH packet. Change-Id: Id9c2331d875465cd5e6bb788d420e0025f5d496e Reviewed-on: https://code.wireshark.org/review/15966 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-16ssh: packets after SSH_MSG_NEWKEYS are encryptedKenny Root1-1/+4
According to RFC 4253 section 7.3, once the SSH_MSG_NEWKEYS is received all packets after that will be encrypted using the negotiated keys. This can happen in the middle of a frame, so account for the offset in the frame where this happens. Change-Id: Ibc3b06a4bdfe38ae15b0e65afac6f5d3646cb58d Reviewed-on: https://code.wireshark.org/review/15965 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-16DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_with_flagsMichael Mann14-2339/+562
Change-Id: I8891ec90244ffd9609d8443df631a7c8e6453b7e Reviewed-on: https://code.wireshark.org/review/15942 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-16MKA: Fix for GCM-AES-256 dissection & Added Enumeration for macsec-cipher-suiteSamiran Saha1-4/+12
Change-Id: Ief38f949d3e30754a65fbfeaa64cbbd2f5646a9b Reviewed-on: https://code.wireshark.org/review/15969 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>
2016-06-16NSH: Correct the display of the NSH header fieldsThomas Shen1-4/+4
Change-Id: I3be75d20a3f00091aa3077e475f9ddb00eeca06c Reviewed-on: https://code.wireshark.org/review/15963 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>
2016-06-16gtk: Check chunk before g_string_chunk_clearStig Bjørlykke1-1/+3
Avoid this warning from wireshark-gtk: (wireshark-gtk:39505): GLib-CRITICAL **: g_string_chunk_clear: assertion 'chunk != NULL' failed Change-Id: I413b3435a1ac595236dd1c4e619e3af1543b6a91 Reviewed-on: https://code.wireshark.org/review/15970 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16Typing error line 4928 of packet-dns.cVictor Barratault1-1/+1
Change-Id: I1a6409262614a87c159236375223707c85114650 Reviewed-on: https://code.wireshark.org/review/15972 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-16gitignore: updated cmake pathsPeter Wu1-2/+3
* files.txt: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.") * epan: v2.1.0rc0-2202-g6b54fbf ("CMake: Add more structure to libwireshark build") * asn1: v2.1.0rc0-2330-g54a520d ("Move /asn1 to /epan/dissectors") Change-Id: I0ef590de7d262d96c011be360b958fbda72a61fa Reviewed-on: https://code.wireshark.org/review/15961 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-16filesystem: Fix build dir detection when using cmakePeter Wu2-30/+17
Fixes loading of plugins by detecting the build output directory of cmake. This requires a "CMakeCache.txt" file to be present in the parent directory (above run/). Change-Id: I297432cdcd0981646058410f3eadf5f73b5248c8 Reviewed-on: https://code.wireshark.org/review/7453 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16Add a note about the new intelligent scroll bar.Gerald Combs1-0/+2
Should we call it the intelligenter scroll bar? Change-Id: I67e76c1aabeb4b2e87e38815fe4ab120f0869b25 Reviewed-on: https://code.wireshark.org/review/15936 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16CID 1250642: check the return value of dup()Martin Kaiser1-1/+4
abort if it is -1 Change-Id: Ie14c18679ff74529731558d6742f63ebfb9fe97b Reviewed-on: https://code.wireshark.org/review/15958 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16Make the rest of the Diameter AVP names unique.Jeff Morriss8-105/+101
In most cases this means prepending the application- or vendor-name to force uniqueness. A few vendors have duplicates within their namespace--append the AVP code to these. Also fix a few other invalid names (with spaces or parentheses in the names). Change-Id: I5bb78d31526122dd5782055638af410cc497e49d Reviewed-on: https://code.wireshark.org/review/15960 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16cmake: Detect proper large file defines even with -Wno-errorBalint Reczey2-4/+19
Without this change large file support was detected as available even when it was not without additional flags on 32 architectures. As a result mergecap and other programs are built without large file support causing mergecap not being able to write files bigger than 2GB on i386 systems. This used to work properly with autotools builds, but not with CMake ones. Change-Id: Ibfd043342b2a48310d2ac9d760e6404a701c5808 Reviewed-on: https://code.wireshark.org/review/15937 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-16qt: move free_stat_tables from SimpleStatisticsDialog::fillTree to ↵Dario Lombardo18-48/+85
~SimpleStatisticsDialog. Add a reference count to stat_tap_table_ui to prevent bad deallocations. Bug: 12437 Change-Id: Ib9b1f929d08a574c306dc755ec416ab94a3fd6d3 Reviewed-on: https://code.wireshark.org/review/15920 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16Update the X11 dissector to use the latest mesa and xcbproto.Jeff Morriss6-13/+107
Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821 Reviewed-on: https://code.wireshark.org/review/15923 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>
2016-06-16Qt: Clarify follow stream dialog's format buttonBalint Reczey1-1/+1
The stream is not just shown, but also saved in ASCII, EBDIC, Raw, etc. Change-Id: Ic29e3273ebb9a3eca0fe791bdd48606c4be3b828 Reviewed-on: https://code.wireshark.org/review/15957 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16X11: Fix last indent issue on X11 generatorAlexis La Goutte3-4701/+4701
and regenerate X11 dissector Change-Id: If2c781d346713f5a2a2e97de84c0fedcfd1958af Reviewed-on: https://code.wireshark.org/review/15944 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16x11: Regenerate dissector after indent change on g2b8caf31ccaAlexis La Goutte1-565/+565
Change-Id: Iac1522998c5983b417a0083b9c607a60e7f66e8c Reviewed-on: https://code.wireshark.org/review/15943 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16randpktdump: fix a crash.Dario Lombardo2-1/+4
Randpktdump requires the init the wtap opttypes. Fixed making the init function public and calling it. Bug: 12539 Change-Id: I02585c41012deacff1526b51ed09ab555cbfc8ce Reviewed-on: https://code.wireshark.org/review/15951 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16Don't call g_ascii_strcasecmp() with an NULL string.AndersBroman1-8/+8
Change-Id: I6efbdcb51efe5f2db233827e32e2105db6322d6c Reviewed-on: https://code.wireshark.org/review/15946 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16gtk: add initializer (CID 1362745).Dario Lombardo1-0/+1
Change-Id: Ib1bc11e905b0a4e84302e3f9ac43f3a87afd6edf Reviewed-on: https://code.wireshark.org/review/15954 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-16Remove a bunch of unassigned ETSI AVPs.Jeff Morriss1-801/+292
These were presumably there to allow indexed search of the AVP list but it wasn't working anyway (binary search was used). And the expert info for "unknown" (to Wireshark) AVPs is a good thing. Change-Id: Id6b9e5c90b8a2a6e3cf4415cd1b6114308c74440 Reviewed-on: https://code.wireshark.org/review/15956 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16ip-over-ib description entry was missingRudra Rugge1-1/+3
Description entry was missing in the list. Change-Id: Ia8f8bd4608ee6800a352f4979752b5c45c4a5086 Reviewed-on: https://code.wireshark.org/review/15947 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>
2016-06-16Export wtap_optionblock_copy_options() symbolPascal Quantin1-1/+1
It can be useful for wiretap plugins Change-Id: Ic56e4357ba3bfcef30d13615efc1361399c3133e Reviewed-on: https://code.wireshark.org/review/15955 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-16file_util.c: do not search in Npcap installation folder when calling ↵Pascal Quantin1-13/+0
ws_load_library() ws_load_library() is not used to load packet.dll or wpcap.dll (we use ws_module_open() for this). Let's not lose time checking the folder content. Change-Id: Ibd4a71b8b0c5ffc0c4c146eca51ad9f20964515b Reviewed-on: https://code.wireshark.org/review/15938 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-16mongo: return the number of bytes we actually consumedMartin Kaiser1-2/+3
even if the document length is 0, we consumed at least 4 bytes for the length field bug: 12534 Change-Id: I2f1612bf575b558c1bcc0afe8202b202747846e3 Reviewed-on: https://code.wireshark.org/review/15934 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15Make some more Diameter AVP names unique.Jeff Morriss5-87/+68
In some cases this means using the correct (updated?) name from the specification. In others it means prepending the application- or vendor-name to force uniqueness. Remove a few more "Unassigned" AVPs from the XML files. Change-Id: I61d55ef97ff8efc3317c91bf79e73031735f740a Reviewed-on: https://code.wireshark.org/review/15949 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15idl2wrs: fix code generationPeter Wu1-39/+39
Fixes a regression from v1.99.9rc0-470-g87f2bd4 which truncated function names to 26 characters. Test: cd epan/dissectors/dcerpc/budb make IDL2WRS=/tmp/wsbuild/run/idl2wrs diff packet-dcerpc-budb.c ../../packet-dcerpc-budb.c While at it, replace all g_strndup(X, strlen(X)) occurrences with g_strdup(X) since that is the same thing and less redundant. Change-Id: Id8da45792c830e2287cf8f14ff6245149751afd2 Reviewed-on: https://code.wireshark.org/review/15939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15gtk: Fix null dereference in statsBalint Reczey1-1/+1
This fixes the bug reported to Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786704 Change-Id: Iabe19c11067318d78664a17fa00d6a4d1998250c Reviewed-on: https://code.wireshark.org/review/15948 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-15proto.c: allow calling proto_item_add_bitmask_tree() with a length set to 0Pascal Quantin1-1/+1
This is required for the flags from packet-frame.c Bug: 12536 Change-Id: I60bfe671687bcd3a9b5c997ba62bed563e890548 Reviewed-on: https://code.wireshark.org/review/15945 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-15capture info (wslua): Dereference of null pointerAlexis La Goutte1-0/+2
Change-Id: Iced579d5acaefa9d1c8e3775a53916773bf87659 Reviewed-on: https://code.wireshark.org/review/15929 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-15documentation: Suggest using prefixed public symbolsBalint Reczey1-0/+5
Change-Id: I9153756b0e921fd74d7df9d119337f5484856ba0 Reviewed-on: https://code.wireshark.org/review/15940 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15Qt: Adjust the search frame layout.Gerald Combs1-12/+25
Add padding on the left side of the search frame in order to reduce the amount of mousing required on large screens. Change-Id: I1dcd8c4a103f4a462f4ab60a22a93b8c0f28b055 Reviewed-on: https://code.wireshark.org/review/15928 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 19:24:06 +0000