metze/wireshark/wip.git
8 years agoRemove the P1 dissector from the dirty dissectors list.
Guy Harris [Tue, 23 Jun 2015 18:29:46 +0000 (11:29 -0700)]
Remove the P1 dissector from the dirty dissectors list.

It was already added to the clean dissectors list, but wasn't removed
from the dirty dissectors list, so it was built twice and linked in
twice, and hilarity ensued.

Change-Id: Ic4636f17b61e619546dc21a04ebbaace0296d583
Reviewed-on: https://code.wireshark.org/review/9067
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoQt: change default behavior of 'Decode As' window
Pascal Quantin [Tue, 23 Jun 2015 17:31:58 +0000 (10:31 -0700)]
Qt: change default behavior of 'Decode As' window

Up to know Qt 'Decode As' window was saving manual configuration automatically, contrary to GTK UI.
This can be misleading when decoding protocols without a fixed identifier (port number, USB bus/device id, ...).
Opening a new trace might lead to previous and now irrelevant settings being applied.
Make this optional and add a Save button to permanently store the current configuration.

Change-Id: I077c560f9e71cab16a74247e2e9d87523c0ed85e
Reviewed-on: https://code.wireshark.org/review/9058
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years agoReplace more deprecated tvb_length calls
Evan Huus [Tue, 23 Jun 2015 18:24:48 +0000 (11:24 -0700)]
Replace more deprecated tvb_length calls

The return values of new-style dissectors always use the captured length, so
replace those automagically with sed.

Change-Id: Ic43072ee4a80d433cd4264444583a0e670adc26a
Reviewed-on: https://code.wireshark.org/review/9065
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agoQt: Be less aggressive about reselecting packets.
Gerald Combs [Tue, 23 Jun 2015 18:19:48 +0000 (11:19 -0700)]
Qt: Be less aggressive about reselecting packets.

Don't reselect the current row in redrawVisiblePackets. That routine is
called in quite a few places, including ones where we don't want to
automatically scroll to the current packet.

Change-Id: Ia29a832235c0e260d8b17f1ce76745047700537b
Reviewed-on: https://code.wireshark.org/review/9064
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoRemove more deprecated tvb_length calls
Evan Huus [Tue, 23 Jun 2015 18:13:21 +0000 (11:13 -0700)]
Remove more deprecated tvb_length calls

Change-Id: Ie40a195db622ebfb096fa5088c5467a1385e69bf
Reviewed-on: https://code.wireshark.org/review/9062
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years ago[afp] improve the error handling for extended attributes
Martin Kaiser [Tue, 23 Jun 2015 16:26:34 +0000 (09:26 -0700)]
[afp] improve the error handling for extended attributes

distinguish between the length field in the packet and the current item's length
make sure that the length field fits into a gint variable
add a cast to the return value of tvb_strsize()
don't throw an exception manually

Change-Id: I2debab778be3e34d68b1be31963d2d9260a30e0e
Reviewed-on: https://code.wireshark.org/review/9056
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
8 years agoRemove deprecated tvb_length from PIDL dissectors
Evan Huus [Tue, 23 Jun 2015 17:55:22 +0000 (10:55 -0700)]
Remove deprecated tvb_length from PIDL dissectors

Also regenerate all to pick up the usage of https in some comment links.

Change-Id: Ic17b6368d2118627178b0b560031450d98e5b5e5
Reviewed-on: https://code.wireshark.org/review/9060
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years ago[zvt] the TLV container starts with an overall length field
Martin Kaiser [Mon, 22 Jun 2015 17:23:36 +0000 (10:23 -0700)]
[zvt] the TLV container starts with an overall length field

new function dissect_zvt_tlv_len(), use it for the total length
and for each tlv entry's length field

Change-Id: I2b7ba6939ddf0326b014c565ffbe5d16e3a88282
Reviewed-on: https://code.wireshark.org/review/9059
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
8 years agoP1: Remove from ASN1 DIRTY list
Alexis La Goutte [Mon, 8 Jun 2015 13:24:49 +0000 (15:24 +0200)]
P1: Remove from ASN1 DIRTY list

Change-Id: If44cdddea6709b824ae242d504d7469756c87b91
Reviewed-on: https://code.wireshark.org/review/8838
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoP1: fix 'dissect_p1_T_report_type' defined but not used [-Wunused-function]
Alexis La Goutte [Thu, 4 Jun 2015 11:17:53 +0000 (13:17 +0200)]
P1: fix 'dissect_p1_T_report_type' defined but not used [-Wunused-function]

Change-Id: Idee443cd35846bb197070cff5fb37e3904afb856
Reviewed-on: https://code.wireshark.org/review/8757
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoExit with the exit status of the command we ran.
Guy Harris [Tue, 23 Jun 2015 17:15:44 +0000 (10:15 -0700)]
Exit with the exit status of the command we ran.

Also, expand a comment.

Change-Id: Icbb8ead02f55087f3ac09747fe518f211d488172
Reviewed-on: https://code.wireshark.org/review/9057
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoRegenerate *-tap-register.c when associated Makefile.common is updated
Bill Meier [Tue, 23 Jun 2015 13:36:40 +0000 (09:36 -0400)]
Regenerate *-tap-register.c when associated Makefile.common is updated

Change-Id: Id9a83aeb285466f409a0e5ee651ef0c9f26ddda8
Reviewed-on: https://code.wireshark.org/review/9055
Reviewed-by: Bill Meier <wmeier@newsguy.com>
8 years agoUse RTD functionality for H.225
Michael Mann [Tue, 23 Jun 2015 00:51:20 +0000 (20:51 -0400)]
Use RTD functionality for H.225

This got missed in the initial refactoring.

Change-Id: I98dcc0816e065efab9b497f753c8d2d388349ff3
Reviewed-on: https://code.wireshark.org/review/9044
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoTry to catch TShark crashing and get a stack trace.
Guy Harris [Tue, 23 Jun 2015 07:21:20 +0000 (00:21 -0700)]
Try to catch TShark crashing and get a stack trace.

