alagoutte [Tue, 24 Dec 2013 15:15:17 +0000 (15:15 +0000)]
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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54442
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Tue, 24 Dec 2013 14:34:06 +0000 (14:34 +0000)]
Avoid accessing past the end of an array.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54441
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Tue, 24 Dec 2013 13:53:09 +0000 (13:53 +0000)]
use https instead of http in the url when the packet contains ssl
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54440
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Tue, 24 Dec 2013 13:44:00 +0000 (13:44 +0000)]
add ssl detection to proto_get_frame_protocols()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54439
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Tue, 24 Dec 2013 13:38:32 +0000 (13:38 +0000)]
dirty hack to make things compile without libgcrypt
would it make sense to check global_pdcp_check_integrity inside
calculate_digest()?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54438
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Tue, 24 Dec 2013 07:24:39 +0000 (07:24 +0000)]
Lop off last 4 bytes of payload to use for digest calculation. Still doesn't get expected result.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54437
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Tue, 24 Dec 2013 03:39:19 +0000 (03:39 +0000)]
Remove now-unused ephemeral stack code. And another one bites the dust...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54436
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Tue, 24 Dec 2013 03:29:14 +0000 (03:29 +0000)]
Replace all(?) remaining ep_stack occurences with wmem stacks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54435
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Tue, 24 Dec 2013 01:38:26 +0000 (01:38 +0000)]
Replace an ep-stack with a wmem stack. Running epan_init() no longer uses
any ephemeral memory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54434
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Dec 2013 01:30:00 +0000 (01:30 +0000)]
Get rid of no-longer-used variables.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54433
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Tue, 24 Dec 2013 01:17:41 +0000 (01:17 +0000)]
Add wmem_destroy_list, wmem_destroy_queue, wmem_destroy_stack so that those
data-structures can be used with manually managed memory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54432
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Dec 2013 01:03:59 +0000 (01:03 +0000)]
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54431
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Tue, 24 Dec 2013 00:54:30 +0000 (00:54 +0000)]
Make sure uchar is always initialized. Just use '?' since the comment indicates
that it's a weird (undefined?) case.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54430
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Dec 2013 00:23:09 +0000 (00:23 +0000)]
Update some comments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54429
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Dec 2013 00:20:09 +0000 (00:20 +0000)]
Add a ENC_3GPP_TS_23_038 encoding, for the standard SMS alphabet in a
bit-packed string, and use it in some places.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54428
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Tue, 24 Dec 2013 00:09:41 +0000 (00:09 +0000)]
Still not quite working, but using MAC API with gcrypt 1.6 now for digest
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54427
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Dec 2013 22:05:23 +0000 (22:05 +0000)]
Fix setup of new expert info item.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54426
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Mon, 23 Dec 2013 21:39:09 +0000 (21:39 +0000)]
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54425
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Mon, 23 Dec 2013 21:30:44 +0000 (21:30 +0000)]
Designated initializers are not standard C90, just list all the '-1's without
their field names.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54424
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Mon, 23 Dec 2013 21:19:34 +0000 (21:19 +0000)]
Avoid using ephemeral memory in register routines.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54423
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Mon, 23 Dec 2013 21:19:06 +0000 (21:19 +0000)]
Avoid one unnecessary use of ephemeral memory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54422
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Mon, 23 Dec 2013 21:09:26 +0000 (21:09 +0000)]
Get rid of some useless intermediate ep-memory when building Diameter arrays.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54421
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Mon, 23 Dec 2013 20:52:12 +0000 (20:52 +0000)]
First round converting OIDs from emem to wmem. Just internal functions so far.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54420
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:42:43 +0000 (20:42 +0000)]
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>
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54419
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:42:28 +0000 (20:42 +0000)]
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>
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54418
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:13:48 +0000 (20:13 +0000)]
Add modelines info
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54417
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:13:31 +0000 (20:13 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54416
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:13:17 +0000 (20:13 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54415
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:13:04 +0000 (20:13 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54414
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:12:51 +0000 (20:12 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54413
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:12:39 +0000 (20:12 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54412
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:12:26 +0000 (20:12 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54411
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 20:12:13 +0000 (20:12 +0000)]
Fix Result of operation is garbage or undefined warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54410
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 23 Dec 2013 20:05:18 +0000 (20:05 +0000)]
Set SVN properties.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54409
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 19:24:20 +0000 (19:24 +0000)]
Fix Windows Buildbot
packet-ubertooth.c(680) : warning C4244: '=' : conversion from 'gint16' to 'guint8', possible loss of data
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54408
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:56:30 +0000 (18:56 +0000)]
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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54407
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:56:19 +0000 (18:56 +0000)]
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54406
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:56:06 +0000 (18:56 +0000)]
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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54405
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:55:55 +0000 (18:55 +0000)]
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54404
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:55:37 +0000 (18:55 +0000)]
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54403
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:55:04 +0000 (18:55 +0000)]
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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54402
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:54:46 +0000 (18:54 +0000)]
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54401
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:54:27 +0000 (18:54 +0000)]
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: Decode the rest of Linux header
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54400
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:54:09 +0000 (18:54 +0000)]
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_USB seems to be compatible with AMP Controllers
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54399
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:12:16 +0000 (18:12 +0000)]
Fix compilation after last change in packet-pdcp-lte (about unused parameter)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54398
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 18:12:04 +0000 (18:12 +0000)]
Make Buildbot Happy
Fix : ./wslua_proto.c:1261:1: error: 'ProtoField_systemid' defined but not used [-Werror=unused-function]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54397
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 23 Dec 2013 18:07:28 +0000 (18:07 +0000)]
mp2t: rework dissecting adaptation field
- move dissecting adaptation field length to dissect_mp2t_adaptation_field()
- return offset, not delta.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54396
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 23 Dec 2013 18:06:33 +0000 (18:06 +0000)]
mp2t: avoid calling get_mp2t_conversation_data()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54395
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Mon, 23 Dec 2013 17:57:57 +0000 (17:57 +0000)]
Add FT_SYSTEM_ID for type checking
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54394
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 23 Dec 2013 17:20:07 +0000 (17:20 +0000)]
Use G_GINT64_CONSTANT(nnn) instead of nnnul in a few places;
Add a few casts to time_t;
Do a few whitespace tweaks (indentation, trailing, etc)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54393
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 23 Dec 2013 17:01:37 +0000 (17:01 +0000)]
Fix up casing and code formatting in the UDP Decode-As code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54392
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 23 Dec 2013 16:50:25 +0000 (16:50 +0000)]
Make the SCTP Decode-As dialog more consistent with the TCP one.
Rename the 2nd SCTP Transport tab to "SCTP(PPID)" to make it obvious what it
is.
Fix up casing and code formatting in both SCTP and TCP Decode-As code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54391
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 23 Dec 2013 16:47:10 +0000 (16:47 +0000)]
Back out inadvertant change introduced in SVN #54340
to use GTK2 when building Windows Wireshark.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54390
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 15:58:26 +0000 (15:58 +0000)]
Make buildbot Happy
error: unused parameter 'allow_partial_value'
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54389
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 23 Dec 2013 15:56:40 +0000 (15:56 +0000)]
Add #if 0'd code to calculate CMAC digest, which isn't supported in windows build of libgcrypt currently getched by 'setup'.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54388
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 23 Dec 2013 15:53:13 +0000 (15:53 +0000)]
From Ville Skyttä: Spelling Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54387
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 23 Dec 2013 15:35:07 +0000 (15:35 +0000)]
Reove _U_ from some function parameters ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54386
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 23 Dec 2013 15:25:05 +0000 (15:25 +0000)]
Change types to try to avoid warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54385
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Mon, 23 Dec 2013 15:19:25 +0000 (15:19 +0000)]
Add GPLv2+ license header to headers-check.c as per private email from the
author.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54384
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Mon, 23 Dec 2013 15:18:48 +0000 (15:18 +0000)]
Add FT_SYSTEM_ID type and convert the dissectors that use print_system_id with FT_BYTES to now use FT_SYSTEM_ID type.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54383
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 23 Dec 2013 13:53:56 +0000 (13:53 +0000)]
Remove printf() call
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54382
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 23 Dec 2013 13:45:07 +0000 (13:45 +0000)]
From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9551
Dissect SCSI XCOPY and RECEIVE COPY Parameters commands
From me :
Fix encoding-args
Fix trailing whitespace
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54381
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 23 Dec 2013 13:43:13 +0000 (13:43 +0000)]
Call function and compare result with parsed mac-i. Now just need to do EIA2(AES) calculation
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54380
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Dec 2013 12:19:16 +0000 (12:19 +0000)]
Removed a wrong sanity check in ByteArray base64_decode.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54379
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 23 Dec 2013 11:38:38 +0000 (11:38 +0000)]
Use preference variable that wasn't used yet to pacify buildbot
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54378
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 23 Dec 2013 10:56:51 +0000 (10:56 +0000)]
Starting to get ready for integrity checking
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54377
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Mon, 23 Dec 2013 09:42:10 +0000 (09:42 +0000)]
correct http2 detection
check the input tvb's length before doing tvb_get_guint8(tvb,2)
reject a short packet, don't throw an exception
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54376
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Dec 2013 02:19:27 +0000 (02:19 +0000)]
Fix warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54375
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Dec 2013 01:25:20 +0000 (01:25 +0000)]
Fix the offset constant in SURROGATE_VALUE(), and add rather than OR it.
Expand a bunch of comments, discussing what various routines do and
should perhaps do.
Pull the core of tvb_get_ucs_2_string()/tvb_get_ucs_2_stringz() and
tvb_get_ucs_4_string()/tvb_get_ucs_4_stringz() into common routines, as
we did for tvb_get_utf_16_string()/tvb_get_utf_16_stringz().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54374
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Mon, 23 Dec 2013 01:16:00 +0000 (01:16 +0000)]
Make (most) fields within packet-osi-options.c filterable.
Not sure how to handle the filter names. Even though OSI isn't a "protocol", there's enough commonality to justify a "dissector". Also not sure if packet-osi-options.c should just be merged with packet-osi.c to make the relationship more obvious (both files aren't that big)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54373
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 22 Dec 2013 22:19:41 +0000 (22:19 +0000)]
Improved out-of-bounds check in TvbRange ustringz and le_ustringz.
This functions should probably be marked as obsoleted now that we
have support for encoding in stringz.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54372
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 22 Dec 2013 22:09:06 +0000 (22:09 +0000)]
Made TvbRange strsize take an optional encoding argument.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54371
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Sun, 22 Dec 2013 21:16:31 +0000 (21:16 +0000)]
From Fabrice Bellard:
Add Carrier Id and detailed PHY info to MAC LTE UDP framing dissector
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54370
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Sun, 22 Dec 2013 20:12:31 +0000 (20:12 +0000)]
Try to pacify buildbots
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54369
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Sun, 22 Dec 2013 19:26:58 +0000 (19:26 +0000)]
Fix dissection of GSM SMS PDU
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54368
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Sun, 22 Dec 2013 18:18:12 +0000 (18:18 +0000)]
Overhaul the ISIS dissectors
1. Make real dissectors and call dissector_try_uint_new for each "isis.type"
2. Use make_register script for dissector initialization
3. Replace isis_dissect_unknown() with real expert info
4. Use convert_proto_tree_add_text.pl to make many more filterable items and gets some files off of the checkAPIs.pl naughty list.
5. Remove (now unnecessary) dissector specific header files
6. Do some reordering of functions to eliminate the need for function declarations.
Additional whitespace formatting and modelines should probably be applied to all of these dissectors.
Used capture files from bug 5354 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5354) and bug 1792 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1792) for fuzztesting.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54367
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Sun, 22 Dec 2013 17:27:53 +0000 (17:27 +0000)]
Fix copy/paste error
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54366
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Sun, 22 Dec 2013 16:27:21 +0000 (16:27 +0000)]
proto_tree_add_text -> proto_tree_add_item
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54365
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sun, 22 Dec 2013 15:47:17 +0000 (15:47 +0000)]
(Trivial)
- Minor whitespace changes;
- Fix a typo;
- Add editor modelines to tnbuff_subset.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54364
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sun, 22 Dec 2013 15:31:42 +0000 (15:31 +0000)]
'L' constant modifier not needed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54362
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sun, 22 Dec 2013 15:22:49 +0000 (15:22 +0000)]
Constant modifier 'L' not needed;
Remove unneeded #includes;
Change several tabs to spaces;
Add editor modelines.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54361
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 22 Dec 2013 15:03:44 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-12-22]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54359
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sun, 22 Dec 2013 14:47:16 +0000 (14:47 +0000)]
Don't use 'L' as a constant modifier.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54358
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sun, 22 Dec 2013 14:43:35 +0000 (14:43 +0000)]
Use G_GINT64_CONSTANT(n) rather than 'nLL' when defining constants;
Fix a typo in a comment.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54357
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 22 Dec 2013 13:08:39 +0000 (13:08 +0000)]
Made TvbRange string and stringz take an optional encoding argument, and
removed the yet-another-string-function string_enc and stringz_enc.
Documented the encoding argument.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54356
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 22 Dec 2013 11:15:35 +0000 (11:15 +0000)]
Get rid of a set-but-unused variable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54355
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Sun, 22 Dec 2013 10:52:29 +0000 (10:52 +0000)]
Move expert value_string body to expert.c (from expert.h)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54354
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Sun, 22 Dec 2013 10:45:22 +0000 (10:45 +0000)]
tvb_get_ucs_4_string: increase offset by 4
copy&paste of tvb_get_ucs_2_string?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54353
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Sun, 22 Dec 2013 10:41:27 +0000 (10:41 +0000)]
Avoid including definition of column_info structure in dissectors.
Move COL_* enum to <epan/column-utils.h>
XXX Later we can rename epan/column-info.h to column-int.h (or smth like this)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54352
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 22 Dec 2013 08:45:57 +0000 (08:45 +0000)]
Add UCS-4 support, and use it.
Shuffle the character ENC_ values around a bit, keeping the Unicode
encodings together, moving the Windows code pages (only one for now)
after the ISO 8859 encodings, and putting "I can't believe it's not
ASCII!" at the end.
Fix some comment typoes, and update another comment, while we're at it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54351
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 22 Dec 2013 02:12:32 +0000 (02:12 +0000)]
We support ENC_UCS_2, so use that in proto_tree_add_item() and
tvb_get_string_enc() rather than using iconv to convert it to UTF-8.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54350
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sun, 22 Dec 2013 01:29:21 +0000 (01:29 +0000)]
Generated stuff does not belong into the source tree
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54349
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sun, 22 Dec 2013 01:21:56 +0000 (01:21 +0000)]
Beginnings of doxygen support.
Currently the doxygen.cfg files are not designed for
out-of-tree builds - that needs to be fixed first.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54348
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 21 Dec 2013 22:12:46 +0000 (22:12 +0000)]
Oops, added the "unknown header version" expert info to the wrong item.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54347
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 21 Dec 2013 22:10:49 +0000 (22:10 +0000)]
Support all the DVB ISO 8859-x encodings, now that we have ENC_ values
for all of them.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54346
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sat, 21 Dec 2013 22:05:42 +0000 (22:05 +0000)]
Fix for
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-peekremote.c: In function ‘dissect_peekremote_new’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-peekremote.c:210:15: error: variable ‘ti_header_version’ set but not used [-Werror=unused-but-set-variable]
proto_item *ti_header_version, *ti_header_size;
^
cc1: all warnings being treated as errors
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54345
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 21 Dec 2013 21:55:46 +0000 (21:55 +0000)]
Add the rest of ISO-8859-n, thanks to Jakub's "generate a mapping table"
program.
Put the character-encoding cases in order.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54344
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 21 Dec 2013 21:42:18 +0000 (21:42 +0000)]
Don't use 'L' as a constant modifier.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54343
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 21 Dec 2013 21:02:41 +0000 (21:02 +0000)]
Use G_GINT64_CONSTANT(-1) instead of -1L.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54342
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 21 Dec 2013 20:54:26 +0000 (20:54 +0000)]
Dissect some more fields in the legacy (20-byte) header, as per the
screenshot in bug 9586.
First cut at dissecting the 802.11n (55-byte) header, as per the other
screenshot in that bug.
Update Protocol column to match the new name we gave the protocol.
Still waiting for a new-header capture to test with....
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54341
f5534014-38df-0310-8fa8-
9805f1628bb7