Commit Graph

51170 Commits

Author SHA1 Message Date
Michael Mann e44ebaa9de Use expert info instead of proto_tree_add_text.
svn path=/trunk/; revision=54450
2013-12-25 03:48:20 +00:00
Michael Mann 6535f89772 Make many fields filterable. Used convert_proto_tree_add_text.pl to do a "first pass" at converting proto_tree_add_text calls since this dissector is the worse (ab)user (by volume) of proto_tree_add_text and the "coding style" is very conducive to having convert_proto_tree_add_text.pl correctly guessing the field info.
Another pass or two of convert_proto_tree_add_text.pl (with more manual intervention) is needed to be a "proper" dissector, but it gets it off of the checkAPIs.pl "naughty list" in time for Christmas.

svn path=/trunk/; revision=54449
2013-12-24 23:41:24 +00:00
Guy Harris b5baf01b86 No need for quotes around the arguments to AC_MSG_ macros.
svn path=/trunk/; revision=54448
2013-12-24 18:51:13 +00:00
Guy Harris 8713e0457b Some warning options are, for reasons not entirely obvious to me, not
supported by some versions of g++ even though the corresponding version
of gcc supports them.  Other versions of g++, and clang, support them.

Check, before adding a -W option for C++, whether the compiler supports
it; that check must be done with -Werror, at least with g++, in order to
get a non-zero exit status from the compiler.

svn path=/trunk/; revision=54447
2013-12-24 18:43:42 +00:00
Alexis La Goutte 68e7ccc5dc From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

rename and remove some variables

svn path=/trunk/; revision=54446
2013-12-24 15:16:02 +00:00
Alexis La Goutte 46d0f09bf5 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

free all gcrypt resources

svn path=/trunk/; revision=54445
2013-12-24 15:15:52 +00:00
Alexis La Goutte ee6d040ebf From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

free all gcrypt resources

svn path=/trunk/; revision=54444
2013-12-24 15:15:43 +00:00
Alexis La Goutte ad5d1b9105 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

initialize all variables

svn path=/trunk/; revision=54443
2013-12-24 15:15:29 +00:00
Alexis La Goutte 7c5dc6d566 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

remove unused functions and a #define

svn path=/trunk/; revision=54442
2013-12-24 15:15:17 +00:00
Evan Huus 36587bc7be Avoid accessing past the end of an array.
svn path=/trunk/; revision=54441
2013-12-24 14:34:06 +00:00
Martin Kaiser d6b1e2e95c use https instead of http in the url when the packet contains ssl
svn path=/trunk/; revision=54440
2013-12-24 13:53:09 +00:00
Martin Kaiser fba61a31be add ssl detection to proto_get_frame_protocols()
svn path=/trunk/; revision=54439
2013-12-24 13:44:00 +00:00
Martin Kaiser 7708c2a19f dirty hack to make things compile without libgcrypt
would it make sense to check global_pdcp_check_integrity inside
calculate_digest()?

svn path=/trunk/; revision=54438
2013-12-24 13:38:32 +00:00
Martin Mathieson 8cbcfcf6a4 Lop off last 4 bytes of payload to use for digest calculation. Still doesn't get expected result.
svn path=/trunk/; revision=54437
2013-12-24 07:24:39 +00:00
Evan Huus 18f94609d8 Remove now-unused ephemeral stack code. And another one bites the dust...
svn path=/trunk/; revision=54436
2013-12-24 03:39:19 +00:00
Evan Huus 7151a4d99e Replace all(?) remaining ep_stack occurences with wmem stacks.
svn path=/trunk/; revision=54435
2013-12-24 03:29:14 +00:00
Evan Huus 0ea5c80e1a Replace an ep-stack with a wmem stack. Running epan_init() no longer uses
any ephemeral memory.

svn path=/trunk/; revision=54434
2013-12-24 01:38:26 +00:00
Guy Harris edb6cf0b16 Get rid of no-longer-used variables.
svn path=/trunk/; revision=54433
2013-12-24 01:30:00 +00:00
Evan Huus 1dfa4e2697 Add wmem_destroy_list, wmem_destroy_queue, wmem_destroy_stack so that those
data-structures can be used with manually managed memory.

svn path=/trunk/; revision=54432
2013-12-24 01:17:41 +00:00
Guy Harris 5f91a0afc7 Oops, escape characters shouldn't cause anything to be added to the
string, they should just cause TRUE to be returned - it's the *next*
code point that gets treated specially and, after mapping, added to the
string.

svn path=/trunk/; revision=54431
2013-12-24 01:03:59 +00:00
Evan Huus 5a81522aa2 Make sure uchar is always initialized. Just use '?' since the comment indicates
that it's a weird (undefined?) case.

svn path=/trunk/; revision=54430
2013-12-24 00:54:30 +00:00
Guy Harris bd8aeb9054 Update some comments.
svn path=/trunk/; revision=54429
2013-12-24 00:23:09 +00:00
Guy Harris 0d7a48a8bf Add a ENC_3GPP_TS_23_038 encoding, for the standard SMS alphabet in a
bit-packed string, and use it in some places.