It's currently crashing in the Solaris buildbot when we do "tshark -v";
hopefully this will give us something more useful than

  test.sh: line 144: 21543 Abort                   (core dumped) $TSHARK -v

  "Version information" Failed!
  Failed to print version information
  Binary file ./core matches

as a diagnostic.

Change-Id: I278c8dd9f6acf5ddfa83bc0a7f3f7a3c48577ac2
Reviewed-on: https://code.wireshark.org/review/9052
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoTreat channel flags fields as just collections of bits, not as type fields.
Guy Harris [Tue, 23 Jun 2015 06:59:59 +0000 (23:59 -0700)]
Treat channel flags fields as just collections of bits, not as type fields.

The radiotap and PPI specs don't call them type fields, and don't list
them as having type values, they call them flags fields and list the
individual bits.

Listing them as type fields is especially confusing with radiotap, as
you can have multiple fields giving *different* channel types, as per,
for example

    https://ask.wireshark.org/questions/42888/multiple-channel-types-and-mcs-missing

where an 802.11ac packet has one "channel type" field claiming it's
802.11a and another one claiming it's 802.11n when it is, in fact,
*neither* 11a *nor* 11n.

If you want to know the channel type, look at the "802.11 radio
information" tree that comes before the 802.11 header tree; it gives a
reasonable summary of most of the radio metadata, giving the *correct*
channel type, and not showing any field multiple times.  Look at the
radiotap or PPI or... tree only if either 1) you're debugging a driver
that creates those headers or 2) there's some data in the header that
*doesn't* show up in any form in the 802.11 radio information tree (in
which case the code for radio information probably needs to be changed
to show it).

Change-Id: I545b81b08a993dbb219fa7a4f54daac3637ea071
Reviewed-on: https://code.wireshark.org/review/9051
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoMorph ProgressBar into CaptureProgressFrame.
Gerald Combs [Fri, 19 Jun 2015 23:56:44 +0000 (16:56 -0700)]
Morph ProgressBar into CaptureProgressFrame.

Switch from a plain QProgressBar to a QFrame with a QProgressBar and a
stop button.

Add a stop_flag boolean to the capture_file struct.

To do:
- Start adding the progress bar to dialogs.
- Don't complain so loudly when the user stops a capture.

Change-Id: Iedd1d7d79f2044f1a53e4fb22186d25930a3ef03
Reviewed-on: https://code.wireshark.org/review/9029
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoprefs: fix memleak
Peter Wu [Mon, 22 Jun 2015 06:56:34 +0000 (08:56 +0200)]
prefs: fix memleak

Calling g_list_remove_link(link, llink) does not free the removed
last link llink. g_list_next or g_list_foreach+g_free followed by
g_list_free should be used instead such that the data is freed before
and then dropped from the list.

This fixes a memleak in tshark -r dns.pcap detected by ASAN (single
packet).

Set pref->default_val.list = NULL just in case, and with symmetry with
capture_columns handling.

Change-Id: I3cc52e275784037ab40c0b42c68d0dd83b73cd98
Reviewed-on: https://code.wireshark.org/review/9026
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 years agopacket: fix memleak
Peter Wu [Mon, 22 Jun 2015 23:30:13 +0000 (01:30 +0200)]
packet: fix memleak

It turns out that a heur_dissector_list_t structure was not released,
only the GSList inside it. Ensure that this list gets released as well.

Change-Id: If79deb5d011d306477d082368744addcee794ae1
Reviewed-on: https://code.wireshark.org/review/9040
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 years agoIS-IS (LSP): Remove proto_tree_add_text call
Alexis La Goutte [Sun, 7 Jun 2015 19:23:47 +0000 (21:23 +0200)]
IS-IS (LSP): Remove proto_tree_add_text call

Part 2 !

Change-Id: Iaa46f3d785cbff6b397edf5bd54c0c3cf65a7264
Reviewed-on: https://code.wireshark.org/review/8822
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoRANAP: call nsap properly when bindingID is included in transport address
Martin Mathieson [Mon, 22 Jun 2015 23:46:57 +0000 (16:46 -0700)]
RANAP: call nsap properly when bindingID is included in transport address

Change-Id: I45fed890cc2f7f5d106bbb7b35038d8db141fa4e
Reviewed-on: https://code.wireshark.org/review/9036
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
8 years agoRemove more deprecated tvb_length calls
Evan Huus [Tue, 23 Jun 2015 03:53:46 +0000 (20:53 -0700)]
Remove more deprecated tvb_length calls

Change-Id: I56260a82b19001ab2f87f4be34a9510f127f841f
Reviewed-on: https://code.wireshark.org/review/9050
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agoCFM: fix CFM Type Test signal (TST) without CRC dissection
JustinKu [Tue, 23 Jun 2015 03:47:23 +0000 (20:47 -0700)]
CFM: fix CFM Type Test signal (TST) without CRC dissection

Bug: 11286
Change-Id: I8efce21e2bab55f9fea50a234419082cdc288f4e
Reviewed-on: https://code.wireshark.org/review/9048
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agocoverity 1306905: integer overflowed argument
Martin Kaiser [Tue, 23 Jun 2015 03:31:23 +0000 (20:31 -0700)]
coverity 1306905: integer overflowed argument

tvb_strsize() returns guint
remove the if (tree) while we're at it

Change-Id: Icc24f166104a3e9b95fca2ef14a7bd8be2677cba
Reviewed-on: https://code.wireshark.org/review/9047
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
8 years agowmem_tree_new_autoreset() never returns NULL
Martin Kaiser [Tue, 23 Jun 2015 00:48:54 +0000 (17:48 -0700)]
wmem_tree_new_autoreset() never returns NULL

