Commit graph

22367 commits

Author SHA1 Message Date
Martin Kaiser
ba7aa190b3 start a dissector for ZVT Kassenschnittstelle
this is a protocol between payment terminals and
electronic cash-register systems / vending machines

Change-Id: Ieac87c0af8e15f2dfe8b4a6274f3b56d652a5b1f
Reviewed-on: https://code.wireshark.org/review/6531
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-15 15:07:53 +00:00
AndersBroman
1e1d96f108 Modify the errorcode defenition to suit ANSI MAP, this is (probably) OK as
ANSI MAP is currently the only user of ANSI TCAP.
Bug: 6112

Change-Id: I49f89c862ddc8351091a9a939415e4ba6e7603f5
Reviewed-on: https://code.wireshark.org/review/6546
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 15:05:04 +00:00
Evan Huus
ef0435bdb5 ZigBee: don't use packet_scope outside of dissection
The decode_* functions defined here are called post-dissection for formatting
labels, so don't have access to packet scope. Just use and free manual memory.

Introduced in gbdfabe59.

Bug: 10855
Change-Id: I9b0085b1f7779ae6fbd12482c44d8f611cdbb49f
Reviewed-on: https://code.wireshark.org/review/6545
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-15 13:34:18 +00:00
Evan Huus
c2350a5070 rsvp: fix typo
caught by test suite as:
Duplicate field detected in call to proto_register_field_array:
rsvp.call_attributes is already registered

Change-Id: Ibf4ead3026b9930fb8f6ab07f0a5a4c299cedc35
Reviewed-on: https://code.wireshark.org/review/6544
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-15 10:43:11 +00:00
Martin Mathieson
0d9248e125 Netflow: Fix spelling of 'latitude'
Change-Id: Iaae40f4a191e458645263c8d7a114392cd063707
Reviewed-on: https://code.wireshark.org/review/6543
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-15 09:42:41 +00:00
Miltos Patsiouras
5b92ab9f97 RSVP: Add support of GMPLS Support for Metro Ethernet Forum and G.8011 (RFC 6004)
This document describes a method for controlling two specific types
   of Ethernet switching via Generalized Multi-Protocol Label Switching
   (GMPLS).  This document supports the types of switching corresponding
   to the Ethernet services that have been defined in the context of the
   Metro Ethernet Forum (MEF) and International Telecommunication Union
   (ITU) G.8011.  Specifically, switching in support of Ethernet private
   line and Ethernet virtual private line services are covered.  Support
   for MEF- and ITU-defined parameters is also cover

Bug: 7841
Change-Id: I12e12d01d497bd0e9703efcf6bd8ad100805bccc
Change-Id: I180c095652604bc025ab81171dd8a042e0930f08
Reviewed-on: https://code.wireshark.org/review/5323
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15 08:33:48 +00:00
Alexis La Goutte
06ddb7e31d CAPWAP: Add a IEE802.11 Message Element Type (RFC5416)
* IEEE 802.11 Information Element (1029)

Add add_tagged_field to packet-ieee80211.h (will be used by other dissector)

Change-Id: Icd13be416ccc47fb2309b9962e9a47c339885d1e
Reviewed-on: https://code.wireshark.org/review/6524
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15 08:30:54 +00:00
Alexis La Goutte
cb1f8a3d2b CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)
* IEEE 802.11 OFDM Control (1033)
* IEEE 802.11 Update WLAN (1044)

Change-Id: I702de1d649b1dc2af1de83ee21152c6a18f42dfc
Reviewed-on: https://code.wireshark.org/review/6509
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 05:43:38 +00:00
Alexis La Goutte
f6021e8d02 CAPWAP: Add a new Message Element Type (RFC5415)
* Delete Station (18)

