metze/wireshark/wip.git
9 years agoPortableApps: ensure that the personal folder is set to the App directory
Pascal Quantin [Sun, 16 Nov 2014 20:58:36 +0000 (21:58 +0100)]
PortableApps: ensure that the personal folder is set to the App directory

Otherwise the portable version ends up loading the user local personal profile

Change-Id: Ib670c065319b0dd9673f239ae9459f6ee530f69e
Reviewed-on: https://code.wireshark.org/review/5351
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoBATMAN: fix indent and encoding args
Alexis La Goutte [Sun, 16 Nov 2014 15:12:40 +0000 (16:12 +0100)]
BATMAN: fix indent and encoding args

use tabs for indent and use fix-encoding-args tools

Change-Id: I5e066c6cbc429021cf21a55d5ffd5b60718ad5f8
Reviewed-on: https://code.wireshark.org/review/5340
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoMake sure the NLPID appears in the protocol tree.
Guy Harris [Sun, 16 Nov 2014 23:21:12 +0000 (15:21 -0800)]
Make sure the NLPID appears in the protocol tree.

For protocols for which the NLPID is not considered part of the PDU, put
the NLPID into the protocol tree ourselves.

Bug: 10706
Change-Id: I2676d1934dd468ec755a6f94d95a23f025ba0f25
Reviewed-on: https://code.wireshark.org/review/5358
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix a comment to reflect reality.
Guy Harris [Sun, 16 Nov 2014 22:59:23 +0000 (14:59 -0800)]
Fix a comment to reflect reality.

Change-Id: I812b0246368266c76f7fe9ef355619603c5d37b0
Reviewed-on: https://code.wireshark.org/review/5357
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd unused-const-variable (enable by default on new clang release)
Alexis La Goutte [Sun, 2 Nov 2014 15:15:31 +0000 (16:15 +0100)]
Add unused-const-variable (enable by default on new clang release)

Change-Id: I1d882e02188ba38ec1b5583c5933d0c92f0539e4
Reviewed-on: https://code.wireshark.org/review/5068
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
9 years agomcast_stream: fix indent (use 4 spaces)
Alexis La Goutte [Sun, 16 Nov 2014 15:28:51 +0000 (16:28 +0100)]
mcast_stream: fix indent (use 4 spaces)

Add also modelines info

Change-Id: Idea65bfa25ce8a379c590074ab89a06f935c6648
Reviewed-on: https://code.wireshark.org/review/5344
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agortp_stream: fix indent (use 4 spaces)
Alexis La Goutte [Sun, 16 Nov 2014 15:42:32 +0000 (16:42 +0100)]
rtp_stream: fix indent (use 4 spaces)

Add also modelines info

Change-Id: I4c4c6d7e292ba387aacb3f71afcac756b2875847
Reviewed-on: https://code.wireshark.org/review/5345
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoBATMAN: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 16 Nov 2014 15:15:27 +0000 (16:15 +0100)]
BATMAN: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I6cfabc18921397002a2303f3511fa51bf5b41956
Reviewed-on: https://code.wireshark.org/review/5341
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoRADIUS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 16 Nov 2014 15:00:35 +0000 (16:00 +0100)]
RADIUS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I5127b737c0d9db08c61a70bb6c16fef030d39f83
Reviewed-on: https://code.wireshark.org/review/5339
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years ago[Automatic manuf, services and enterprise-numbers update for 2014-11-16]
Gerald Combs [Sun, 16 Nov 2014 16:06:50 +0000 (08:06 -0800)]
[Automatic manuf, services and enterprise-numbers update for 2014-11-16]

Change-Id: Ie677285f75a7ef0390d93469a4f97eaad813fdc0
Reviewed-on: https://code.wireshark.org/review/5346
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agobtavdtp: Add missing break;
Alexis La Goutte [Sun, 16 Nov 2014 14:27:06 +0000 (15:27 +0100)]
btavdtp: Add missing break;

Issue found by Clang Analyzer:
Value stored to 'codec_dissector' is never read

Change-Id: I7a9fc5e3ffd04c77cbbb8d5e5b885d8a29468cfd
Reviewed-on: https://code.wireshark.org/review/5330
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
9 years agoRemove file_type_subtype member from packet_info.
Michael Mann [Sun, 16 Nov 2014 02:24:27 +0000 (21:24 -0500)]
Remove file_type_subtype member from packet_info.

Just pass the necessary data to the frame dissector.

Change-Id: I1a4bab32f7b5e28f4e7707794d71b04dab388908
Reviewed-on: https://code.wireshark.org/review/5328
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>
9 years ago"Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more obvious...
Michael Mann [Sat, 15 Nov 2014 23:47:06 +0000 (18:47 -0500)]
"Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more obvious where in used in hopes that it can be eliminated through passing dissector data (or methods other than using packet_info)

Change-Id: Ib0e7efc123a3f9c06f58b5579c3c25b18818205c
Reviewed-on: https://code.wireshark.org/review/5326
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>
9 years agoRemove ipproto member of packet_info.
Michael Mann [Sun, 16 Nov 2014 01:35:51 +0000 (20:35 -0500)]
Remove ipproto member of packet_info.

All situations can be handled with "shimmed" dissector functions.

Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8
Reviewed-on: https://code.wireshark.org/review/5327
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>
9 years agoDNS: NAPTR RR Replacement Length is incorrect
Alexis La Goutte [Fri, 14 Nov 2014 16:42:44 +0000 (17:42 +0100)]
DNS: NAPTR RR Replacement Length is incorrect