Change-Id: I497b77dec1eb4617179d492838ecd7d267539ba4
Reviewed-on: https://code.wireshark.org/review/9043
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
8 years agoRemove more deprecated tvb_length
Evan Huus [Tue, 23 Jun 2015 00:19:23 +0000 (17:19 -0700)]
Remove more deprecated tvb_length

Change-Id: Iac23a6c804ad3720d37186559477909b2ff33eb2
Reviewed-on: https://code.wireshark.org/review/9042
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agoRemove more deprecated tvb_length
Evan Huus [Tue, 23 Jun 2015 00:05:37 +0000 (17:05 -0700)]
Remove more deprecated tvb_length

Change-Id: I36603453c2563406f82663683930088dedd5f39c
Reviewed-on: https://code.wireshark.org/review/9041
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agosrt_table.h: fix parameter 'opt_arg/filter' not found in the function declaration...
Alexis La Goutte [Sun, 21 Jun 2015 13:53:53 +0000 (15:53 +0200)]
srt_table.h: fix parameter 'opt_arg/filter' not found in the function declaration [-Wdocumentation]

Change-Id: I6edda434d02a4926a2ec7a2580a7f684b6e96ee6
Reviewed-on: https://code.wireshark.org/review/9008
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoSIP: add support for draft-ietf-insipid-session-id
Pascal Quantin [Mon, 22 Jun 2015 18:38:52 +0000 (11:38 -0700)]
SIP: add support for draft-ietf-insipid-session-id

Bug: 11294
Change-Id: I54f7e19d129cddb1f11525f6ee9931270cc41f40
Reviewed-on: https://code.wireshark.org/review/9028
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoDon't use the value of the Flags field if we didn't have it.
Guy Harris [Mon, 22 Jun 2015 23:16:23 +0000 (16:16 -0700)]
Don't use the value of the Flags field if we didn't have it.

Change-Id: Idd7771bd39ee823981b31b827645abd2ae516f66
Reviewed-on: https://code.wireshark.org/review/9039
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoFix handling of XChannel radiotap field.
Guy Harris [Mon, 22 Jun 2015 23:07:20 +0000 (16:07 -0700)]
Fix handling of XChannel radiotap field.

Fetch the flags before using them; thanks to Peter Wu for catching that
one.

Fetch and use the frequency and channel.

Have cflags be the variable for the flags in Channel and xcflags be the
variable for the flags in XChannel.

Change-Id: If82f7adb448eef04b769186a90a8722d03a702a3
Reviewed-on: https://code.wireshark.org/review/9038
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agogtk,qt: Fix minor buffer underrun
Peter Wu [Mon, 22 Jun 2015 20:54:30 +0000 (22:54 +0200)]
gtk,qt: Fix minor buffer underrun

Avoid accessing the first byte before an empty dirname. No idea why this
was not triggered before. Reproduced with an empty Wireshark profile and
wireshark and wireshark-qt.

Caught with ASAN.

Change-Id: I44f8fdab03ad0f24e663df63a1c54567996a3dfc
Reviewed-on: https://code.wireshark.org/review/9037
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 years agopacket: write explicit type for destroy_heuristic_dissector_list
Peter Wu [Mon, 22 Jun 2015 22:45:12 +0000 (00:45 +0200)]
packet: write explicit type for destroy_heuristic_dissector_list

It is an implementation detail that the data pointer contains a GSList*.
Use the type that got inserted into function
register_heur_dissector_list.

Change-Id: I25b6414afa73818baa0c955a5c8aa7669f3058ee
Reviewed-on: https://code.wireshark.org/review/9035
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 years agoIEEE 802.11: add an expert info when tag length value is bigger than remaining payload
Pascal Quantin [Mon, 22 Jun 2015 22:14:46 +0000 (15:14 -0700)]
IEEE 802.11: add an expert info when tag length value is bigger than remaining payload

Bug: 11298
Change-Id: I18082a15fbeaa843099741511292eec19acf94b9
Reviewed-on: https://code.wireshark.org/review/9033
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years agoFix "Unescaped left brace in regex is deprecated"
Peter Wu [Mon, 22 Jun 2015 22:27:11 +0000 (00:27 +0200)]
Fix "Unescaped left brace in regex is deprecated"

This got reported with Perl 5.22:

    Unescaped left brace in regex is deprecated, passed through in
    regex; marked by <-- HERE in m/^typedef enum { <-- HERE / at
    epan/wslua/make-init-lua.pl line 228.

The perldelta manual page says this about it:

    "[..] a future version of Perl (tentatively v5.26) will consider
    this to be a syntax error."

Change-Id: I7f23cc10dc3311a35d8c15faa4337e4d50d0bd61
Reviewed-on: https://code.wireshark.org/review/9034
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 years agoProvide PHY type and band information in the 802.11 pseudo-header.
Guy Harris [Mon, 22 Jun 2015 22:04:28 +0000 (15:04 -0700)]
Provide PHY type and band information in the 802.11 pseudo-header.

Provide that information so that the "802.11 radio information" protocol
can indicate whether a packet was 802.11 legacy/11b/11a/11g/11n/11ac,
and possibly whether it's 2.4 GHz or 5 GHz 11n.  (Sometimes the center
frequency might not be supplied, so the band information can be useful.)

Also, provide some 11ac information, now that we can distinguish between
11n and 11ac.  Don't calculate the data rate from the MCS index unless
it's 11n; we don't yet have code to calculate it for 11ac.

For radiotap, only provide guard interval information for 11n and 11ac,
not for earlier standards.

Handle the 11ac flag in the Peek remote protocol.

For Peek tagged files, the "extension flags" are 11n/11ac flags, so we
don't have to check for the "MCS used" bit in order to decide that the
packet is 11n or 11ac or to decide whether to provide the "bandwidth" or
"short GI" information.

Change-Id: Ia8a1a9b11a35243ed84eb4e72c384cc77512b098
Reviewed-on: https://code.wireshark.org/review/9032
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoieee80211: fix memleak
Peter Wu [Mon, 22 Jun 2015 06:45:21 +0000 (08:45 +0200)]
ieee80211: fix memleak

