summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-07-20Convert uses of g_alloced data with tvb_new_child_real_data to use ↵Michael Mann14-84/+44
pinfo->pool instead. Aldo update documentation to suggest using wmem pinfo->pool instead of glib memory Change-Id: I5d34cc6c1515aa9f0d57784b38da501ffcb95ccc Reviewed-on: https://code.wireshark.org/review/16551 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: Evan Huus <eapache@gmail.com>
2016-07-20IPv6: Add option type encodingsJoão Valverde1-7/+47
Change-Id: I9c8811dd30fed59591edb84166d2c854fd5b1885 Reviewed-on: https://code.wireshark.org/review/16553 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-20[RRC] Update to V13.3.0 (2016-07)AndersBroman6-3933/+3929
Change-Id: Ide2017d2610a55345a4ab1ef631b1da57a06ceb7 Reviewed-on: https://code.wireshark.org/review/16560 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20IPv6: Mark ENDI option as deprecated (do not ignore)João Valverde1-1/+1
As requested by Alexis. Change-Id: I33e91aa0234e7c07869d69b5da6d0df8f94254ba Reviewed-on: https://code.wireshark.org/review/16559 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-20PCP: add a missing castPascal Quantin1-1/+1
Change-Id: I3fd85defefb5ba3c27ef7c7cc5e83a8193cf1263 Reviewed-on: https://code.wireshark.org/review/16558 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-20Convert some g_ APIs to wmem.Michael Mann3-101/+22
Change-Id: I7fb0b60fc54004326680f07298fe43e8c48e9b39 Reviewed-on: https://code.wireshark.org/review/16550 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20IPv6: Fix LIO option dissectionJoão Valverde1-11/+9
It was passing the wrong offset for an FT_UINT_STRING type. Change-Id: I739eb5bbf86768f6bf953662d407270cc8e27f2b Reviewed-on: https://code.wireshark.org/review/16547 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-07-20MPTCP: fix mask used to display backup flagPascal Quantin1-1/+1
Bug: 12635 Change-Id: I077e0a2632c528acf7978123a61d8e0380f3e4e2 Reviewed-on: https://code.wireshark.org/review/16556 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-20IPv6: Mark ENDI option as deprecated (ignore)João Valverde1-2/+2
In accordance with the IANA registry. This option was never used. Change-Id: I2fc16579b084a0d537f16b9104b025d97a0afd8d Reviewed-on: https://code.wireshark.org/review/16552 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-20packet-ldap.c: Convert some g_ APIs to wmem.Michael Mann2-86/+28
Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 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-07-20packet-nbap.c: Convert some g_ APIs to wmem.Michael Mann3-113/+67
Change-Id: I480dd5c533b53cc90e483f42e974c5f3e660e305 Reviewed-on: https://code.wireshark.org/review/16548 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20Allow BASE_NONE (with strings conversion) for integral values again.Jeff Morriss3-8/+27
This mostly reverts SVN rev 43412 (3fa645481f82e32d5ad01ebce9c482c4edae31ae) with the addition of documenting that FT_*INT*'s with BASE_NONE and a FIELDCONVERT tells the Wireshark core that the field's numeric value is meaningless and should not be shown to the user. Use BASE_NONE again with the expert info group and severity fields. This (finally) resolves the complaint from: https://www.wireshark.org/lists/wireshark-dev/201206/msg00188.html (yes, this mail's been sitting in my "todo" pile since then! <sigh>) Change-Id: I1c6dd2864e7a2e959c97c409f277853af74a8d93 Reviewed-on: https://code.wireshark.org/review/16518 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-19Qt: Fix Windows taskbar progress behavior.Gerald Combs1-2/+3
Connect the valueChanged signal each time we show the taskbar progress indicator and disconnect it each time we hide. Fixes stuck behavior seen here when reloading a capture. Change-Id: I11c6205675823e041cda7816237e54fa8a8afb7a Reviewed-on: https://code.wireshark.org/review/16544 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-19AH: Make some display formats more standardJoão Valverde1-18/+19
Minor code improvements too. Change-Id: I65992f7733289a553efa3c2bf8ff144de796a985 Reviewed-on: https://code.wireshark.org/review/16540 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-19AH: Remove ah_header_data and subtree payload preferenceJoão Valverde1-41/+8
When combined with the IPv6 preference for extension headers under the IPv6 header tree it's too many hierarchical levels, confusing in code and UX. Change-Id: Ia593da8ef543d1014b9e7575084a72b5b630ea08 Reviewed-on: https://code.wireshark.org/review/16539 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-19VXLAN: use the newly created vxlan.next_proto dissector table everywherePascal Quantin8-44/+52
Change-Id: Ib6f44e0f1d3d8c76d2b6e6c778af8c243af4389c Reviewed-on: https://code.wireshark.org/review/16543 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: Anders Broman <a.broman58@gmail.com>
2016-07-19Support for NSH with VXLAN encapsulationsjha31-0/+5
Bug: 12271 Change-Id: Ia6d999049d56a4828936c95e272524e47d84bf8f Reviewed-on: https://code.wireshark.org/review/16517 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-07-19asterix: remove unused hf entryMartin Kaiser1-2/+0
Change-Id: I17dc7cfb8144dbfe3e36ff1902ce91241c5629ed Reviewed-on: https://code.wireshark.org/review/16536 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-18Mark the file as having unsaved data if you change address resolution.Guy Harris5-14/+47
That information can, and will, get saved in some file formats, so mark the file as changed so it can and will get saved by "Save". XXX - we need to treat it as a type of data that can be discarded when saving in some file formats, just like comments. Bug: 12629 Change-Id: I1fd69b95f4f7345c339961b4c53c28b98b364e4e Reviewed-on: https://code.wireshark.org/review/16538 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-18block->options is never null; don't check for it.Guy Harris1-2/+1
A wtap_block_t always has an array of options, even if it's empty. Fixes CID 1364135. Change-Id: Ib1ba791ddcac078ec34def321d63d140c5576037 Reviewed-on: https://code.wireshark.org/review/16535 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-18Remove wtap_block_num_options_of_type().Guy Harris1-36/+0
It's not used; currently, everything that accesses instances of a multiple-instance-allowed option do so in a loop that iterates over option instances by fetching values of the Nth option until the attempt to fetch the option fails, making only one pass over the options. Change-Id: Ife9583a5d246027dbfc133ab58027ef6641d65ef Reviewed-on: https://code.wireshark.org/review/16534 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-18IPv6: Export ipv6_pinfo interface for sub-dissectorsJoão Valverde2-36/+38
Change-Id: If39838f6952356aa3417ea9241d974f4c64f9898 Reviewed-on: https://code.wireshark.org/review/16530 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-07-18IPv6: Remove unknown extension header dissectionJoão Valverde1-64/+1
It's not being used and makes some things more difficult so kill it. It's not possible in general to distinguish an unknown extension header from an unknown IP protocol and the concept is fuzzy anyway (for example ESP is officially an extension header but meh) so don't bother trying for now. Change-Id: I3bdfcc2b76b47e8c1588e91838225b14808e43a7 Reviewed-on: https://code.wireshark.org/review/16529 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-07-18ouch: fix indent (use 4spaces)Alexis La Goutte1-5/+5
Change-Id: Ifdfaa87cc1818768ca939ff93015fbb8d77cddc5 Reviewed-on: https://code.wireshark.org/review/16533 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-18SHIM6: fix no previous prototype for ↵Alexis La Goutte1-0/+3
'proto_register_shim6/proto_reg_handoff_shim6' [-Wmissing-prototypes] Change-Id: I148ecae8d2e9926fcfebab75b3b2f0a769813ef5 Reviewed-on: https://code.wireshark.org/review/16532 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-18[GTPv2] Extend MM Context dissection.AndersBroman1-9/+101
Change-Id: I24e9f8307ea199d5da0713f26aa075466c59bb1f Reviewed-on: https://code.wireshark.org/review/16528 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-07-18IPv6: Set (jumbo) length by inspecting hop-by-hop header, if existingJoão Valverde1-39/+56
Change-Id: I84bade7526ef3f094875eaf207b2650d734ed10f Reviewed-on: https://code.wireshark.org/review/16523 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-07-18IPv6: Dissect as much as possible in case of errorsJoão Valverde2-157/+129
Don't require 40 bytes upfront, do it by field. Miscellaneous cleanups. Change-Id: Ib40b43eb3cf9aa52aa490cdabc6de26b0e977483 Reviewed-on: https://code.wireshark.org/review/16522 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-18[Diameter] Update with new AVPsAndersBroman1-0/+65
Change-Id: I6dfa43320ae3e02afb2b795dd352d492c75a0e60 Reviewed-on: https://code.wireshark.org/review/16526 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-18Add support for the U-bit in I-FORWARD-TSN chunks.Michael Tuexen1-15/+34
This adds support for the upcoming Internet Draft draft-ietf-tsvwg-sctp-ndata-07. Change-Id: Icb7c464504c41a743aa9c61d449f54bf400c1cd3 Reviewed-on: https://code.wireshark.org/review/16525 Petri-Dish: Michael Tüxen <tuexen@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2016-07-18Use follow_record_t in SSL follow stream.Jeff Morriss4-149/+16
... rather than a structure (SslDecryptedRecord) which looks (mostly) like a follow_record_t. (The biggest different is the former carries its data in a StringInfo while the latter uses a GByteArray.) With this change following SSL no longer needs its own special code. This also fixes a crash after saving a followed SSL stream (in the Qt UI). Bug: 12616 Change-Id: Ibdb2b85f8a6a30712743a5da420be1e6b78f5b92 Reviewed-on: https://code.wireshark.org/review/16516 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-07-18packet-smb2: add dissectors forHiroshi Ioka1-3/+104
FSCTL_GET_REPARSE_POINT/FSCTL_SET_REPARSE_POINT Change-Id: I3b6230aea2a0027d7b85d35d3aea6385cace569b Reviewed-on: https://code.wireshark.org/review/16511 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-07-18Rename iph->ip_p to iph->ip_nxtJoão Valverde7-14/+14
struct ws_ip is IP version agnostic. "ip_p" is too terse and less appropriate. Change-Id: I06b8740ab420e20781bf7b9efcf5dce19ad22ab2 Reviewed-on: https://code.wireshark.org/review/16519 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-07-18IPv6: Remove union from struct ip6_hdrJoão Valverde3-60/+59
The field macros are a particularly obnoxious form of namespace pollution. Change-Id: I9010a767625fd1c4b4a48c9d75481c577915fce6 Reviewed-on: https://code.wireshark.org/review/16520 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-07-17L2TP: Add dissectors for Ericsson specific L2TP AVPsHarald Welte1-0/+300
Ericsson's L2TP implementation uses some vendor-specific AVPs. Let's add some decoder/dissector support for these. Change-Id: I65d5527087a9c0f4e18ba17c9e7c63793ef6e995 Reviewed-on: https://code.wireshark.org/review/16507 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-17[Automatic update for 2016-07-17]Gerald Combs13-506/+865
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I0ca539cf81e1708a6ea8eafbdf91488086e9ee2d Reviewed-on: https://code.wireshark.org/review/16513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-17Add osx/macos build for Travis CIAlexis La Goutte1-4/+20
Change-Id: Id6beedfbe909ac3639790cbb7471bd968bed5b82 Reviewed-on: https://code.wireshark.org/review/16496 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-17Fix printf style parameters complaints from VS Code AnalysisMichael Mann7-15/+16
Change-Id: I5669e2442582f899643fae4a9f86ab6d505dde07 Reviewed-on: https://code.wireshark.org/review/16505 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-07-17ciscodump.c - Address VS Code Analysis warnings.Michael Mann1-3/+12
1. Check sscanf return value 2. Take large "packet" byte array off of stack and onto heap. Change-Id: I8ade76359f1b0739ec31d7f3b688d212f21357ba Reviewed-on: https://code.wireshark.org/review/16498 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-17Update to support OUCH-4.2 as of 2016/02/29 releaseDavid Arnold1-54/+314
Bug: 12615 Change-Id: I7122ded30083dd85e7785a842c6dd62b459d9676 Reviewed-on: https://code.wireshark.org/review/16465 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-07-17Fix sscanf VS Code Analysis warnings.Michael Mann5-88/+95
Some needed to check return value, others were converted to use strtoul. Change-Id: I55aae216f95362b67e006f6e682abbd5ae2c8dcc Reviewed-on: https://code.wireshark.org/review/16502 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-07-16ISIS (LSP): Fix Malformed packetAlexis La Goutte1-6/+24
Coming from fetch too longer bytes... Rework the display for add some missing field (SubTLV indicator, prefix len) and for prefix IPv4 use the same code like BGP Issue reported by Garri Djavadyan Bug:12617 Change-Id: Ib40f1badf8e03fadacfbb0aff1ebd3eab8ca342b Reviewed-on: https://code.wireshark.org/review/16436 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>
2016-07-16androiddump.c - Address VS Code Analysis warnings.Michael Mann1-3/+3
1. Take large "packet" byte arrays off of stack and onto heap. 2. Cast away an shift operation that should have been identified as safe anyway. Change-Id: I159c4a7452744763f667336cf4824d5ac3472343 Reviewed-on: https://code.wireshark.org/review/16500 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-16Have extcap executables mirror the GTK's WinMain signature.Michael Mann4-8/+24
This is for appeasing VS Code Analysis. Change-Id: Ib7b3d8a3025dd764da283335051d0f77b45f6dee Reviewed-on: https://code.wireshark.org/review/16499 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-16wmem_map.c: Address some VS Code Analysis warnings.Michael Mann1-3/+4
size_t can vary on size, so you can't always mix it with guint. Change-Id: I7e2ea3a990dd4df99422f6113aa3ae53dbf2bc4f Reviewed-on: https://code.wireshark.org/review/16501 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>
2016-07-16IPv6: Improve offset handling for options sub-dissectorsJoão Valverde1-90/+134
We pass the Option Data offset to sub-dissectors. Change-Id: I4a20514f3f1c31179f93c86e251ba67d671844b3 Reviewed-on: https://code.wireshark.org/review/16484 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-07-16Use debian tools script for travisAlexis La Goutte1-3/+4
Change-Id: I0e3390048fe2723579cc108f5adf582f570a41e5 Reviewed-on: https://code.wireshark.org/review/16494 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-07-16Use timers instead of packet counts to update our UI.Gerald Combs3-136/+111
In file.c, update our UI based on the time elapsed since we last finished updating the UI instead of on the number of packets we've processed. Remove the timer code from progress_frame.cpp since it's now redundant. This makes the UI more responsive here for captures with large numbers of packets and it should mean that packets_bar_update spends less time repainting, at least on Windows. Change-Id: I9edfa944c44192350bef75b8c0c3ad63bae9c131 Reviewed-on: https://code.wireshark.org/review/16476 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: Anders Broman <a.broman58@gmail.com>
2016-07-16Allocate data sources using wmem.Gerald Combs1-14/+2
Use wmem_strdup + the pinfo pool instead of g_strdup. Change-Id: I11fbb5ce31b7139421c558ee65ca43c8d8e85900 Reviewed-on: https://code.wireshark.org/review/16445 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: Anders Broman <a.broman58@gmail.com>
2016-07-16always update the status bar at the end of a captureMartin Kaiser1-3/+5
We used to update the status bar when we get a stopCapture signal. This does not work for extcap interfaces like randpktdump which creates 1000 packets and then exits. The status bar message "Live capture in progress" is not deleted. For randpktdump, the only reliable indication to detect the end of the "capture" is when the pipe to dumpcap is destroyed. Update the status bar at this time. Change-Id: I59768e7f518625283b2c27c34c428bb115e27a61 Reviewed-on: https://code.wireshark.org/review/16479 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-07 10:48:28 +0000