It seems the Replacement Length field calculated by Wireshark (which Wireshark calls "rReplacement Length"), is the length of the first label of the DNS name in the Replacement, instead of the entire DNS name length.

Issue found by Boaz

Bug:10700
Change-Id: I8b726f3a3bf316d688a40c3ade100d255ca3be42
Reviewed-on: https://code.wireshark.org/review/5300
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoVoIP calls: Fixup whitespace.
Gerald Combs [Sat, 15 Nov 2014 18:36:16 +0000 (10:36 -0800)]
VoIP calls: Fixup whitespace.

Set modelines and reindent to match the files in the top-level ui
directory.

Change-Id: I7ea221e76a4b0ad3b6bcf7a3c8b4645c16aecbba
Reviewed-on: https://code.wireshark.org/review/5325
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoVoIP calls: Start separating common and GTK+-dependent code.
Gerald Combs [Sat, 15 Nov 2014 17:18:06 +0000 (09:18 -0800)]
VoIP calls: Start separating common and GTK+-dependent code.

Remove more calls to voip_calls_get_info. Get rid of the global cfile.
Lowercase more function names.

Change-Id: Ieda779779cce9f05e07c54314bceab4a18bae22f
Reviewed-on: https://code.wireshark.org/review/5324
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agopaquet-mq: Eliminiate proto_tree_add_text
Robert Grange [Sat, 15 Nov 2014 10:35:09 +0000 (11:35 +0100)]
paquet-mq: Eliminiate proto_tree_add_text

Eliminate proto_tree_add_text for Expert Info
Improve PCF Parameters numeric value display

Change-Id: Ibc259ba05d0591d434e7638d91d6943101d45305
Reviewed-on: https://code.wireshark.org/review/5080
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoVoIP calls: Use our tap offsets.
Gerald Combs [Sat, 15 Nov 2014 02:43:28 +0000 (18:43 -0800)]
VoIP calls: Use our tap offsets.

Add convenience functions to convert between tap IDs and tapinfo
pointers. Use them to get rid of some calls to voip_calls_get_info().

Lowercase function names. Remove more exit()s.

Change-Id: I187fdc505bc22cc05edafed9e97ede8279ea53f9
Reviewed-on: https://code.wireshark.org/review/5321
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years ago0.0 is a double, 0.0f is a float.
Guy Harris [Sat, 15 Nov 2014 03:37:32 +0000 (19:37 -0800)]
0.0 is a double, 0.0f is a float.

Change-Id: I882bbda2c579cfd7a1b96ce190541262193405e0
Reviewed-on: https://code.wireshark.org/review/5320
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix a pointer type.
Gerald Combs [Sat, 15 Nov 2014 03:30:42 +0000 (19:30 -0800)]
Fix a pointer type.

Change-Id: I5cc67fa320b3241d6793575d59e49160ef40b260
Reviewed-on: https://code.wireshark.org/review/5319
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoLLDP: Dissector for Hytec specific extensions added
Gregor Miernik [Tue, 4 Nov 2014 10:53:39 +0000 (11:53 +0100)]
LLDP: Dissector for Hytec specific extensions added

It provides dissection of objects with additional neighbor and link information
defined by Hytec (pcap example available on wiki.wireshark.org/HYTEC).
Also OUI of "Hytec Geraetebau GmbH" added.

Change-Id: I92119e46fd5f4c4b385ac3df3170a4766fe056b7
Reviewed-on: https://code.wireshark.org/review/5107
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoVoIP calls: Clean up tap registration and removal.
Gerald Combs [Fri, 14 Nov 2014 21:53:58 +0000 (13:53 -0800)]
VoIP calls: Clean up tap registration and removal.

Start moving away from a global voip_calls_tapinfo_t. Pass the
voip_calls_tapinfo_t struct address to each registration and removal
routine.

All of the tap registration and removal routines are called at the same
time. Replace the individual registration tracking booleans with a
central one.

Calling exit() from the GUI is rude. Don't do that.

Change-Id: I9535002e2905a45a8cfc9643590b5d2d360ffc24
Reviewed-on: https://code.wireshark.org/review/5318
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoEliminate proto_tree_add_text from some plugin dissector files.
Michael Mann [Fri, 14 Nov 2014 20:18:23 +0000 (15:18 -0500)]
Eliminate proto_tree_add_text from some plugin dissector files.

Change-Id: Ib2d900833a8763307be6b1cfc8df20d7019d2706
Reviewed-on: https://code.wireshark.org/review/5313
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoVoIP calls tap ID cleanup.
Gerald Combs [Fri, 14 Nov 2014 21:15:38 +0000 (13:15 -0800)]
VoIP calls tap ID cleanup.

Remove all of the public dummy members from voip_calls_tapinfo_t. Use
pointer arithmetic to generate private, unique IDs instead.

We weren't removing the SUA listener. Do so. Use the correct M3UA ID.

Change-Id: I8e8cdb6addbc4868aebc004be20a2f57b4acf75b
Reviewed-on: https://code.wireshark.org/review/5315
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoDo the "-z help" processing separately, and do it for Wireshark as well.
Guy Harris [Fri, 14 Nov 2014 23:59:38 +0000 (15:59 -0800)]
Do the "-z help" processing separately, and do it for Wireshark as well.

Yes, Wireshark does a bunch of GUI stuff, and then takes the window down
before printing the help, but the same is true for some command-line
error messages as well.