parse_key_string reads from rec->string and rec->key (without
modifying those parameters), then returns a newly allocated
decryption_key_t struct which is not used except for reading the
type field. Release memory after copying that single field!

Change-Id: Iac19bea23dedb73cab9dd1ea09f98cc83556e96c
Reviewed-on: https://code.wireshark.org/review/9025
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 years agoRemove more tvb_length
Evan Huus [Mon, 22 Jun 2015 21:40:23 +0000 (14:40 -0700)]
Remove more tvb_length

Change-Id: I940704e927001b2a051a59fd0738e7a02328472b
Reviewed-on: https://code.wireshark.org/review/9031
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agoUse StockIcon to load toolbar icons.
Gerald Combs [Mon, 22 Jun 2015 21:03:02 +0000 (14:03 -0700)]
Use StockIcon to load toolbar icons.

StockIcon loads each available icon size.

Change-Id: Ia5604cc11ed8350e7f4f782312939cf30c94f548
Reviewed-on: https://code.wireshark.org/review/9030
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agortd_table.h: fix parameter 'srt/srt_array' not found in the function declaration...
Alexis La Goutte [Mon, 22 Jun 2015 17:19:39 +0000 (19:19 +0200)]
rtd_table.h: fix parameter 'srt/srt_array' not found in the function declaration [-Wdocumentation]

srt => rtd

Change-Id: I297258ebb22723f280588692fdbb5d062d08ced9
Reviewed-on: https://code.wireshark.org/review/9024
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agofix the interface list in the main welcome screen
Martin Kaiser [Sat, 20 Jun 2015 11:53:14 +0000 (13:53 +0200)]
fix the interface list in the main welcome screen

when no interfaces are available at startup, the number of columns in
the interface tree is set to 1
when new interfaces become available later, the column number is not
reset to the default value and we end up with an interface list whose
entries are not visible
reset the number of columns each time the interface list is updated

Change-Id: I267c5b47da6d5ae9e7769b1036622f79da4d97f2
Reviewed-on: https://code.wireshark.org/review/8996
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoRemove a bunch of deprecated tvb_length calls
Evan Huus [Mon, 22 Jun 2015 16:59:50 +0000 (09:59 -0700)]
Remove a bunch of deprecated tvb_length calls

Change-Id: I9362e0fdc4519ba5f3d656152966e7030f478839
Reviewed-on: https://code.wireshark.org/review/9022
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agocheckAPIs.pl: proto_tree_add_bytes_item takes an encoding parameter
Pascal Quantin [Mon, 22 Jun 2015 18:38:04 +0000 (11:38 -0700)]
checkAPIs.pl: proto_tree_add_bytes_item takes an encoding parameter

Change-Id: Iebe0e2483d9fd1661bf87ea5efaeb4ae14f6e105
Reviewed-on: https://code.wireshark.org/review/9027
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoNCP: fix comma at end of enumerator list [-Wpedantic]
Alexis La Goutte [Mon, 22 Jun 2015 17:17:10 +0000 (19:17 +0200)]
NCP: fix comma at end of enumerator list [-Wpedantic]

Change-Id: I47795fb9e1044f4319721c3bf1208c269a4b9c34
Reviewed-on: https://code.wireshark.org/review/9023
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agows80211_utils.h: fix empty paragraph passed to '@param' command [-Wdocumentation]
Alexis La Goutte [Sun, 21 Jun 2015 13:56:16 +0000 (15:56 +0200)]
ws80211_utils.h: fix empty paragraph passed to '@param' command [-Wdocumentation]

Change-Id: Iecd9f8820840959a2f226120cbc359977d20c757
Reviewed-on: https://code.wireshark.org/review/9009
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agoPKCS12: Remove from ASN1 DIRTY list
Alexis La Goutte [Sun, 21 Jun 2015 13:40:55 +0000 (15:40 +0200)]
PKCS12: Remove from ASN1 DIRTY list

Change-Id: I454c48d5342ebe5682217667e4cafd6164e58d41
Reviewed-on: https://code.wireshark.org/review/9004
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>
8 years agoPKCS12: fix unused function 'dissect_AuthenticatedSafe_PDU' [-Wunused-function]
Alexis La Goutte [Sun, 21 Jun 2015 13:37:26 +0000 (15:37 +0200)]
PKCS12: fix unused function 'dissect_AuthenticatedSafe_PDU' [-Wunused-function]

Change-Id: Iaaaaffc8a271ac844b745d1b9265eb06df2efe9c
Reviewed-on: https://code.wireshark.org/review/9003
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agoAdd a strlen cast.
Gerald Combs [Mon, 22 Jun 2015 15:53:34 +0000 (08:53 -0700)]
Add a strlen cast.

Change-Id: I480e2e7436f0334f0dfd99352bd49304765fcee3
Reviewed-on: https://code.wireshark.org/review/9021
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoRefactor RTD stats.
Michael Mann [Sat, 20 Jun 2015 16:22:22 +0000 (12:22 -0400)]
Refactor RTD stats.

Very similar to the refactoring of SRT stats, it provides more commonality of the stats for all GUI interfaces.  Currently implemented for TShark and GTK.  Affected dissectors: MEGACO, MGCP, Radius

Change-Id: Icb73a7e603dc3502b39bf696227fcaae37d4ed21
Reviewed-on: https://code.wireshark.org/review/8998
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>
8 years agoFix make distcheck buildbot
Alexis La Goutte [Mon, 22 Jun 2015 14:52:20 +0000 (16:52 +0200)]
Fix make distcheck buildbot

packet-dnp.c:2735:28: error: variable 'al_filename' set but not used [-Werror=unused-but-set-variable]
packet-dnp.c:1843:32: error: variable 'al_filename_offs' set but not used [-Werror=unused-but-set-variable]

