Commit Graph

56508 Commits

Author SHA1 Message Date
AndersBroman 872a239732 Add missing #include ( "ui/gtk/old-gtk-compat.h" )
Change-Id: Ic53c3cd4a38c587ab3c0dcb9f8349ca50e338f80
Reviewed-on: https://code.wireshark.org/review/6443
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 09:17:42 +00:00
Michael Mann 284229c0f8 Convert EUI64 address APIs to use wmem.
Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2
Reviewed-on: https://code.wireshark.org/review/6419
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 07:44:54 +00:00
Michal Labedzki 17f1a44168 Bluetooth: AVDTP: Fix other-side Reconfigure
It is used to properly configure internal SEP data using to
properly decode music stream.

Change-Id: If8a15267ce072eaedfac947d7558be2d3e796483
Reviewed-on: https://code.wireshark.org/review/6404
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
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-09 07:00:41 +00:00
Michal Labedzki 5be440f1cb Bluetooth: AVDTP/VDP: Add link to first and last packet in the stream
Useful for analyzing stream issues.

Change-Id: I1c9f43807dc3abc050cf17c971fbd270b812faa5
Reviewed-on: https://code.wireshark.org/review/6402
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-09 07:00:21 +00:00
Michal Labedzki 879a221db4 Bluetooth: BTLE RF: Remove tree and reduce indentation level
Useless check for tree avoid setting Bluetooth addresses.

Change-Id: If38465679370c5ea74f6d916e409e337d60cf7db
Reviewed-on: https://code.wireshark.org/review/6403
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-09 06:59:29 +00:00
Michael Mann 6a6e2efbf9 Have ipxnet addresses use wmem scoped memory.
Change-Id: I1d8eed2ceacccce2768590f0689cd2c83a5e56e9
Reviewed-on: https://code.wireshark.org/review/6418
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 06:02:59 +00:00
Michael Mann 456095c89d disperse atalk-utils.[ch]
The functionality was suiting for address_to_str.c and the #defines belong in packet-atalk.h.  Kept the address structure with the "address string conversion", but that can probably be better cleaned up when the address to str as a whole is cleaned up.

Would also consider making AT_ATALK an FT_ type as well.

Change-Id: Ia534096c707e6fb94acdfee0d332beda6571c371
Reviewed-on: https://code.wireshark.org/review/6417
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 05:58:59 +00:00
Michael Mann d296c75247 Some more random removal of ep_ memory.
Change-Id: I6eccd20280e907bd9e6a5fcf873ccf80afddecac
Reviewed-on: https://code.wireshark.org/review/6416
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 05:54:38 +00:00
AndersBroman 45cbdbc70a Add missing #include ( "ui/gtk/old-gtk-compat.h" )
Change-Id: I03ddea2fc7db52df1ff3571e196250bc5e3ff036
Reviewed-on: https://code.wireshark.org/review/6410
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 05:44:59 +00:00
Joerg Mayer fb40fd31c3 Add a possible replacement for the cmd hack to work around hhc.exe
returning non-null on success.
To be invoked via "cmake -P hhc.cmake <single-arg>".

Change-Id: Ib2584379c512cbd7f437f36ef932b372fe02203a
Reviewed-on: https://code.wireshark.org/review/6440
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09 01:36:33 +00:00
Gerald Combs 4bc8d0f9a8 CMake: Try to fix the xsltproc path.
Try to make the xsltproc path compatible with Cygwin. This is a blind
attempt to fix the Windows 8 buildbot. It works fine locally.

Change-Id: Ib9d55dd07c6b17cfddf313716227d347109d2103
Reviewed-on: https://code.wireshark.org/review/6438
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 01:11:29 +00:00
Michael Mann 67b1593921 Remove proto_tree_add_ax25
There isn't a legitimate use for the API, all cases can be covered with proto_tree_add_item.  As a bonus, a few more tvb_get_ptr calls can be removed.

