summaryrefslogtreecommitdiff
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-12-18Handle "I can't map this for that file format" better.Guy Harris2-8/+32
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-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-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-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.0AndersBroman3-30/+476
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 Brandson16-2236/+4469
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-17Rename WTAP_ERR_UNSUPPORTED_FILE_TYPE to WTAP_ERR_UNWRITABLE_FILE_TYPE.Guy Harris1-2/+2
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>
2014-12-17Rename WTAP_ERR_UNSUPPORTED_ENCAP to WTAP_ERR_UNWRITABLE_ENCAP.Guy Harris2-6/+6
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: Icc5c9cff43be6c073f0467607555fa7138c5d074 Reviewed-on: https://code.wireshark.org/review/5797 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-16HiSLIP: disable heuristic dissector by defaultPascal Quantin1-1/+9
It is too weak (just checking that the 2 first bytes of TCP segment are "HS") to be always activated Change-Id: Iffda96046cc687004f403dd4d8e735375790b07b Reviewed-on: https://code.wireshark.org/review/5789 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-16Disable the MDS Header ethertype preference.Gerald Combs1-1/+1
If you encounter a frame with an all-zeroes ethertype it's very likely due to buggy hardware or software. Don't try to dissect it as MDS Header traffic. Change-Id: Ie08d6aba2dcb82e4e49d6dbe96a2a3639e3cafc4 Bug: 8256 Reviewed-on: https://code.wireshark.org/review/5788 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-16http: properly calculate end of chunked responsePeter Wu1-31/+71
It was previously assumed that the remainder of a packet contains a chunked-body response. This does not have be the case, and if the assumption is violated, then the dissector would add multiple parts to a single "De-chunked entity body". This patch properly calculates the end of a chunked-body response, taking the optional trailer-part into account and adjusting the size of the chunked-body data as needed. The CRLF in last-chunk that was previously dissected as "Chunk Boundary" is the last CRLF that closes chunked-body, it is not part of last-chunk (as it has no chunk-data to terminate). A new header field is added for this trailer-part (RFC 7230 sec. 4.1). Bug: 10707 Change-Id: Ifef1cc7dd0443edca4198eb1c27f58719f85fa9f Reviewed-on: https://code.wireshark.org/review/5526 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-16RDM: Mode verbose decoding of parameter IDs.zeuz1-1/+1
-> I don't see why they were uint8; ANSI E1.33 and ANSI E1.20 use uint16 Change-Id: Ia2c024b503d6a4b8c18020699bdc676a8459dcbd Reviewed-on: https://code.wireshark.org/review/5783 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-16HTTP2: Update to draft-16Alexis La Goutte1-3/+3
Also update HTTP Header Compression (to draft-10) No framing change on HTTP2 draft-16 Change-Id: I7f8ffd7ab37bc22fd6fbe156b0bf52543025e3a8 Reviewed-on: https://code.wireshark.org/review/5782 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-16Riemann: attach metric_d field to parent eventMarc Fournier1-1/+1
Bug: 10781 Change-Id: I93ad2704f200afb303f3638fe0af65693d4c8f52 Reviewed-on: https://code.wireshark.org/review/5781 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-16ISIS LSP: Add Segment Routing Algorithm Sub TLV dissectionYann Lejeune1-1/+29
This commit implements a part of draft-ietf-isis-segment-routing-extensions: - 3.2. SR-Algorithm Sub-TLV Change-Id: Ibb419de234bf5a199f8067989b1321064fa93983 Ping-Bug: 10520 Reviewed-on: https://code.wireshark.org/review/5742 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-16ISIS LSP: Add Segment Routing Capabilities Sub-TLV dissectionYann Lejeune1-5/+101
This commit implements a part of draft-ietf-isis-segment-routing-extensions: - 3.1 Routing Capabilities Sub-TLV - 2.3 SID/Label Sub-TLV Change-Id: I3ee5e6d949cc6add412da761ffc55ef3101ddb97 Ping-Bug: 10520 Reviewed-on: https://code.wireshark.org/review/5739 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-15exit if the key wasn't found in the parameters listMartin Kaiser1-0/+3
Bug: 10761 Change-Id: I072cd3a68d852cb8dc57b9b9f807f792caba7259 Reviewed-on: https://code.wireshark.org/review/5750 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-15MP4: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang ↵Alexis La Goutte1-1/+1
> 3.3 Change-Id: I0befc8846b9af43e1563adb369ba4d332775ef76 Reviewed-on: https://code.wireshark.org/review/5778 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-15MP4: fix Unused entry: epan/dissectors/file-mp4.c, hf_mp4_stsd_entry_cntAlexis La Goutte1-1/+1
Change-Id: I95f0ab387570c0c56e19990cb9b9063051bb792f Reviewed-on: https://code.wireshark.org/review/5779 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-15Enable case-insensitive string dissector tablesEvan Huus4-18/+44
Permit passing TRUE as the parameter during table registration to achieve that effect. Use it in RTP media type table. Bug: 10708 Change-Id: I892fb1a421d349f0c05197dec90f14fc34ad6b97 Reviewed-on: https://code.wireshark.org/review/5695 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-15Revert "Bluetooth: BTLE: Add src/dst addresses when they are known"Pascal Quantin5-116/+102
This reverts commit a89c17fb52ec1270076abd82e6e5cd56d94fa682. Change-Id: I99029d72b82aaec1b398dffee0beec30829a3939 Reviewed-on: https://code.wireshark.org/review/5775 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-15[ISUP] Add dissection of Japan TTC EMERGENCY CALL INDICATORAndersBroman1-31/+61
Change-Id: I63cdb7eead49207cf66ea36d1da966d1bbec4320 Reviewed-on: https://code.wireshark.org/review/5774 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-15Bluetooth: BTLE: Add src/dst addresses when they are knownMichal Labedzki5-102/+116
Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: I28da88381a26826ad4897b56da993909130683d3 Reviewed-on: https://code.wireshark.org/review/5768 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15Bluetooth: Fix CRC Init length in UbertoothMichal Labedzki1-4/+4
Change-Id: If4292c85598e2449eff54d6680274edc3c3e4fa2 Reviewed-on: https://code.wireshark.org/review/5770 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15Bluetooth: BTLE: SN, NESN should be numbers not booleansMichal Labedzki1-2/+2
SN = Sequence Number, so it is not bool. Change-Id: I0691b17150bbbdd34a0e7cbe3cb90058c9183ff7 Reviewed-on: https://code.wireshark.org/review/5769 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15HTTP2: Update nghttp2 lib (0.6.7)Alexis La Goutte14-6295/+6120
lot of change but it is majority reindent change (Using clang-format) Change-Id: Idcd0fa79ca977e25d69eb80a89d3c61d228885e9 Reviewed-on: https://code.wireshark.org/review/5764 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-14Add support for EAPOL-MKA (802.1x-2010)maisheri4-0/+791
Use by MACSec Change-Id: I27eee40ddc476435aecd57711c1b3597c2049901 Reviewed-on: https://code.wireshark.org/review/5751 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-14Kerberos: import KRB5_AD_WIN2K_PAC dissection from old non ASN.1 based dissectorPascal Quantin1-18/+465
Bug: 10539 Change-Id: I06d1179210bdcc63800ef9580bb274c714a77c6e Reviewed-on: https://code.wireshark.org/review/5761 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>
2014-12-14GSM SMS: fix dissection of Character Set IEPascal Quantin1-29/+14
Also do not display a 8bits data SMS as an expert error Those 2 points led me to a wrong analysis yesterday Change-Id: Ib319e2ef8f0e7297cd2e119b6d0d98638e6a3d61 Reviewed-on: https://code.wireshark.org/review/5763 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-14[Automatic manuf, services and enterprise-numbers update for 2014-12-14]Gerald Combs3-42/+643
Change-Id: Ic1cf4600f35ca5e573c88e758971c578489ab673 Reviewed-on: https://code.wireshark.org/review/5758 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-13Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...Bill Meier15-53/+53
Change-Id: Ie8cb993bb9dd3e8dbfa1876a4e731bca10ee0507 Reviewed-on: https://code.wireshark.org/review/5754 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ...Bill Meier25-232/+232
(for some dissectors which fetch all other integral fields using ENC_LITTLE_ENDIAN). Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd Reviewed-on: https://code.wireshark.org/review/5752 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13rfid-pn532.c: Use FT_UINT24 to display complete hex value for three 3-byte ↵Bill Meier1-3/+3
fields. Specifically: the fields are fetched as 3 bytes, but had a type, display of FT_UINT8, BASE_HEX so only that the LO byte was displayed. Change-Id: I06ea7b9527ae788be7f19278e8ba4dc2d34b2777 Reviewed-on: https://code.wireshark.org/review/5747 Reviewed-by: maisheri <maisheri.hitesh@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13gsm_sms: Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fieldsBill Meier1-47/+47
Change-Id: If41cf6c10e4af8554cd8f6a69bd8654ad7262c85 Reviewed-on: https://code.wireshark.org/review/5749 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...Bill Meier122-1219/+1219
(for some dissectors which fetch all other integral fields using ENC_BIG_ENDIAN). Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56 Reviewed-on: https://code.wireshark.org/review/5748 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13GSM SMS: fix 'msg_class' may be used uninitialized in this function warningPascal Quantin1-3/+2
Change-Id: Ie1c53929df2dfec1b4935ca1088f375c666d3b36 Reviewed-on: https://code.wireshark.org/review/5746 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-13fix compile errorMartin Kaiser1-1/+1
packet-gsm_sms.c: In function 'dis_field_dcs': packet-gsm_sms.c:694:12: error: 'msg_class' may be used uninitialized in this function [-Werror=maybe-uninitialized] cc1: all warnings being treated as errors make[5]: *** [libdissectors_la-packet-gsm_sms.lo] Error 1 I suppose that 0xff is an invalid message class and therefore a reasonable default value. Change-Id: Iab3d3f50144b24bee4972063c2170d7a9f9b7c25 Reviewed-on: https://code.wireshark.org/review/5745 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-13GSM SMS: fix (U)SIM Data Download Class 2 dissectionPascal Quantin1-7/+27
Change-Id: Id4ea574e34c0bd35bc757fdc68d0e6b72129ef04 Reviewed-on: https://code.wireshark.org/review/5744 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-13dissector_try_uint(_new) and dissector_try_string now return the number of ↵Pascal Quantin10-34/+32
bytes consumed Change-Id: I528ad736caee1f29e2f0abfc0afcca6587d74eca Reviewed-on: https://code.wireshark.org/review/5743 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-13Riemann: add support for TCP transportPascal Quantin1-15/+51
Bug: 10770 Change-Id: I101d0152f41c0ab3d7f0fa0ccab6dec3b9e68f0d Reviewed-on: https://code.wireshark.org/review/5741 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-13Use g_direct_ functions for hash tables where possibleMartin Mathieson2-65/+13
Change-Id: Ie364cbdcf500d7a04e64d7adcdd03bd1926dda86 Reviewed-on: https://code.wireshark.org/review/5736 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-13DNS: Remove whitespace on DNS Col info before type nameAlexis La Goutte1-2/+2
Change-Id: I33a9a54a318a1a3ea106f4531db4e79a6b6d42ac Reviewed-on: https://code.wireshark.org/review/5716 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-12cip: Access FT_UINT16 hf_cip_sc_create_instance with proper encoding-arg.Bill Meier1-1/+1
Specifically: Use ENC_LITTLE_ENDIAN (not ENC_NA) to match all other integral fetches in the cip dissector. Change-Id: I5d330084168493f53135dbb97674a2dba9ed7477 Reviewed-on: https://code.wireshark.org/review/5732 Reviewed-by: Bill Meier <wmeier@newsguy.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-12Change ENC_NA to ENC_BIG_ENDIAN for all fetches of integral type fields.Bill Meier11-297/+297
Change-Id: Ia4f5735c61eedcbe8354eabd5da05d02e167f25e Reviewed-on: https://code.wireshark.org/review/5734 Reviewed-by: Bill Meier <wmeier@newsguy.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-30 19:54:41 +0000