Change-Id: Id501468416c83308e4c0a9e7a66116d8d33a9d84
Reviewed-on: https://code.wireshark.org/review/5317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoIt's not missing, it's passed on.
Guy Harris [Fri, 14 Nov 2014 20:29:04 +0000 (12:29 -0800)]
It's not missing, it's passed on.

Change-Id: Id1b1c7501f357667abb961948afdd816e13a7ad3
Reviewed-on: https://code.wireshark.org/review/5314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUpdate Debian symbol files.
Guy Harris [Fri, 14 Nov 2014 20:24:51 +0000 (12:24 -0800)]
Update Debian symbol files.

Change-Id: Iee66cf87d742780740b572b39c8ecf94f93dc142
Reviewed-on: https://code.wireshark.org/review/5310
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd a name field to tap_param, for use in error messages.
Guy Harris [Fri, 14 Nov 2014 20:21:12 +0000 (12:21 -0800)]
Add a name field to tap_param, for use in error messages.

Change-Id: Ia4317b61ff30e269eba0ee2ea2c46f1668544b1b
Reviewed-on: https://code.wireshark.org/review/5309
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoThe registered -z parameter string shouldn't end with a comma.
Guy Harris [Fri, 14 Nov 2014 20:05:31 +0000 (12:05 -0800)]
The registered -z parameter string shouldn't end with a comma.

If it ends with a comma, then, if you don't provide any parameters, you
get a "no such -z statistic" message followed by a list of available
statistics.

If it doesn't end with a comma, then, if you don't provide any
parameters *and* a parameter is required, you get a usage message, which
is more useful - and, in many of those cases, a parameter *isn't*
required.

Change-Id: I81275ea41ad4611d8210ca3cb07c09f0abde58f2
Reviewed-on: https://code.wireshark.org/review/5308
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd an optional flag and a type for UUID parameters for stat taps.
Guy Harris [Fri, 14 Nov 2014 19:25:04 +0000 (11:25 -0800)]
Add an optional flag and a type for UUID parameters for stat taps.

For future use, with common code to parse the -z argument.

Change-Id: Ib2a11bd5c91b5ac48ced2cd2d112b97c301ff72a
Reviewed-on: https://code.wireshark.org/review/5307
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUpdate my e-mail address again.
Stephen Fisher [Fri, 14 Nov 2014 19:17:36 +0000 (12:17 -0700)]
Update my e-mail address again.

Change-Id: I0083bbf84658dbb0d4cef91e9e8f5855b8a2ba4f
Reviewed-on: https://code.wireshark.org/review/5306
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
9 years agoThere's nothing GTK+ about TShark.
Guy Harris [Fri, 14 Nov 2014 18:55:50 +0000 (10:55 -0800)]
There's nothing GTK+ about TShark.

Remove gtk from routine names in CLI taps.

Change-Id: I0846da9b1e8119ed966b441cb1ca0ce1820fd1c8
Reviewed-on: https://code.wireshark.org/review/5305
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRename stat_cmd_args.[ch] to stat_tap_ui.[ch].
Guy Harris [Fri, 14 Nov 2014 18:51:40 +0000 (10:51 -0800)]
Rename stat_cmd_args.[ch] to stat_tap_ui.[ch].

The intent is to handle more than just command-line arguments; reflect that.

Change-Id: Ia10efda85a9d11c6579d1bec6f789cee30d9e825
Reviewed-on: https://code.wireshark.org/review/5304
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAllow SCTP graphs to resize with the window they're in.
Irene Ruengeler [Fri, 14 Nov 2014 09:06:51 +0000 (10:06 +0100)]
Allow SCTP graphs to resize with the window they're in.

Bug: 10698
Change-Id: I3304bd36945619aeb405c74917f21de3faa3fcbb
Reviewed-on: https://code.wireshark.org/review/5284
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agotap_ui -> stat_tap_ui.
Guy Harris [Fri, 14 Nov 2014 18:42:26 +0000 (10:42 -0800)]
tap_ui -> stat_tap_ui.

The old routine had stat_ in the name, as the expectation was that they
were for statistics taps; that's still the expectation, so have stat_ in
the data structure and routine names.

Change-Id: Ic98d011012b8641173d41fa0ec4f4e625614370a
Reviewed-on: https://code.wireshark.org/review/5303
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUse G_GUINT64_FORMAT to format a guint64.
Guy Harris [Fri, 14 Nov 2014 18:35:42 +0000 (10:35 -0800)]
Use G_GUINT64_FORMAT to format a guint64.

A 64-bit integer isn't necessarily a long, it might be a long long.  Use
G_GUINT64_FORMAT to format it.

Make it a guint64 while we're at it - the field is a FT_GUINT64.

Change-Id: I7ee855905ea77347576005441824b1c4630f5659
Reviewed-on: https://code.wireshark.org/review/5302
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFor tap UIs, register a list of parameters and some menu information.
Guy Harris [Fri, 14 Nov 2014 18:31:04 +0000 (10:31 -0800)]
For tap UIs, register a list of parameters and some menu information.

The intent here is to centralize more UI information so that we can move
more tap UI stuff to common code.  This is a beginning.

Change-Id: Ic35ac0c01bc7b942aab88177db4065847a5e6c30
Reviewed-on: https://code.wireshark.org/review/5301
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agohiqnet: Improve dissection for hiqnet over TCP or UDP
Bill Meier [Thu, 13 Nov 2014 04:38:40 +0000 (23:38 -0500)]
hiqnet: Improve dissection for hiqnet over TCP or UDP

