aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-12-24Refactor 802.11 radio flags.Simon Barber11-206/+181
The use of a flag field here is aesthetically unpleasing when the flags are referred to frequently. Convert these into bitfield entries. Change-Id: I6f47e31558439dfd343ec7f856d04480366a1237 Reviewed-on: https://code.wireshark.org/review/12511 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-24Add preference to interpret radiotap rates with bit 7 set as MCS.Simon Barber1-12/+9
Change-Id: Ib3a3a70e0edbaeba143703d9b5f4f9c5c8d90818 Reviewed-on: https://code.wireshark.org/review/12855 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-12-23[PPCAP] Handle SGSAP and GTPv2 messages.AndersBroman1-31/+41
Change-Id: I94c86a94984ae9384ff27fde36ef804f1e40a413 Reviewed-on: https://code.wireshark.org/review/12798 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-12-23added support for IEEE 802.15.4 2012e Information Elements, IEsChris Brandson2-735/+996
Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-23QUIC: Display Sequence before CID (Connection ID)Alexis La Goutte1-1/+3
There is always a sequence id Change-Id: If038957ba7538b1ddec9ad9f3afc35af9e031451 Reviewed-on: https://code.wireshark.org/review/12845 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-12-23[mp2t] add an expert info for invalid adaptation_field_control valuesMartin Kaiser1-8/+16
use it for docsis and for null packets do some other minor cleanup while at it Change-Id: I605f0a9291aa7715d1fe68449c39a2e18e03fa18 Reviewed-on: https://code.wireshark.org/review/12853 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-23[mp2t] adaptation_field_control for NULL packets should not be 0Martin Kaiser1-1/+0
just remove the wrong statement, I'll add some expert info later... Bug: 11921 Change-Id: I1a4f2e32e9c7c32c54b251445f8750d7c3f5ab6f Reviewed-on: https://code.wireshark.org/review/12850 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-23Zigbee(zdp): Changing Comment format.(javadocs=>Doxygen)Rishi Dev Singh5-1711/+872
Change-Id: Ic55286739a35f43bde80cd96ea49e8b4bdf10fc9 Reviewed-on: https://code.wireshark.org/review/12842 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-12-23QUIC: Need also to increment tag_offset when tag_len is not zeroAlexis La Goutte1-1/+2
Change-Id: Id693f906bfbd03438de579755a4db7ee8dfcc474 Reviewed-on: https://code.wireshark.org/review/12843 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-12-23QUIC: It is possible to have multiple CCSAlexis La Goutte1-3/+5
Change-Id: I0b073d8ef5b004cf14e5236d210543c8eed7cde2 Reviewed-on: https://code.wireshark.org/review/12844 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-12-23Adding MULTISTATE OUTPUT (BASIC) CLUSTER,MULTISTATE INPUT (BASIC) ↵Darshan Nevgi2-0/+870
CLUSTER,MULTISTATE VALUE (BASIC) CLUSTER Change-Id: I43e5a9a96b54b6a9ebb737614dbef2ff1adacb66 Reviewed-on: https://code.wireshark.org/review/12835 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-23Plug memory leak in filter_expression_freeStig Bjørlykke1-0/+1
The list_head itself will leak in filter_expression_free(), so ensure we also free this. Change-Id: Ide6ef0c013d172b0c0120c744ce4ed46ee4321e0 Reviewed-on: https://code.wireshark.org/review/12837 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-23ui: Plug memory leak in decode_build_reset_list.Stig Bjørlykke1-1/+1
The strings passed to decode_build_reset_list() is not freed, so ensure we cleanup in decode_clear_all(). Change-Id: Ib68bde71403e260199482831272beb161fe033f9 Reviewed-on: https://code.wireshark.org/review/12836 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-22Zbee(zc): Changing comment format(javadoc=>Doxygen)Rishi Dev Singh6-1958/+1019
Change-Id: Ic0b5d7139e324cbbe786cb4a0cf7d9f924acdf04 Reviewed-on: https://code.wireshark.org/review/12818 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22[zbee] Fix display format for integersEvan Huus1-4/+4
Change-Id: Id6a22b949124e6841b9967179bf785a78eeae637 Reviewed-on: https://code.wireshark.org/review/12828 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-12-22Adding Shade Configuration and Door Lock Clusters for ZigbeeAditya Jain4-0/+615
Change-Id: Ifc99c47e4bf8c03355f60ab508cd7f9b2fb249e4 Reviewed-on: https://code.wireshark.org/review/12776 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22DNS: fix malformed warning when there is no quest(ions)Dario Lombardo1-3/+5
Change-Id: I14ef5244ddcc34fc0edea159e3e8593da8f50ffe Reviewed-on: https://code.wireshark.org/review/12819 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-22Not all versions of GLib support the g_int64 hash routines.Guy Harris1-0/+1
So include <epan/g_int64_hash_routines.h> to fix the build with those versions. Change-Id: I4c72ceff934ad0e94376c237130406f582dfce8f Reviewed-on: https://code.wireshark.org/review/12820 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-22Don't limit capture packet counts to a fixed set of protocols.Michael Mann18-40/+65
Kept backwards compatibility with GTK+ capture info dialog by keeping the protocols tracked hardcoded, but Qt should have more freedom. Change-Id: I497be71ec761d53f312e14858daa7152d01b8c72 Reviewed-on: https://code.wireshark.org/review/12724 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-12-22RTITCP: Added new dissectorJuanjo Martin4-0/+998
This dissector was mostly code-reviewed in a previous change: https://code.wireshark.org/review/#/c/11305 But it had an issue with a pointer using a sequence number (8 Bytes). This change is meant to correct that, as well as a small formatting error I found in the text shown. Change-Id: Ib7e27eb2734c46e970b99161bd04438b5675bde4 Reviewed-on: https://code.wireshark.org/review/12660 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-22ui: Optimize col_custom_prime_edt()Stig Bjørlykke2-30/+17
The col_item->col_custom_fields_ids list does not change between packet so this can be initialized in build_column_format_array(). Change-Id: I171b583912dbd1568c3d85159fac1ab435dcaa7c Reviewed-on: https://code.wireshark.org/review/12801 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-21g_malloc the decrypted key in AES_unwrap(), but always free it.Guy Harris2-2/+5
It doesn't need to exist after AirPDcapDecryptWPABroadcastKey() returns. Change-Id: Ifaf08dfb285be3cf54429f7b77d44565962d4450 Reviewed-on: https://code.wireshark.org/review/12808 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-21g_mallocate the encrypted key, but free it in all paths out of the function.Guy Harris1-2/+7
It doesn't need to persist after the function returns. Change-Id: Ic601a6ef6a0aa0f22f9c8b9a1c586cec95093f27 Reviewed-on: https://code.wireshark.org/review/12805 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-21[SMTP] Combine username and password when base64 decoding fails or is disabled.Michael Mann1-4/+19
Also add expert info "hint" that base64 decoding may be disabled. Bug: 11853 Change-Id: Ib2138ae0c70e22f311e1369c66816ff9d6fbdb82 Reviewed-on: https://code.wireshark.org/review/12734 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-21Adding RSSI Location Cluster for ZigbeeVikram Hegde2-0/+1208
Change-Id: I1b4545e132bce437570a1ea3afb2b707e7553f4b Reviewed-on: https://code.wireshark.org/review/12718 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-21ui: Improved splitting custom column multi-fieldStig Bjørlykke1-1/+1
Improved the custom column prime regex so that all fields must be separated by "||" or "or" to avoid false positives when having multi-fields which is valid display filters but not valid for custom columns (e.g. "udp and tcp"). Change-Id: Iec9942d458d6b265d04e14b5966907f1de43b782 Reviewed-on: https://code.wireshark.org/review/12751 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-21PPP: fix no previous prototype for 'proto_reg_handoff_bcp_bpdu/ncp' ↵Alexis La Goutte1-0/+2
[-Wmissing-prototypes] Change-Id: I4a90d1b2dbd5af4222ca4206f1c701842aa0d424 Reviewed-on: https://code.wireshark.org/review/12774 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-21Zbee(nwk): Changing comment format (javadoc=>Doxygen)Rishi Dev Singh1-300/+169
Change-Id: If56dfe7f52d965d0ebffcc36588b0c93234a1309 Reviewed-on: https://code.wireshark.org/review/12773 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-21CAN: Add call to register_dissector in CAN dissectorSebastian Schildt1-0/+1
Change-Id: I34d24b05941f9a56c48273254d84cab3b91a12d5 Reviewed-on: https://code.wireshark.org/review/12780 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-21Netflow/Ipfix: Add Barracuda NGFirewallUli Heilmeier2-2/+229
Add support for Barracuda NGFirewall Ipfix Audit. Used documentation found at https://techlib.barracuda.com/NG61/ConfigAuditReportingIPFIX The configuration allows to switch between little endian and big endian for a Ipfix collector. This commit expects big endian encoding. However it seems that there is a bug in NGFirewall 6.1.1 which interchanges the encoding (little-endian instead of big endian and vice versa). Bug: 11902 Change-Id: I84c497188eadedf6781dce309888242b0dc1592f Reviewed-on: https://code.wireshark.org/review/12703 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-21ICMP timestamp is in mseconds, not seconds.Michael Mann1-3/+3
Introduced in Iad5e28aa Bug: 11910 Change-Id: I80be5f156786ddb9f7bbe25460b48dbb4588cb8d Reviewed-on: https://code.wireshark.org/review/12755 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-21ui: Fixed column tooltip when having multi-field custom columns.Stig Bjørlykke1-19/+47
Change-Id: Iac09b841ff782ea351052ad6b20f5b4ff170e8e8 Reviewed-on: https://code.wireshark.org/review/12752 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-21[airpdcap rijndael] use packet scoped wmem memory in AES_unwrap()Martin Kaiser2-6/+2
at the moment, AirPDcapDecryptWPABroadcastKey() does not free the buffer allocated by AES_unwrap() if there's an error while parsing the returned data this could be fixed by adding more g_free() calls or by using wmem memory Change-Id: I332968da2186fbd17cbb7708082fa701dcab668e Reviewed-on: https://code.wireshark.org/review/12744 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-21[airpdcap] check the length of the WPA broadcast key we calculatedMartin Kaiser1-0/+4
return an error if our key is shorter than the key type required for the encryption method we detected this check prevents an out-of-bounds memory access when the key is copied Bug: 11826 Change-Id: Ic779b5d87aa97a3b2d2b2c92ce12d0fff4a85adc Reviewed-on: https://code.wireshark.org/review/12743 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-12-21[aidpdcap] use packet scoped wmem memory for szEncryptedKeyMartin Kaiser1-2/+1
to make sure that AirPDcapDecryptWPABroadcastKey() does not leak memory when it returns an error Change-Id: I01dc8dc0d6cc1e72e9784a262e35e24844e35dbc Reviewed-on: https://code.wireshark.org/review/12745 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-20Add COL_CUSTOM_PRIME_REGEXStig Bjørlykke2-1/+2
Use this as a common regex to split multi-field custom columns. Change-Id: I40f76743284c5981c95d2e47d6d1d2a7f357d2ea Reviewed-on: https://code.wireshark.org/review/12753 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-20[Automatic update for 2015-12-20]Gerald Combs3-76/+328
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I888e6e56894ab3226ad32e8f1d5e3d351cfcd8d8 Reviewed-on: https://code.wireshark.org/review/12747 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-20[png] add two more chunk namesMartin Kaiser1-0/+4
Change-Id: Ic6c6113e91adb416f19aeea5ed85d5deb61832d4 Reviewed-on: https://code.wireshark.org/review/12746 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-20[AES_unwrap] initialize the output array with 0sMartin Kaiser1-1/+1
for cipher_len==56, some bytes of the output array are not written An alternative approach would be to add a check for cipher_len. I understand from RFC 3394 that the AES key wrap algorithm works on multiples of 64bits and has no upper limit, we couldn't easily reject 56 bytes cipher_len. Bug: 11527 Change-Id: Ie82357bbe5512de391813dd55098df7a16bda9ae Reviewed-on: https://code.wireshark.org/review/12741 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-20[USB] dissect the data part in outgoing isochronous URBs on LinuxMartin Kaiser1-3/+8
The kernel sets the URBs status to -EXDEV in this case. Don't require status == OK in this case. Set pinfo->p2p_dir for USB packets. Sent/received is from the perspective of the host. Bug: 11868 Change-Id: I2be2348507bef47272d3d8786019ec90457141ac Reviewed-on: https://code.wireshark.org/review/12731 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-20Qt: Add missing multi-field column validationMichal Labedzki5-65/+65
GTK already has it, but Qt forgot about it, so multi-field custom column works ok if previously saved in GTK-shark. Invalid validation prevent from modifying and saving multi-field custom column in Qt version. While at it, rename "custom field" to "custom fields" to ensure we think about multi-field custom column. Change-Id: I99588150ccb38be11b75f5dd5b0f6443e7055ebb Reviewed-on: https://code.wireshark.org/review/12685 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-20Create capture dissector table for LLC non-snap dissectors.Michael Mann9-55/+10
Change-Id: I37602d0e2148150b55b2812855bccf2f181d31b8 Reviewed-on: https://code.wireshark.org/review/12737 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-12-20Condense DMX dissectors into a single file and create a dissector table for ↵Michael Mann8-835/+596
them. Change-Id: Ie7b8964fcbb5e0a7c6b4296ee2b63e168dcc55fa Reviewed-on: https://code.wireshark.org/review/12738 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-20packet-enc.c: Convert flags to use proto_tree_add_bitmask.Michael Mann1-17/+35
Change-Id: Ie828a38ea0da14224ccf38ae5c703038bddcc835 Reviewed-on: https://code.wireshark.org/review/12736 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-20flags_set_truth -> tfs_set_notsetMichael Mann2-19/+5
Change-Id: I127f55f4ed26a99facea4d1ecc29786ab4898a75 Reviewed-on: https://code.wireshark.org/review/12735 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-19Get rid of the argument to filter_expression_init().Guy Harris3-12/+11
It's always TRUE. Clean up indentation while we're at it. Change-Id: I11f5b849274b68bbda4fa32a8d909d6d5e71cbb1 Reviewed-on: https://code.wireshark.org/review/12732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-19ERF: Add basic no-break support for ERF_TYPE_META.Anthony Coddington1-0/+6
Update erf_open heuristic to not break when ERF_TYPE_META records are present. Remove check for maximum non-pad ERF type and add defines for reserved types. No dissection in this commit beyond record type name, this will come later. Change-Id: Ib64e450e26b2878b5519fb6afeafa2ce9477ac85 Reviewed-on: https://code.wireshark.org/review/12708 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-19Adding Flow Measurement and Occupancy Sensing Clusters for ZigbeeAditya Jain2-0/+462
Change-Id: I5b43c02a75ae2ade1d389d01f352b1500417779d Reviewed-on: https://code.wireshark.org/review/12696 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-19Get rid of a couple of extra blank lines.Guy Harris1-2/+0
Change-Id: I57fd59a065e987e0e188b0898a874116e7cc56e8 Reviewed-on: https://code.wireshark.org/review/12722 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-18Remove a comment that didn't need to be copied and pasted.Guy Harris1-4/+0
Change-Id: Id05c3fbf0c667ae2b2e349b73eba62a23d9e9e9e Reviewed-on: https://code.wireshark.org/review/12721 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 11:57:38 +0000