Change-Id: Ia84b270aa8f56fb4104fb875339dc3d39c6105c6
Reviewed-on: https://code.wireshark.org/review/9020
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years ago[pcep] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for certain multibyte fields.
Bill Meier [Mon, 22 Jun 2015 03:07:33 +0000 (23:07 -0400)]
[pcep] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for certain multibyte fields.

Change-Id: Idc31728ce1b327ff86a58541ba01275107c7598b
Reviewed-on: https://code.wireshark.org/review/9019
Reviewed-by: Bill Meier <wmeier@newsguy.com>
8 years ago[rfid-pn532] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for several 3-byte fields.
Bill Meier [Mon, 22 Jun 2015 02:41:56 +0000 (22:41 -0400)]
[rfid-pn532] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for several 3-byte fields.

Change-Id: If70a45d59fdce105b429d00fbbc4a8b2784262a2
Reviewed-on: https://code.wireshark.org/review/9018
Reviewed-by: Bill Meier <wmeier@newsguy.com>
8 years agoservice_response_time_table.h: fix parameter 'gui_data' not found in the function...
Alexis La Goutte [Sun, 21 Jun 2015 14:12:03 +0000 (16:12 +0200)]
service_response_time_table.h: fix parameter 'gui_data' not found in the function declaration [-Wdocumentation]

Change-Id: Ie214d654aa91b91da2a1435dce63a822e404669a
Reviewed-on: https://code.wireshark.org/review/9010
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoFix typo caused assertion
Michal Labedzki [Mon, 22 Jun 2015 07:44:51 +0000 (09:44 +0200)]
Fix typo caused assertion

Invalid character ')' in filter name 'gsm_abis_rsl.llsdu.sacch)'
**
ERROR:wireshark/epan/wmem/wmem_core.c:50:wmem_alloc: assertion failed: (allocator->in_scope)
Aborted

Change-Id: Ie22035cf9a9d1d29354a64cd5b085f1c2e18b1d3
Reviewed-on: https://code.wireshark.org/review/9017
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
8 years agoGSM MAP: Fix decoding of IPv6 addresses
Vasil Velichckov [Fri, 19 Jun 2015 16:24:53 +0000 (19:24 +0300)]
GSM MAP: Fix decoding of IPv6 addresses

From 3GPP 23.003

The GSN Address is composed of the following elements:
1) The Address Type, which is a fixed length code (of 2 bits) identifying the type of address that is used in the
Address field.
2) The Address Length, which is a fixed length code (of 6 bits) identifying the length of the Address field.
3) The Address, which is a variable length field which contains either an IPv4 address or an IPv6 address.
Address Type 0 and Address Length 4 are used when Address is an IPv4 address.
Address Type 1 and Address Length 16 are used when Address is an IPv6 address.
The IP v4 address structure is defined in RFC 791 [14].
The IP v6 address structure is defined in RFC 2373 [15].

Currently the Wireshark decodes IPv6 addresses as IPv4

This commit reverts parts of commit 1cdef1d98aac306932dc599d427a3e1191d48a44

Change-Id: I4905d4cf559abcb42b9dfe3652667d2ff96dd444
Reviewed-on: https://code.wireshark.org/review/8984
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoEliminate proto_tree_add_text from some dissectors.
Michael Mann [Sun, 21 Jun 2015 19:06:47 +0000 (15:06 -0400)]
Eliminate proto_tree_add_text from some dissectors.

Change-Id: I979990e9385182870ce4809a7e6fa16e598cb2be
Reviewed-on: https://code.wireshark.org/review/9016
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoConvert "macro checks" to use expert info in line with dissectors with comparable...
Michael Mann [Mon, 8 Jun 2015 12:41:54 +0000 (08:41 -0400)]
Convert "macro checks" to use expert info in line with dissectors with comparable checks.

Change-Id: I30affba4941ba150c34541bfba67ff8da5b52a17
Reviewed-on: https://code.wireshark.org/review/9015
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years ago[bmp] minor cleanup
Bill Meier [Mon, 22 Jun 2015 02:10:33 +0000 (22:10 -0400)]
[bmp] minor cleanup

- Simplify some code;
- Remove unneeded initializers;
- Remove some unused code;

Change-Id: I30b6a7751845670b732eae8ec143cd23e57fc54c
Reviewed-on: https://code.wireshark.org/review/9014
Reviewed-by: Bill Meier <wmeier@newsguy.com>
8 years agoPKCS12: fix warning about unused parameter when don't build with LIBGCRYPT
Alexis La Goutte [Sun, 21 Jun 2015 05:46:55 +0000 (07:46 +0200)]
PKCS12: fix warning about unused parameter when don't build with LIBGCRYPT

Change-Id: I7cc47f811d6c090aa2be54d3d92361966d011ccd
Reviewed-on: https://code.wireshark.org/review/9002
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoRemove deprecated tvb_length from a bunch of dissectors
Evan Huus [Sun, 21 Jun 2015 10:48:58 +0000 (06:48 -0400)]
Remove deprecated tvb_length from a bunch of dissectors

Change-Id: I5c777806cb1403062a9d85261149d722df57b239
Reviewed-on: https://code.wireshark.org/review/9005
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoFix memory leak printing eui64s
Evan Huus [Sun, 21 Jun 2015 14:02:43 +0000 (14:02 +0000)]
Fix memory leak printing eui64s

The scope that is passed in should only be used for the return value - other
temporary buffers we must alloc/free ourselves, since if the scope is NULL they
will not be managed automatically.

Bug: 11293
Change-Id: I27be856f1c5cdf47f78e766192a29523664a543e
Reviewed-on: https://code.wireshark.org/review/9007
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoERM (Aruba): Fix Assigned value is garbage or undefined found by Clang Analyzer
Alexis La Goutte [Sun, 21 Jun 2015 13:49:49 +0000 (15:49 +0200)]
ERM (Aruba): Fix Assigned value is garbage or undefined found by Clang Analyzer

Fix also trailing whitespace