-- Use tcp_dissect_pdus() for hiqnet over tcp so as to properly
    handle hiqnet PDUS is a TCP stream of data;

-- Handle possible multiple hiqnet PDUs in a UDP payload.

-- Add Fixme: re multiple hiqnet PDUs in a frame.

Change-Id: I3527c6ea13571d16bcf23dd3771d0a89734a7c5a
Reviewed-on: https://code.wireshark.org/review/5267
Reviewed-by: Raphaël Doursenaud <rdoursenaud@free.fr>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agohiqnet: Simplify code somewhat; Adjust the "names" and display of certain fields.
Bill Meier [Thu, 13 Nov 2014 03:04:37 +0000 (22:04 -0500)]
hiqnet: Simplify code somewhat; Adjust the "names" and display of certain fields.

Specifically: Use proto_tree_add_bitmask() to show the "flags" and
              "categories" bitfields (instead of building the fields
              display "by hand").
              The bitfield display changed as follows:
              - A bitfield with all bits=0 will have a detailed
                dissection tree; (for both 'flags' & 'categories');
              - The 'categories' individual bitfields are now
                displayed as FT_BOOLEAN (not FT_UINT32).

Change-Id: Icd35698aae492b81b340d08030e6a1563f1640ae
Reviewed-on: https://code.wireshark.org/review/5266
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years ago[S1AP) Wrong tree used
AndersBroman [Fri, 14 Nov 2014 14:39:45 +0000 (15:39 +0100)]
[S1AP) Wrong tree used
s1ap.cnf:547:14: error: variable 'subtree' set but not used

Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e
Reviewed-on: https://code.wireshark.org/review/5299
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years ago[S1AP] Let the A21 dissector do further dissection of Cdma2000SectorID
AndersBroman [Fri, 14 Nov 2014 13:53:02 +0000 (14:53 +0100)]
[S1AP] Let the A21 dissector do further dissection of Cdma2000SectorID

Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb
Reviewed-on: https://code.wireshark.org/review/5298
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoFix declaration in btavrcp
Michal Labedzki [Fri, 14 Nov 2014 12:39:29 +0000 (13:39 +0100)]
Fix declaration in btavrcp

Change-Id: I47e4ad2baa7ca4c48e8c0eea472e568fc06d3386
Reviewed-on: https://code.wireshark.org/review/5297
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoBluetooth: Ubertooth: Update to the latest firmware
Michal Labedzki [Wed, 12 Nov 2014 11:00:46 +0000 (12:00 +0100)]
Bluetooth: Ubertooth: Update to the latest firmware

Changelog:
- add some assign numbers
- implement new type of usb_rx_packet: LE_PROMISC

Change-Id: Iffe01a50f873221c695f16a76c1954d6c82d73df
Reviewed-on: https://code.wireshark.org/review/5289
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years ago[BSSMAP] Handle vendor specific encoding of "Layer 3 Message Contents".
AndersBroman [Fri, 14 Nov 2014 11:54:33 +0000 (12:54 +0100)]
[BSSMAP] Handle vendor specific encoding of "Layer 3 Message Contents".

Change-Id: I351bc0a6a8ae636b2f888a80f61e526096a61b64
Reviewed-on: https://code.wireshark.org/review/5295
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoNAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFE
Pascal Quantin [Fri, 14 Nov 2014 09:07:52 +0000 (10:07 +0100)]
NAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFE

Bug: 10699
Change-Id: I0f359639d5836f557370ab6d6aad45faa4417b6e
Reviewed-on: https://code.wireshark.org/review/5285
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
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>
9 years agoTranslations: Update Polish translation
Michal Labedzki [Sun, 2 Nov 2014 17:55:40 +0000 (18:55 +0100)]
Translations: Update Polish translation

All messages are translated now.

Tłumaczenie Wiresharka jest teraz kompletne. Zachęcam do testowania
i wytykania błędów.

Change-Id: Iaffb2e581c765b5b3dff7750f878e6391539ebd6
Reviewed-on: https://code.wireshark.org/review/5293
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: A2DP: Add AVRCP song position indicator
Michal Labedzki [Wed, 12 Nov 2014 10:57:12 +0000 (11:57 +0100)]
Bluetooth: A2DP: Add AVRCP song position indicator

"sbc.avrcp_song_position" can be used to determine time synchronization
between AVRCP and A2DP. It is updated on every
AVRCP PlaybackPositionChanged. Also provide version for aptx.

Change-Id: I48cd49f0fee54131a738290e2a70a24d33ba1d22
Reviewed-on: https://code.wireshark.org/review/5290
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoQt: Fix non-translate-able text
Michal Labedzki [Thu, 13 Nov 2014 09:52:16 +0000 (10:52 +0100)]
Qt: Fix non-translate-able text

Change-Id: I8c2376117ca1ac92c341ba938929af2d13e23f72
Reviewed-on: https://code.wireshark.org/review/5291
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoQt: Fix typo
Michal Labedzki [Thu, 13 Nov 2014 18:42:36 +0000 (19:42 +0100)]
Qt: Fix typo

Change-Id: Idc2b945ac3bd5de961cc9c581398dc12f6831070
Reviewed-on: https://code.wireshark.org/review/5292
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: AVRCP: Improve command/response trancing
Michal Labedzki [Fri, 7 Nov 2014 14:41:29 +0000 (15:41 +0100)]
Bluetooth: AVRCP: Improve command/response trancing

Make command/response tracking field filterable and jumpable.

