aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-06-30SDP: Fix warnings [-Wcast-qual]João Valverde1-3/+3
Change-Id: I471c3d060ff69982e94c9046ca121bb0c15f0d74 Reviewed-on: https://code.wireshark.org/review/16212 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-30BGP dissector: Fixing NLRI length for flow spec NLRIMatt Texier1-1/+1
Bug: 12568 Change-Id: Id2b89c2d133865771e21acf3ee224f57ac9d262b Reviewed-on: https://code.wireshark.org/review/16203 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-30Pass the format as an argument to write_specified_fields().Guy Harris1-13/+9
That makes failing to specify a format a compile-time error. Change-Id: Iff0bda8be35b1e3acc97e4314657ceaff2b3d0be Reviewed-on: https://code.wireshark.org/review/16218 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-30Remove unused edt field from print_data structure.Guy Harris1-3/+0
Change-Id: I5778b08c52119b5be1ec482be9417b3c4ba8ed62 Reviewed-on: https://code.wireshark.org/review/16215 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-29Get rid of unused edt member in write_pdml_data structure.Guy Harris1-2/+0
Change-Id: I2a41d378187c1685afb701372cf3a8ec9c0aeb70 Reviewed-on: https://code.wireshark.org/review/16214 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-29Remove unused edt member from write_json_data structure.Guy Harris1-3/+0
Change-Id: Id8b45715c753dc6006f7833e5f49bd8aabc15271 Reviewed-on: https://code.wireshark.org/review/16213 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-29Fix -T fields, broken by ceae9e4d1fff4500b285dba021c3f239ff87779e.Guy Harris1-27/+49
Rename write_fields_proto_tree() to write_specified_fields(), and make it static. Make write_fields_proto_tree() a wrapper around write_specified_fields() that sets the format to FORMAT_CSV. Have write_specified_fields() fail with an assertion if fields->format isn't one of the known formats, to catch problems such as this in the future. Don't fill in the "data" structure if we're not going to use it. Change-Id: I11dbf448d72ca389f0e5fb8558a41b7eecf7c9a4 Reviewed-on: https://code.wireshark.org/review/16210 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-29packet-nfs: fixup whitespace in pNFS SCSI workBenjamin Coddington1-34/+34
A recent patch introduced whitespace errors.. clean them out. Change-Id: Id67bed40646d60dc6775e1e1f958a5a07a5f5f6d Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-on: https://code.wireshark.org/review/16205 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: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-29LAPD. SCTP can carry LAPD information.clairvoyant1-2/+24
* LAPD can be configured in "Decode As" using port and protocol identifier. * Add default sctp ppi (the number is not assigned by IANA). Change-Id: Iaa4797e844f6480881605ad4e6b408d7d5f60cad Reviewed-on: https://code.wireshark.org/review/16107 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-29Provide new interface for Export PDU.Michael Mann19-414/+304
Rather than have a bitmask for each desired field, have a dissector provide a list of structures that represent data that goes into the PDU. Change-Id: I125190cbaee489ebffb7d9f5d8bc6f3be2d06353 Reviewed-on: https://code.wireshark.org/review/16122 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-29tshark fields filter added for other outputsMartin Kacer2-52/+192
-e fields filter addded to ek|json|pdml output. Bug: 12529 Change-Id: I1f0f8772eefceb5b71927925ce0c34af483571b9 Reviewed-on: https://code.wireshark.org/review/16193 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-283GPP NAS: add a missing separator for optional stringPascal Quantin1-1/+1
Change-Id: Idddbae0e969b525ddbe31f3b1ddbccaed232891a Reviewed-on: https://code.wireshark.org/review/16197 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-28DTN: fix indentAlexis La Goutte2-3/+16
* Replace tab by 4-spaces * Add modelines (for packet-dtn.c) Change-Id: I668f20b4a021ef94a1bb0b26ac815495eb9920d9 Reviewed-on: https://code.wireshark.org/review/16165 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-28DTN follow up to Change ID: I49769271a41b6a7b23c6bc1d4beaadbe8819198dDavid Zoller1-19/+7
Change-Id: Ia90644c22896586e4a260a3bf11d1f3e50bd4c4b Reviewed-on: https://code.wireshark.org/review/16134 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-283GPP NAS: upgrade dissector to v13.6.0Pascal Quantin2-50/+233
Change-Id: Ieffc5d6544f3bd121ff317ff598faaadb5f117ab Reviewed-on: https://code.wireshark.org/review/16194 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-28print.c NULL pointer check in print_escapedDario Lombardo1-0/+8
Added NULL pointer check in print_escaped functions. Requested by comment in change 16034. Change-Id: Id172d772d9b5cb4bcd31fe8b42286f885ec5b968 Reviewed-on: https://code.wireshark.org/review/16188 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-06-28print: change function call.Dario Lombardo1-1/+1
Change-Id: I8cae4a8d2b57f961d16cb388befed2348a88badc Reviewed-on: https://code.wireshark.org/review/16191 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Kacer <kacer.martin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-06-28print: merge json and ek functions.Dario Lombardo1-44/+16
Change-Id: Ia5d75bab03bfc065651ea83c936aedffb1f69e9f Reviewed-on: https://code.wireshark.org/review/16190 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Kacer <kacer.martin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-06-28print(.c): fix no previous prototype for 'check_protocolfilter' ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: Ib10e919dd3f0bec92004c68bf73a3c7d37961f03 Reviewed-on: https://code.wireshark.org/review/16187 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-28Qt: Preferences dialog performance improvements.Gerald Combs1-3/+3
Fill in advanced and module tree item text when requested. Create ModulePreferencesScrollAreas only when we need to show them. Change-Id: I5aa7d5dba8f5d20de088de3a9d1ee9d58e779269 Reviewed-on: https://code.wireshark.org/review/16181 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-28OSPF: Differentiate meaning of N/P bit in NSSA LSA type 7Jaap Keuter1-5/+26
In OSPF v2 the N/P bit in NSSA LSA type 7 messages has to be interpreted as P-bit (RFC 3101) instead of N-bit. This change makes it so. Bug: 12555 Change-Id: I1d4a8978ca42d0472d5967528e72cbfada87b799 Reviewed-on: https://code.wireshark.org/review/16174 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-27cmake: add idl2wrs-dissectors target for DCERPCPeter Wu2-45/+54
Add a callable target such that dissectors can be generated without the AUTOGEN_dcerpc option. Modelled after the pidl CMakeLists.txt file and target. This approach has the advantage over the previous implementation such that the clean target does not remove the packet-dcerpc-X.c files. Change-Id: I3226937eaa76dffa253df9d4f989421d5faa3f3f Reviewed-on: https://code.wireshark.org/review/15989 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-27Fixed tshark pdml output.Martin Kacer1-20/+13
Corrected if no protocol filter (-j) specified. Change-Id: Id20dd255642951633efa935dbb1363e7b9aa9be0 Reviewed-on: https://code.wireshark.org/review/16164 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_stringMichael Mann95-1111/+900
Also some other tricks to remove unnecessary tvb_get_string_enc calls. Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914 Reviewed-on: https://code.wireshark.org/review/16158 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-27CIP: Cleanup info column for MSP packetsD. Ulis1-6/+15
1. Skip printing class name in info column when it was an MSP, since it's implied. 2. Don't print response status for embedded messages in info column for MSP. It makes the line too long. 3. Print the response status for embedded messages in the Service Packet tree. This makes it easier to find the packet that may have failed. Change-Id: I2c60fb9baf113a215ada7301f493cbd51e340dcd Reviewed-on: https://code.wireshark.org/review/16162 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: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27LTP: fix indentAlexis La Goutte1-3/+3
replace space by tab Change-Id: I52d5fefbf795fe6ee2dbdeda087c49280ba47503 Reviewed-on: https://code.wireshark.org/review/16166 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-27Remove author comments and some accompanying useless code commentsJoerg Mayer1-61/+3
This only removes author's names that appear in the AUTHORS* files. In those cases where a group of people get mentioned, this patch does not remove any in case at least one name is not found in AUTHORS* Change-Id: I2259dbda3d4a1250bdc103f3fc5be93df5482489 Reviewed-on: https://code.wireshark.org/review/16154 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-27s7comm: Sinumerik NC file transferThomas Wiens1-1/+117
Added decoding of up-/downloading files from/to a Sinumerik NC CNC control machine. Change-Id: If7939e56e972fc2b8feb12150c4184a880b0cdae Reviewed-on: https://code.wireshark.org/review/16129 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-27json: corrected json output format.Martin Kacer1-0/+32
Some pcaps caused invalid json and ek files. Bug: 11754 Change-Id: Id4c4d744b4d07fe4e8b6423688be1bb10a803844 Reviewed-on: https://code.wireshark.org/review/16152 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27radiotap: Fix for the VHT 20MHz MCS 9 data rate not displayedAshish Shukla1-1/+1
MCS 9 at 20 MHz is valid for 3 and 6 spatial streams. Changed the rate table to include rate (mbps) for VHT 20MHz MCS 9. Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Bug: 12558 Change-Id: Ia16ae545a5ac1779131e24e1f54a5659390cd321 Reviewed-on: https://code.wireshark.org/review/16146 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27circuit(.h): fix indent (and add modelines)Alexis La Goutte1-16/+24
Change-Id: I71bb0a8eaf9f5bd34395a4182e4158abaca4ace2 Reviewed-on: https://code.wireshark.org/review/16144 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-27The "coding" subfield of the VHT field is a bitmask.Guy Harris1-6/+7
Treat it as such. Fetch it once, regardless of whether we have any non-zero NSS values or not, and use the per-user NSS value to decide whether a particular bit in the bitmask is valid and worth displaying. Make the four coding fields bitfields, with the appropriate bit. Change-Id: I506b35afa9d07da8d800da5c304d5d0aadd87c54 Reviewed-on: https://code.wireshark.org/review/16155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-26Check for an invalid 11ac MCS/bandwidth/NSS combination.Guy Harris2-3/+184
A few of the combinations are marked as "Not valid" in 802.11ac-2013. Ping-Bug: 12558 Change-Id: I18b78ebb84ab32a6fc53c6d634ef07ae87fb4866 Reviewed-on: https://code.wireshark.org/review/16153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-26Decode partial virtual bitmap in TIM IEJoerg Mayer1-11/+31
- Add yet another filter name for an association id element - Minor (consistency) cleanups in the vicinity of the new hf element. Bug: 12545 Change-Id: Ic8e7580e7de7572e1b449ae03494b25567d86ea3 Reviewed-on: https://code.wireshark.org/review/16150 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-26[Automatic update for 2016-06-26]Gerald Combs2-24/+419
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id5cc1bbd3d7f899e48ae9c2de48613ef0366cc29 Reviewed-on: https://code.wireshark.org/review/16142 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-26circuit: rename shadow variableDario Lombardo2-2/+2
Change-Id: I67e2c80e89af9526ba4b482933d64cab93b9490a Reviewed-on: https://code.wireshark.org/review/16105 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26app_mem_usage: rename shadow variableDario Lombardo2-5/+5
Change-Id: I0db888633118beeabfe4bb8fa6da419d0827c7c1 Reviewed-on: https://code.wireshark.org/review/16106 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-26conversation: rename shadow variableDario Lombardo33-56/+56
Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911 Reviewed-on: https://code.wireshark.org/review/16104 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26ex-opt: rename shadow variableDario Lombardo2-4/+4
Change-Id: Iba19920e58ffb7f1a88c2a75964c518f0479c66f Reviewed-on: https://code.wireshark.org/review/16103 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26filter: rename shadow varDario Lombardo2-2/+2
Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545 Reviewed-on: https://code.wireshark.org/review/16102 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26srt: rename shadow variableDario Lombardo2-8/+8
Change-Id: I69bda25f79b6b46bdb288e32133847a853b614e0 Reviewed-on: https://code.wireshark.org/review/16101 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26stats_tree: rename shadow variableDario Lombardo1-2/+2
Change-Id: I5b3272cc4df728c70d6b0370b0d8a6d3482a0c6c Reviewed-on: https://code.wireshark.org/review/16100 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26h248: rename shadow variable.Dario Lombardo5-5/+5
Change-Id: I98545776127a0cc3b5d9c44bb625a217672b4443 Reviewed-on: https://code.wireshark.org/review/16099 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-24print(.c): fix indentAlexis La Goutte1-86/+83
Change-Id: Ie7c55fb432b29abe689eed1968cfa30bd8e88e33 Reviewed-on: https://code.wireshark.org/review/16124 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-24Indicate how this should be done.Guy Harris1-0/+7
Assuming that it could, if registered as an "eth.trailer" heuristic dissector, get the length of the entire frame, that is. Change-Id: I1ac26feeb10bb8ba357089a80f4b768f580bb51d Reviewed-on: https://code.wireshark.org/review/16121 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23Fix "disable this protocol by default".Guy Harris3-9/+28
Allow a dissector to mark its protocol as "disabled by default", which means that the "enable all protocols" routine won't enable it. This is necessary in order to allow the disabling of protocols not to be unintentionally changed due to profile changes; see bug 9826. Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f Ping-Bug: 9826 Reviewed-on: https://code.wireshark.org/review/16109 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23LTE RRC: fix display of info column when receiving a BR SIBPascal Quantin3-10/+54
Change-Id: Ic288cb10fad3bd34fe088479e7a79f77985808e0 Reviewed-on: https://code.wireshark.org/review/16098 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-23packet-nfs: add extent decoding for SCSI layoutsBenjamin Coddington1-0/+58
Decode extents sent within the response to a LAYOUTGET operation on SCSI layout types. Change-Id: I1fc0a5e3d4782f078f96866dc63f2ec43b6d62b1 Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-on: https://code.wireshark.org/review/16097 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-23NASA provided LTP and DTN updates dz-msfc3-264/+671
Change-Id: I49769271a41b6a7b23c6bc1d4beaadbe8819198d Reviewed-on: https://code.wireshark.org/review/14310 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-23Increase MAX_DISSECTOR_ADDR_TYPE.Jens Kilian1-1/+1
With the recent changes causing some address types to be registered by their proper dissectors, I ran into the MAX_DISSECTOR_ADDR_TYPE limit in a new dissector I'm currently writing. Change-Id: I72f521266af9190e8ad198ace4d6608b6b4d2dee Reviewed-on: https://code.wireshark.org/review/16091 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 17:45:47 +0000