summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-06-19Ability to invoke "Decode As..." as command-line argument for GUIshark.Michael Mann7-836/+438
TShark has had the functionality for awhile. While the GUI version still has ways to change and persist Decode As functionality, adding command line functionality gives the Decode As from initial launch of the GUI. Was also an excuse to refactor a bunch of code out of tshark.c Bug: 5143 Change-Id: Ie67007d75e897bc06cc9afd9b84372a96b93778c Reviewed-on: https://code.wireshark.org/review/16008 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-19Get rid of an unused variable.Guy Harris1-1/+0
There's no need for the capture_option_specified variable; it's now in a structure. Change-Id: Ic2f1faee4666eea7ae91fd6899cecaa76d0ceb9f Reviewed-on: https://code.wireshark.org/review/16018 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19Get rid of an unused variable; set a structure member.Guy Harris2-1/+3
There's no need for the capture_option_specified variable, but we *do* need to initialize the capture_option_specified member of *param_info before parsing the flags. Change-Id: I89d0b8c338c2784742b21ba4e854f702ce491849 Reviewed-on: https://code.wireshark.org/review/16017 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19[Automatic update for 2016-06-19]Gerald Combs18-1409/+2019
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Idd2d53a32188f2e607351da874b1a68a4811ed57 Reviewed-on: https://code.wireshark.org/review/16014 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-19Revert "tap: change glib functions to wmem."Pascal Quantin84-356/+377
This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985. It breaks the registration of codec, dissector and libwiretap plugins. Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de Reviewed-on: https://code.wireshark.org/review/16012 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-19Add modelinesJoerg Mayer2-1/+27
Change-Id: I3d5ed2e671ec761f3628fb8de6f393fdc915165e Reviewed-on: https://code.wireshark.org/review/16011 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-19Calculate and print CWmin and CWmax in addition to ECWmin and ECWmaxJoerg Mayer1-3/+22
This also changes the summary presentation to make it more compact Change-Id: I27ef8b2da280e36cff84dcb97d6d40dc0015a74b Reviewed-on: https://code.wireshark.org/review/16000 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-19Fix problems when compiling without pcap.Guy Harris1-2/+2
Change-Id: Id682a76ac561f92f65638bbdfcd4236eb92e46b7 Reviewed-on: https://code.wireshark.org/review/16010 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19Put #ifdef/#endif around a variable used only on Windows.Guy Harris1-1/+4
Change-Id: Ia6fed6db03cb88433469e758693fcc72c4bd9071 Reviewed-on: https://code.wireshark.org/review/16009 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19Refactor command-line handling of GUI options.Michael Mann10-1173/+875
Both GTK and Qt both use the same command-line options, so refactor the parsing and (possibly) applying of those arguments to a single location. Ping-Bug: 12546 Change-Id: Ib31e576c509c5d3d21c33d3247640d9f9c68661b Reviewed-on: https://code.wireshark.org/review/16006 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-19cmake: add PIDL dissector generation supportPeter Wu5-31/+172
The dissectors list is generated based on regex magic on pidl/Makefile. A dssetup.cnf file is added because all other protocols already have this file. The srvsvc and wkssvc protocols cannot be built for some reason, so just disable it (this mirrors the original Makefile). Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing compared to autotools. Tested with an out-of-tree and in-tree build with cmake (make and ninja): cmake -GNinja && ninja -v pidl-dissectors touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03 Reviewed-on: https://code.wireshark.org/review/15962 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-18DCE/RPC: fix array of pointers with NULLBinh Trinh17-20/+71
Change-Id: Ie89f8fd4ec744d427d41866206d5a6784c5b224f Reviewed-on: https://code.wireshark.org/review/16004 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-18ZigBee dissector added support for the Power Negotiation bitChris Brandson2-0/+8
An update to R22 adds the Power Negotiation bit to the Parent Information of the End Device Timeout Response Change-Id: I3d423e1088821ccaba98183e2be7f2152bd659d1 Reviewed-on: https://code.wireshark.org/review/16001 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-18GTPv2: Use proto_tree_add_bitmaskMichael Mann1-14/+9
Change-Id: I236a3513237a7a977389438adaf381542281943d Reviewed-on: https://code.wireshark.org/review/15997 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-17MKA: tvbrange for all subtrees correctedSamiran Saha1-15/+16
* Incorrect tvbrabge was affecting highlight on selection. * AN & Confidentiality Offset dissection fixed. Change-Id: Ibc4422322b765b0073471345f6e0bc3b1aeba2f9 Reviewed-on: https://code.wireshark.org/review/15996 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17ssh: add RSA host key printingKenny Root1-3/+20
Adds a dissector for the ssh-rsa type of public key where the modulus and public exponent are extracted out. Change-Id: I10b1f2d6f41878d9f7ffe5d399b9b7d4f69ad96e Reviewed-on: https://code.wireshark.org/review/15975 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17ssh: add hostkey informationKenny Root1-6/+56
Adds a framework for hostkey to be printed out separately from the rest of the key exchange. This will allow for individual key information to be presented separately in subsequent changes. Change-Id: I27433772ef1a9e1c45f388809017ed07cf6e41fa Reviewed-on: https://code.wireshark.org/review/15974 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-17Diameter-3GPP: add AVP 21 RAT-Type decodingBinh Trinh1-0/+42
Change-Id: Ibede796a52bb382525bc1f430d5fdecd555c233f Reviewed-on: https://code.wireshark.org/review/15993 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17Add an expert item to asure that aifsn is at least 2Joerg Mayer1-0/+7
Change-Id: If7105ba2e476acca8a02ce740decc4966b0af1bb Reviewed-on: https://code.wireshark.org/review/15998 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-17tap: change glib functions to wmem.Dario Lombardo84-377/+356
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf Reviewed-on: https://code.wireshark.org/review/15270 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17GTPV2: add decoding of ECI into enodebid and cellidBinh Trinh1-1/+24
Change-Id: If46cc354e202ff9a126580bf742d747e42678f83 Reviewed-on: https://code.wireshark.org/review/15994 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-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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-03 03:15:10 +0000