svn path=/trunk/; revision=54428
2013-12-24 00:20:09 +00:00
Martin Mathieson 57c6542aaf Still not quite working, but using MAC API with gcrypt 1.6 now for digest
svn path=/trunk/; revision=54427
2013-12-24 00:09:41 +00:00
Guy Harris b71b269a23 Fix setup of new expert info item.
svn path=/trunk/; revision=54426
2013-12-23 22:05:23 +00:00
Michael Mann 7adc48009b Make C-type filterable.
If someone wanted to make more hf_ variables accompanied by a variety of value_strings for each category, they are certainly more than welcome.  For now it just cuts down on the proto_tree_add_text (ab)use.

"Comment out" unused hf_ variable found.

svn path=/trunk/; revision=54425
2013-12-23 21:39:09 +00:00
Evan Huus 0fc3f9c05c Designated initializers are not standard C90, just list all the '-1's without
their field names.

svn path=/trunk/; revision=54424
2013-12-23 21:30:44 +00:00
Evan Huus e805778692 Avoid using ephemeral memory in register routines.
svn path=/trunk/; revision=54423
2013-12-23 21:19:34 +00:00
Evan Huus a0321ddb9d Avoid one unnecessary use of ephemeral memory.
svn path=/trunk/; revision=54422
2013-12-23 21:19:06 +00:00
Evan Huus adff2b3b50 Get rid of some useless intermediate ep-memory when building Diameter arrays.
svn path=/trunk/; revision=54421
2013-12-23 21:09:26 +00:00
Evan Huus b2e5e4a81a First round converting OIDs from emem to wmem. Just internal functions so far.
svn path=/trunk/; revision=54420
2013-12-23 20:52:12 +00:00
Alexis La Goutte d5672481ea From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9498
dtls: use generic ssl dissect code for TLS extensions

This makes the DTLS dissector use the now common TLS extensions
dissector from packet-ssl-utils.c instead of its own.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

svn path=/trunk/; revision=54419
2013-12-23 20:42:43 +00:00
Alexis La Goutte 7b75159f1e From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9498
ssl: move TLS ext dissect code to packet-ssl-utils.c

This moves the code used to parse the TLS extension into packet-
ssl-utils.c and adds an architecture that this code could be used by
dtls in the next patch. This patch should not change anything in the
functionality.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

svn path=/trunk/; revision=54418
2013-12-23 20:42:28 +00:00
Alexis La Goutte a92a1252f5 Add modelines info
svn path=/trunk/; revision=54417
2013-12-23 20:13:48 +00:00
Alexis La Goutte aa65e8463e Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54416
2013-12-23 20:13:31 +00:00
Alexis La Goutte 09e10bb331 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54415
2013-12-23 20:13:17 +00:00
Alexis La Goutte c3a3825b99 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54414
2013-12-23 20:13:04 +00:00
Alexis La Goutte efa81cdac8 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54413
2013-12-23 20:12:51 +00:00
Alexis La Goutte b3a584d8dc Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54412
2013-12-23 20:12:39 +00:00
Alexis La Goutte 368df16f6a Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54411
2013-12-23 20:12:26 +00:00
Alexis La Goutte 8b468ca3ff Fix Result of operation is garbage or undefined warning found by Clang
svn path=/trunk/; revision=54410
2013-12-23 20:12:13 +00:00
Jeff Morriss b48d585d6c Set SVN properties.
svn path=/trunk/; revision=54409
2013-12-23 20:05:18 +00:00
Alexis La Goutte 43a2cd33ee Fix Windows Buildbot
packet-ubertooth.c(680) : warning C4244: '=' : conversion from 'gint16' to 'guint8', possible loss of data

svn path=/trunk/; revision=54408
2013-12-23 19:24:20 +00:00
Alexis La Goutte 0d76e3453e From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122

USB: CCID: Add ACR122 dissector to be autodetected by VendorId/ProductID

svn path=/trunk/; revision=54407
2013-12-23 18:56:30 +00:00
Alexis La Goutte e32d169edf From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122

NFC: Add ACR122 USB dongle dissector

ACS ACR122 is compatibile with PN532, but has its own API. Dissect it.

svn path=/trunk/; revision=54406
2013-12-23 18:56:19 +00:00
Alexis La Goutte 908bd09730 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122

Bluetooth: Add support for Low Energy Link Layer dissector

svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Alexis La Goutte b16af7bdec From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122

Bluetooth: L2CAP: Clarify constant

BTL2CAP_FIXED_CID_MAX should not be 0x40 because this is first
dynamic CID, so rename to BTL2CAP_FIXED_CID_LAST and set to
last fixed CID value.

svn path=/trunk/; revision=54404
2013-12-23 18:55:55 +00:00
Alexis La Goutte eb68a7b8d3 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122

Bluetooth: HCI: Clarify roles for Switch Role command

Descriptions now based on Core 4.1 specification.

svn path=/trunk/; revision=54403
2013-12-23 18:55:37 +00:00
Alexis La Goutte 717b8d3c49 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122

USB: Add support for Ubertooth dissections

svn path=/trunk/; revision=54402
2013-12-23 18:55:04 +00:00
Alexis La Goutte 00fd173870 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122

USB: Make setup request to be able decoding by next dissector

Most devices use them as commands, so we can dissect this protocol (class, vendor).
Also update "hci_usb" to decode these informations.

svn path=/trunk/; revision=54401
2013-12-23 18:54:46 +00:00