summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-06-12Add checks to address setting routines.Guy Harris6-30/+43
Fail if: 1) you have an AT_NONE address with data; 2) you have a non-AT_NONE address with a zero length and a non-null data pointer, or with a non-zero length and a null data pointer. When comparing addresses for equality, just make sure the types are the same, the lengths are the same and, if the lengths are non-zero, the data is the same; don't treat AT_NONE specially - the "lengths are non-zero" check will make sure we do the right thing. Make sure when we create an AT_NONE address it has a zero length and null data pointer. Change-Id: I5c452ef0d140c2d9aef3004f1cfd124a95b78fb2 Reviewed-on: https://code.wireshark.org/review/15839 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-12Store the tree item to add to later (CID-1159152)Jaap Keuter1-1/+1
The tree item needed to test and append to isn't being stored, so the items are never amended with notes, resulting in dead code. Change-Id: Ib1a9b7994ad12a9a9013d1bc1e1e4c165f34f20f Reviewed-on: https://code.wireshark.org/review/15826 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-12H225: Replace globals that track packet data with ↵Michael Mann3-262/+526
p_add_proto_data/p_get_proto_data. Change-Id: I0380151fb0f45063b81bc55dd5b8dc4add99ad30 Reviewed-on: https://code.wireshark.org/review/15794 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-06-11Line up comments.Guy Harris1-54/+54
Change-Id: Ifda0499e00dfa38c936f7e054ab4d5b3a0fd627f Reviewed-on: https://code.wireshark.org/review/15830 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-11GSM RLC/MAC: improve dissection of Packet Resource Request messageVincent Helfre2-18/+203
Change-Id: I8513ef550e81a97e1a8ac1c1f365355118d5ebae Reviewed-on: https://code.wireshark.org/review/15827 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>
2016-06-11dcerpc-browser: don't THROW() an exception from a dissectorMartin Kaiser1-12/+0
the condition for THROW() will never be true there's no way to decrement offset below its initial value the dissect_browser_TYPE_x_data() functions read a uint32 and increment offset by 4 + the uint32 value that was read Change-Id: Ia5a63e714ffa0add601960d858452152e4d9b10b Reviewed-on: https://code.wireshark.org/review/15627 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-11iso14443: dissect attrib's p3 byteMartin Kaiser1-4/+15
Change-Id: Iec3595a9ee0f7037af1f949804f1022f315d1edc Reviewed-on: https://code.wireshark.org/review/15824 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-10ftype-protocol: Fix [-Wcast-qual] warningsJoão Valverde1-13/+13
Change-Id: Ia8a02d8dc66aead486c8ae3f0bdf4cd82717ed20 Reviewed-on: https://code.wireshark.org/review/15817 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-10More comment clarification.Guy Harris1-2/+4
That's not "the biggest record we're willing to write", it's "the biggest record the pcapng format supports, as the record length is a 16-bit field". Change-Id: Icbd5e0cc4ed8e2a3a0d474245a9b9ed2c999d520 Reviewed-on: https://code.wireshark.org/review/15818 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 09de28933f9a17d4472206e1ac4b7c92001e44f5) Reviewed-on: https://code.wireshark.org/review/15820
2016-06-10Make the IPv4 NRB code's comments match the IPv6 NRB code's comments.Guy Harris1-1/+8
The IPv6 comments gave more details. Change-Id: I4e4d865feadbabfd625cdf2b2b162b99c4f23efa Reviewed-on: https://code.wireshark.org/review/15815 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-10Qt: Expert info grouping.Gerald Combs4-60/+203
Add the ability to group expert info items by summary and enable it by default. This more closely matches the GTK+ UI behavior. Show matching item counts while we're here. Bug: 12218 Change-Id: Ic02267da8435fb70015de8dd15e0ac46faabbee9 Reviewed-on: https://code.wireshark.org/review/15796 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-06-10Qt/Bluetooth: Add Device dialogMichal Labedzki16-41/+1571
Device dialog appears when user double clicks on device in Devices dialog (Bluetooth->Devices). It provides summary of device, like BD_ADDR, name, timeouts, etc. Base on information from HCI layer, so this feature is more interesting for local devices (capturing on its side). Each field has changes counter, what mean that value at specified field changes in time, for example: user change device name 3 times. Please note that initial change is not counted. It means that you can see fielkd without any value then change occur and counter is not increased. It will be increased next time. Reason for that is in most cases field value is unknown at start. Change-Id: Ife0a6bd454eac00a28f8eb2906e1b395695b0307 Reviewed-on: https://code.wireshark.org/review/15793 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>
2016-06-10Bluetooth HCI (Qt): Remove Q_UNUSEDAlexis La Goutte1-6/+2
See g21754f43e for detail There is always some other Q_UNUSED but include on #if/#endif... Change-Id: Ib2283660c91787acbf6392841faa3db6aed39438 Reviewed-on: https://code.wireshark.org/review/15803 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-06-10Always count packets per encapsulation.Guy Harris1-8/+5
Currently, for pcapng files, if all of the IDBs we've seen *so far* are the same, we report it as the file's encapsulation type; however, we may see IDBs of a different type in the future, so don't check for per-packet encapsulation before counting packets of the encapsulation type. Change-Id: I617ddcf2963aa16e7ba58855b3e5bf326ab7dc32 Reviewed-on: https://code.wireshark.org/review/15808 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-10Set the size of the packet counts array when we create it.Guy Harris1-0/+1
g_array_sized_new() sets the amount of *space allocated for* the array, but doesn't actually set its *length*. Change-Id: Ia7deab34c758c88910dfb0e246a6903301e68029 Reviewed-on: https://code.wireshark.org/review/15806 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-10Set cf_info.num_interfaces before using it.Guy Harris1-0/+1
Change-Id: I6ba5932f339ea6296dd91a6800721b11bcd4956a Reviewed-on: https://code.wireshark.org/review/15804 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-10LANforge: fix wrong offset for magic detectionAlexis La Goutte1-1/+1
Issue reported by Brent Lovelace https://www.wireshark.org/lists/wireshark-dev/201606/msg00034.html Change-Id: If296f01747316ddbe28e88d4d11d9df90d68bc5d Reviewed-on: https://code.wireshark.org/review/15800 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: 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-06-10Remove superfluous length check (CID-1158783)Jaap Keuter1-6/+0
When entering a loop with check for minimum length, don't stick to the pattern of checking length first thing. Change-Id: I28c414108efa5499dbacd8527b2c3e654e49e808 Reviewed-on: https://code.wireshark.org/review/15795 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-10Don't assume all IDBs are available aftre we open the file.Guy Harris1-18/+41
IDBs can occur anywhere in the file, so if we see an interface ID bigger than the number of IDBs we've see, re-fetch the interface information, update the IDB count, and grow the packet count array as necessary. Get the information strings for interfaces after reading the entire file; we don't need them until then. Change-Id: Ib6096e481e321de485710d14eadf7b5232bf0be7 Reviewed-on: https://code.wireshark.org/review/15797 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-09Make the determination if file is relative. (CID-1348040)Jaap Keuter1-0/+1
The code tries to show a file handle when the file is relative to it, but doesn't actually make that determination. Extract the relevant bit and use that to flag the relative file. Change-Id: I7259c8843dc388b9dda96a73399a6da5575d3f5e Reviewed-on: https://code.wireshark.org/review/15789 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-06-09MGCP: Replace globals that track packet data with passing data to functions.Michael Mann1-36/+10
Change-Id: I9595abf882adb821fd3c08532afba1b7e20412fe Reviewed-on: https://code.wireshark.org/review/15788 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-09Qt/Bluetooth: Set missing HCI Summary Occurence fieldsMichal Labedzki1-2/+2
Set they to zeros at startup like other fields. Change-Id: I820e7a0ce8fad5726448cb83f85235ecf578d77d Reviewed-on: https://code.wireshark.org/review/15792 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>
2016-06-09Bluetooth: ATT: Fix Object List Control Point responseMichal Labedzki1-1/+1
Fix CID 1355646. Bug: 12496 Change-Id: Ia6c95c8f31a19b5e8fc21182658147ed4208d635 Reviewed-on: https://code.wireshark.org/review/15790 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-09Logcat: Unicodize textsMichal Labedzki2-8/+8
Text over Logcat is in real in Unicode. ASCII does not display it correctly. Change-Id: I998dad1ee50c4b00b874a1f197f6e465fadd3e38 Reviewed-on: https://code.wireshark.org/review/15791 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-09Update Developer's Guide to reflect dissector_t signature changePascal Quantin1-14/+25
Change-Id: Ia793d94c7e79e49d1f27ad8adbdbafdb30131abe Reviewed-on: https://code.wireshark.org/review/15783 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-09Use the locale's decimal separator for times as seconds and fraction.Guy Harris1-15/+34
We use it when printing *other* seconds-and-fraction values, as we're just using %f, so we should use it consistently. If you don't want commas as decimal separators, you presumably don't want them anywhere; if you want to standardize the way numbers are shown, set the locale to the C locale. This addresses one of the two problems mentioned in bug 12500; there may be other places in the Wireshark suite where we should use the locale's decimal separator in times. Change-Id: I41f1c44d12ebf0f46ff678c977a955d09831b0cf Ping-Bug: 12500 Reviewed-on: https://code.wireshark.org/review/15787 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-08ieee80211_htrate() isn't exported.Guy Harris1-1/+0
Change-Id: I8a7a4727b473820d46ee543875f9fb57c5d79928 Reviewed-on: https://code.wireshark.org/review/15786 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-082.1.0 → 2.1.1.Gerald Combs8-3328/+19
Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5 Reviewed-on: https://code.wireshark.org/review/15785 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-08Build 2.1.0, second try.Gerald Combs2-2/+2
Remove the "-git" version extra default in CMakeLists.txt and configure.ac, otherwise we end up with wireshark-2.1.0-git.tar.bz2, Wireshark-win64-2.1.0-git.exe, etc. Change-Id: I89b9beaa87ac475950e24a3111cf09e878a33ff7 Reviewed-on: https://code.wireshark.org/review/15784 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-08Build 2.1.0.Gerald Combs16-8720/+5030
Change-Id: I3fe4a2bc580b5788462f832abf62b53afb5d8ae1 Reviewed-on: https://code.wireshark.org/review/15782 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-08Check whether cf_info->shb is null before using it.Guy Harris1-68/+72
Fixes CID 1362571. Change-Id: I8cb930bade47653d172f8c2057e3bfc446f4e9af Reviewed-on: https://code.wireshark.org/review/15781 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-08Switch some AsciiDoc replacements to attributes.Gerald Combs7-91/+96
Many of our AsciiDoc "macros" are simple string replacements. Start converting them to attributes. Update the release notes. Change-Id: I23d9ffd311f13a34c16cde3b4898b7f7bb8ba638 Reviewed-on: https://code.wireshark.org/review/15778 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-06-08Kafka: pass api_version to response and start to use itMartin Mathieson1-8/+47
Change-Id: Idc43e37d113e5b598cd5b1a8875ede335f9534de Reviewed-on: https://code.wireshark.org/review/15776 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2016-06-08Allow for vendor private use RRO subobjectJaap Keuter1-1/+2
ERO subobjects have subobjects 0..127, while RRO have subobjects 0..255. Make this distinction when retreiving the subobject ID. See RFC 3936, section 2.3.1. Change-Id: Iae061c259c59b1cf585ce99d02dd0f6ca09a49c3 Reviewed-on: https://code.wireshark.org/review/15772 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-06-08Remove superfluous size checks (CID-1158694)Jaap Keuter1-24/+3
Don't try to add expert items for size < 1 when this code isn't executed for size == 0. (note: size is unsigned) Change-Id: Ieb3d2593d4bb5f175ac368ef38571511b4f56f25 Reviewed-on: https://code.wireshark.org/review/15774 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>
2016-06-08Apply the prefix operator to iterators.Jaap Keuter11-59/+58
Prefix operators are supposed to be more efficient with iterators, so lets use them instead of postfix operators. Change-Id: I3090e4954c5cb67db47c88e2874b1a8ac52aa2cd Reviewed-on: https://code.wireshark.org/review/15546 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-08Use separate main geometry settings for Qt and GTK+.Gerald Combs4-5/+32
Qt and GTK+ can have wildly different notions about the top-left position of the main window, particularly in multiple-screen configurations. For example, on OS X with the following monitor arrangment: g .---------. | | | | q--------.| | | |`---------' | | `--------' GTK+ positions windows relative to 'g' and Qt positions windows relative to 'q'. As a result it's easy for one UI to clobber the settings of the other. Split the geometry_main_x and geometry_main_y recent settings into Qt and GTK+ versions. In the Qt UI, try moving the main window onscreen before falling back to the default geometry. This keeps us from losing our size settings. Add a link to a Qt geometry bug. Change-Id: If7ae0dcc1719e646299ee3bbf1c88743f655c9a0 Ping-Bug: 12389 Reviewed-on: https://code.wireshark.org/review/15775 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-06-08Support reading in and storing multiple Section Header and Name Resolution ↵Michael Mann1-14/+8
blocks. The data is not applied anywhere, just stored. The first Section Header block is still the only one that is used to read a pcapng file. Change-Id: If9546401101d2fe79b2325bacbd597b92127e86e Reviewed-on: https://code.wireshark.org/review/15705 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: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-08Upgrade Filter Expressions preference to use DisplayFilterEdit.Michael Mann1-6/+6
That way you get dropdown suggestions for filter completion. Change-Id: I2b9d417ca50559ffdc8bd3f7f0e1bbc185c1384d Reviewed-on: https://code.wireshark.org/review/15592 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-08Fix condition for expert info (CID-1025920)Jaap Keuter1-1/+1
The expert info refers to encoding_id not being zero. So then test for it. Change-Id: I6692f0b6ac0275328bc84741d9ded094bdf25e31 Reviewed-on: https://code.wireshark.org/review/15769 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-08Synchronize file type registrations from freedesktop to OS X.Jeff Morriss2-11/+121
... at least for files for which have file extensions, including the gzip'd versions of these files. Add .pkt (Savvius) file extensions to our freedesktop.org registrations. Change-Id: I0fb72909a1e9e3073451de06a64503fcfc6b57ed Reviewed-on: https://code.wireshark.org/review/15694 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-06-07Free if the pointer to the item being freed is *non*-null, not if it's null.Guy Harris1-5/+5
Bug: 12497 Change-Id: I282411e36783e735b02b66a024627287767813e2 Reviewed-on: https://code.wireshark.org/review/15773 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-07ESP: keep IP protocol, encryption and authentication algorithms when copying ↵Pascal Quantin1-0/+3
an UAT entry Change-Id: I92da18fd78b150f8cc626a0d7746f21eb5e7ff3b Reviewed-on: https://code.wireshark.org/review/15766 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>
2016-06-07Qt: Fix "applicable" capture interface behavior.Gerald Combs1-2/+1
In the Capture Interfaces dialog, make sure we have exactly one of a "not applicable" dash or a checkbox. Otherwise if your interface falsely reports that it supports monitor mode you might end up with both. Change-Id: I9b256f1ef0e8ff32626e7f2b526130f3c110d142 Reviewed-on: https://code.wireshark.org/review/15761 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-06-07Don't sign extend unsigned integer fields larger than 32 bits.Jens Kilian1-4/+0
Fix a bug in proto_tree_set_uint64() which caused fields to be sign extended. (This only showed up when a non-zero bitmask was present.) Change-Id: Ibcc986e3d42f97348966ea66c2ae9fca73b09992 Reviewed-on: https://code.wireshark.org/review/15764 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: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-07PIMv2 Hello packet incorrectly dissect Option 1Alexis La Goutte1-2/+2
Bug: 12493 Change-Id: I646853c6756689f9776b11c585d573c117c68cf2 Reviewed-on: https://code.wireshark.org/review/15762 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>
2016-06-07PIMv2: Enchance display of HoldtimeAlexis La Goutte1-3/+3
Change-Id: If92dd22c4ceee41bc7b0151acb09f4341b2e97f3 Reviewed-on: https://code.wireshark.org/review/15763 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-07pcap: Remove the WinPcap version checking for the Details dialogYang Luo1-37/+1
This check only works on the GTK UI's "Details" window. And it only can check version numbers. So there's no way for this code to be able to differentiate Npcap from WinPcap. And Npcap uses a very small version like "0.07", which makes itself not welcomed by this checking code. Change-Id: I861e9decd123e7d30547789c0488043616b17032 Reviewed-on: https://code.wireshark.org/review/15304 Reviewed-by: Yang Luo <hsluoyz@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-07ERF: Make ERF wiretap forwards compatible.Anthony Coddington3-11/+7
Dissector has always been able to cope with unknown record types so pass them through (and call the data dissector from the ERF dissector in this case). Previously was stopping processing on the first unrecognized record which is very unhelpful for otherwise valid files that have new types mixed in. Remove ERF type check altogether from open heuristic as ERF type could be past 48 in future and with more extension headers bit any byte value could be valid. Also allow setting ERF_RECORDS_TO_CHECK to 0 to force skipping the heuristic. Change-Id: I8331eef30ba2e949564f418b3100bd73b8f58116 Reviewed-on: https://code.wireshark.org/review/15361 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-06-06Qt: RTP audio stream fixups.Gerald Combs3-7/+14
Make sure audio_stream_ is non-NULL before we try to use it. Delete audio_stream_ more gracefully and add a note about mutexes on OS X and Windows. Bug: 12166 Change-Id: I12e76c49e631bc1de813c5c7d82c7d928c71237e Reviewed-on: https://code.wireshark.org/review/15759 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-07 10:48:55 +0000