aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-alljoyn.c
AgeCommit message (Collapse)AuthorFilesLines
2015-10-19AllJoyn: prevent an infinite loopPascal Quantin1-0/+19
Display an expert error when the argument is empty Bug: 11607 Change-Id: I8682eab8fe1822f784e848220ff90de4eb5e13ff Reviewed-on: https://code.wireshark.org/review/11132 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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>
2015-03-06alljoyn: more robust signature handlingEvan Huus1-1/+3
There were two bugs in the handling of all-joyn struct signatures: - we were advancing the pointer without decrementing the length remaining - we were not checking for the string's null-terminator (which is only necessary if the string is malformed, but that's entirely possible) Bug: 11028 Change-Id: I38b98cf3f43681f709846e3cb9068d20c4fdce82 Reviewed-on: https://code.wireshark.org/review/7552 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>
2015-02-18Add a CF_FUNC macro for casting BASE_CUSTOM functions.Gerald Combs1-2/+1
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>
2015-01-07Improved handling of ARDP fragmented packets.Joseph Huffman1-19/+66
With the AllJoyn Reliable Datagram Protocol large packets are fragmented in a way that Wireshark doesn't desegment. The AllJoyn dissector now detects this situation and reports things to the user in a manner which indicates things are behaving normally rather than an error condition. Change-Id: I1f2aa722b6e0d1ed3572ff332b4dd8c0e5c5a765 Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org> Reviewed-on: https://code.wireshark.org/review/6344 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>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-2/+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-02alljoyn: Rename some filters; Fix some filter types.Bill Meier1-25/+25
Details: - Rename various "alljoyn.header..." display filter names releated to the alljoyn "message header" to "alljoyn.mess_header..." to distinguish the fields from actual alljoyn "header" fields. This also fixes the duplicate use of the display filter name "alljoyn.header". - Don't use FT_PROTOCOL for a field type. Change-Id: Id4e78f36716cf6064638aecd5faf561bcbc88b46 Reviewed-on: https://code.wireshark.org/review/5561 Petri-Dish: Bill Meier <wmeier@newsguy.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Joe Huffman <jhuffman@codeaurora.org> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-28AllJoyn: fix warning: no previous prototype for 'add_padding_item' ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: Id18ac125390efa22638845083f7d0d5eaf71cb97 Reviewed-on: https://code.wireshark.org/review/4955 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-26Added support for AllJoyn Reliable Datagram Protocol.Joseph Huffman1-40/+488
Change-Id: I3ec37d7aec0c51f9bd0791c8fa0c5ef3dabc9fbf Signed-off-by: Joseph Huffman <jhuffman@qce.qualcomm.com> Reviewed-on: https://code.wireshark.org/review/4414 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>
2014-10-13Fixed missing padding. Fixed ENC_NA/ENC_BIG_ENDIAN errors.Joseph Huffman1-6/+74
There was no tree items for padding in the many instances where there were bytes added to make certain data types align on even boundaries of 2, 4, or 8 bytes. These instances now show up as "Padding" in the display. There were many instances where ENC_NA was used for fields of more than one byte. This wasn't noticed before because ENC_NA was ENC_BIG_ENDIAN for historical reasons and all these fields are big endian fields. Change-Id: Iabadd46eacc9ceb8ca85f4a5ba42b6583375c5f0 Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org> Reviewed-on: https://code.wireshark.org/review/4413 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-19Do encoding-arg changes (all benign)Bill Meier1-5/+5
For: - FT_BYTES: Always use just ENC_NA - integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN Also: - FT_UINT... --> FT_UINT8 in a few cases (to match proto_tree_add_item...) - Change one case of incorrect '||' to '|' Change-Id: I427e0e61618ff8faf55691c8a695930f67d455b0 Reviewed-on: https://code.wireshark.org/review/4184 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-18AJTOOLS-4 Data field not being parsed properly by WireShark plugin if two or ↵Joseph Huffman1-117/+265
more AllJoyn Messages are combined in single TCP packet. Fixed bugs where multiple messages are combined in a single packet. Fixed bugs where a single message is distributed across multiple packets. Fixed bug where arrays of zero length were not dissected properly. Change-Id: Icfb83e73519d8217d6c477edf531ba6d3f3dcd48 Reviewed-on: https://code.wireshark.org/review/4159 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-21Define a function as 'static' (Fixes [-Wmissing-prototypes] warning).Bill Meier1-1/+2
Change-Id: Ia0a5c05c953053691837c5795c8204e2144d8067 Reviewed-on: https://code.wireshark.org/review/1241 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-04-21Fix some bugs; Do more cleanup;Bill Meier1-389/+585
Bugs fixed: - DISSECTOR_BUG (reported by proto.c) when displaying "Parameters" (Apparently introduced in I8de7a19 (gc538b44)) - Incorrect byte pane highlighting for ARG_ARRAY container type (In dissector code as originally committed) - "uint32uint32" should be "uint32" in packet details. (In dissector code as originally committed) Cleanup: - Remove unneeded #includes; - Simplify some code; - Remove unneeded initializers; - Fix: "warning: no previous prototype...[-Wmissing-prototypes]" - Reformat hf[] array entries; - Fix some spelling; - Do indentation, whitespace & formatting style changes. Change-Id: If1f488f10ba83b27f75a1f71cf4bce7d5279e87c Reviewed-on: https://code.wireshark.org/review/1238 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-15remove unused variable 'tree'Martin Kaiser1-1/+1
Change-Id: Icd39b32aa61fd9fc39c7a15d22134350582b9de6 Reviewed-on: https://code.wireshark.org/review/1160 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-15Cleanup Alljoyn dissector.Michael Mann1-795/+404
Change-Id: I8de7a196ad068506f8e7312021879d20be4063d2 Reviewed-on: https://code.wireshark.org/review/1156 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Joe Huffman <jhuffman@codeaurora.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15Fix check*.pl errorsMichael Mann1-11/+8
Change-Id: Id0526cd9b6b724a8f125574507f9ce6302db540d Reviewed-on: https://code.wireshark.org/review/1129 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-14Addition of AllJoyn packet dissector. Bug 9361Joseph Huffman1-0/+2536
Change-Id: Ia582732ee27ce9c1e4280afef5a6b3e3be959d23 Reviewed-on: https://code.wireshark.org/review/1127 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 00:08:20 +0000