Change-Id: Ib0dfc9ea9954f8d29d06ceda3d44a7f95c94bc53
Reviewed-on: https://code.wireshark.org/review/5288
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: AVRCP: Fix swappend SongPosition and SongLength
Michal Labedzki [Fri, 7 Nov 2014 09:47:33 +0000 (10:47 +0100)]
Bluetooth: AVRCP: Fix swappend SongPosition and SongLength

SongPosition and SongLength are swapped in Info column. Fix it.

Change-Id: I4c9bece51dbfe62885e8426a8aef07f336670099
Reviewed-on: https://code.wireshark.org/review/5287
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: AVDTP: Add possibility to force decode as APT-X
Michal Labedzki [Mon, 3 Nov 2014 09:14:28 +0000 (10:14 +0100)]
Bluetooth: AVDTP: Add possibility to force decode as APT-X

Change-Id: Id99647846c9bc7666f33938c811358576353390d
Reviewed-on: https://code.wireshark.org/review/5286
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agodtd_preparse : fix indent (Use tabs)
Alexis La Goutte [Wed, 12 Nov 2014 15:40:02 +0000 (16:40 +0100)]
dtd_preparse : fix indent (Use tabs)

Change-Id: Iec6ef7109ccea8a164db4f62af9fae1dceba6ae6
Reviewed-on: https://code.wireshark.org/review/5282
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoGtk Utils: fix unknown command tag name 'parm'; did you mean 'param'? (-Wdocumentation)
Alexis La Goutte [Wed, 12 Nov 2014 16:10:40 +0000 (17:10 +0100)]
Gtk Utils: fix unknown command tag name 'parm'; did you mean 'param'? (-Wdocumentation)

Change-Id: I89f242bf916d22e0a4a665696ec3fe5ee02b8a1f
Reviewed-on: https://code.wireshark.org/review/5283
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoMultipath TCP checksum requires M flag set as well as enough option length.
Michael Mann [Fri, 14 Nov 2014 01:37:46 +0000 (20:37 -0500)]
Multipath TCP checksum requires M flag set as well as enough option length.

Bug: 10692
Change-Id: I8d9874a2c0a6b98497d43804bcf27a8c7e152a9b
Reviewed-on: https://code.wireshark.org/review/5275
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoAlways create a subtree for Mobility options, even if it doesn't have a specific...
Michael Mann [Fri, 14 Nov 2014 03:38:54 +0000 (22:38 -0500)]
Always create a subtree for Mobility options, even if it doesn't have a specific dissection function.

Bug: 10618
Change-Id: Ic4d52485a6bd96f906b4a0d61b75a31bfad4e8f8
Reviewed-on: https://code.wireshark.org/review/5276
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoDissector for elasticsearch protocol
Ryan Doyle [Wed, 12 Nov 2014 09:36:49 +0000 (20:36 +1100)]
Dissector for elasticsearch protocol

Provides dissection for the elasticsearch protocol. This includes full
dissection of the multicast discovery protocol, the HTTP query interface
and partial dissection of the binary protocol.

Change-Id: I738fb498976e44fa05168c2bc3a7e842a9e96df9
Reviewed-on: https://code.wireshark.org/review/4948
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agobatadv: Add dissector support for batadv v15
Sven Eckelmann [Wed, 1 Oct 2014 16:26:12 +0000 (18:26 +0200)]
batadv: Add dissector support for batadv v15

The packet format for batman-adv v15 supports:

 * Complete reordered packet type ids
 * reordered flags
 * type-version-length-value data containers
 * new types for coding packets and unicast transfer of TVLVs
 * dropped packet types for vis, translation table query and roaming
 * reordered packet formats
 * transparent fragmentation of batadv packets

Change-Id: I9e6733f9dd6b54eeecda19cf570599161d28b46e
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
Reviewed-on: https://code.wireshark.org/review/5175
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoepl: Duplicated Frames
Lukas Emersberger [Fri, 17 Oct 2014 12:13:06 +0000 (14:13 +0200)]
epl: Duplicated Frames

  Remake of the duplicated frames filter with
  less memory usage.

Change-Id: I7c8694b5ae69c919b866bbc661bad5e3f0a3e1d7
Reviewed-on: https://code.wireshark.org/review/4773
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agohf_cc_loss is supposed to be a floating-point value, divided by 65535.
Guy Harris [Thu, 13 Nov 2014 08:43:17 +0000 (00:43 -0800)]
hf_cc_loss is supposed to be a floating-point value, divided by 65535.

That's what the code did when it used proto_tree_add_text(); make it do
so now.  That squelches a run-time error.

Reformat the script-added hf_ values while we're at it.

Change-Id: I48d16280c523faa3b266e8df37f5e0e0b2827712
Reviewed-on: https://code.wireshark.org/review/5270
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoGet rid of spaces before tabs.
Guy Harris [Thu, 13 Nov 2014 05:22:05 +0000 (21:22 -0800)]
Get rid of spaces before tabs.

Change-Id: I70ff250a905ac578d7e3afc63a82a5fcb3983608
Reviewed-on: https://code.wireshark.org/review/5269
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd dissector table for sFlow header dissection.
Michael Mann [Mon, 10 Nov 2014 02:13:38 +0000 (21:13 -0500)]
Add dissector table for sFlow header dissection.

Change-Id: I189a5b2d5f769395fa5e387f8be49b81903fb252
Reviewed-on: https://code.wireshark.org/review/5262
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>
9 years agoHandle duplicate attribute and TLV entries specially.
Guy Harris [Thu, 13 Nov 2014 05:19:41 +0000 (21:19 -0800)]
Handle duplicate attribute and TLV entries specially.