Change-Id: I9e9e09f6855f41609581ea1b7cd1bd16b15f85f4
Reviewed-on: https://code.wireshark.org/review/9006
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years ago[Automatic update for 2015-06-21]
Gerald Combs [Sun, 21 Jun 2015 15:09:36 +0000 (08:09 -0700)]
[Automatic update for 2015-06-21]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I266509d729803494666458651ab3ae88cac50a21
Reviewed-on: https://code.wireshark.org/review/9012
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoeditcap: split usage output so won't wrap in cmd.exe window
Martin Mathieson [Sun, 21 Jun 2015 12:17:33 +0000 (13:17 +0100)]
editcap: split usage output so won't wrap in cmd.exe window

Change-Id: I8a8ed3721e525ceb685f8e105147a0cc012fc912
Reviewed-on: https://code.wireshark.org/review/9001
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
8 years agoRemove now unneeded tap-srt.h
Michael Mann [Fri, 19 Jun 2015 23:52:36 +0000 (19:52 -0400)]
Remove now unneeded tap-srt.h

Change-Id: Ic625f5a0f8e3c4d70dd04f5e3eb7100fb54027e5
Reviewed-on: https://code.wireshark.org/review/8997
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoeditcap: trivial changes while looking into the -L option
Martin Mathieson [Sun, 21 Jun 2015 11:44:24 +0000 (12:44 +0100)]
editcap: trivial changes while looking into the -L option

Change-Id: I94dd83af160eebb9dc44c123b2b83674bc5866f6
Reviewed-on: https://code.wireshark.org/review/9000
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
8 years agosrt_table: fix conversion shortens 64-bit value into a 32-bit value
Alexis La Goutte [Sun, 21 Jun 2015 05:35:27 +0000 (07:35 +0200)]
srt_table: fix conversion shortens 64-bit value into a 32-bit value

Change-Id: I62d04fc2c02c393fd15bccbdfe194c557665dc0e
Reviewed-on: https://code.wireshark.org/review/8999
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years agoFurther refactor SRT stats.
Michael Mann [Tue, 16 Jun 2015 21:07:04 +0000 (17:07 -0400)]
Further refactor SRT stats.

Create "common" SRT tap data collection intended for all GUIs.   Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK.

SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic.
CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone.

Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc
Reviewed-on: https://code.wireshark.org/review/8894
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoCall the "802.11 radio information" dissector for radio headers.
Guy Harris [Sat, 20 Jun 2015 22:57:57 +0000 (15:57 -0700)]
Call the "802.11 radio information" dissector for radio headers.

Have dissectors of various forms of radio information headers in the
packets fill in a struct ieee_802_11_phdr with radio information as
appropriate, and call the "802.11 radio information" dissector rather
than the raw 802.11 dissector.

This means that the radio information can be found in a
protocol-independent and encapsulation-independent form when you're
looking at the packet; that information can be presented in a form
somewhat easier to read than the raw metadata header format.

It also enables having a single "radio information" tap that allows
statistics to handle all different sorts of radio information
encapsulation.

In addition, it lets us clean up some of the arguments passed to the
common 802.11 dissector routine, by having it pull that information from
the struct ieee_802_11_phdr.

Ensure that the right structure gets passed to that routine, and that
all the appropriate parts of that structure are filled in.

Rename the 802.11 radio protocol to "wlan_radio", rather than just
"radio", as it's 802.11-specific.  Give all its fields "wlan_radio."
names rather than "wlan." names.

Change-Id: I78d79afece0ce0cf5fc17293c1e29596413b31c8
Reviewed-on: https://code.wireshark.org/review/8992
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years ago(trivial) fix a spelling mistake in a comment
Martin Kaiser [Sat, 20 Jun 2015 11:24:37 +0000 (13:24 +0200)]
(trivial) fix a spelling mistake in a comment

Change-Id: I3f9feab57032c8c701c4ea487c0f5acca428d5d9
Reviewed-on: https://code.wireshark.org/review/8995
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
8 years ago[mifare] make the payload of the write command filterable
Martin Kaiser [Sat, 20 Jun 2015 09:21:35 +0000 (11:21 +0200)]
[mifare] make the payload of the write command filterable

use an FT_BYTES variable instead of passing it to the data dissector

Change-Id: Ia52cba24dedec13c9842109d45b3a277ee627f42
Reviewed-on: https://code.wireshark.org/review/8994
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
8 years ago[mifare] minor cleanup
Martin Kaiser [Sat, 20 Jun 2015 06:27:10 +0000 (08:27 +0200)]
[mifare] minor cleanup

remove the if(tree) so that we fill the info column regardless of the tree
clear the info column first, then append our data
remove an unnecessary initializer

Change-Id: I0e9e9582f360dd929e422f994c3d4a644c602642
Reviewed-on: https://code.wireshark.org/review/8993
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
8 years agoUse "Present"/"Absent" for presence bits.
Guy Harris [Sat, 20 Jun 2015 22:41:42 +0000 (15:41 -0700)]
Use "Present"/"Absent" for presence bits.

That's clearer than "True"/"False".

Change-Id: I300c040f347eff8477a87f639bea8402772314b9
Reviewed-on: https://code.wireshark.org/review/8991
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoSupport the "number of extension spatial streams" information.
Guy Harris [Sat, 20 Jun 2015 22:23:35 +0000 (15:23 -0700)]
Support the "number of extension spatial streams" information.

Change-Id: If69088aac0848d6ec8d239e3a9acc140ad376d6f
Reviewed-on: https://code.wireshark.org/review/8990
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoftypes: display BASE_HEX_DEC integers as hexadecimal
Pascal Quantin [Sat, 20 Jun 2015 05:51:54 +0000 (07:51 +0200)]
ftypes: display BASE_HEX_DEC integers as hexadecimal

