aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-01-09Some more random removal of ep_ memory.Michael Mann7-20/+19
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-09Add missing #include ( "ui/gtk/old-gtk-compat.h" )AndersBroman7-0/+7
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-09Add a possible replacement for the cmd hack to work around hhc.exeJoerg Mayer1-0/+9
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-09CMake: Try to fix the xsltproc path.Gerald Combs1-17/+27
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-09Remove proto_tree_add_ax25Michael Mann5-59/+11
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-09convert variables that were static just because of SET_ADDRESS macro to use ↵Michael Mann8-49/+40
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-09Fix CMake Warning "Argument not separated from preceding token by whitespace."Joerg Mayer1-1/+1
Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2 Reviewed-on: https://code.wireshark.org/review/6437 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09Use the FindHTMLHelp.cmake provided by cmake to find the hhc.Joerg Mayer1-11/+7
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-09HTML Help: Fix titles.Gerald Combs1-1/+8
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-09CMake: Revert the release notes xsltproc command.Gerald Combs1-1/+3
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-08Use G_GINT64_CONSTANT() for 64-bit constants.Guy Harris1-59/+59
Change-Id: I2b4f24c0e68f8d1edb53981b2ada7db6cd0eff72 Reviewed-on: https://code.wireshark.org/review/6433 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08CMake: Enable DocBook on Windows.Gerald Combs10-95/+312
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-08To register an SCTP port, register in "sctp.port", not "udp.port".Guy Harris1-4/+4
Change-Id: I8f013b2895e42919ea0d97cdc35414ea3f5aec9b Reviewed-on: https://code.wireshark.org/review/6422 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08MQ: fix crash at startupPascal Quantin1-3/+3
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-08Netflow: add (hidden) root filters for each vendor with supported 'pie' entriesMartin Mathieson1-1/+69
Change-Id: I2bdca4c092c247ab253d6ceb3770ac7ea935cdad Reviewed-on: https://code.wireshark.org/review/6414 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-08Bluetooth: Update to latest Assigned Numbers (up to 4.2)Michal Labedzki7-45/+1109
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-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 09:12:23 +0000