AgeCommit message (Collapse)AuthorFilesLines
2015-03-19Build 1.99.5.Gerald Combs3-2098/+41
Change-Id: I50505b48db1f14523f36a19a5e8232caff1e712a Reviewed-on: https://code.wireshark.org/review/7765 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19Try to fix interface property fetching.Gerald Combs1-11/+6
Use g_strdup instead of calculating string lengths manually. Return NULL for empty strings, otherwise lo0 shows up as ": lo0" instead of "Loopback: lo0" here. Change-Id: I143aa5e12c9512b7a9f4729b62b353c13ee3635a Reviewed-on: https://code.wireshark.org/review/7764 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19Revert "Revert "TCP: tabs -> spaces""Gerald Combs1-8/+8
1.99.4 is done. This reverts commit e60b826a0131b90d4a10d3e9e5e1f45e777d3142. Change-Id: I230b12d3a83a0abcb93809321df2b4396a7f0a0b Reviewed-on: https://code.wireshark.org/review/7760 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-191.99.4 → 1.99.5.Gerald Combs10-14/+14
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19Revert "TCP: tabs -> spaces"Gerald Combs1-8/+8
The 1.99.4 is still in progress. This reverts commit 260c84729c8c32d6e312d0974d4d4c5966aee514. Change-Id: I8c24d301c103dd45e2ac2cdb4cda34b918ac5a37 Reviewed-on: https://code.wireshark.org/review/7758 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19TCP: tabs -> spacesPascal Quantin1-8/+8
Change-Id: Ia95addb6b26f7eed89bbfe62baea289a50cf0523 Reviewed-on: https://code.wireshark.org/review/7756 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-03-19Build 1.99.4.Gerald Combs3-5144/+1372
Change-Id: Id2d98cc5def03fd54d69c54db4565c6ecd27c552 Reviewed-on: https://code.wireshark.org/review/7755 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19Add a couple of items to the release notes.Gerald Combs1-0/+8
Change-Id: I0d27b436c6cae363a7c7ff9917707829fd30b52b Reviewed-on: https://code.wireshark.org/review/7754 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19Implement proto_tree_add_item_ret_int() and proto_tree_add_item_ret_uint() whichAndersBroman6-15/+144
works as proto_tree_add_item(), but also returns the value of (u)ints of 8,16,24 and 32 bits length in a 32 bit variable. It's based on Hadriels previous work. Change-Id: If3b4b8588b63251f1ee9b954a202acde7c02ce86 Reviewed-on: https://code.wireshark.org/review/7230 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-03-19Netflow/Ipfix: Add Citrix Netscaler AppFlowUli Heilmeier2-2/+1499
This commit adds dissection of Citrix Ntscaler Appflow templates to Netflow/Ipfix. The documenation for the templates was found at: https://raw.githubusercontent.com/splunk/ipfix/master/app/Splunk_TA_IPFIX/bin/IPFIX/information-elements/5951.xml Due to non-disclosure I can't provide any sample pcap. Change-Id: I1d34ad4298a51c71986bc8565cc5f3802b0df3c2 Reviewed-on: https://code.wireshark.org/review/7740 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-03-19Replace enumerated preference for choosing subdissector with a subdissector ↵Michael Mann4-54/+63
table and Decode As functionality. This makes it much easier for other subdissectors (and plugins) to associate themselves with CAN. Change-Id: I49dd832af51651d0c91f9850c100e544d178b8c4 Reviewed-on: https://code.wireshark.org/review/7734 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-03-19Make the snapshot-length member of interface_t an int.Guy Harris2-3/+1
That matches what it is in other structures, and eliminates a compiler warning. While we're at it, remove an empty if statement revealed by that change. Change-Id: I5e8c8f92fdb3567e75800c729443737032a1bcc7 Reviewed-on: https://code.wireshark.org/review/7752 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-19Eliminate decode_bitfield_value from "public" use.Michael Mann4-14/+11
This "encourages" (forces) dissectors to use the bitmask field of the header_field_info structure to get "bitmask formatting" of a field. other_decode_bitfield_value should be treated the same (eventually eliminated), but there are still replacements to be made in the dissectors. Change-Id: I8a0d829c3fef2d5e5a588667a259e231bca559e6 Reviewed-on: https://code.wireshark.org/review/7736 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-03-19Fix another call to capture_dev_user_snaplen_find().Guy Harris1-2/+3
Change-Id: I20064f782b7ad8ebffc70322a877d88501d6ef60 Reviewed-on: https://code.wireshark.org/review/7749 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-19Squelch a "no implicit conversions in C++" warning.Guy Harris1-1/+1
Change-Id: Ib2876e055e8bfb1d0de36bbf7bb3b1e52217f108 Reviewed-on: https://code.wireshark.org/review/7748 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-19Fix extracting of parameter.Guy Harris1-9/+9
We have to find the closing parenthesis before overwriting the opening parenthesis, otherwise the end of the string, from which strrchr() searches, is at the point where the opening parenthesis was. Fix incorrect arithmetic (-1 + -1 + 1 = -1, not 1). Change-Id: Ida47dd9670b36269eef28368aa845301a7185c3f Reviewed-on: https://code.wireshark.org/review/7747 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-19Fix a comment.Guy Harris1-1/+1
Change-Id: I6e85f4abdc41ac01296b276f6b394376e75abe47 Reviewed-on: https://code.wireshark.org/review/7746 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-19Patch some memory leaks.Guy Harris4-45/+73
capture_dev_user_descr_find() and capture_dev_user_cfilter_find() return g_malloc()ated strings; we don't need to g_strdup() them to get a g_malloc()ated string, and we *do* need to free them if we aren't going to use them any more. Document that while we're at it, and give more details for the functions returning integer user-specified interface parameters as well. Change-Id: Icf98a48992b1c4168ead54bdc4cc2847da89d665 Reviewed-on: https://code.wireshark.org/review/7745 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-19Unused parameters are done differently in C++.Guy Harris1-1/+1
Change-Id: If6324e7ee57156e067c2584b80df835620f94ac0 Reviewed-on: https://code.wireshark.org/review/7744 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-19Add a comment.Gerald Combs1-0/+3
Change-Id: I82d31ce4435f1c136e158a007c9d4507e47a73a6 Reviewed-on: https://code.wireshark.org/review/7743 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-18Fix space before tab.Guy Harris1-1/+1
Change-Id: I8e9de014bd1e69102edb0eb2ec65d8da12ab8311 Reviewed-on: https://code.wireshark.org/review/7742 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-18Fix parsing of interface properties strings.Guy Harris6-168/+161
The first entry in the list does not have a leading comma, so a strstr() for ",{ifname}(" will not work. Instead, use g_strsplit() with a comma for all of the preferences. Have common code for all the "uncomplicated" preferences. Have a specialized handler for the one "complicated" preference. Change-Id: I2144a98ab0cb70db56eaaba88175d6e03885de2a Reviewed-on: https://code.wireshark.org/review/7741 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-18Complete the fix from g6b5c71a.Gerald Combs1-1/+0
Change-Id: I18360cbc50d790a22e69e85dcc16363f8c682c64 Reviewed-on: https://code.wireshark.org/review/7739 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-18Don't cache existing IPv4 and IPv6 hostnames.Gerald Combs1-13/+14
In the Qt UI redrawing the packet list redissects our visible packets, which might call add_ipv{4,6}_name, which sets new_resolved_objects = TRUE, which emits the addressResolutionChanged signal, which redraws the packet list, which ... Break out of the loop by checking to see if we've already cached an IPv4 or IPv6 hostname. Change-Id: Icb2841e3453fb98d4cf0ea06a0f49737e2b8f25e Reviewed-on: https://code.wireshark.org/review/7738 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-18Eliminate decode_bitfield_value from dissectors.Michael Mann2-106/+140
Change-Id: I37f5dbd5e88fd4dd8f736b014d36aae926082d1f Reviewed-on: https://code.wireshark.org/review/7735 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-18Qt: Fix recent files threadsMichal Labedzki3-40/+24
Fix crash and memory leak. Please not that Recent File Status objects and threads still continously grow and shrink memory usage, but do not grow continuously. Bug: 10893 Change-Id: Icc8b7fefd6572b902ac81d22e5f7b16e304fcf16 Reviewed-on: https://code.wireshark.org/review/7699 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18[BOOTP] Try to fix the build boot by casting a variable to 32bits while atAndersBroman1-17/+18
it replace tvb_length() with tvb_reported_length(). Change-Id: Ic2a0c99c20320ddd15d2f4ec173d73229dcf41f6 Reviewed-on: https://code.wireshark.org/review/7733 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18DNS: fix Coverity scan (1238867: Missing Break in switch)Alexis La Goutte1-0/+2
Change-Id: I4f1042cebe527874c3f890411f5e44aa71da5d28 Reviewed-on: https://code.wireshark.org/review/7732 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18[H248] Use hf fields from the SDP dissector to make it possible to findAndersBroman1-6/+65
related SDP in other protocols such as SIP. Change-Id: I5fb01128e6070f21b09b4f8364b5650f71fa305e Reviewed-on: https://code.wireshark.org/review/7719 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18[Reassembly] Fix a reassembly case where the two fragments are in the sameAndersBroman2-20/+30
frame but in different SCTP DATA chunks, whitout the patch the message is reassembled in both chunks leading to duplicated upper layer PDU:s in the frame. Change-Id: Ie31142c38c728018178947544b571622447d8e8f Reviewed-on: https://code.wireshark.org/review/7716 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18Remove proto_tree_add_text from packet-bootp.cMichael Mann1-276/+682
Change-Id: I651211cbe7365409e6c42ef1840122a03460aa42 Reviewed-on: https://code.wireshark.org/review/7731 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-03-18Remove proto_tree_add_text from packet-gtp.cMichael Mann1-57/+125
Change-Id: I53dcee56565e2a82bf0789199ce1c552f622840b Reviewed-on: https://code.wireshark.org/review/7730 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18Remove proto_tree_add_text from packet-x25.cMichael Mann1-171/+109
Change-Id: I8b08c922515d16350f6f80256564389ae3e408c4 Reviewed-on: https://code.wireshark.org/review/7729 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-17Qt: Start address resolver timerMichal Labedzki1-1/+1
Change-Id: Ic3de3db089f25d9fdfd6100f916b3960e52046f0 Reviewed-on: https://code.wireshark.org/review/7715 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-03-17Don't say "Capturing on..." if we're not capturing on.Guy Harris1-38/+39
Only print the "Capturing on..." message if we're actually capturing, not if we're printing link-layer types. Change-Id: Icc554776a6a2826276893acb38f7d700effd5f78 Reviewed-on: https://code.wireshark.org/review/7726 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-17Allow multiple -D/-L/-d/-S flags, only allow one -k flag.Guy Harris1-12/+25
Multiple instances of a single flag from -D/-L/-d/-S should behave like a single instance of that flag; -D plus -L, for example, is not supported, but -D plus another -D should be. -k, however, takes an argument, and we only support one. Change-Id: I8baced346fbffd75f8d768497213f67bb9a0555f Reviewed-on: https://code.wireshark.org/review/7723 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-17Fix "Save All" for Export Objects.Guy Harris1-16/+29
Fix the loop that goes through all the objects to be saved so that it looks at all the objects to be saved rather than repeatedly looking at the first object. When letting the user select a directory in which to save, restrict them to looking at directories. QDir doesn't do what we actually want here - QDir.setCurrent() might do a chdir() but it doesn't appear to set the QDir's path, so when we use it to construct pathnames it constructs them based on wsApp->lastOpenDir() rather than the directory the user selected. Use Boring Old GLib's g_build_filename(), as we do in the GTK+ version, for now. (It also does something we *don't* want, namely, at least as the documentation implies, a chdir().) Bug: 11062 Change-Id: I705292dc2713b9dba615b0d59a4cf8313f357d82 Reviewed-on: https://code.wireshark.org/review/7720 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-17MIP6: Add Localized Routing for Proxy Mobile IPv6 (RFC6705)Alexis La Goutte1-4/+170
* Add LRI and LRA Mobility Header * Add MAG IPv6 Mobility Option * Remove one proto_tree_add_text Change-Id: Ib96eddc0a349214d0a112cdd92efe129f97be1ab Reviewed-on: https://code.wireshark.org/review/7717 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-03-17IP: fix soft-deprecated APIs (tvb_length)Alexis La Goutte1-1/+1
Change-Id: Ifcf70a3eb9fb603e5ba06f90a71184533736c69d Reviewed-on: https://code.wireshark.org/review/7718 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-17packet-dcerpc-*: fix alignment of dissect_ndr_ctx_hnd()Stefan Metzmacher2-1/+4
Change-Id: I9685f37580d1def6c0956d786398e3e70e819cee Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/7714 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-17Fix Wai dissectorCedric Izoard1-7/+52
- Add description for attribute type, verification and authentication results - Fix Certificate Authentication Response The second signature is optional - Fix Access WAI Authentication Response The Multiple Certificate Verification Result field is actually the content of Certificate Authentication Response : result plus one or two signature - FIx CErtificate Authentication request THe last filed is optional and it is a identity list bug: 11061 Change-Id: Ia6710046d8d28ca3c53354f7a997a3d76f09373d Reviewed-on: https://code.wireshark.org/review/7708 Reviewed-by: cedric izoard <cedric.izoard@ceva-dsp.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-16CMake: Fix an uninstall.exe dependency.Gerald Combs2-12/+14
Make sure building nsis_package doesn't clobber uninstall.exe. Change-Id: I8d00adb7fd3813c48118a0690feccb6a06bf15cb Reviewed-on: https://code.wireshark.org/review/7710 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-16Update an error message to reflect all the run-dumpcap-and-quit arguments.Guy Harris1-1/+5
Change-Id: I3c270279b4ea044919de5497d373c283ea87c5bf Reviewed-on: https://code.wireshark.org/review/7709 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-16DNS: Add CSYNC (Child-to-Parent Synchronization in DNS RFC7477)Alexis La Goutte1-3/+60
Change-Id: Ida53904b4db1ca982055de267ce6f4fdcedd248b Reviewed-on: https://code.wireshark.org/review/7701 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-03-16Add dissection of E-UTRAN Description in Cell selection indicator afterLars Sundström1-1/+49
release of all TCH and SDCCH IE Change-Id: I552c436fe8bea5971863fd7ba023a86aa08f2f0c Reviewed-on: https://code.wireshark.org/review/7700 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: Anders Broman <a.broman58@gmail.com>
2015-03-16PCEP, support new drafts:Francesco Fondelli2-12/+236
Conveying path setup type in PCEP messages, draft-ietf-pce-lsp-setup-type-00 PCEP Extensions for Segment Routing, draft-ietf-pce-segment-routing-01 Bug: 11046 Change-Id: Ib2ea9a96079324377fa65ef8c3ab37a98f530793 Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com> Reviewed-on: https://code.wireshark.org/review/7618 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-03-16Fix for waitpid return EINTR sometimes on launch.Vik1-29/+38
The return of EINTR is not exactly a failure of child process but may be because of any number of reasons. Adding logic to retry to get status of child process. Bug: 10889 Change-Id: Ic2de7248cb7bd9c801b917c841ce911fb7c17dcc Reviewed-on: https://code.wireshark.org/review/7669 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-16Remove proto_tree_add_text from packet-ssl.cMichael Mann1-73/+172
Change-Id: Icb81649363725c92f94dde5cb28cbba0f6ab5099 Reviewed-on: https://code.wireshark.org/review/7687 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-03-15Remove proto_tree_add_text from packet-synphasor.cMichael Mann1-40/+94
Change-Id: If7cf7ab42ca6a886deb1eab6bc1f391d993e1dad Reviewed-on: https://code.wireshark.org/review/7677 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-03-15Remove proto_tree_add_text from packet-edonkey.cMichael Mann1-214/+234
Change-Id: I42a06b728d807853d2c9b87a18ed36e1e0321085 Reviewed-on: https://code.wireshark.org/review/7685 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>