summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-12-19[RFC] Implement Export PDU for tsharkbug/3444Peter Wu3-22/+164
This patch introduces the "-U tap_name[,filter]" tshark option and is similar to the "Export PDUs as file" option in Wireshark. Wireshark implements this feature by reopening a capture file, applying a tap and finally opening the temporary file. Since tshark knows in advance that a PDU export is needed, it can optimize by not creating the temporary file and perform the export at the first opportunity. This patch splits the opening/tapping functionality from error reporting since tshark does not need a temp file and has no dialogs. The capture file comment is now specified explicitly as there is no "current file" anymore if the tap is running without active file. TODO: - Do not '#ifdef 0' the GTK/Qt functionality, split the file to avoid a linking error with tshark. - Why is pkt_encap modifiable? Both Wireshark Qt and GTK set WTAP_ENCAP_WIRESHARK_UPPER_PDU, what is the idea behind this? - Review whether it is acceptable to overwrite save_file in tshark. - Add documentation (tshark manpage). Bug: 3444 Change-Id: Ie159495d42c32c2ba7400f2991b7b8185b3fda09
2014-12-19Fix Python 3 compatibility in LocatePythonModulePeter Wu1-1/+1
Regression introduced with cb345eb4bd0149b4a71d6069f957600a83cc3417. Change-Id: I625432ac4572d2449cb6981a158e46c560a81f1a
2014-12-19Take out parenthesis around faq.txt rule so it works when automakeStephen Fisher1-5/+5
chooses Korn shell instead of Bourne shell. It still works with the Bourne shell in my testing. Change-Id: I00bfed22fb0d9bb183637ea5fb111904b8536949 Reviewed-on: https://code.wireshark.org/review/5880 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19Replace uses of proto_get_frame_protocols with proto_is_frame_protocol when ↵Michael Mann5-38/+8
only one protocol is desired. Also use proto_get_frame_protocols in main_menubar.c instead of doing it "manually". Change-Id: Ie7a365c538700f2cebdd1e3d253f2fd9b189f5cf Reviewed-on: https://code.wireshark.org/review/5851 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-19Skip over the new 'switch' field in xproto/src/xinput.xml so we canStephen Fisher1-0/+1
re-generate the x11 dissector again without the script breaking. Change-Id: I6d24cf098f370f4c1ff191052e2ea67b7875b33a Reviewed-on: https://code.wireshark.org/review/5878 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19ISIS: Fix warning: '@return' command used in a comment that is attached to a ↵Alexis La Goutte1-1/+0
function returning void [-Wdocumentation] Change-Id: I7f20311125e369cc90df808772323e8e98f8c94e Reviewed-on: https://code.wireshark.org/review/5850 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-19Bring pkg.m4 in from pkgconfig version 0.28 so we can use theStephen Fisher1-0/+214
PKG_PROG_PKG_CONFIG macro to try searching for pkg-config even when it isn't installed. Without this (and without pkg-config installed) the configure script is broken. With it, it gives a message saying pkg-config isn't found. Change-Id: I4c5af4cedd8c1927c1e00dd6b42faef3f31b84d4 Reviewed-on: https://code.wireshark.org/review/5671 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-19Use new color_dissector_filters.[ch] to refactor (color) conversation ↵Michael Mann10-747/+329
generation in GTK menus. Change-Id: I5868a40b71a989a3a1522cb091064bb0aaec6daf Reviewed-on: https://code.wireshark.org/review/5828 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>
2014-12-19Bluetooth: Remove unused value strings.Gerald Combs1-14/+0
Remove bluetooth_type_vals and bluetooth_direction_vals. Change-Id: I2d39a59fc815f06d1a5cd5ab838e2bde37597469 Reviewed-on: https://code.wireshark.org/review/5842 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2014-12-19Put a colon after the error message and before the field the errorStephen Fisher1-1/+1
is referring to for clarity. Change-Id: I7930e851647c847335b91435c7b0871c6db2defe Reviewed-on: https://code.wireshark.org/review/5847 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19Add a comment to each of these scripts to say thatStephen Fisher2-0/+4
epan/dissectors/README.X11 has instructions for running them. Change-Id: Id3c1df1bf1f50b19372b9a0470822da9ca6504f7 Reviewed-on: https://code.wireshark.org/review/5846 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19Finish renaming si_code to mtp3_si_code.Jeff Morriss1-3/+3
I5e183b997768c87f275569343afa69ca542aba46 missed a spot. Change-Id: I0970f7e50719e71efc824bbb07a6c2a69c66e991 Reviewed-on: https://code.wireshark.org/review/5845 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-19Remove main-menubar-ui.xml because it's not used.Michael Mann2-397/+0
Noticed it because it had some really old menu information in it. Much of which is now programmatically done. Change-Id: I0a24227df48c00310bc3223f72ba71c00b2c9fc7 Reviewed-on: https://code.wireshark.org/review/5829 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-19Rename si_code variable to mtp3_si_code to avoid conflicts with NetBSD'sStephen Fisher3-3/+3
si_code #define in sys/siginfo.h Change-Id: I5e183b997768c87f275569343afa69ca542aba46 Reviewed-on: https://code.wireshark.org/review/5844 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-18Allow "cba" filter prefix for hf_ fields. Seems like something with "pn" or ↵Michael Mann1-0/+1
(abbreviated) Profinet would make more sense (with dissectors to match), but trying to satisfy pre-commit check. Change-Id: I1db5314fdc77ab7b909c955415f66f24da7d2a0a Reviewed-on: https://code.wireshark.org/review/5838 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-18proto.c: Add hint to 'DISSECTOR_ASSERT(hf->bitmask != 0)' to show field name.Bill Meier1-1/+1
Change-Id: Ie578a73742901c1837802da17c0aaf2e58d48c6f Reviewed-on: https://code.wireshark.org/review/5835 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-18Add new cmake.in files to the distributionMaarten Bezemer1-0/+2
Change-Id: I685b9376342087182cc0dc8d9b8ed8e17a5ff8e7 Reviewed-on: https://code.wireshark.org/review/5833 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18Add new cmake files to the distributionAndersBroman1-0/+2
Change-Id: Iae5ffac472c6d013cf5dd37310278f203a04f8d3 Reviewed-on: https://code.wireshark.org/review/5831 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18Add support for multifields in custom columnMichal Labedzki6-273/+313
You can now add column with Custom type with more than one field by using OR "||" splitter. Bug: 9695 Change-Id: Ia82a91e7a35b867647d36cb9626e3870f46c0d85 Reviewed-on: https://code.wireshark.org/review/5804 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-18Bluetooth: Add generic Bluetooth dissectorMichal Labedzki29-1070/+1986
Bluetooth dissector is used to add ability to filter all bluetooth payload from capture files (there are many transport like: hci_h4, hci_h1, hci_usb, hci_mon, btle). Also it is used to placeholder for all data tree used to store additional informations like bd_addrs, names, etc. Finally it is used to be one point for Bluetooth Endpoints/Conversation filtering what is enabled now. Also add Master/Slave Role and Connection Mode tracking. Change-Id: I67048080fb8ee16fa0f4ec429c1257de81ddd737 Reviewed-on: https://code.wireshark.org/review/5771 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-18Bluetooth: BTLE: Add src/dst addresses when they are knownMichal Labedzki5-104/+123
Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 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>
2014-12-18DisplayFilter: Check also another fields with the same nameMichal Labedzki1-33/+18
This adds possibility to have two fields with the same abbrev name but different type, for example FT_ETHER and FT_STRING. That allows to compare each one to find a valid field. Change-Id: I8b2a1708ac9648b7a4289777c72a0f3b18f3d8f8 Reviewed-on: https://code.wireshark.org/review/5702 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>
2014-12-18Use LocatePythonModule to locate asn2wrs.pyMaarten Bezemer3-22/+6
This reuses existing functionality and thereby making FindAsn2Wrs.cmake obsolete, resulting in a reduction of the cmake module maintaince load Change-Id: Ic6ae53e65236246c0cbe86f8c2f066a2d034e0b9 Reviewed-on: https://code.wireshark.org/review/5805 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>
2014-12-18Use LocatePythonModule to find make-dissector-reg.py in order to make ↵Maarten Bezemer5-5/+62
UseMakeDissectorReg.cmake more generally (out-of-source) usable. Add make-dissector-reg.py to the Debian packages. Making it possible to generate out-of-source wireshark plugins. Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6 Reviewed-on: https://code.wireshark.org/review/5802 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18Make sure err_info is always set, and print it iff it's non-null.Guy Harris12-116/+92
Change-Id: Ib5c600c491a3d8adcfa91c00fa9445283610545b Reviewed-on: https://code.wireshark.org/review/5830 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-18WTAP_ERR_UNWRITABLE_ errors aren't returned by reads or open-for-reading.Guy Harris10-88/+9
Check for them *only* on opening for writing and writes. Change-Id: I4b537d511ec04bcfc81f69166a2b9a2ee9310067 Reviewed-on: https://code.wireshark.org/review/5827 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-18Rename WTAP_ERR_REC_TYPE_UNSUPPORTED to WTAP_ERR_UNWRITABLE_REC_TYPE.Guy Harris26-31/+31
That indicates that it's a problem specific to *writing* capture files; we've already converted some errors to that style, and added a new one in that style. Change-Id: I8268316fd8b1a9e301bf09ae970b4b1fbcb35c9d Reviewed-on: https://code.wireshark.org/review/5826 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-18Handle "I can't map this for that file format" better.Guy Harris37-73/+333
For cases where record (meta)data is something that can't be written out in a particular file format, return WTAP_ERR_UNWRITABLE_REC_DATA along with an err_info string. Report (and free) that err_info string in cases where WTAP_ERR_UNWRITABLE_REC_DATA is returned. Clean up some other error reporting cases, and flag with an XXX some cases where we aren't reporting errors at all, while we're at it. Change-Id: I91d02093af0d42c24ec4634c2c773b30f3d39ab3 Reviewed-on: https://code.wireshark.org/review/5823 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-17Resync Debian symbolsMaarten Bezemer2-1/+8
Fix wrong symbol for proto_tree_add_bitmask_with_flags Change-Id: I6804aab8f4394653fbeb2b6343d20d43eaa2b93e Reviewed-on: https://code.wireshark.org/review/5803 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-17Fix zbee errors introduced by change 5565, commit ↵Graham Bloice3-10/+1
df639f509e812fff3c5eb4bdf4f77988c6ec122b Reworked zbee_mfr_code_names to be in monotonic order. Fixed implicit shortening of time value with a cast. Change-Id: I629948fbe32543fd2672bbc40af790333b970b10 Reviewed-on: https://code.wireshark.org/review/5808 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-12-17This code is used in Wireshark, not TShark; fix messages.Guy Harris1-7/+7
Change-Id: I3c6b7686de478e42eeeb9c51c8bdb5b6843666af Reviewed-on: https://code.wireshark.org/review/5814 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-17Fix another incorrect message for WTAP_ERR_UNSUPPORTED.Guy Harris1-1/+1
WTAP_ERR_FILE_UNKNOWN_FORMAT is reported if the file is in a format that libwiretap doesn't know about (either because it's not a capture file at all or because it's a capture file in a format it doesn't support). WTAP_ERR_UNSUPPORTED is for files in a *known* format that are using features or file format elements (record type, link-layer header type, etc.) that libwireshark doesn't support. Fix another copy-and-pasteo causing WTAP_ERR_UNSUPPORTED to be reported with a message appropriate for WTAP_ERR_FILE_UNKNOWN_FORMAT. Change-Id: Ib35e2a6b6c62517887e0386f0fed1795db335439 Reviewed-on: https://code.wireshark.org/review/5810 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-17Artnet3 and OEM Codes Updatezeuz1-202/+1134
- Improved handling of status bits - Using bitfields where applicable - Unified capitalization of hex values - Using TFS instead of bits for status flags - Added universe ID calculation from Address/Net/Port - Added RDM PID decoding (values in packet-rdm.c) - Added Poll/PollReply/Toc/Rdm support for Artnet3 (15bit universe) - Updated manufacturer list from ESTA website - Updated OEM codes from Art-Net SDK Change-Id: I33edbfa754cb37391614f7cf4d6d4a9b11bcd52d Reviewed-on: https://code.wireshark.org/review/5755 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17RDM: Made PID array global (can be reused in packet-artnet.c)zeuz3-3/+41
Fixed deprecated API warning Change-Id: I761181baf9f5ae31a8a3807eb27d791d8868dcde Reviewed-on: https://code.wireshark.org/review/5786 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17zbee-zcl: swap honeywell codesEvan Huus1-2/+2
they were out of order for the extended value-string, I suspect honeywell1 and honeywell2 had just been put in backwards Change-Id: I4aacf27ba8aa20c137731f1ad652380cd5af5562 Reviewed-on: https://code.wireshark.org/review/5809 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-17Fix missing spaceMaarten Bezemer1-1/+1
Change-Id: Ia56ff1d78d584ca062a714aac097c05034279e34 Reviewed-on: https://code.wireshark.org/review/5807 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17[MIP] Add refreence to 3GPP2 documents for 3GPP2 CVSE GRE_KEY_EXTAndersBroman1-1/+3
Change-Id: I24d77e3602afba4c522648a3fabd7672c7c1f736 Reviewed-on: https://code.wireshark.org/review/5806 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17[TCP] Don't attempt reassembly on retransmitted segments.AndersBroman1-0/+13
Change-Id: I140227416435589a8b83ccb440625ccb90d0673e Reviewed-on: https://code.wireshark.org/review/5772 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Adding fix to convert latitude/longitude degrees to floating point format ↵Ganesh Nawsupe1-10/+36
from fixed point format Change-Id: Ibcfeae69e4f60423c87a0fdb8666192a1ca5dc0c Reviewed-on: https://code.wireshark.org/review/5726 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>
2014-12-17mip: Fix Rev Revocation [Ack] Flags dissection bugs.Bill Meier1-11/+15
Change-Id: Ia1eb397ee6aba8211b1091636e4ac4f51c95cc2b Reviewed-on: https://code.wireshark.org/review/5791 Reviewed-by: Bill Meier <wmeier@newsguy.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17mip: fix (what appear to be) bugs in CVSE GRE key extension dissectionBill Meier1-9/+10
Change-Id: I43dc48de62eda3a62bef4bf4a40fd18cb45751f3 Reviewed-on: https://code.wireshark.org/review/5733 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Update to V12.5.0AndersBroman9-44/+2348
Bug: 10782 Change-Id: I5fd4ec14279411682d8a23f5e0f503180113f093 Reviewed-on: https://code.wireshark.org/review/5790 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and ↵Chris Brandson17-2236/+4471
moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector. Removed attrID and cmdID ZCL cluster functions. Bug in ZCL HVAC attribute registration. Fixed bug in ZCL command ID field registration. Update Manufacturer Codes and Profile Ids to ZigBee-053874r26 Oct 2014 Fixed broken fragmented ZigBee packet collection and reassembly Use protocol fields for Thermostat schedule transitions. Added support for Key Establishment Cluster (CBKE) at SE 1.2a Updated Message cluster to SE 1.2a spec Added attribute reporting status which is common to all SE 1.2a clusters Added SE 1.2a tunnel cluster support ZigBee Smart Energy (SE) decryption appears to have been broken for some time. For SE you do not know the Link Key until after successful completion of Key Establishment and then manually enter it into preferences. Entry in preferences was broken such that when the new Link Key was entered all existing link keys would be lost. This lead to the loss of the Network Key as well when the Transport Key message was re-processed without the Pre-Configured Link Key. The Link Key 'key ring' has been moved to the UAT post-update callback so that it will always be updated correctly after changes to the link keys in preferences The attribute reporting status attribute which is common to all SE clusters was accidentally shared, now each cluster has it's own instance ZigBee security added key display for decrypted packets ZigBee Security Preferences fixed UAT type for Label so key label is editable again Added definition for Retail Service profile Added dissection for profile-wide (General Command Frame) commands when the profile is unknown Added zbee-zcl-misc.c to precommit check whitelist as it contains ias and hvac clusters avoiding proliferation of too many small files Change-Id: I53d85ba9d782db6a0e7e78c51b0bc7cdcdbca3ad Reviewed-on: https://code.wireshark.org/review/5565 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>
2014-12-17Install cmake files to make them available for out of source buildsMaarten Bezemer1-0/+2
Change-Id: I2cb4018f0214b6c0bdccfd1e83c7a7f22a818e8b Reviewed-on: https://code.wireshark.org/review/5256 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Invoke asn2wrs.py using a custom commandMaarten Bezemer1-3/+4
A custom target is defined to be always invalid, so asn2wrs.py is always invoked. A custom command is able to convert input file(s) into output file(s), the actual command is only invoked in the provided dependencies are changed. As an advantage the dependencies are correct, so cmake is able to determine when the output file is required, so it can be build in time. Change-Id: I84be5d408cfc87cf88d67b6073bea439febbe712 Reviewed-on: https://code.wireshark.org/review/5255 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Do not force the output directoryMaarten Bezemer1-2/+11
For out of source builds, the output directory should not point to wireshark source locations. By default it does point to the wireshark source directory (to stay compatible with the build in dissectors). When the A2W_OUTPUT_DIR variable is set to "_EMPTY_" the output lcoation argument (-O) is not invoked. Use A2W_FLAGS to set an output location for out of source builds (or use A2W_OUTPUT_DIR, which has the same result) Change-Id: I48b7486fcda982f0dce57cde3beacb99f946abd9 Reviewed-on: https://code.wireshark.org/review/5254 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Use FindAsn2Wrs to find asn2wrs.pyMaarten Bezemer2-4/+22
A first step to make it possible to reuse the UseAsn2Wrs for out of source builds. Change-Id: Iefb34f943e06db3d6afed55ab69d3f26aa9d633d Reviewed-on: https://code.wireshark.org/review/5253 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Install GLib cmake helper filesMaarten Bezemer1-0/+2
GLib is always/mostly required when building wireshark plugins. These cmake fiels help finding the install glib components Change-Id: Ie59b50bf8c53c367d4bf89f53db5ae31e97e0575 Reviewed-on: https://code.wireshark.org/review/5252 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>
2014-12-17Report WTAP_ERR_UNSUPPORTED correctly.Guy Harris2-3/+3
WTAP_ERR_FILE_UNKNOWN_FORMAT is reported if the file is in a format that libwiretap doesn't know about (either because it's not a capture file at all or because it's a capture file in a format it doesn't support). WTAP_ERR_UNSUPPORTED is for files in a *known* format that are using features or file format elements (record type, link-layer header type, etc.) that libwireshark doesn't support. Fix some copy-and-pasteos causing WTAP_ERR_UNSUPPORTED to be reported with a message appropriate for WTAP_ERR_FILE_UNKNOWN_FORMAT. Change-Id: Ic675ffd501c52838d8944a6c61e1b01041b73098 Reviewed-on: https://code.wireshark.org/review/5799 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-17Rename WTAP_ERR_UNSUPPORTED_FILE_TYPE to WTAP_ERR_UNWRITABLE_FILE_TYPE.Guy Harris14-23/+23
That makes it clearer what the problem is, and that it should only be returned by the dump code path, not by the read code path. Change-Id: I22d407efe3ae9fba7aa25f08f050317549866442 Reviewed-on: https://code.wireshark.org/review/5798 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-15 13:56:45 +0000