For attributes, handle them the same way we handle duplicate vendors.

For TLVs, ignore duplicates; they shouldn't happen.

Change-Id: Ie968478c40a9b7848fa8ea25b144eda8656e5874
Reviewed-on: https://code.wireshark.org/review/5268
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoEliminate proto_tree_add_text for some dissectors.
Michael Mann [Thu, 6 Nov 2014 04:07:35 +0000 (23:07 -0500)]
Eliminate proto_tree_add_text for some dissectors.

Change-Id: Ide14bcac0b1563bee4260ac9c1a280ba99e97e71
Reviewed-on: https://code.wireshark.org/review/5261
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>
9 years agoHandle new vendors and changes to vendors differently.
Guy Harris [Thu, 13 Nov 2014 03:01:26 +0000 (19:01 -0800)]
Handle new vendors and changes to vendors differently.

If, when adding a new vendor, we already find a vendor with the given
ID, don't bother adding it to the vendors-by-ID table with the same ID,
and, if and only if the vendor name has changed, remove it from the
vendors-by-name table, free the old name, replace it with the new name,
and, add it back to the vendors-by-name table with the new name.

Bug: 10666
Change-Id: I43ebcb57c742563157c71b01ebc0b35797a408e1
Reviewed-on: https://code.wireshark.org/review/5265
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoSquelch a compiler warning.
Guy Harris [Thu, 13 Nov 2014 02:11:00 +0000 (18:11 -0800)]
Squelch a compiler warning.

Some compilers complain that we're casting a 16-bit integer to a
pointer; making it a standard-size integer squelches the warning.

Change-Id: Iba0e767d7801afdc369b64a1cf050bf8db37da7b
Reviewed-on: https://code.wireshark.org/review/5264
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoQt: Flatten group boxes.
Gerald Combs [Tue, 11 Nov 2014 17:56:58 +0000 (09:56 -0800)]
Qt: Flatten group boxes.

As discussed in change 5185, the "big 3" HIGs discourage the use of
traditional group boxes. Flatten our existing ones.

Change-Id: I68ef4aa9fd0f69a42750bf735df2250a468bfb2d
Reviewed-on: https://code.wireshark.org/review/5263
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoAdd Decode As functionality for MPLS PW Associated Channel Type.
Michael Mann [Sun, 9 Nov 2014 20:44:56 +0000 (15:44 -0500)]
Add Decode As functionality for MPLS PW Associated Channel Type.

Add CFM and MPLS dissector as possible decoders.

Bug: 10574
Change-Id: Ic39c6b8d68b965ff9d342f5ee789a8eff3134a5a
Reviewed-on: https://code.wireshark.org/review/4935
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFix warning: no previous prototype for function ... [-Wmissing-prototypes]
Alexis La Goutte [Wed, 12 Nov 2014 11:57:36 +0000 (12:57 +0100)]
Fix warning: no previous prototype for function ... [-Wmissing-prototypes]

warning coming after g055e4768ece and g421913b721

Change-Id: I5caeeb89c559faef8007f2946c68c7172b75dfa8
Reviewed-on: https://code.wireshark.org/review/5250
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>
9 years ago[Art-Net]
AndersBroman [Wed, 12 Nov 2014 13:15:48 +0000 (14:15 +0100)]
[Art-Net]
- The heuristic chek was missing "e" out of "Art-Net\0"
- tvb_length() - tvb_captured_length()

Change-Id: Iad9900f3a22e2fdbd0d6056efc1af90511cc458a
Reviewed-on: https://code.wireshark.org/review/5257
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoADB: fix warning: no newline at end of file [-Wnewline-eof]
Alexis La Goutte [Wed, 12 Nov 2014 11:26:22 +0000 (12:26 +0100)]
ADB: fix  warning: no newline at end of file [-Wnewline-eof]

Warning found by Clang

Change-Id: I7b801808aefa294e32fff560ea1a49620f0e0ea0
Reviewed-on: https://code.wireshark.org/review/5249
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoUpdates in it translation.
Dario Lombardo [Wed, 12 Nov 2014 10:06:45 +0000 (11:06 +0100)]
Updates in it translation.

Change-Id: I9e90fca521f17f4ae49e132990f77b2610807e6d
Reviewed-on: https://code.wireshark.org/review/5248
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoPIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Tue, 11 Nov 2014 11:52:04 +0000 (12:52 +0100)]
PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I1540c7878692625a9e38b48f8681c07bab852a64
Reviewed-on: https://code.wireshark.org/review/5234
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFix SMPP timestamp decoding when the current date/time's offset to UTC is
Jeff Morriss [Tue, 11 Nov 2014 20:22:12 +0000 (15:22 -0500)]
Fix SMPP timestamp decoding when the current date/time's offset to UTC is
different from the timestamp's offset to UTC.

The fix for bug 6712 ignored the fact that daylight savings will affect the
offset from UTC--and whether daylight savings is in effect today might be
different than whether it was in effect in the timestamp we're decoding.

Bug: 10672
Change-Id: Ie513c361cff41007f2328cd9ca9ca4800ffef500
Reviewed-on: https://code.wireshark.org/review/5245
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up
Jeff Morriss [Wed, 12 Nov 2014 01:48:39 +0000 (20:48 -0500)]
Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up
on the OSX 10.5 buildbot.