Bug: 11292
Change-Id: I69a5591996bec77c2cb2bfcd04e9179784470edf
Reviewed-on: https://code.wireshark.org/review/8987
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoqt_ui_utils: fix parameter 'glib_string' not found in the function declaration
Alexis La Goutte [Sat, 20 Jun 2015 12:07:55 +0000 (14:07 +0200)]
qt_ui_utils: fix  parameter 'glib_string' not found in the function declaration

Only a small typo glib_string => glib_gstring

Change-Id: Ia3ad0a8086f6c1a47065754dee33eff1e0ad770f
Reviewed-on: https://code.wireshark.org/review/8988
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years ago[rpcrdma] Do some minor bug-fixes and cleanup
Bill Meier [Fri, 19 Jun 2015 18:51:23 +0000 (14:51 -0400)]
[rpcrdma] Do some minor bug-fixes and cleanup

Change-Id: I9d440cba281945672767642967d955351fa67b90
Reviewed-on: https://code.wireshark.org/review/8985
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
8 years ago[rtse] Convert tabs to spaces to match editor modelines
Bill Meier [Fri, 19 Jun 2015 19:29:19 +0000 (15:29 -0400)]
[rtse] Convert tabs to spaces to match editor modelines

Change-Id: I03c7decacd4def0552f461c81c4e634a85380438
Reviewed-on: https://code.wireshark.org/review/8986
Reviewed-by: Bill Meier <wmeier@newsguy.com>
8 years ago[thrift] fix a minor bug; Also: use col_clear()
Bill Meier [Wed, 17 Jun 2015 19:36:00 +0000 (15:36 -0400)]
[thrift] fix a minor bug; Also: use col_clear()

Change-Id: I07dc57583f2e78b6b841a7adb5470e57fa314786
Reviewed-on: https://code.wireshark.org/review/8969
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoImproved dissection of some netlink attributes
Matthieu Coudron [Mon, 8 Jun 2015 20:24:17 +0000 (22:24 +0200)]
Improved dissection of some netlink attributes

Added missing strings to netlink_route_ifla_attr_vals
Improved dissection of netlink.hdr_flags
Replaced deprecated use of tvb_length_remaining

Change-Id: Ie16f7e602e1fb69a0a88a4d0657ec2d6da3c0d83
Reviewed-on: https://code.wireshark.org/review/8916
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agorecent.c: accept an UTF-8 string in read_set_recent_pair_dynamic() function
Pascal Quantin [Wed, 17 Jun 2015 21:45:42 +0000 (23:45 +0200)]
recent.c: accept an UTF-8 string in read_set_recent_pair_dynamic() function

Previous code was checking that the string was ASCII, which does not work when
the recent capture files list contains non ASCII characters

Change-Id: I1ea96035cca4b2aa2ea5061e7a4f98e78ac88f20
Reviewed-on: https://code.wireshark.org/review/8965
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoBluetooth: Coverity fixes
Michal Labedzki [Thu, 18 Jun 2015 07:10:55 +0000 (09:10 +0200)]
Bluetooth: Coverity fixes

Try to fix Coverity issues in Bluetooth HCI and androiddump.

Change-Id: Id2ed35130eb4dbb0698b7a54afccdba56af62bfd
Reviewed-on: https://code.wireshark.org/review/8983
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
8 years agoQt: remove some compilation warnings
Pascal Quantin [Thu, 18 Jun 2015 21:30:50 +0000 (23:30 +0200)]
Qt: remove some compilation warnings

Change-Id: If14d6b46cfb3d42798afdaa0721f9892af93fddc
Reviewed-on: https://code.wireshark.org/review/8981
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoPass the 802.11 pseudo-header as an argument.
Guy Harris [Thu, 18 Jun 2015 20:12:43 +0000 (13:12 -0700)]
Pass the 802.11 pseudo-header as an argument.

Rather than accessing it through pinfo->pseudo_header, have it passed as
an argument.

This means we no longer tweak the pseudo-header filled in by libwiretap,
but instead construct our own pseudo-header, which is a bit cleaner.

It also opens up the possibility of other dissectors passing radio
information down to the 802.11 dissector, so it can display it in a
better-organized format than the raw metadata headers for
radiotap/PPI/Prism/AVS/etc., and having some of the options for 802.11
dissection (Atheros padding, Centrino stuff, etc.) also passed in
through that pseudo-header so we have fewer arguments to
dissect_ieee80211_common().

Change-Id: I470300a0407ebf029c542f7ca5878593563a70a9
Reviewed-on: https://code.wireshark.org/review/8980
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years ago1.99.7 → 1.99.8
Gerald Combs [Thu, 18 Jun 2015 20:01:05 +0000 (13:01 -0700)]
1.99.7 → 1.99.8

Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17
Reviewed-on: https://code.wireshark.org/review/8979
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoBuild 1.99.7.
Gerald Combs [Thu, 18 Jun 2015 17:03:03 +0000 (10:03 -0700)]
Build 1.99.7.

Change-Id: Ia990ad2c9a56ef41b1ed82509afe18079bdc451f
Reviewed-on: https://code.wireshark.org/review/8978
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoAdd ExtremeNetworks attribute 213 (and the source of the information)
Joerg Mayer [Thu, 18 Jun 2015 14:48:42 +0000 (16:48 +0200)]
Add ExtremeNetworks attribute 213 (and the source of the information)

Change-Id: I2fe561eef38ecc31693270b527af1f42ef564734
Reviewed-on: https://code.wireshark.org/review/8977
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
8 years agoBluetooth: ensure to give bluetooth_data structure to dissect_eir_ad_data()
Pascal Quantin [Thu, 18 Jun 2015 13:21:22 +0000 (15:21 +0200)]
Bluetooth: ensure to give bluetooth_data structure to dissect_eir_ad_data()

Bug: 11285
Change-Id: I1d3a4900fe3daec6f8d7596a9925322063f2c4eb
Reviewed-on: https://code.wireshark.org/review/8976
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years ago[aeron] Remove unneeded initializers
Bill Meier [Thu, 18 Jun 2015 04:38:44 +0000 (00:38 -0400)]
[aeron] Remove unneeded initializers

