aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rfid-pn532.c
AgeCommit message (Collapse)AuthorFilesLines
2015-02-18Add a CF_FUNC macro for casting BASE_CUSTOM functions.Gerald Combs1-2/+2
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid the following warning: warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic] We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be more consistent with the other macros in proto.h. Update each instance of BASE_CUSTOM to use CF_FUNC. Adjust a dummy variable name generated by asn2wrs.py that was triggering an invalid error in checkhf.pl. Fix an encoding arguement in packet-elasticsearch.c found by fix-encoding-args.pl. Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22 Reviewed-on: https://code.wireshark.org/review/7150 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-3/+0
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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-11-27Fix a number of dup hf[] filter-names probably mostly resulting from ↵Bill Meier1-1/+1
cut/paste errs Change-Id: Id658b9e1803b2f5b92e711a3ce981ff602333d98 Reviewed-on: https://code.wireshark.org/review/5513 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-56/+56
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-56/+56
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann1-1/+1
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-06Ue TFS & VALS macros for certain 'fieldconvert' fields.Bill Meier1-7/+7
Change-Id: I8d7468e62d5de99eb68b554134be71b17d1b87c8 Reviewed-on: https://code.wireshark.org/review/525 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-12remove unused dissector tablesMartin Kaiser1-4/+0
http://www.wireshark.org/lists/wireshark-dev/201312/msg00137.html svn path=/trunk/; revision=53977
2013-12-09Reject the packet if data is NULL without doing anything else.Chris Maynard1-3/+6
Note: We *might* want to do _something_ but that _something_ should be well-defined and consistent across all dissectors. Previously, some dissectors called proto_tree_add_text() to add some error message text to the tree, while others called DISSECTOR_ASSERT(). svn path=/trunk/; revision=53895
2013-11-12From Michal LabedzkiMartin Kaiser1-4/+4
change two local variables to gint16 so we can store -1 for invalid value https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 svn path=/trunk/; revision=53286
2013-11-12Remove usb_conv_info_t from packet_info and pass the data directly into the ↵Michael Mann1-6/+5
subdissectors. Bug 9413 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9413) svn path=/trunk/; revision=53274
2013-11-12From Michal LabedskiMartin Kaiser1-4/+4
fix Logically Dead Code: allow cmd==0 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9420 svn path=/trunk/; revision=53273
2013-11-06NFC: PN532: Dissect InListPassiveTarget Response and Diagnose request and ↵Michael Mann1-158/+399
response. Bug 9333 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333) From Michal Labedzki From me: adjust datatype to guint8 on a few local variables to quiet the Microsoft compiler. svn path=/trunk/; revision=53116
2013-10-13whitespace fixes; mostly: remove trailing blanksBill Meier1-1/+1
svn path=/trunk/; revision=52591
2013-09-23Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+2
svn path=/trunk/; revision=52185
2013-09-15From Michal Labedzki viaEvan Huus1-103/+704
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9119 Implement the majority of the remaining items from the PN532 spec. svn path=/trunk/; revision=52073
2013-09-12Need to specify the particular FT_UINTn type.Guy Harris1-2/+2
svn path=/trunk/; revision=51964
2013-09-12Fix the types of some multi-bit bitfields - they're not Booleans. GiveGuy Harris1-3/+3
some of them real names (presumably they were copied-and-pasted without editing). Thanks and a tip of the Hatlo hat to checkAPI.pl for catching this. svn path=/trunk/; revision=51962
2013-09-10From: Michal Labedzki <michal.labedzki@tieto.com>Anders Broman1-292/+960
Subject: [PATCH] NFC: PN532: Implement half of PN532 specification Implement TG_* and RF_* commands/responses. Also decode "status" field in all commands. Update USB CCID to decode "escaped" payload. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9119 svn path=/trunk/; revision=51916
2013-09-07From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9105 :Pascal Quantin1-33/+71
Add additional PN532 opcodes, and update USB CCID dissector to skip status word in PN532 responses svn path=/trunk/; revision=51812
2013-09-04From Tyson Key:Anders Broman1-0/+10
Update the InListPassiveTarget Response handler to dissect the ISO 14443-A ATQA, and UID values from InnoVision/Broadcom Topaz cards/tags. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9096 svn path=/trunk/; revision=51745
2013-08-15From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9037Evan Huus1-10/+13
Update the heuristics for detecting ISO 14443-A payloads with 4 byte UIDs, and ATS values to support MTCOS-based cards/tokens (e.g. passports) in PN532 InListPassiveTarget responses. svn path=/trunk/; revision=51361
2013-03-30From Tyson Key:Jaap Keuter1-4/+40
The attached patch adds support for dissection of SAMConfiguration request packets, and updates the opcode table to identify their corresponding (null/empty) responses. svn path=/trunk/; revision=48656
2013-03-24From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8514Evan Huus1-31/+43
Device->Host detection of ISO 7816 commands in PN532 packets. From me: clean up indentation a bit in that section of the code. svn path=/trunk/; revision=48530
2013-03-22From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8514Evan Huus1-2/+17
Add support for ISO 7816 commands payloads (from host -> device, only) in PN532 InDataExchange request packets svn path=/trunk/; revision=48474
2013-03-14From Tyson Key:Jaap Keuter1-4/+41
I have just finished slightly refactoring part of the PN532 dissector's with InListPassiveTarget Response handler, to resolve some issues where ISO 14443-A UIDs of various lengths in the aforementioned packet types are incorrectly dissected. The patch also introduces basic support for identifying, and dissecting InListPassiveTarget Responses from cards/tokens with variable-length Answer To Select (ATS) payloads, such as contactless EMV payment smartcards. svn path=/trunk/; revision=48306
2013-02-06From Tyson Key:Anders Broman1-4/+36
Support for dissection of MiFare command payloads in PN532 InDataExchange packets. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8291 svn path=/trunk/; revision=47518
2013-01-26From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8246Evan Huus1-7/+54
Support for dissection of FeliCa payloads in PN532 InCommunicateThru packets. svn path=/trunk/; revision=47297
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
svn path=/trunk/; revision=45017
2012-07-26Minor cleanup;Bill Meier1-293/+302
- Create/use an extended value string to access a value string array; - Reformat to match editor modelines (convert tabs to spaces). svn path=/trunk/; revision=44050
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-04-14From Tyson Key: Support for PN532 InDeselect, Release, and InSelect Command ↵Anders Broman1-10/+50
and Response Packets. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7083 svn path=/trunk/; revision=42063
2012-04-13From Tyson Key:pascal1-28/+92
Additional PN532 dissector opcode descriptions https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7078 svn path=/trunk/; revision=42052
2012-03-13(sigh) Take out the whole if(tree) as Chris suggested. ↵Jeff Morriss1-130/+127
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6903#c14 svn path=/trunk/; revision=41529
2012-03-13Move the col_set_str() outside the if(tree) to address ↵Jeff Morriss1-59/+59
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6903#c7 svn path=/trunk/; revision=41528
2012-03-12From Tyson Key:Anders Broman1-0/+514
Dissector for the NXP PN532 protocol https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6903 svn path=/trunk/; revision=41497
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 20:40:27 +0000