Change-Id: I33afa96d183b8ff22725d2e00dcfeccea3fdfa04
Reviewed-on: https://code.wireshark.org/review/6508
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 05:40:51 +00:00
AndersBroman
20e2c05d9b [E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an
argument. While at it remove deprecated APIs

Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6
Reviewed-on: https://code.wireshark.org/review/6534
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-14 13:37:14 +00:00
Pascal Quantin
0ee179c8c6 HTTP: allocate header_name in packet scope instead of file scope
While we are at it, factorize the copy of value string

Change-Id: I2a16155641b8bd8623baf51f787a5f450e7b3803
Reviewed-on: https://code.wireshark.org/review/6530
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-14 09:16:02 +00:00
Guy Harris
63a3d043e3 Consistently use the "g_string_free returns a C string pointer" idiom.
g_string_free(str, FALSE) frees the GString container but not the
underlying g_malloc()ed string; instead, it returns a pointer to the
g_malloc()ed string.

Fix those places that didn't already get the string pointer from
g_string_free() to do so rather than manually extracting the string
themselves.

And fix one place that didn't even need to use a string - it was just
scanning a C string without even modifying it.

Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5
Reviewed-on: https://code.wireshark.org/review/6532
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 23:14:13 +00:00
Pascal Quantin
25f010b269 MAC LTE: upgrade dissector to v12.4.0
Change-Id: Ieb5395a6ae7a1d7625fe645d0caf14008993d3d9
Reviewed-on: https://code.wireshark.org/review/6521
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-13 20:57:01 +00:00
Guy Harris
bc23f79729 UAT error string pointers should not be const pointers.
UAT error strings are usually allocated by g_strdup() or
g_strdup_printf(), and must ultimately be freed by the caller.

Make the pointer-to-error-string-pointer arguments to various functions
be "char **", not "const char **".

Fix cases that finds where a raw string was being used, as that won't
work if you try to free it; g_strdup() it instead.

Add a missing free of an error string.

Remove some no-longer-necessary casts.

Remove some unnecessary g_strdup()s (the string being handed to it was
already g_malloc()ated).

Change some variable declarations to match.

Put in XXX comments for some cases where the error string is just freed,
without being shown to the user.

Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0
Reviewed-on: https://code.wireshark.org/review/6525
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 20:20:03 +00:00
AndersBroman
42e4040429 [GPRS CDR]Fix faulty ASN1 modification
Should be: egsnPDPRecord			[70] EGSNPDPRecordV750

Change-Id: I4b03524c09b6ce603cf4783144d588c8839a16e6
Reviewed-on: https://code.wireshark.org/review/6523
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-13 14:15:20 +00:00
AndersBroman
db7f25f354 [GPRS CDR] Handle Rel 7 CDRs
Change-Id: I09833a326e486273c3eacaceba0963fe88e0dac6
Reviewed-on: https://code.wireshark.org/review/6522
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-13 13:44:01 +00:00
Guy Harris
f90eeb1775 When allocating address structures, use wmem_new0().
For structures used as the data in an address, use wmem_new(), so that
structure padding is zeroed out; the comparison code for addresses
compares all bytes of the structure for addresses that are structures,
and the hashing code for hash tables using addresses as keys hash all
the bytes, so we have to make sure that, for addresses that are the
same, *all* bytes are the same.

Change-Id: I995fd26cc2f20edb5a599f95562b720561708e57
Reviewed-on: https://code.wireshark.org/review/6517
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 04:36:24 +00:00
Guy Harris
b204ff4846 Do bounds checking when decompressing WCP packets.
Extract the data offset and count only once, and make sure we don't run
past the end of the data we've copied from the packet; have
decompressed_entry() just do the decompression, rather than also
fetching the data offset and count.

Add some comments while we're at it.

Bug: 10844
Change-Id: I2dc2f9594422ffa8f15fd5c57c9dac2e30e363f4
Reviewed-on: https://code.wireshark.org/review/6514
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 04:08:23 +00:00
Michael Mann
7967ef9510 Remove emem APIs from UAT functionality.
Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856
Reviewed-on: https://code.wireshark.org/review/6460
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-12 14:25:12 +00:00
AndersBroman
554a3972cd [GPRS CDR] Add expert info for unknown record types.
Change-Id: Ib485f435b6c423b06c7c31f2cf681d01261bfc15
Reviewed-on: https://code.wireshark.org/review/6504
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12 13:01:00 +00:00
AndersBroman
2619eddee8 [E212] Make it possible to use different filters for MCC and MNC in LAI
RAI and SAI.

Change-Id: I2abcc868899b8752f66347b3a0fe190670c3ce3f
Reviewed-on: https://code.wireshark.org/review/6447
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12 08:42:55 +00:00
Alexis La Goutte
706c625e2a ISIS: Add code and length for SubTLV Extended IS Reachability
* remove some proto_tree_add_text call

Change-Id: I18bc26cc95934e77b19d24edbb417af4c895d53e
Reviewed-on: https://code.wireshark.org/review/6468
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12 05:24:01 +00:00
Pascal Quantin
c8c9917f81 Fix some more regressions introduced in gecaa1f8
Convert one other set of static variables to pinfo scoped memory while we are at it

Change-Id: If550b76ef6a4dd2707d79de8579ac439d16dce79
Reviewed-on: https://code.wireshark.org/review/6490
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-11 19:12:43 +00:00
Robert Grange
9b9a06c3cb packet-mq: Avoid using sort in dissector
Avoid using sort for string_value_ext. The string value are now
sorted at definition

Change-Id: I08452b0423289d04e55ed7e3573e74bfcc329865
Reviewed-on: https://code.wireshark.org/review/6488
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 17:23:44 +00:00
Gerald Combs
9d55a0ba62 [Automatic manuf, services and enterprise-numbers update for 2015-01-11]
Change-Id: I2f9625ebc812095bd4c7464981a96b38c4548694
Reviewed-on: https://code.wireshark.org/review/6491
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-11 16:05:11 +00:00
Pascal Quantin
f2bedeb3fe FDDI: fix a memory corruption introduced in gecaa1f8
Bug: 10845
Change-Id: I4d47711f397d9aaa965dff3e97478517f638a2e2
Reviewed-on: https://code.wireshark.org/review/6489
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 13:58:14 +00:00
Pascal Quantin
aa9376e0b4 LTE RRC: upgrade dissector to v12.4.0
Change-Id: I0bd6c124bd3aa0efe09db81135adc690751e08ae
Reviewed-on: https://code.wireshark.org/review/6477
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 09:43:02 +00:00
Michael Mann
d07364d042 Restore #undef HAVE_STDLIB_H and #undef HAVE_STRING_H in kerberos dissector.
These were removed when the kerberos dissector was switched to being a pure ASN.1 dissector (see dea68bf00f).

Change-Id: I04177046250d039a750f4e4e4dd956d8beab23bc
Reviewed-on: https://code.wireshark.org/review/6476
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-11 01:08:41 +00:00
Michael Mann
f5c4d06dba Replace some "low hanging fruit" uses of emem.
Most of the remaining ep_ uses are grouped with specific functionality.

Change-Id: I8fa64a17acc6bcdcf6891b2d28715ac0c58f1a4a
Reviewed-on: https://code.wireshark.org/review/6484
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-11 00:27:57 +00:00
Guy Harris
fdd6554ccd Rename the FT_BYTES separator types to SEP_ from BASE_.
There's no requirement for "display" field values to have names
beginning with BASE_; use SEP_, to indicate that they're separators.

(And, yes, we should introduce SEP_NONE, with a value of 0, and use it.)

While we're at it, fix BASE_SEMICOLON - the separator is a colon, not a
semicolon - and document SEP_SPACE in doc/README.dissector.

Change-Id: I856aafda2c60b8320dffe287f0deb06a9604a2bf
Reviewed-on: https://code.wireshark.org/review/6486
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-11 00:27:28 +00:00
Martin Mathieson
2219f78426 Netflow: do transport resolution on ports (if know they are UDP or TCP)
Change-Id: I8fc3675f03b7eaec6a9385638197067981762a70
Reviewed-on: https://code.wireshark.org/review/6474
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-10 21:52:46 +00:00
Michael Mann
effc8266ce Add preference to display spaces between bytes for FT_BYTES fields.
I think this can make fields more readable (for a small amount of bytes).

Converted DeviceNet dissector to use proto_tree_add_item for some FT_BYTES field as tvb_bytes_to_str_punct was used to create this effect "manually".

Change-Id: I59e2acf9b00a4eb1279e6c2b2b7bd8ecef20db9b
Reviewed-on: https://code.wireshark.org/review/6304
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 19:57:27 +00:00
Guy Harris
02fb2908ff Sort the value_string_exts at dissector registration time.
You *CANNOT* defer it until dissection time, otherwise "tshark -G
values" will fail.

Change-Id: I4edf9abda271baaf916f020a211b9add5543ecc7
Reviewed-on: https://code.wireshark.org/review/6481
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-10 19:48:10 +00:00
Guy Harris
531a9f0eab Squelch a compiler warning.
The clang I'm using warns about a non-constant format string in
val_to_str_ext() calls; get rid of the unknown_format variable and,
instead, make two different proto_item_append_text() calls with
different format arguments in the val_to_str_ext()-call arguments.

Change-Id: Id668efe666634798c278958bd7e6d790ec476539
Reviewed-on: https://code.wireshark.org/review/6479
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-10 19:40:33 +00:00
Robert Grange
51acf1685b packet-mq: sort some value_string_ext in dissector
Some value_string_ext are sorted only in the dissector,
and only once.

Adapted as said in comments.
Added test for sort in dissect_mq_spx

Change-Id: If72159fe96ab28a3ed540778d67996e152b4f110
Reviewed-on: https://code.wireshark.org/review/6444
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-10 17:42:09 +00:00
Pascal Quantin
b760da956d MQ: ensure that at least 4 bytes were captured before doing heuristic checks
Otherwise it could trigger an exception

Change-Id: I280e3c5d9e5554e4be49035c03e0170ae4495e6e
Reviewed-on: https://code.wireshark.org/review/6463
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-10 16:44:40 +00:00
Alexis La Goutte
7600ddb88e UTS: fix Copy-paste error (CID 11158603)
Change-Id: Ibabb8ab3ccb0543856c84822542baa1ac0139f7e
Reviewed-on: https://code.wireshark.org/review/6472
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:57:05 +00:00
Alexis La Goutte
15ac6eb5c8 ISMACRYP: fix Copy-paste error (CID 11158602)
Change-Id: I4978627115f46a8aa90ccf67f7c008cdf9986da6
Reviewed-on: https://code.wireshark.org/review/6471
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:56:16 +00:00
Alexis La Goutte
e2fa5a516d CTDB: fix Copy-paste error (CID 11158596)
Change-Id: Ieaa70505f4b880569be6126166a71f32d84f79a8
Reviewed-on: https://code.wireshark.org/review/6470
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:55:15 +00:00
Alexis La Goutte
678051933d NLM: fix Copy-paste error (CID 11158588)
Change-Id: I0d2736f3e00c62bb908e346a641d0ddc8b171fd2
Reviewed-on: https://code.wireshark.org/review/6469
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:54:43 +00:00
Michal Labedzki
1a30c9767a Bluetooth: A2DP: APT-X: Unhardcode stream configuration
Change-Id: I16cfb4d014020a7fb2c67fef3128021c9901719a
Reviewed-on: https://code.wireshark.org/review/6442
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:36:39 +00:00
Michal Labedzki
f343710ee2 Bluetooth: HCI: Detect Vendor by "Read Local Version Information"
There is information about manufacturer of Bluetooth chip.
Also try to detect if that "permament" info is not changed,
if so informs user about this rare event (probably there is an issue)

Change-Id: I1fa748a67ad7943e61d4445d240f0578b94560fc
Reviewed-on: https://code.wireshark.org/review/6408
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:36:22 +00:00
Michal Labedzki
55df238efd Bluetooth: SMP: Add missing opcode for "Identity Address Information"
Also fix tvb_length, tvb_length_remaining warnings.

Bug: 10299

Change-Id: Ib8b55ea9f2220394a5896d13e5cc4e2cefff1e13
Reviewed-on: https://code.wireshark.org/review/6407
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:36:02 +00:00
Michal Labedzki
d6e0409892 Bluetooth: Add HCI Vendor Broadcom dissector
Since those command/events are vendor specific and proprietary
not all commands/events are implemented. All implemented commands can be
found in Open Source implementations for Broadcom chip. If you found more,
please let me know.

Change-Id: Ie68d3737c88a8cef39260a9d93192cfc81871d6c
Reviewed-on: https://code.wireshark.org/review/6406
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:35:39 +00:00
Michal Labedzki
c69b2ab320 Bluetooth: ATT: Dissect opcode with more precision
Change-Id: Iddc1a6d899b10b0d5c25723a71da7dcd11c6dfad
Reviewed-on: https://code.wireshark.org/review/6405
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:35:03 +00:00
Michal Labedzki
7177cedc26 USB: Fix Conversation/Endpoint filters
There were not fields for that, so simple add them.

Change-Id: I489bae24ac96ea0baf395add731f4d62ccf19352
Reviewed-on: https://code.wireshark.org/review/6401
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:34:24 +00:00
Alexis La Goutte
c93d0ab880 IS-IS: Incorrect decoding of IPv4 Interface/Neighbor Address sub-TLVs in Extended IS Reachability TLV
Correct 4-byte IPv4 address is incorrectly detected as wrong 6-byte IPv4 address and cannot be decoded (IPv4 Interface Address (sub-TLV type 6) and IPv4 Neighbor Address (sub-TLV type 8) of Extended IS Reachability TLV (TLV type 22) of IS-IS.

Wrong offset for some Sub-TLV

Issue found by Alexander Okonnikov

Bug: 10837
Change-Id: I81d083722da72115e1905237352650d380e9d0ac
Reviewed-on: https://code.wireshark.org/review/6453
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>
2015-01-10 13:41:20 +00:00
Evan Huus
3a9869d81a Remove/replace ep_strsplit()
Change-Id: I4a803d83844d937804849b2ad3b067381c9b96d0
Reviewed-on: https://code.wireshark.org/review/6448
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 01:56:08 +00:00
Martin Mathieson
f5de0c45a3 Netflow: Fix some duplicate label names
Change-Id: I077bdd6394898a445c00a1e7aec1c4c11b3e9ec2
Reviewed-on: https://code.wireshark.org/review/6450
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-09 18:13:38 +00:00
Dario Lombardo
1b4f96516c Some typos fixed.
Change-Id: I65df0c40d771c4854b73fd5c35d1af600f15f324
Reviewed-on: https://code.wireshark.org/review/6445
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-09 14:07:06 +00:00
Michael Mann
284229c0f8 Convert EUI64 address APIs to use wmem.
Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2
Reviewed-on: https://code.wireshark.org/review/6419
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 07:44:54 +00:00
Michal Labedzki
17f1a44168 Bluetooth: AVDTP: Fix other-side Reconfigure
It is used to properly configure internal SEP data using to
properly decode music stream.

Change-Id: If8a15267ce072eaedfac947d7558be2d3e796483
Reviewed-on: https://code.wireshark.org/review/6404
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-09 07:00:41 +00:00
Michal Labedzki
5be440f1cb Bluetooth: AVDTP/VDP: Add link to first and last packet in the stream
Useful for analyzing stream issues.

Change-Id: I1c9f43807dc3abc050cf17c971fbd270b812faa5
Reviewed-on: https://code.wireshark.org/review/6402
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-09 07:00:21 +00:00
Michal Labedzki
879a221db4 Bluetooth: BTLE RF: Remove tree and reduce indentation level
Useless check for tree avoid setting Bluetooth addresses.

Change-Id: If38465679370c5ea74f6d916e409e337d60cf7db
Reviewed-on: https://code.wireshark.org/review/6403
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-09 06:59:29 +00:00
Michael Mann
6a6e2efbf9 Have ipxnet addresses use wmem scoped memory.
Change-Id: I1d8eed2ceacccce2768590f0689cd2c83a5e56e9
Reviewed-on: https://code.wireshark.org/review/6418
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 06:02:59 +00:00
Michael Mann
456095c89d disperse atalk-utils.[ch]
The functionality was suiting for address_to_str.c and the #defines belong in packet-atalk.h.  Kept the address structure with the "address string conversion", but that can probably be better cleaned up when the address to str as a whole is cleaned up.

Would also consider making AT_ATALK an FT_ type as well.

Change-Id: Ia534096c707e6fb94acdfee0d332beda6571c371
Reviewed-on: https://code.wireshark.org/review/6417
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 05:58:59 +00:00
Michael Mann
67b1593921 Remove proto_tree_add_ax25
There isn't a legitimate use for the API, all cases can be covered with proto_tree_add_item.  As a bonus, a few more tvb_get_ptr calls can be removed.

Change-Id: I3bb86ba8f05ef3363407bcfe9b059ee27ebc135d
Reviewed-on: https://code.wireshark.org/review/6429
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-09 01:10:28 +00:00
Michael Mann
ecaa1f8d21 convert variables that were static just because of SET_ADDRESS macro to use the proper pinfo->pool instead.
Change-Id: I914918d9629f654ead497dddac0f412b690e4409
Reviewed-on: https://code.wireshark.org/review/6430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-09 01:10:05 +00:00
Guy Harris
1baf9bba9c Use G_GINT64_CONSTANT() for 64-bit constants.
Change-Id: I2b4f24c0e68f8d1edb53981b2ada7db6cd0eff72
Reviewed-on: https://code.wireshark.org/review/6433
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08 23:50:44 +00:00
Guy Harris
4b8c66891a To register an SCTP port, register in "sctp.port", not "udp.port".
Change-Id: I8f013b2895e42919ea0d97cdc35414ea3f5aec9b
Reviewed-on: https://code.wireshark.org/review/6422
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08 21:26:34 +00:00
Pascal Quantin
d8773b158a MQ: fix crash at startup
the array given to qsort algorithm must be alterable

Change-Id: I811cade161b7635e9bc9e070c1ec37d2cce50d1f
Reviewed-on: https://code.wireshark.org/review/6420
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-08 20:20:32 +00:00
Martin Mathieson
c94192d5e6 Netflow: add (hidden) root filters for each vendor with supported 'pie' entries
Change-Id: I2bdca4c092c247ab253d6ceb3770ac7ea935cdad
Reviewed-on: https://code.wireshark.org/review/6414
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-08 16:12:27 +00:00
Michal Labedzki
8bfd306a27 Bluetooth: Update to latest Assigned Numbers (up to 4.2)
Also start decoding next two profile attribute groups in SDP
(MPS and CTN) and add new two fields in EIR/AD.

Change-Id: I4dc13df2b3b13e8c2a2a5c4af2cabae9ee83d539
Reviewed-on: https://code.wireshark.org/review/6409
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-08 16:00:18 +00:00
Bill Meier
90453a4918 mka: Minor cleanup
Remove unneeded/unused code;
  Remove 'dead initializers';
  tvb_captured_length() ==> tvb_reported_length();
  Reformat a few long lines.

Change-Id: I4a09bf330e939613ea8a47e69d4fc7b21dd496e8
Reviewed-on: https://code.wireshark.org/review/6413
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-08 15:50:16 +00:00
Bill Meier
e123878834 zbee-zcl-misc: Minor changes
tvb_captured_length() --> tvb_reported_length();
  whitespace changes.

Change-Id: Id9c302d84f28ec23e554445777c7685c8d09918c
Reviewed-on: https://code.wireshark.org/review/6412
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-08 15:49:53 +00:00
Michal Labedzki
e63e77169c Bluetooth: AVDTP: Present bitfields for codec ad true/false
Previously they are present as hex value.

Change-Id: Ia30ba4da02e6bd4b0d68987506245e0534feadb6
Reviewed-on: https://code.wireshark.org/review/6400
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08 14:45:48 +00:00
Michael Mann
2d448f0d5d Eliminate proto_tree_add_text from some dissectors.
Change-Id: Ief4c377d56748e1a8ed0ef7fe5ba03b9be00cd8d
Reviewed-on: https://code.wireshark.org/review/6267
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 14:30:52 +00:00
Alexis La Goutte
ec8ca916f3 BTSDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I48ddaa9ffe8f81094d63dd886dd15bb63888cbd7
Reviewed-on: https://code.wireshark.org/review/6396
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08 13:03:16 +00:00
Alexis La Goutte
a3e934fa2a BATADV: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I3c33511389aa2f4b3eed73f1c712561b20e18bf7
Reviewed-on: https://code.wireshark.org/review/6395
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08 13:00:23 +00:00
Evan Huus
513ed24a97 ieee80211: initialize bssid for data frames
Hypothentical fix for
https://bugs.launchpad.net/ubuntu/+source/wireshark/+bug/1407662 which I haven't
actually tried.

Change-Id: Ib6d30873be7676eef756731a56a1d21a41c2c16c
Reviewed-on: https://code.wireshark.org/review/6330
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 09:46:38 +00:00
Robert Grange
a323f0ce3e packet-mq: Add New Def, Reformat Lines, re-order val_str def
Add missing definition, add new definition, Reformat some lines
Re-order the value_string used with ext_value_string definition
so they are in asc ASCII order as the ext_value_string is now
sorted before first use

renamed own tvb_get... funct to new tvb_get_guintxx funct
and deleted own tvb_get... funct
use ptvcursor_ funct instead of own macro to increment offset
removed <epan/tvbuff.h> in *.c files
correct [-Wunused-const-variable]

Change-Id: Iaee26289e098cde0e5787ca1c98de64b6b733fa2
Reviewed-on: https://code.wireshark.org/review/6079
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
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: Anders Broman <a.broman58@gmail.com>
2015-01-08 09:32:59 +00:00
Martin Kaiser
dcc49369b9 use the http server port as index for the ws.port dissector table
pinfo->match_uint is not set if websocket is called because of a
previous http Upgrade: header and http is running on a non-standard port

Bug: 10805
Change-Id: Ib0d35d29fe947cfb7b21107e734c64debbb91048
Reviewed-on: https://code.wireshark.org/review/6353
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-08 07:53:25 +00:00
Alexis La Goutte
866d2f8b87 PPCAP: Nesting level does not match indendation (CID 1259218)
Change-Id: I3d3a4243913f7f0267342693868ec1f2981534e3
Reviewed-on: https://code.wireshark.org/review/6374
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 07:25:36 +00:00
Michael Mann
20414ebf4b Replace some ep_alloc and ep_alloc0 with its wmem equivalent.
These cases were pretty easy to identify.  Also replaced some comments that referenced ep_alloced memory, when it's now in fact wmem_alloced.

Change-Id: I07d2f390a9c0b34aa2956880476755d1acf5db0a
Reviewed-on: https://code.wireshark.org/review/6392
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 07:24:15 +00:00
Michael Mann
cff098e3eb guid_to_ep_str -> guid_to_str
guid_to_str now uses wmem allocation.

Change-Id: I8e48d1a720942fbefbaa6227ae0929cb9f856359
Reviewed-on: https://code.wireshark.org/review/6391
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 07:18:09 +00:00
Michael Mann
5d610b58c5 Remove decode_numeric_bitfield.
It was only used by 1 dissector and that dissector can just use bitmasking in the hf_ field.

Change-Id: I99179356dd7cbfab0c7be1512357a7e4c0eecde6
Reviewed-on: https://code.wireshark.org/review/6390
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 05:46:26 +00:00
Michael Mann
4a5ca5c76e bytes_to_ep_str -> bytes_to_str
Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750
Reviewed-on: https://code.wireshark.org/review/6389
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 05:43:51 +00:00
Michael Mann
2209678149 ep_<protocol>_port_to_display -> <protocol>_port_to_display
Adjust any other ep_ related APIs related to the transition.

Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c
Reviewed-on: https://code.wireshark.org/review/6388
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 05:32:32 +00:00
David Ameiss
907d145f86 Various minor updates to the LBM dissectors.
Change-Id: I36954ea0d8b525b4d7a1b3407f9e9d0e1c9bbd67
Reviewed-on: https://code.wireshark.org/review/6378
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-08 02:15:26 +00:00
Guy Harris
6edb27b58e FT_DOUBLEs are 8 bytes; use FT_FLOAT for 4-byte floating-point values.
Change-Id: Ia39f8604229df18e1cdbbf81b78cd423e70f0f3c
Reviewed-on: https://code.wireshark.org/review/6386
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08 00:50:56 +00:00
Luke Mewburn
8f1b82b0aa Set the (GT) address even if the message is routed by SSN.
If sccp.set_addresses is enabled, always SET_ADDRESS to the GT
if the GT is present, not just if ROUTE_ON_GT.  This fixes TCAP
session handling in some situations.

Change-Id: Ic088a4de408303a34c17c42820602ed6bf113840
Reviewed-on: https://code.wireshark.org/review/6053
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-07 23:10:33 +00:00
Alexis La Goutte
d3f67c16d4 S5066DTS: Nesting level does not match indendation (CID 1159211 & 1159212)
Change-Id: I8145696de995e821793e7bc1576d5a5673c7b503
Reviewed-on: https://code.wireshark.org/review/6377
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07 18:32:22 +00:00
Alexis La Goutte
a6ba632ec3 BTLE: Nesting level does not match indendation (CID 1261651)
Change-Id: I11e436ca91c766edc8e85fd2402e61a17465bee2
Reviewed-on: https://code.wireshark.org/review/6373
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:20:53 +00:00
Michael Mann
64a7bac641 tvb_bytes_to_ep_str -> tvb_bytes_to_str
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4
Reviewed-on: https://code.wireshark.org/review/6371
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:16:23 +00:00
Michael Mann
98d3b1494b Replace bytes_to_ep_str_punct with wmem equivalent.
Change-Id: I8aa7d7374db94685fd875cbf358c3bfbc83f3255
Reviewed-on: https://code.wireshark.org/review/6370
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:12:35 +00:00
Michael Mann
9cfe67fde6 tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punct
Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size)

Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e
Reviewed-on: https://code.wireshark.org/review/6369
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:05:35 +00:00
AndersBroman
667897c98a [MIP6] Update to handling of
Mobility Header Link-Layer Address (MH-LLA) Option
to RFC 5268 e.g no special handling of length.
Bug:10043

Change-Id: Id32789fa5e34766c5734b0be13af015473ac257c
Reviewed-on: https://code.wireshark.org/review/6372
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07 16:39:38 +00:00
Michael Mann
ed9a9be5df Use tvb_address_to_str as an optimization
Change-Id: Ic79d8bdc58b84087531b298b3b27273c1afccd4f
Reviewed-on: https://code.wireshark.org/review/6357
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 12:38:07 +00:00
Michael Mann
4088a8286d SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use.
Not all changes were able to remove their corresponding tvb_get_ptr, because there are other API dependent on the (tvb_get)pointer, but future iterations optimizing those other APIs will then be able to remove it.

Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22
Reviewed-on: https://code.wireshark.org/review/6358
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 12:37:52 +00:00
Pascal Quantin
6252074a24 DJIUAV: small cleanups
- fix some typos
- remove a useless include
- change an obsolete API
- comment unused hf entries for now

Change-Id: I5939bc2fe9ddc6c422f35423aa22e884f20f088d
Reviewed-on: https://code.wireshark.org/review/6349
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: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07 10:19:51 +00:00
Martin Kaiser
9696eb66db SMB: the "encryption key" in the negotiate response is not really a key
but the data for the Challenge/Response authentication

(at least, that's my understanding of
 http://msdn.microsoft.com/en-us/library/ee441946.aspx)

rename the items and filter strings accordingly

Bug: 10777
Change-Id: I38378f0b31252d7bc8ec5e8ad7cee81a1a48cb4d
Reviewed-on: https://code.wireshark.org/review/6137
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07 06:00:01 +00:00
Michael Mann
47d670d3d7 Add tvb_address_to_str.
This is intended to handle ALL address types retrieved from a tvbuff.

One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string.

A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str.  Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str.

Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43
Reviewed-on: https://code.wireshark.org/review/6333
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 04:25:07 +00:00
Joseph Huffman
0f426d6f01 Improved handling of ARDP fragmented packets.
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>
2015-01-07 02:50:36 +00:00
Pascal Quantin
119f564e0d MBIM: call dissector_(add|delete)_uint only when necessary
Change-Id: I12bbe9e1d81560f1874d4e575b19db1842fa0c72
Reviewed-on: https://code.wireshark.org/review/6352
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-06 21:04:19 +00:00
Martin Mathieson
f39366bb12 NetFlow: Add Ixia 'IxFlow' fields and make some general usability improvements
- Sequence number analysis using flow sequence within an observation domain.
- Link back from data set to template frame, if have seen
- Show more information (observation domain ID, set ID, etc) in Info column and protocol roots
- Look up protocol field from ip_proto

Change-Id: I3147387a3cd0d1fc33b879b3ba226753ed2cd8dd
Reviewed-on: https://code.wireshark.org/review/6331
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06 20:17:23 +00:00
Alexis La Goutte
087fea319a DJI UAV: Add dissector to autotools and add modelines info
Change-Id: I2a312af906ddf01ff05083a657f474a921ab95a3
Reviewed-on: https://code.wireshark.org/review/6337
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-06 16:01:44 +00:00
Alexis La Goutte
1d7da82938 DNS: fix no previous prototype for 'qname_labels_count' [-Wmissing-prototypes]
Change-Id: I2c5b662f6b46d60a97a491ca8ec01b3f0e41fa56
Reviewed-on: https://code.wireshark.org/review/6338
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-06 15:42:54 +00:00
Stig Bjørlykke
cbca7eeb71 p_mul: Indicate if fletcher algorithm is used.
The first version of ACP 142 uses the fletcher algorithm for checksum.
Indicate if this (now old variant) checksum is used.

Change-Id: Id6f3e7ecfcde022b339bdb956cd6f642a917076a
Reviewed-on: https://code.wireshark.org/review/6342
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06 13:01:31 +00:00
Stig Bjørlykke
0910b551a9 s5066ses: Fixed some missing sapid mappings.
The previous s5066ses commit added sapid value strings but missed
updating PDU type 21 and 25.

Change-Id: I5cd4dba14eacdf2f590490a95b0cc62b04193b9e
Reviewed-on: https://code.wireshark.org/review/6341
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06 12:55:11 +00:00
Ricardo Cristian Ramirez
e8568c83f4 s5066sis: Consume transport layer data in S5066sis
S5066 spec describes a transport layer for some
clients like Acp 142 and DMP but not for all of
them. Since RCOP/UDOP header definition are given
in S'5066 specification, consuming these header
bytes in S'5066 SIS dissector may be appropriate

Bug: 10827
Change-Id: Iffdf5d567e1a417ccbafdac919f5a5200159d31b
Reviewed-on: https://code.wireshark.org/review/6292
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06 11:51:00 +00:00
Guy Harris
1176db2ffe Squelch harmless compiler warnings.
(Yes, we know, we're casting 16-bit integers to pointers.  That's
because various generic maps need to be able to take arbitrary values as
keys, and sometimes the arbitrary values aren't structures to which we
point, but just integral values, and that's why GUINT_TO_POINTER()
exists, but it doesn't do enough casting to suppress harmless warnings.)

Change-Id: I1a9c68b4b1007f0a38017ba3570b94efb0b6845a
Reviewed-on: https://code.wireshark.org/review/6329
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05 21:18:56 +00:00
Joerg Mayer
318b8f81ae Beginnings of dissection of the dji drones control protocol.
Change-Id: Ifda0b97df7e25b535a5010f25c8e8e1af83cb532
Reviewed-on: https://code.wireshark.org/review/6328
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-05 19:42:45 +00:00
Stephen Fisher
cbc5faa06c Get rid of some GNU make extensions so users can build with
the make that comes with *BSD and other systems now.

Change-Id: Ib2eee8d37e7029202675bac35839b1c0d5fc5131
Reviewed-on: https://code.wireshark.org/review/6320
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-05 17:47:56 +00:00
Michael Mann
22b4ec91c0 Replace ep_display_to_address with wmem equivalent display_to_address.
Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI.

Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9
Reviewed-on: https://code.wireshark.org/review/6318
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-05 13:55:04 +00:00
Alexis La Goutte
42706734a3 OSITP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ied8e931541e8e570ef32376eec61779a32bbd493
Reviewed-on: https://code.wireshark.org/review/6322
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05 10:39:35 +00:00
Alexis La Goutte
b03a21a1e6 SMTP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I234b9dad79e3327637f8cdcd406a49f9e7435f33
Reviewed-on: https://code.wireshark.org/review/6321
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05 10:37:08 +00:00
Dario Lombardo
696fcdba21 Added DNS statistics support
This affects both the dissector (that has been added with a tap interface and a stats generator) and the UI (to recall the stats menu).

Change-Id: I90658f7aa6707aa39bdd787a51b20fed4dbddc53
Reviewed-on: https://code.wireshark.org/review/6236
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-05 09:06:32 +00:00
Pascal Quantin
9aeb249943 ACSE: get rid of an evil global variable
Bug: 10787
Change-Id: I225dab439e195bbd308bcafd4658e77ef9023c0f
Reviewed-on: https://code.wireshark.org/review/6263
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 20:14:11 +00:00
Pascal Quantin
d9b480dd58 PKIX1Explicit: get rid of an evil global variable
Bug: 10744
Change-Id: I9fbd7c881ab6b17fa9febb55a4f33dbb229c900b
Reviewed-on: https://code.wireshark.org/review/6264
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 19:34:44 +00:00
Michael Mann
d16f114ec2 Convert "FC Member Identifier" fields from all strings to their "native" formats.
Change-Id: I7ea32170b1cdcbc16c1d62b1069c4ed71ea6e9bb
Reviewed-on: https://code.wireshark.org/review/6099
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 18:46:28 +00:00
Gerald Combs
d3581aecda Make sure we don't underrun a buffer when decrypting SSL.
Discovered by Noam Rathaus.

Change-Id: Ia0275601b2a825ba616656064d9a6eca109e34fa
Reviewed-on: https://code.wireshark.org/review/6256
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-04 18:43:41 +00:00
Alexis La Goutte
c2f6ce7571 TCP: Update Multipath TCP (MPTCP) to final RFC (RFC 6824)
* Add Fast Close subtype
* Sender MAC => Sender HMAC
* Display some reserved field
* Add new flag (Checksum, Extensibility, HMAC-SHA1...) from MP Capability subtype
* Use also proto_tree_add_bitmask for flag

Change-Id: I2e4dfd75623d3218c574e3a112e799666adcc377
Reviewed-on: https://code.wireshark.org/review/6034
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: Evan Huus <eapache@gmail.com>
2015-01-04 18:39:05 +00:00
Michael Mann
553da37446 Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field type.
These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter.  FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter.

Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type.

Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values.

Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9
Reviewed-on: https://code.wireshark.org/review/6098
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 16:32:03 +00:00
2085bbec9d gmr1_rach: Update dual-values fields to use true_false_string
Change-Id: I87f2be4b28f6409e525afc36e8ed834fae3befbb
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6300
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 16:29:55 +00:00
84e43d9cb3 gmr1_rach: Add support for GmPRS/GMR-1 3G Channel Request Type 1 & 2
Those are related to the Packet Data service.

Change-Id: Ia8e9732901609e1cdad38558aac4a2f3475a0a9d
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6291
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 16:29:43 +00:00
Alexis La Goutte
b0b51ddad0 GTPv2: fix Logically dead code (CID 1250813)
Change-Id: I1761af90bd85b14e6021a5d7b07686a37593a152
Reviewed-on: https://code.wireshark.org/review/6279
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-04 13:59:13 +00:00
Alexis La Goutte
fa0ebfcae0 BACAPP: fix empty paragraph passed to '@param' command [-Wdocumentation]
Change-Id: Ibef3cee6930dea08fc7a87635c48de609d3d4015
Reviewed-on: https://code.wireshark.org/review/6299
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 13:54:07 +00:00
Alexis La Goutte
83ac5b752a GTPv2: fix Logically dead code (CID 1255924)
Change-Id: Ia21d8f68b5d898b4493da8cf948ad421f94234fc
Reviewed-on: https://code.wireshark.org/review/6278
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-04 12:06:38 +00:00
98ba63005c gmr1_rach: Fixup the MOC Dialled Number decoding
Turns out the special values 1023/1022/1021 can happen in any group
and not just the last one.

The last one is still special though with codes [1100->1209] being
exclusive to it.

Change-Id: If86d0260aaa2cc1215560b89d7fc57d7ef21f082
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6290
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 10:51:49 +00:00
a22ea3dc52 gmr1_rach: Update NULL GPS position decoding with reality
The spec doesn't always match 100% reality. In this case it seems some
manufacturer implemented NULL GPS position with longitude.

Change-Id: I0c09627d64814a9467ecbecdc18e43974e4bab4a
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6289
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 10:17:47 +00:00
a16ac8f306 gmr1_rach: Use FT_INT24 instead of FT_UINT24 for latitude/longitude
No need to do sign extension manually, the core code now supports
signed integers with bitmask and it will do the sign extension.
Not sure if that was always the code, but it works now.

This also have the advantage that the real value 'seen' by wireshark
when applying filters is the real signed value.

Change-Id: I47e2357e5556160a00110ad63e3342879769a0b9
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6288
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 10:14:39 +00:00
Alexis La Goutte
2ef85f5cda WiFi Display: fix no previous prototype for ... [-Wmissing-prototypes]
It is the revert of adb81f335d

Change-Id: I7a19ff175ca1ab59d0d0d9e89b3b3e6e12de3b96
Reviewed-on: https://code.wireshark.org/review/6273
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 04:12:25 +00:00
Pascal Quantin
17dcd95f2b IPv6: do not allocate tap data on stack
Bug: 10780
Change-Id: I2526fb9a5a2dfd61b19dff5ba1b7902f77927f4a
Reviewed-on: https://code.wireshark.org/review/6276
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-03 19:50:16 +00:00
Guy Harris
61c6fb8281 Remove the probes from packet-kerberos.c.
None of HAVE_KERBEROS, HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or
HAVE_LIBNETTLE defined when it's compiled.  So how is HAVE_KERBEROS
getting defined when wireshark-qt.cpp is compiled?

Change-Id: If238ff54aa4f0cda662c7a52d76e33363a77240d
Reviewed-on: https://code.wireshark.org/review/6262
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03 11:07:26 +00:00
Guy Harris
544ed8adcf Stick some #define probes in on Windows.
Let's try to figure out why, on the 64-bit Windows build,
wireshark-qt.cpp is being compiled to call read_keytab_file() but
packet-kerberos.c is not being compiled to define it.

Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d
Reviewed-on: https://code.wireshark.org/review/6261
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03 07:42:17 +00:00
Michael Mann
d1d5bf121e Replace proto_tree_add_text in dissector header files where it was used in a macro that should be expert info.
Change-Id: I045368a0a91586231fc4b1e2700c2275088b76af
Reviewed-on: https://code.wireshark.org/review/6244
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02 22:11:34 +00:00
Guy Harris
5eecf81b0c Don't define a stub read_keytab_file() on Windows if we don't have Kerberos.
We don't declare it, so all the DLL export stuff won't work, and we
shouldn't need it, as we shouldn't be calling it if we don't have
Kerberos (we shouldn't support the -K option if we don't have Kerberos,
for example).

Change-Id: I7e7b12aa93c4f31953300ef513fc09a1f55f8aef
Reviewed-on: https://code.wireshark.org/review/6255
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-02 21:17:55 +00:00
Pascal Quantin
42baa9d848 USB HID: fix report descriptor main items dissection
true_false_string definitions were inverted
While we are at it, use the exact same wording as in the spec

Bug: 10825
Change-Id: Ia391b310e92eb88a9a144a2fb0974701a460afc8
Reviewed-on: https://code.wireshark.org/review/6251
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-02 20:13:35 +00:00
Bill Meier
a3c705af06 mux27010: Add a link to info about the mux27010 packet structure.
Change-Id: I46f8efc8c95bf4501a631ef3adc5291939ab1497
Reviewed-on: https://code.wireshark.org/review/6240
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02 16:28:16 +00:00
Evan Huus
1c7ffed576 ositp: fix some BASE_ errors from g7935ba9f5be
Change-Id: I71639f95f8efff9619e00dae45763ff863f0ca21
Reviewed-on: https://code.wireshark.org/review/6237
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-02 15:49:24 +00:00
Michael Mann
7935ba9f5b Eliminate proto_tree_add_text from packet-ositp.c
Change-Id: If97f1b17bf8dbd6bac708b7dfbef6df73fad0f30
Reviewed-on: https://code.wireshark.org/review/6218
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-02 14:28:01 +00:00
Guy Harris
611cfd00c2 Always set decrypt_len when setting decrypt.
This may not always be necessary, but....

Change-Id: Ib409839dbee0574c516568a1f43793f8b407f611
Reviewed-on: https://code.wireshark.org/review/6232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-02 03:55:06 +00:00
Guy Harris
854157883b When deccoding base-64, the result is the length of the *decoded* result.
That way, for example, format_text() calls on the decoded result don't
go past the end of the decoded result.

Fix some more indentation while we're at it.

Bug: 10823
Change-Id: Ia7b7b1d9fb06af5df945f19a375bf5bef3277018
Reviewed-on: https://code.wireshark.org/review/6221
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-02 01:53:57 +00:00
Bill Meier
5c529c95c5 Add '*.nativecodeanalysis.xml' to 'clean' targets
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6
Reviewed-on: https://code.wireshark.org/review/6220
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02 01:45:16 +00:00
Michael Mann
860cb393d8 tshark: Add endpoints statistics
"stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector.

Change-Id: If34bcb5165b493948e784ba038ab202803a59843
Reviewed-on: https://code.wireshark.org/review/6154
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-02 00:02:18 +00:00
Michael Mann
07c9492b8d Remove pkt_comment member from packet_info structure.
Change-Id: Ifd3d201a09944e3fc36188f891ea8a584886101d
Reviewed-on: https://code.wireshark.org/review/5884
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-02 00:00:57 +00:00
Guy Harris
f384fa07f9 Fix tpyo.
Change-Id: I5b190ee35086664ed053d376def4e21ab9ad9236
Reviewed-on: https://code.wireshark.org/review/6213
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 23:35:22 +00:00
Guy Harris
2ce7dfe14f More indentation cleanups.
Change-Id: I6d21bda89f8032d302620e21ac393dc345165ac7
Reviewed-on: https://code.wireshark.org/review/6212
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 23:28:35 +00:00
Guy Harris
6c24c7e3a8 Clean up indentation.
Change-Id: I5aa6cafc6249b3a820b1bbf2eddc2ec1fdc88685
Reviewed-on: https://code.wireshark.org/review/6211
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 23:15:23 +00:00
Guy Harris
5981dab95b Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.
Don't throw its declaration in file.h, as it's not defined in file.c.
Instead, include it in epan/dissectors/packet-kerberos.h and include
that wherever read_keytab_file() is called.

Yes, that means you also have to include <epan/asn1.h> and, therefore,
you have to include <epan/packet.h>.  Yes, that should be cleaned up,
perhaps by splitting the Kerberos support code into "stuff that handles
encryption keys without any reference to dissection" and "stuff that
does dissection-related work".

Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef
Reviewed-on: https://code.wireshark.org/review/6210
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 23:05:57 +00:00
Guy Harris
219d37e2d1 Let routines from the Kerberos dissector be called from C++.
Wrap its declarations in the usual "extern "C"" stuff.

Change-Id: I353ab334bc08a69fdacaaab5672edf758b14766a
Reviewed-on: https://code.wireshark.org/review/6201
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 12:13:34 +00:00
Graham Bloice
21697af636 Added DNP3 support for g13 and g43, output command events
Bug: 10347
Change-Id: Ic173f31d8cf3fd002454f4c22b85c19bae42d544
Reviewed-on: https://code.wireshark.org/review/6175
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-01 04:38:34 +00:00
Alexis La Goutte
ce9ca9df77 rtse.cnf: fix Nesting level does not match indendation (CID 1159214)
Change-Id: I86e6c9103990bedf93c323e1360394a7c0a39db4
Reviewed-on: https://code.wireshark.org/review/6173
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 18:04:44 +00:00
Alexis La Goutte
f42fe1a898 Zbee ZDP: fix Copy-paste error (CID 1158598)
Change-Id: If98d391f51c9d2aa31b1a3a93b774d91d364cccc
Reviewed-on: https://code.wireshark.org/review/6163
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 17:17:35 +00:00
Alexis La Goutte
02f41b1e71 GTPv2: fix Copy-paste error (CID 1158587)
Change-Id: I56eaa2071b4b8042c214cf882d35ebec646d2cb5
Reviewed-on: https://code.wireshark.org/review/6169
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 17:13:41 +00:00
Bill Meier
b0e6fbf2d4 umts_fp: Replace se_new0(...) by wmem_new0(wmem_file_scope(), ...)
Change-Id: I9d40ffd199147fb8b975c493253d5cf796be5983
Reviewed-on: https://code.wireshark.org/review/6179
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-31 16:11:42 +00:00
Alexis La Goutte
11212887a1 GTP: fix Copy-paste error (CID 1158594 & 1158595)
Change-Id: I501c0d666c7b280656e2d7cf7a196d489d452eff
Reviewed-on: https://code.wireshark.org/review/6166
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31 15:50:23 +00:00
Alexis La Goutte
493e413636 SCTP: fix Nesting level does not match indendation (CID 1159213 & 1159215 )
Change-Id: Icd04c5f1f09b9cf704828e4b6a598cd2c1f6dd15
Reviewed-on: https://code.wireshark.org/review/6172
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 15:21:48 +00:00
Alexis La Goutte
beb50e627a DHCPv6: fix Nesting level does not match indendation (CID 1159219)
Change-Id: Id57a9f2df6a4011078b0bef359b2cd5503f6f7ce
Reviewed-on: https://code.wireshark.org/review/6171
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 15:17:51 +00:00
Alexis La Goutte
784b39cbb4 GTPv2: fix typo in Anders e-mail Address
Change-Id: I2410aa7bce574c9153b971b2d8b0cbfbe24e54dc
Reviewed-on: https://code.wireshark.org/review/6170
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 15:17:23 +00:00