Change-Id: Ifa129c221b5df9120a0c475edc2109775f84ae35
Reviewed-on: https://code.wireshark.org/review/8974
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
8 years agoAsterix: field array must be NULL terminated
Pascal Quantin [Thu, 18 Jun 2015 10:29:16 +0000 (12:29 +0200)]
Asterix: field array must be NULL terminated

Bug: 11287
Change-Id: Iffcaa1cd2663768f616aedb550a101b7196e456b
Reviewed-on: https://code.wireshark.org/review/8975
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoAdd possibility to export Logcat Text PDUs
michal.orynicz [Tue, 16 Jun 2015 13:50:25 +0000 (15:50 +0200)]
Add possibility to export Logcat Text PDUs

Enable exporting PDUs from Logcat Text, so they can be saved as pcapng.

Change-Id: I413055d7706d245525609a9a4cbe9e02e8d99a0f
Reviewed-on: https://code.wireshark.org/review/8904
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoBTLE: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Wed, 17 Jun 2015 18:02:46 +0000 (20:02 +0200)]
BTLE: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I818ba409a01b2ae2701d22f97340183df42cd075
Reviewed-on: https://code.wireshark.org/review/8962
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
8 years agoGet rid of unnecessary stuff copied-and-pasted from the radiotap dissector.
Guy Harris [Thu, 18 Jun 2015 04:03:03 +0000 (21:03 -0700)]
Get rid of unnecessary stuff copied-and-pasted from the radiotap dissector.

What the dissector calls "radiotap" isn't even remotely like radiotap.
It took some flags from radiotap, but that's it.

Make the names of the flags in question match what's in the libwiretap
code.  Get rid of everything not in the libwiretap code, and get rid of
all code that does anything if those flags are set or that puts them
into the protocol tree.

This means that we don't do anything with the FCS or the Atheros
padding; just call the "802.11 with no FCS" dissector.

Change-Id: I4d3646d5d6c409b772985d0b05a86d5ee903157a
Reviewed-on: https://code.wireshark.org/review/8973
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoGet rid of some unused members of struct ieee_802_11_phdr.
Guy Harris [Thu, 18 Jun 2015 02:14:43 +0000 (19:14 -0700)]
Get rid of some unused members of struct ieee_802_11_phdr.

Remove some unused members, and move the presence flags after the
should-always-be-set fields, right before the fields to which it
applies.

Change-Id: I8d6f08e1d3d8de0c11a9e04de4e98408d6b90693
Reviewed-on: https://code.wireshark.org/review/8972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoThe STBC subfield of the radiotap MCS field is a count, not a flag.
Guy Harris [Thu, 18 Jun 2015 02:08:13 +0000 (19:08 -0700)]
The STBC subfield of the radiotap MCS field is a count, not a flag.

It's a 2-bit field that is the "number of STBC streams", according to
the radiotap Web site item for the MCS field:

http://www.radiotap.org/defined-fields/MCS

Correctly label both the FCS type and STBC stream count fields.

Change-Id: Ic49f6faec3335096c6bb8ce96ce0dec2f9342a37
Reviewed-on: https://code.wireshark.org/review/8971
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years ago[c15ch] Trivial: Remove unneeded #include
Bill Meier [Wed, 17 Jun 2015 19:16:49 +0000 (15:16 -0400)]
[c15ch] Trivial: Remove unneeded #include

Change-Id: I07db4f6e7dda81f3be1b828d42c08c385b6e8e27
Reviewed-on: https://code.wireshark.org/review/8968
Reviewed-by: Bill Meier <wmeier@newsguy.com>
8 years agoAdd frequency_utils.
Gerald Combs [Thu, 18 Jun 2015 00:45:23 +0000 (17:45 -0700)]
Add frequency_utils.

Change-Id: Id82cae52756b4c3798aaa4498aadebce93d4f29a
Reviewed-on: https://code.wireshark.org/review/8970
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoAdd a preferences editor frame.
Gerald Combs [Wed, 17 Jun 2015 15:41:41 +0000 (08:41 -0700)]
Add a preferences editor frame.

This replaces the single preference editor dialog in the GTK+ UI.

Change-Id: I10e030981e9f7d1ec121811593586b65cf0797c5
Reviewed-on: https://code.wireshark.org/review/8966
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoUpdate the release notes.
Gerald Combs [Tue, 16 Jun 2015 21:02:14 +0000 (14:02 -0700)]
Update the release notes.

Change-Id: I33eb3c205d2384a7e7475b599f38637009c5455b
Reviewed-on: https://code.wireshark.org/review/8967
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoQt: fix a crash when closing application under Windows
Pascal Quantin [Wed, 17 Jun 2015 17:55:19 +0000 (19:55 +0200)]
Qt: fix a crash when closing application under Windows

QCoreApplication visits eldritch horrors upon argv on Windows. Keep a
local copy for our own processing.

---
[ Pascal's original comments ]
g6c4ec4a introduced the use of arg_list_utf_16to8 that triggers a crash on my
computer when freeing the g_allocated memory.
Let's do a similar work but with a memory allocator that does not trigger an exception.

Also fix a memory leak in arg_list_utf_16to8 while we are at it.

Change-Id: I93d899af20b09c9a5d584a46297f715591502df9
Reviewed-on: https://code.wireshark.org/review/8961
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoAsterix dissector support for category 021 v2.3
Andrew Hoag [Wed, 17 Jun 2015 14:39:27 +0000 (10:39 -0400)]
Asterix dissector support for category 021 v2.3

- Add item 040 field LLC
- Add item 200 field ME
- Edit item 271 field LW

Change-Id: I13b3774b248731f208b3b950f7ae0736398edbe4
Reviewed-on: https://code.wireshark.org/review/8892
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Marko Hrastovec <marko.hrastovec@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>