Change-Id: I49e066feab8b980ea85371095234e96e89db71e1
Reviewed-on: https://code.wireshark.org/review/5247
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoFix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up with...
Jeff Morriss [Tue, 11 Nov 2014 20:37:04 +0000 (15:37 -0500)]
Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up with gcc 4.8.3.

Change-Id: I71c9013670dd6e8c74e039bd252cfac2c9e95a18
Reviewed-on: https://code.wireshark.org/review/5246
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years ago[GTP] Fix decoding of UMTS GTP QoS Profile i n Radius and Diameter
AndersBroman [Tue, 11 Nov 2014 20:21:28 +0000 (21:21 +0100)]
[GTP] Fix decoding of UMTS GTP QoS Profile i n Radius and Diameter
messages.
Fixes Bug 10688

Change-Id: Iff29ae3f6cee1b4ad12a0e5c5d7fd3da1c9343af
Reviewed-on: https://code.wireshark.org/review/5244
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years ago[Radius] Make dictionary.starent.vsa1 the default dictionary.
AndersBroman [Tue, 11 Nov 2014 20:00:16 +0000 (21:00 +0100)]
[Radius] Make dictionary.starent.vsa1 the default dictionary.
at least with the trace in Bug 10688 that makes the most sense.

Change-Id: I76213449076a2f49a4b72c6dd87b022fb10b9eef
Reviewed-on: https://code.wireshark.org/review/5242
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoTools: Add fix_pragma_wdocumentation to UNKNOWN licence
Alexis La Goutte [Tue, 11 Nov 2014 18:35:55 +0000 (19:35 +0100)]
Tools: Add fix_pragma_wdocumentation to UNKNOWN licence

Change-Id: Ib5665924b99644c52c95d408c7cff19509cf3eb2
Reviewed-on: https://code.wireshark.org/review/5241
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agohiqnet: Use correct filter names; Fix specification of hf_dhcp
Bill Meier [Tue, 11 Nov 2014 17:56:34 +0000 (12:56 -0500)]
hiqnet: Use correct filter names; Fix specification of hf_dhcp

   "foo.flags..." --> "hiqnet.flags...";
   Use BASE_NONE for hf_dchp.

Change-Id: Ic3ca4754a1daeefc831dbfcd6a280fe19f8efbf3
Reviewed-on: https://code.wireshark.org/review/5240
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoAdd tools for fix -Wdocumentation
Alexis La Goutte [Sat, 8 Nov 2014 17:21:07 +0000 (18:21 +0100)]
Add tools for fix -Wdocumentation

Use pragma to disable -Wdocumentation when include glib.h, gmodule or gtk/gtk.h

Change-Id: I576c0d5c4a12ac3b505ac9543646356ff29ac814
Reviewed-on: https://code.wireshark.org/review/5198
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoHiqnet: fix warning found by fix-encoding-args tools
Alexis La Goutte [Tue, 11 Nov 2014 16:56:05 +0000 (17:56 +0100)]
Hiqnet: fix warning found by fix-encoding-args tools

Change-Id: I7e513ec5b617217cd238861f5f02d44edce0bedd
Reviewed-on: https://code.wireshark.org/review/5239
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoHiqnet: fix Mac OS X buildbot
Alexis La Goutte [Tue, 11 Nov 2014 16:50:17 +0000 (17:50 +0100)]
Hiqnet: fix Mac OS X buildbot

Change-Id: Ia4fec86ed389ccb558fe9e1acfb6e87b7012bb75
warning: declaration of 'strlen' shadows a global declaration
Reviewed-on: https://code.wireshark.org/review/5237
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoHiqnet: fix typo lenght => length
Alexis La Goutte [Tue, 11 Nov 2014 16:54:09 +0000 (17:54 +0100)]
Hiqnet: fix typo lenght => length

Change-Id: I104d8bb0c56899faef6f4d608859e7b1a34e45a4
Reviewed-on: https://code.wireshark.org/review/5238
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoInitial Harman HiQnet dissector
Raphaël Doursenaud [Mon, 20 Oct 2014 11:07:56 +0000 (13:07 +0200)]
Initial Harman HiQnet dissector

Change-Id: I43042edde09395e328d84bf4b172465829915a98
Reviewed-on: https://code.wireshark.org/review/5014
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoBACAPP: fix dissection of event parameters for event notifications of Event_Type...
desolat [Mon, 10 Nov 2014 23:46:05 +0000 (00:46 +0100)]
BACAPP: fix dissection of event parameters for event notifications of Event_Type Change_of_Status_Flags

Implementation for this event parameter type was missing

Bug: 9626
Change-Id: Iea0bc819858bbf5660d97cfd0c418a963ac149fb
Reviewed-on: https://code.wireshark.org/review/5228
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>
9 years agoFix a problem that causes build failures with CMake on Yosemite.
Guy Harris [Tue, 11 Nov 2014 03:47:59 +0000 (19:47 -0800)]
Fix a problem that causes build failures with CMake on Yosemite.

Change-Id: I52e81656470df887eb3c53b2632bf5a310b1b063
Reviewed-on: https://code.wireshark.org/review/5229
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAllow building under OSX Yosemite using cmake.
David Ameiss [Mon, 10 Nov 2014 20:24:18 +0000 (14:24 -0600)]
Allow building under OSX Yosemite using cmake.

CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools
build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and
update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM.

Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b
Note: CFPropertyListCreateWithStream() works under Mavericks as well.
Reviewed-on: https://code.wireshark.org/review/5226
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
9 years agoamqp: Misc changes;
Bill Meier [Mon, 10 Nov 2014 20:07:51 +0000 (15:07 -0500)]
amqp: Misc changes;

