aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-01-08mka: Minor cleanupBill Meier1-44/+33
Remove unneeded/unused code; Remove 'dead initializers'; tvb_captured_length() ==> tvb_reported_length(); Reformat a few long lines. Change-Id: I4a09bf330e939613ea8a47e69d4fc7b21dd496e8 Reviewed-on: https://code.wireshark.org/review/6413 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-08zbee-zcl-misc: Minor changesBill Meier1-49/+49
tvb_captured_length() --> tvb_reported_length(); whitespace changes. Change-Id: Id9c302d84f28ec23e554445777c7685c8d09918c Reviewed-on: https://code.wireshark.org/review/6412 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-08Bluetooth: AVDTP: Present bitfields for codec ad true/falseMichal Labedzki1-4/+4
Previously they are present as hex value. Change-Id: Ia30ba4da02e6bd4b0d68987506245e0534feadb6 Reviewed-on: https://code.wireshark.org/review/6400 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08Eliminate proto_tree_add_text from some dissectors.Michael Mann12-247/+330
Change-Id: Ief4c377d56748e1a8ed0ef7fe5ba03b9be00cd8d Reviewed-on: https://code.wireshark.org/review/6267 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08autotools: Add possibility to build without optional codec SBCMichal Labedzki1-4/+13
SBC is optional but build any time if configure script detect it, so let user choose if it really want it. Default to build with SBC. Bug: 10794 Change-Id: I1b936c628c9de0179aa3d5da5ac547bd910af8ba Reviewed-on: https://code.wireshark.org/review/6399 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-08Add quotation marks in Conversations/Endpoints when address is stringMichal Labedzki1-0/+22
Change-Id: I39d49542cd563db1f6d3423b4e382a9a5e1c801b Reviewed-on: https://code.wireshark.org/review/6398 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>
2015-01-08BTSDP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I48ddaa9ffe8f81094d63dd886dd15bb63888cbd7 Reviewed-on: https://code.wireshark.org/review/6396 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08BATADV: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-6/+0
Change-Id: I3c33511389aa2f4b3eed73f1c712561b20e18bf7 Reviewed-on: https://code.wireshark.org/review/6395 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08GTK/RTP Player: Fix crash when touch RTP StreamMichal Labedzki1-8/+12
Move converts of addresses when they are really valid. Change-Id: Ie0c77e8e23bd97ba55d68dad7da7015b9d355b0d Reviewed-on: https://code.wireshark.org/review/6397 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-08Small parenthesis fixDario Lombardo2-2/+2
Change-Id: I6bab238a37f7309daece7a7bfc062da41819d9ff Reviewed-on: https://code.wireshark.org/review/6394 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-01-08ieee80211: initialize bssid for data framesEvan Huus1-3/+7
Hypothentical fix for https://bugs.launchpad.net/ubuntu/+source/wireshark/+bug/1407662 which I haven't actually tried. Change-Id: Ib6d30873be7676eef756731a56a1d21a41c2c16c Reviewed-on: https://code.wireshark.org/review/6330 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08packet-mq: Add New Def, Reformat Lines, re-order val_str defRobert Grange4-399/+628
Add missing definition, add new definition, Reformat some lines Re-order the value_string used with ext_value_string definition so they are in asc ASCII order as the ext_value_string is now sorted before first use renamed own tvb_get... funct to new tvb_get_guintxx funct and deleted own tvb_get... funct use ptvcursor_ funct instead of own macro to increment offset removed <epan/tvbuff.h> in *.c files correct [-Wunused-const-variable] Change-Id: Iaee26289e098cde0e5787ca1c98de64b6b733fa2 Reviewed-on: https://code.wireshark.org/review/6079 Reviewed-by: Robert Grange <robionekenobi@bluewin.ch> 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-01-08Unistim: Nesting level does not match indendation (CID 1159216)Alexis La Goutte1-3/+1
Change-Id: I024f47a41328ea7e8db3c79012b892f3cb48caad Reviewed-on: https://code.wireshark.org/review/6376 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08use the http server port as index for the ws.port dissector tableMartin Kaiser1-5/+19
pinfo->match_uint is not set if websocket is called because of a previous http Upgrade: header and http is running on a non-standard port Bug: 10805 Change-Id: Ib0d35d29fe947cfb7b21107e734c64debbb91048 Reviewed-on: https://code.wireshark.org/review/6353 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-08PPCAP: Nesting level does not match indendation (CID 1259218)Alexis La Goutte1-1/+3
Change-Id: I3d3a4243913f7f0267342693868ec1f2981534e3 Reviewed-on: https://code.wireshark.org/review/6374 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08Replace some ep_alloc and ep_alloc0 with its wmem equivalent.Michael Mann13-25/+28
These cases were pretty easy to identify. Also replaced some comments that referenced ep_alloced memory, when it's now in fact wmem_alloced. Change-Id: I07d2f390a9c0b34aa2956880476755d1acf5db0a Reviewed-on: https://code.wireshark.org/review/6392 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-01-08guid_to_ep_str -> guid_to_strMichael Mann15-41/+52
guid_to_str now uses wmem allocation. Change-Id: I8e48d1a720942fbefbaa6227ae0929cb9f856359 Reviewed-on: https://code.wireshark.org/review/6391 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08Remove decode_numeric_bitfield.Michael Mann4-29/+2
It was only used by 1 dissector and that dissector can just use bitmasking in the hf_ field. Change-Id: I99179356dd7cbfab0c7be1512357a7e4c0eecde6 Reviewed-on: https://code.wireshark.org/review/6390 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08bytes_to_ep_str -> bytes_to_strMichael Mann23-78/+63
Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750 Reviewed-on: https://code.wireshark.org/review/6389 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08ep_<protocol>_port_to_display -> <protocol>_port_to_displayMichael Mann26-115/+153
Adjust any other ep_ related APIs related to the transition. Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c Reviewed-on: https://code.wireshark.org/review/6388 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08Various minor updates to the LBM dissectors.David Ameiss1-16/+34
Change-Id: I36954ea0d8b525b4d7a1b3407f9e9d0e1c9bbd67 Reviewed-on: https://code.wireshark.org/review/6378 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-08packet-irda.c: Add editor modelinesBill Meier1-0/+13
Change-Id: I626b60a185e750af94306892cd41dc8729920cfd Reviewed-on: https://code.wireshark.org/review/6393 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-08FT_DOUBLEs are 8 bytes; use FT_FLOAT for 4-byte floating-point values.Guy Harris1-12/+30
Change-Id: Ia39f8604229df18e1cdbbf81b78cd423e70f0f3c Reviewed-on: https://code.wireshark.org/review/6386 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07Set the (GT) address even if the message is routed by SSN.Luke Mewburn1-7/+7
If sccp.set_addresses is enabled, always SET_ADDRESS to the GT if the GT is present, not just if ROUTE_ON_GT. This fixes TCAP session handling in some situations. Change-Id: Ic088a4de408303a34c17c42820602ed6bf113840 Reviewed-on: https://code.wireshark.org/review/6053 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-07Squelch a compiler warning.Guy Harris1-1/+1
No need for buflen to be bigger than len, which it will be on LP64 and LLP64 platforms if it's size_t and len is guint32. Change-Id: Iffd2940187180cde1ad55ff7d3bd7c45acf22eba Reviewed-on: https://code.wireshark.org/review/6380 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07capture file dlg (GTK): Nesting level does not match indendation (CID 1159217)Alexis La Goutte1-1/+2
Change-Id: I9ae1862993a3a9d10bd7575295b08c91752cb77f Reviewed-on: https://code.wireshark.org/review/6375 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07S5066DTS: Nesting level does not match indendation (CID 1159211 & 1159212)Alexis La Goutte1-2/+4
Change-Id: I8145696de995e821793e7bc1576d5a5673c7b503 Reviewed-on: https://code.wireshark.org/review/6377 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07BTLE: Nesting level does not match indendation (CID 1261651)Alexis La Goutte1-2/+2
Change-Id: I11e436ca91c766edc8e85fd2402e61a17465bee2 Reviewed-on: https://code.wireshark.org/review/6373 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07tvb_bytes_to_ep_str -> tvb_bytes_to_strMichael Mann64-128/+107
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4 Reviewed-on: https://code.wireshark.org/review/6371 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-01-07Replace bytes_to_ep_str_punct with wmem equivalent.Michael Mann7-80/+63
Change-Id: I8aa7d7374db94685fd875cbf358c3bfbc83f3255 Reviewed-on: https://code.wireshark.org/review/6370 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punctMichael Mann15-42/+48
Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size) Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e Reviewed-on: https://code.wireshark.org/review/6369 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07Remove bytestring_to_ep_strMichael Mann5-42/+8
Use wmem equivalent bytestring_to_str Change-Id: I1ec7509e3adb36ab0f65317459653cb3b4b11af8 Reviewed-on: https://code.wireshark.org/review/6368 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07Updates in it translation.Dario Lombardo2-1181/+1813
Change-Id: I3a7b71daa6e4e69ef9cc6dcb777851a8643d6684 Reviewed-on: https://code.wireshark.org/review/6367 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07[MIP6] Update to handling ofAndersBroman1-17/+3
Mobility Header Link-Layer Address (MH-LLA) Option to RFC 5268 e.g no special handling of length. Bug:10043 Change-Id: Id32789fa5e34766c5734b0be13af015473ac257c Reviewed-on: https://code.wireshark.org/review/6372 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07simplify tvb_address_to_strEvan Huus1-17/+11
deduplicate most of the tvb_get_ptr calls Change-Id: Ic95b1d545bfebf58fc64a81f816c47d63e5ddcd0 Reviewed-on: https://code.wireshark.org/review/6366 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-07MSVC: Fix opting out of librariesOrgad Shaneh2-16/+3
When *_DIR variables are defined (even if empty), nmake tries to build them and fails. Don't set them at all if not configured to. Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34 Reviewed-on: https://code.wireshark.org/review/6365 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-07Use tvb_address_to_str as an optimizationMichael Mann2-16/+4
Change-Id: Ic79d8bdc58b84087531b298b3b27273c1afccd4f Reviewed-on: https://code.wireshark.org/review/6357 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-01-07SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use.Michael Mann17-397/+267
Not all changes were able to remove their corresponding tvb_get_ptr, because there are other API dependent on the (tvb_get)pointer, but future iterations optimizing those other APIs will then be able to remove it. Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22 Reviewed-on: https://code.wireshark.org/review/6358 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-01-07DJIUAV: small cleanupsPascal Quantin1-8/+12
- fix some typos - remove a useless include - change an obsolete API - comment unused hf entries for now Change-Id: I5939bc2fe9ddc6c422f35423aa22e884f20f088d Reviewed-on: https://code.wireshark.org/review/6349 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: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07Don't run checkapi on .rc files.Guy Harris1-0/+3
Change-Id: I75879bfcd0d9706523447146b16c319d3eb56d23 Reviewed-on: https://code.wireshark.org/review/6361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07SMB: the "encryption key" in the negotiate response is not really a keyMartin Kaiser1-27/+27
but the data for the Challenge/Response authentication (at least, that's my understanding of http://msdn.microsoft.com/en-us/library/ee441946.aspx) rename the items and filter strings accordingly Bug: 10777 Change-Id: I38378f0b31252d7bc8ec5e8ad7cee81a1a48cb4d Reviewed-on: https://code.wireshark.org/review/6137 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07Cast away an insignificant warning.Guy Harris1-1/+1
Change-Id: Ifd74719ced4d1ff99a2a913ad6a6797d3e80b311 Reviewed-on: https://code.wireshark.org/review/6359 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07Fix compiler error because I didn't completely amend last patch.Michael Mann1-12/+1
Change-Id: I7b8ffc4a63e69b5f50666dc1cf3482ae20124c0f Reviewed-on: https://code.wireshark.org/review/6356 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07Add tvb_address_to_str.Michael Mann7-92/+139
This is intended to handle ALL address types retrieved from a tvbuff. One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string. A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str. Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str. Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43 Reviewed-on: https://code.wireshark.org/review/6333 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07Improved handling of ARDP fragmented packets.Joseph Huffman1-19/+66
With the AllJoyn Reliable Datagram Protocol large packets are fragmented in a way that Wireshark doesn't desegment. The AllJoyn dissector now detects this situation and reports things to the user in a manner which indicates things are behaving normally rather than an error condition. Change-Id: I1f2aa722b6e0d1ed3572ff332b4dd8c0e5c5a765 Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org> Reviewed-on: https://code.wireshark.org/review/6344 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-01-06Fix GCC pragma.Gerald Combs1-6/+2
Fix "error: #pragma GCC diagnostic not allowed inside functions". Change-Id: Iaa7e39ac46975f00bc337b97875ba8b77295064a Reviewed-on: https://code.wireshark.org/review/6355 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06checkAPIs: C++ comments are allowed in Windows resource files.Gerald Combs1-1/+7
Change-Id: I3885278bf293b1fd7db812ce265734bcdc904c6f Reviewed-on: https://code.wireshark.org/review/6354 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06Try to suppress clang warnings in exntest.Gerald Combs1-1/+8
Nested TRYs result in: warning: declaration shadows a local variable Change-Id: Ifaa7baebde0ea4c18be5a53ab7e7964e84716496 Reviewed-on: https://code.wireshark.org/review/6347 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-01-06MBIM: call dissector_(add|delete)_uint only when necessaryPascal Quantin1-6/+9
Change-Id: I12bbe9e1d81560f1874d4e575b19db1842fa0c72 Reviewed-on: https://code.wireshark.org/review/6352 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-06NSIS: Quote all paths in config.nsh.Gerald Combs3-19/+21
Fix the MAKEDIR substitution. Add config.nsh to .gitignore. Change-Id: I9c5f6469569e826e4a8036b9b1b483c16558f788 Reviewed-on: https://code.wireshark.org/review/6351 Reviewed-by: Gerald Combs <gerald@wireshark.org>