Commit Graph

24389 Commits

Author SHA1 Message Date
Guy Harris a8ac118885 Use Unicode REPLACEMENT CHARACTER for TS 23.038 errors, as we do for
unassigned code points in some other character sets.

svn path=/trunk/; revision=54477
2013-12-27 23:55:23 +00:00
Jakub Zawadzki d6b35d5c6b mp2t: return offset when dissecting AF (continuation of r54396)
svn path=/trunk/; revision=54476
2013-12-27 17:42:46 +00:00
Anders Broman d0915cabb3 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54473
2013-12-27 10:49:35 +00:00
Evan Huus 31954c98ee From Robert Jongbloed via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8355

Support RTP/RTCP multiplexing. With input from Jonathan Lennox.

svn path=/trunk/; revision=54469
2013-12-26 21:35:20 +00:00
Michael Mann 29f61a9deb Add numeric types instead of string where possible in the RTPproxy dissector. Bug 9561 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9561)
From Peter Lemenkov

svn path=/trunk/; revision=54467
2013-12-26 15:42:06 +00:00
Michael Mann f563d1d4f8 ZigBee Test Profile #2 and ZDP fixes. Bug 9584 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9584)
From DSR Corporation

svn path=/trunk/; revision=54466
2013-12-26 15:08:18 +00:00
Michael Mann 60b1c30382 Bugfix attribute id parsing in zbee dissectors. Bug 9566 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9566)
From Fabio Tarabelloni

svn path=/trunk/; revision=54465
2013-12-26 14:28:22 +00:00
Evan Huus a2abd0eef4 Protect ucp_mktime against too-short input strings, as caught by Alexis'
ASAN-fuzzing.

svn path=/trunk/; revision=54464
2013-12-26 14:12:50 +00:00
Michael Mann 6697a94ba5 "Better" fix for OpenSafety heuristics with Modbus/TCP. Bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572)
From Roland Knall

This fix is on top of/in conjunction with r54193 and both need to be backported.

svn path=/trunk/; revision=54463
2013-12-26 14:10:26 +00:00
Evan Huus 441ebf8cc8 Use the correct define for the array length check, actually fixes the overflow I
originall tried to fix in r54441.

svn path=/trunk/; revision=54462
2013-12-26 14:01:37 +00:00
Alexis La Goutte e79f82dc9f Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54458
2013-12-26 10:00:36 +00:00
Alexis La Goutte c39b9e7db5 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54457
2013-12-26 09:54:31 +00:00
Alexis La Goutte 766d4438f2 Fix -Wunused-const-variable found by Clang
svn path=/trunk/; revision=54456
2013-12-26 09:54:22 +00:00
Alexis La Goutte 00fb8f078a From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9595
Small changes (mainly textual) to packet-scsi.c

The attached patch fixes small issues in SCSI dissection:
1. Extends the meaning of some fields (for example, the mysterious 'LBPME' becomes 'LBPME (logical block provisioning management enabled) / TPE'
2. Adds another ASC value which is important to me - 'Thin Provisioning Soft Threshold Reached' . Added comment where to get all of them (at  http://www.t10.org/lists/asc-alph.txt or http://www.t10.org/lists/asc-num.txt)
3. Fixes a small typo: scsi.extcopy.dest_lba is 'Destination LBA', not 'Source LBA' (silly copy-paste mistake).

svn path=/trunk/; revision=54455
2013-12-26 09:54:12 +00:00
Guy Harris c0823e1977 OmniPeek's dissection nonwitstanding, the timestamp field in the
PeekRemote packets from Cisco appears to be a 64-bit timestamp; it's
probably the Time Synchronization Function timestamp (TSFT), so call it
that.

svn path=/trunk/; revision=54453
2013-12-25 23:03:12 +00:00
Guy Harris 189debcadb Code that uses that parameter is #if 0'ed out, so _U_ it for now.
svn path=/trunk/; revision=54452
2013-12-25 09:23:33 +00:00
Martin Mathieson 21f8c1fb7b Show ciphering and integrity keys separately. Correct inputs to integrity calculation (result still not right with gcrypt 1.6 yet)
svn path=/trunk/; revision=54451
2013-12-25 08:44:43 +00:00
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
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 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