- amqp_1_0_dissectiom: Use MIN(32-bit-length, 0xFFFF) as the length to dissect;
  The original code just used the low-order 16 bits of the 32-bit length
  field  as the length to dissect.
  Add an expert warning if the actual PDU length is > 65K.

- tvb_length() --> tvb_reported_length()

Change-Id: I3230600f460a8bd495eeec17fa6e704bf24de1a2
Reviewed-on: https://code.wireshark.org/review/5225
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoUSB: consider the device class when we try to select the next dissector
Martin Kaiser [Mon, 1 Sep 2014 07:47:26 +0000 (09:47 +0200)]
USB: consider the device class when we try to select the next dissector

at the moment, we only use the interface class, even in situations where
it's not applicable (e.g. control request that's not addressed to an
interface or an endpoint) - this is a hack that works because some
dissectors register for interface class "unknown", I'm trying to make
this workaround obsolete

Change-Id: I6bf4253a2f8bf5a75ea1a08c3e52d36f80abd7ab
Reviewed-on: https://code.wireshark.org/review/5215
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Sean Stalley <seanstalley@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoUse correct offset and lenght for Choice EOC.
AndersBroman [Mon, 10 Nov 2014 16:43:53 +0000 (17:43 +0100)]
Use correct offset and lenght for Choice EOC.

Change-Id: I8152e1a07768a3bc245bbafa7c24901ba26a2478
Reviewed-on: https://code.wireshark.org/review/5224
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoWCCP: fix parsing of extended assignment data element
Victor Voronkov [Mon, 10 Nov 2014 11:07:15 +0000 (12:07 +0100)]
WCCP: fix parsing of extended assignment data element

Bug: 10641
Change-Id: I51322757c5aa7877fa8ff7915330ff24e7a8cbe2
Reviewed-on: https://code.wireshark.org/review/5221
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoImproved deregistering fields.
Stig Bjørlykke [Thu, 6 Nov 2014 10:19:25 +0000 (11:19 +0100)]
Improved deregistering fields.

This improvement avoids use of deallocated memory (crash) if using a
deregistered field in display filter, color filter, custom column and
other cases when the field is used as "interesting field".

This functionality is currently used in http, imf and ldap preferences.

Also removed unused proto_registrar_n() as this does not work correctly
after deregistering fields.

Change-Id: I043e3bf7a98bd773c9801e712a012d1eab8a7f94
Reviewed-on: https://code.wireshark.org/review/5161
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
9 years agoFixed memory leakage in col_cleanup.
Stig Bjørlykke [Wed, 5 Nov 2014 13:36:29 +0000 (14:36 +0100)]
Fixed memory leakage in col_cleanup.

Several fields in cinfo is allocated memory and must be freed here
to avoid memory leakage when recreating the packet list.

Do not allocate memory for col_expr[] as this points to static strings
or other allocated strings.

Change-Id: I840377e3c590b1a3e2a38e0537465a028041d1e9
Reviewed-on: https://code.wireshark.org/review/5137
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoTry to fix dist.
Gerald Combs [Mon, 10 Nov 2014 06:16:15 +0000 (22:16 -0800)]
Try to fix dist.

Change-Id: Ib4332bace88f9db7a06867861c40627e2bdc55f0
Reviewed-on: https://code.wireshark.org/review/5218
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix an include.
Gerald Combs [Mon, 10 Nov 2014 05:28:00 +0000 (21:28 -0800)]
Fix an include.

Change-Id: Ic46b24cac01c49be01c7ad9e8a12b276fcdf81a5
Reviewed-on: https://code.wireshark.org/review/5217
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFinish converting the User's Guide to AsciiDoc.
Gerald Combs [Mon, 10 Nov 2014 02:13:57 +0000 (18:13 -0800)]
Finish converting the User's Guide to AsciiDoc.

As with the Developer's Guide, add user-guide-docinfo.xml, which lets us
carry over DocBook front matter. Remove the meta_info chapter. Most of
its contents are now in user-guide-docinfo.xml. Add a DocBook revision
history based on hints from the Git/SVN/CVS revision history.

Remove the various makefile targets for converting AsciiDoc files to
DocBook chapters. Remove GPL_appendix.xml. We use the AsciiDoc version.

Change-Id: I543fa2a92f2c735c5f00c97ec65cff2187e09e3a
Reviewed-on: https://code.wireshark.org/review/5216
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoAdd subdissector table for MPLS PW Associated Channel Type
Michael Mann [Sun, 9 Nov 2014 19:00:01 +0000 (14:00 -0500)]
Add subdissector table for MPLS PW Associated Channel Type

Change-Id: Id72fcbe74b91b4eb25fb4d3f3d47a1d53c2857b2
Reviewed-on: https://code.wireshark.org/review/5212
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoWSUG: Convert ``Command Line Tools'' to AsciiDoc.
Gerald Combs [Sun, 9 Nov 2014 19:39:15 +0000 (11:39 -0800)]
WSUG: Convert ``Command Line Tools'' to AsciiDoc.

Move the idl2wrs section to the Developer's Guide. Leave most of the
other content intact for now.

Change-Id: I98c6eeab62af5cc55e3ce23ab1107df02b1a22cf
Reviewed-on: https://code.wireshark.org/review/5214
Reviewed-by: Gerald Combs <gerald@wireshark.org>