summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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>
2015-12-29Qt: Add gui.prepend_window_title optionAlexis La Goutte3-0/+12
Bug: 11102 Change-Id: I659b6be4652a65542c217370e01340e4696c0e31 Reviewed-on: https://code.wireshark.org/review/12653 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-12-29Qt: Add support of gui.window_titleAlexis La Goutte4-10/+22
Ping-Bug: 11102 Bug: 11691 Change-Id: I7b1673ffafcda644f4905265061ba11733dd91d3 Reviewed-on: https://code.wireshark.org/review/12650 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-29Qt: Remove usage of setWindowFilePathAlexis La Goutte1-25/+3
Change-Id: I29591709d88d1858e44c753d09e4a29d0f28ce53 Reviewed-on: https://code.wireshark.org/review/12781 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-29ZigBee NWK: add End Device Initiator field into NWK Frame Control according ↵dsrsupport2-0/+7
to ZigBee r21 Change-Id: I99d079145d371106257bb8f41979fd04b0d030d4 Reviewed-on: https://code.wireshark.org/review/12910 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-12-29Add support for IEEE-11073 FLOATsMichal Labedzki10-43/+1661
Add support for IEEE-11073 32-bit FLOAT and 16 bit SFLOAT field types. Use them in Bluetooth ATT dissector. Change-Id: Ife0f3843da84a9af23483b0a0d9b69cd2f511d08 Reviewed-on: https://code.wireshark.org/review/12680 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> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-29NAS EPS: upgrade dissector to v13.4.0Pascal Quantin2-10/+120
Change-Id: Iac7257fe574841e5199a99559ee99252da75b1fd Reviewed-on: https://code.wireshark.org/review/12906 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-293GPP NAS: upgrade dissector to v13.4.0Pascal Quantin2-1/+166
Change-Id: Id4c7b29d63216e0475da93ed38b5a275bd29cd5c Reviewed-on: https://code.wireshark.org/review/12905 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-29IPv6: Update option type parameters, make value_string_extJoão Valverde1-41/+49
Also correct IANA registry URL. Change-Id: I362ddc797b51f6f77c3da86dcdf30ad95a674069 Reviewed-on: https://code.wireshark.org/review/12892 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-12-29Update.Guy Harris1-3/+43
Change-Id: Ie008e8c396a3ead44f046ce2ebe4965ad93dae5c Reviewed-on: https://code.wireshark.org/review/12903 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-29Always supply a g_mallocated error message from select_rlc_lte_session().Guy Harris4-25/+22
That way, we don't have to pass a "free this" indication separately. While we're at it, don't just free the error message, *display* it in all cases where rlc_graph_segment_list_get() fails. (I wish more programming languages had a proper string type, including some whose names consist solely of the third letter of the alphabet, but I digress....) Change-Id: I99f8b088aa19bc8fbb178bdb36d85ba5b89c06e0 Reviewed-on: https://code.wireshark.org/review/12902 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-29debian: Recommend libqt5multimedia5-plugins for wireshark-qtBalint Reczey1-0/+1
This makes RTP Player actually play RTP stream using Qt, too. Bug: 11918 Change-Id: I9a90f50ceeccc1f298bf1b0a8dcc7a9017107484 Reviewed-on: https://code.wireshark.org/review/12882 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Reviewed-by: 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-12-29selfm: Dissector fails to detect message length on multi-message packetscbontje1-23/+3
- correction to get_selfm_length function - fix Fast Message response decoding when multiple auto-configuration sessions are present in capture - remove depreciated selfm 'simple' dissection Bug: 11935 Change-Id: I685dba3bddfc61e0d2faf7b0258cd5572ce4e7ed Reviewed-on: https://code.wireshark.org/review/12888 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-29Revert "Prep for 2.0.1." Wrong branch.Gerald Combs1-136/+1
This reverts commit affa8011a2fc5e8128e7d5bf46df15e8e7b491db. Change-Id: I5816b1100a44d7db961f0d0f6586130958ccbc17 Reviewed-on: https://code.wireshark.org/review/12900 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-29Clean up indentation.Guy Harris1-48/+48
Change-Id: I77954f376ba9356f134e5876239838a40f9364ff Reviewed-on: https://code.wireshark.org/review/12899 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-29Get rid of another unnecessary new_ prefix.Guy Harris2-3/+3
Change-Id: I99522c1e5f2a4aac091cb19dd7fff450ddc2c26e Reviewed-on: https://code.wireshark.org/review/12898 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-29Rename new_stat_tap_ui to stat_tap_table_ui.Guy Harris22-111/+111
A "new" statistics tap UI is a statistics tap UI where the statistics are maintained as tables and common code handles the tables; what matters is the tables, not that it's "new". Change-Id: I7a0e63cfac98c24cd5e7dce973b9a0cc5b6a03ba Reviewed-on: https://code.wireshark.org/review/12897 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-29There's no "old" stat_tap_table, so remove "new_" from the name.Guy Harris20-117/+117
Change-Id: I1a0349d5d9d47210a97ff7a99fb358e59fd70e72 Reviewed-on: https://code.wireshark.org/review/12896 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-28Prep for 2.0.1.Gerald Combs1-1/+136
Change-Id: Ie25cefb4dd317a77b1cb63b1f3dff4186f8f425e Reviewed-on: https://code.wireshark.org/review/12895 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-28Code cleanupStig Bjørlykke1-6/+4
This is a small code cleanup to sync with master-2.0. Change-Id: I96a0fbd8bbb7bfde9d69a9bf512de839b2ca1536 Reviewed-on: https://code.wireshark.org/review/12894 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-28Save the results of wmem_strndup(NULL, ...) in a non-const pointer.Guy Harris2-27/+30
That way, we have a non-const pointer to use when freeing it, and don't have to undo the constification with a cast. Rename "has_slash" to "slash", while we're at it, as it's not a Boolean indicating whether the string has a slash, it's either a pointer to the slash in question or NULL if the string has no slash. Change-Id: Ia55b39bddb67c8ca71f7b09ee5eb82efaa3bdf0c Reviewed-on: https://code.wireshark.org/review/12891 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-28Don't cast away constness for the key in g_hash_table_lookup().Guy Harris5-9/+9
Change-Id: Ibd5cf8947028d90a734de629e3c4202af9d0514b Reviewed-on: https://code.wireshark.org/review/12887 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-28Eliminate more unnecessary casting away of constness.Guy Harris9-19/+19
Change-Id: I3d2d83d60f798703ea3fa16ba2d6e95a00f88469 Reviewed-on: https://code.wireshark.org/review/12885 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-28Don't cast away constness unnecessarily.Guy Harris4-8/+8
Compare functions for various collection data types don't need to modify what they're comparing, so keep everything const. Change-Id: I1c2cff6954b1a8c5ade74943934324d0bd8f523c Reviewed-on: https://code.wireshark.org/review/12884 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-28Qt: fix QString::arg: Argument missing: "PT=%u telephone/event" warningPascal Quantin1-1/+1
Change-Id: If6065d0895a4bf8311badfff74bb1dff5841490d Ping-Bug: 11918 Reviewed-on: https://code.wireshark.org/review/12881 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-28Refactor GUI dependencies out of color_filters.[ch] and move it to epan ↵Michael Mann41-366/+432
directory. This also moved color.h into color_filters.h Change-Id: Ic19e27aa1b3ec67e764aa7ee8bbef7b1187bb12e Reviewed-on: https://code.wireshark.org/review/12831 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-12-28[docsis->bpkmattrib] Correction for TLV 15 text from 14->15AdrianSimionov1-1/+1
Change-Id: Ic1122e36c8099c1f891d3d5f81bd7fb4977d2ffd Reviewed-on: https://code.wireshark.org/review/12880 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-28ZigBee: Implement r21 NWK End Device Timeout Request/Response commandsdsrsupport2-1/+142
Change-Id: I4d05307d5c6bbfaacc68429bd675c1ecf14d1d5c Reviewed-on: https://code.wireshark.org/review/12866 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>
2015-12-28Zbee zdp (management/binding): fix parameter 'pinfo' not found in the ↵Alexis La Goutte2-3/+0
function declaration [-Wdocumentation] Change-Id: If10f81281e410efc67e9602d33a09b4d1807766d Reviewed-on: https://code.wireshark.org/review/12869 Reviewed-by: Eugene Exarevsky <eugene.exarevsky@dsr-company.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-28[docsis->sync] Remove colon from INFO fieldAdrianSimionov1-1/+1
SYNC is a simple message, there is no info to follow the colon. Most probably was introduced as a copy paste from more complex packets. Change-Id: I552aad68f9484f347266838e9c319de680825dde Reviewed-on: https://code.wireshark.org/review/12879 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-27[Automatic update for 2015-12-27]Gerald Combs16-305/+657
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ib19b36e9bc2d5c8cdbbeb3291b32f4291e619851 Reviewed-on: https://code.wireshark.org/review/12876 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-27ZigBee: fix for inabulity to parse ZigBee packets due to parsing _any_ IEEE ↵dsrsupport1-13/+14
802.15.4 packet as a command. In dissect_ieee802154_common() any packet unconditionally parsed as a command, command it byte cut. As a result, all except MAC commands are garbaged. Added check for the frame type and parce/cut command id only for 802.15.4 commands. Bug: 11929 Change-Id: Iab17d28c19485063e3d802eec3dc03a9d9c33a7a Reviewed-on: https://code.wireshark.org/review/12860 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: Graham Bloice <graham.bloice@trihedral.com>
2015-12-26Sanity check column size to prevent allocating an unrealistic amount of memory.Michael Mann1-2/+14
Bug: 11931 Change-Id: I19fa2937a649382b3a2eda2c8192246e3e9d9e28 Reviewed-on: https://code.wireshark.org/review/12874 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-12-26HTTP2: fix cast from 'const void *' to 'struct HTTP2Tap *' drops const ↵Alexis La Goutte1-1/+1
qualifier [-Wcast-qual] Change-Id: I9d0ba8eb1ce5a3e3f867266f3fbad0727984fca2 Reviewed-on: https://code.wireshark.org/review/12873 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-12-26NGHTTP2: Update to 1.6.0Alexis La Goutte2-10/+70
Change-Id: I0794b47ec95a6604ade3d1e0637603a9687d1ed4 Reviewed-on: https://code.wireshark.org/review/12872 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-12-26ieee802154: fix parameter '...' not found in the function declaration / ↵Alexis La Goutte1-9/+7
'...' command used in a comment that is not attached to a function declaration [-Wdocumentation] Change-Id: I797e68c409a10877315f2a13fa6f16f8d4a768e2 Reviewed-on: https://code.wireshark.org/review/12871 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-26Zbee (aps): fix parameter 'clisuer_id' not found in the function declaration ↵Alexis La Goutte1-1/+1
[-Wdocumentation] Change-Id: I30a2671f1c469d5e04958f6e00fd9022d93e1339 Reviewed-on: https://code.wireshark.org/review/12870 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-26ZigBee: ZDP Mgmt Leave: rollback Mgmt_leave bitmask definition changedsrsupport1-3/+2
Oops, sorry - I was wrong, no need to change a bitmask defines. Please, rollback. Bug: 11927 Change-Id: Iba0f8829f2fd5eb080c4e97742a7be18c6565f32 Reviewed-on: https://code.wireshark.org/review/12868 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-26ZigBee: Implement r21 APS commands Verify Key and Confirm Keydsrsupport2-1/+134
Introduced general APS command status, approproate field calles zbee_aps.cmd.status. Changed zbee_aps.cmd.status field name of UPDATE-DEVICE to zbee_aps.cmd.update_status. Change-Id: I0ad330e5d4a8948413aab428cac1e1475076c97b Reviewed-on: https://code.wireshark.org/review/12864 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-12-26ZigBee: Implement ZDO Parent Annce according to r21dsrsupport3-0/+36
Change-Id: I208688c00e1cd7cb38c0d26a34ef8e49af3347e8 Reviewed-on: https://code.wireshark.org/review/12867 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-12-25ZigBee: Implement r21 Stack Compliance Revision in Node Descriptordsrsupport2-0/+7
According to r21, high 8 bytes of server flags contain stack compliance revision (21 for r21). Change-Id: Ifb84d74ed17f8d202d8aa92140ffcbe43abb39cc Reviewed-on: https://code.wireshark.org/review/12865 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-25ZigBee ZDO: Fix Mgmt_Leave fieldsdsrsupport2-4/+5
There were no masks for bitfields of Mgmt_Leave command. Fixed. ZBEE_ZDP_MGMT_LEAVE_* constants were wrongly copied from NWK LEAVE command. Fixed. Bug: 11927 Change-Id: Idac27b83740528678549824daa42e59c46c524ed Reviewed-on: https://code.wireshark.org/review/12859 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-25ZigBee NWK: fix Fix placement of NWK FCdsrsupport1-2/+2
NWK Frame Control tree bitmask was placed into the main tree. As a result, it was displayed at the same level as NWK packet. Fixed by changing tree to nwk_tree moving NWK FC into NWK packet. Bug: 11926 Change-Id: Iae8ce89098d81a5ab7fb3bd57660853c2f20957d Reviewed-on: https://code.wireshark.org/review/12858 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-25Refactor VHT rates table, to use Ndbps (number of data bits per symbol)Simon Barber1-72/+23
to calculate rate. This will enable calculation of FEC rounding precisely later on. Change-Id: If7dcee39e12db208636fc8a90bfd784ffbea723c Reviewed-on: https://code.wireshark.org/review/12857 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-12-25Refactoring: Use data bits per symbol MCS table to calculate rates andSimon Barber4-399/+43
remove redundant HT MCS/rate table. Preparation for duration calculations that will use this data as well. Change-Id: Iee4fb2eefb00eaa53a6368eca4ed60f705ff49df Reviewed-on: https://code.wireshark.org/review/12856 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-24Refactor 802.11 radio flags.Simon Barber20-393/+323
The use of a flag field here is aesthetically unpleasing when the flags are referred to frequently. Convert these into bitfield entries. Change-Id: I6f47e31558439dfd343ec7f856d04480366a1237 Reviewed-on: https://code.wireshark.org/review/12511 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-24Add preference to interpret radiotap rates with bit 7 set as MCS.Simon Barber1-12/+9
Change-Id: Ib3a3a70e0edbaeba143703d9b5f4f9c5c8d90818 Reviewed-on: https://code.wireshark.org/review/12855 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-12-23[PPCAP] Handle SGSAP and GTPv2 messages.AndersBroman1-31/+41
Change-Id: I94c86a94984ae9384ff27fde36ef804f1e40a413 Reviewed-on: https://code.wireshark.org/review/12798 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>
2015-12-23added support for IEEE 802.15.4 2012e Information Elements, IEsChris Brandson2-735/+996
Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-01 02:22:12 +0000