Change-Id: I3bb86ba8f05ef3363407bcfe9b059ee27ebc135d
Reviewed-on: https://code.wireshark.org/review/6429
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-09 01:10:28 +00:00
Michael Mann ecaa1f8d21 convert variables that were static just because of SET_ADDRESS macro to use the proper pinfo->pool instead.
Change-Id: I914918d9629f654ead497dddac0f412b690e4409
Reviewed-on: https://code.wireshark.org/review/6430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-09 01:10:05 +00:00
Joerg Mayer a2abf8b37f Fix CMake Warning "Argument not separated from preceding token by whitespace."
Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2
Reviewed-on: https://code.wireshark.org/review/6437
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09 01:07:59 +00:00
Joerg Mayer ab717f222a Use the FindHTMLHelp.cmake provided by cmake to find the hhc.
Lower case some function/macro calls.

Change-Id: I57532e3b4701963b88a536a7ecfe7dfaf4be3d4c
Reviewed-on: https://code.wireshark.org/review/6436
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09 01:04:14 +00:00
Gerald Combs 03f273a5ee HTML Help: Fix titles.
AsciiDoc converts single quotes into curly quote entities, which HTML
Help doesn't support. Use sed to fixup the title string.

We might want to drop HTML Help at some point.

Change-Id: I0c7d3be90c0de7dbac0f1367cc6ba323c7380939
Reviewed-on: https://code.wireshark.org/review/6435
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 00:35:19 +00:00
Gerald Combs 315cc729a8 CMake: Revert the release notes xsltproc command.
Should fix the release_notes_txt target.

Change-Id: Ie930c49ad34ad70070b8f7d28d79bee55f263c40
Reviewed-on: https://code.wireshark.org/review/6434
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 00:29:49 +00:00
Guy Harris 1baf9bba9c Use G_GINT64_CONSTANT() for 64-bit constants.
Change-Id: I2b4f24c0e68f8d1edb53981b2ada7db6cd0eff72
Reviewed-on: https://code.wireshark.org/review/6433
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08 23:50:44 +00:00
Gerald Combs cd7408e526 CMake: Enable DocBook on Windows.
Add a wrapper script and CMake macros which lets us run Cygwin's a2x
from Windows. Add *another* wrapper script that ignores the return value
of hhc.exe.

Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake.
Add hints to FindFOP.cmake.

Use unique file names in the HTML Help chain in an attempt to avoid a
race condition.

To do:
- Fix curly quote in HHC title.

Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d
Reviewed-on: https://code.wireshark.org/review/6379
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-08 22:05:38 +00:00
Guy Harris 4b8c66891a To register an SCTP port, register in "sctp.port", not "udp.port".
Change-Id: I8f013b2895e42919ea0d97cdc35414ea3f5aec9b
Reviewed-on: https://code.wireshark.org/review/6422
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08 21:26:34 +00:00
Pascal Quantin d8773b158a MQ: fix crash at startup
the array given to qsort algorithm must be alterable

Change-Id: I811cade161b7635e9bc9e070c1ec37d2cce50d1f
Reviewed-on: https://code.wireshark.org/review/6420
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-08 20:20:32 +00:00
Martin Mathieson c94192d5e6 Netflow: add (hidden) root filters for each vendor with supported 'pie' entries
Change-Id: I2bdca4c092c247ab253d6ceb3770ac7ea935cdad
Reviewed-on: https://code.wireshark.org/review/6414
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-08 16:12:27 +00:00
Michal Labedzki 8bfd306a27 Bluetooth: Update to latest Assigned Numbers (up to 4.2)
Also start decoding next two profile attribute groups in SDP
(MPS and CTN) and add new two fields in EIR/AD.

Change-Id: I4dc13df2b3b13e8c2a2a5c4af2cabae9ee83d539
Reviewed-on: https://code.wireshark.org/review/6409
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: 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-08 16:00:18 +00:00
Bill Meier 90453a4918 mka: Minor cleanup
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-08 15:50:16 +00:00
Bill Meier e123878834 zbee-zcl-misc: Minor changes
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-08 15:49:53 +00:00
Michal Labedzki e63e77169c Bluetooth: AVDTP: Present bitfields for codec ad true/false
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-08 14:45:48 +00:00
Michael Mann 2d448f0d5d Eliminate proto_tree_add_text from some dissectors.
Change-Id: Ief4c377d56748e1a8ed0ef7fe5ba03b9be00cd8d
Reviewed-on: https://code.wireshark.org/review/6267
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 14:30:52 +00:00
Michal Labedzki 202184572e autotools: Add possibility to build without optional codec SBC
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-08 14:07:37 +00:00
Michal Labedzki 0078211c84 Add quotation marks in Conversations/Endpoints when address is string
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-08 13:45:11 +00:00
Alexis La Goutte ec8ca916f3 BTSDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
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-08 13:03:16 +00:00
Alexis La Goutte a3e934fa2a BATADV: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I3c33511389aa2f4b3eed73f1c712561b20e18bf7
Reviewed-on: https://code.wireshark.org/review/6395
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08 13:00:23 +00:00
Michal Labedzki bd1cd01c7d GTK/RTP Player: Fix crash when touch RTP Stream
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-08 12:40:52 +00:00
Dario Lombardo b6cf61bfe3 Small parenthesis fix
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-08 11:59:11 +00:00
Evan Huus 513ed24a97 ieee80211: initialize bssid for data frames
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-08 09:46:38 +00:00
Robert Grange a323f0ce3e packet-mq: Add New Def, Reformat Lines, re-order val_str def
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-08 09:32:59 +00:00
Alexis La Goutte 37e64d83cd Unistim: Nesting level does not match indendation (CID 1159216)
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-08 09:20:05 +00:00
Martin Kaiser dcc49369b9 use the http server port as index for the ws.port dissector table
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-08 07:53:25 +00:00
Alexis La Goutte 866d2f8b87 PPCAP: Nesting level does not match indendation (CID 1259218)
Change-Id: I3d3a4243913f7f0267342693868ec1f2981534e3
Reviewed-on: https://code.wireshark.org/review/6374
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 07:25:36 +00:00
Michael Mann 20414ebf4b Replace some ep_alloc and ep_alloc0 with its wmem equivalent.
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-08 07:24:15 +00:00
Michael Mann cff098e3eb guid_to_ep_str -> guid_to_str
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-08 07:18:09 +00:00
Michael Mann 5d610b58c5 Remove decode_numeric_bitfield.
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-08 05:46:26 +00:00
Michael Mann 4a5ca5c76e bytes_to_ep_str -> bytes_to_str
Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750
Reviewed-on: https://code.wireshark.org/review/6389
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 05:43:51 +00:00
Michael Mann 2209678149 ep_<protocol>_port_to_display -> <protocol>_port_to_display
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-08 05:32:32 +00:00
David Ameiss 907d145f86 Various minor updates to the LBM dissectors.
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-08 02:15:26 +00:00
Bill Meier d245f38c12 packet-irda.c: Add editor modelines
Change-Id: I626b60a185e750af94306892cd41dc8729920cfd
Reviewed-on: https://code.wireshark.org/review/6393
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-08 01:52:56 +00:00
Guy Harris 6edb27b58e FT_DOUBLEs are 8 bytes; use FT_FLOAT for 4-byte floating-point values.
Change-Id: Ia39f8604229df18e1cdbbf81b78cd423e70f0f3c
Reviewed-on: https://code.wireshark.org/review/6386
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08 00:50:56 +00:00
Luke Mewburn 8f1b82b0aa Set the (GT) address even if the message is routed by SSN.
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-07 23:10:33 +00:00
Guy Harris 5e8c053d68 Squelch a compiler warning.
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-07 19:43:40 +00:00
Alexis La Goutte ccce7abaf4 capture file dlg (GTK): Nesting level does not match indendation (CID 1159217)
Change-Id: I9ae1862993a3a9d10bd7575295b08c91752cb77f
Reviewed-on: https://code.wireshark.org/review/6375
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07 18:35:50 +00:00
Alexis La Goutte d3f67c16d4 S5066DTS: Nesting level does not match indendation (CID 1159211 & 1159212)
Change-Id: I8145696de995e821793e7bc1576d5a5673c7b503
Reviewed-on: https://code.wireshark.org/review/6377
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07 18:32:22 +00:00