jelmer/wireshark.git
5 years agoTry to improve the "Kerberos requested but not OpenSSL" message. master
Guy Harris [Sun, 9 Mar 2014 22:40:31 +0000 (15:40 -0700)]
Try to improve the "Kerberos requested but not OpenSSL" message.

At least one person didn't realize that it meant that you have to
specify --with-ssl when configuring, so try saying that a bit more
explicitly.

Change-Id: If15a9cfaeaf7d4aca2c570602fc09ff3ae489d35
Reviewed-on: https://code.wireshark.org/review/575
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoadd the CLIENT_RANDOM format to the tooltip
Martin Kaiser [Sun, 9 Mar 2014 18:01:24 +0000 (19:01 +0100)]
add the CLIENT_RANDOM format to the tooltip

Change-Id: I8fe6ceb148ec8145a1e71002d42bbdace58edbb6
Reviewed-on: https://code.wireshark.org/review/574
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoRemove a warning, add a comment guessing the intent
Evan Huus [Sat, 8 Mar 2014 19:34:44 +0000 (14:34 -0500)]
Remove a warning, add a comment guessing the intent

Discovered investigating bug #9833, not the cause of that bug.

Change-Id: I53ee5c792eba8429d2c203c03e2f359a433ca262
Reviewed-on: https://code.wireshark.org/review/562
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years ago[Automatic manuf, services and enterprise-numbers update for 2014-03-09]
Gerald Combs [Sun, 9 Mar 2014 15:06:26 +0000 (08:06 -0700)]
[Automatic manuf, services and enterprise-numbers update for 2014-03-09]

Change-Id: Iadbd9fb43228b9723195bfc6e7326d64e9a92412
Reviewed-on: https://code.wireshark.org/review/569
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoadd the CC protocol name to the info column
Martin Kaiser [Mon, 24 Feb 2014 08:23:30 +0000 (09:23 +0100)]
add the CC protocol name to the info column

Change-Id: Ic57c2a36c88a7528c4e37681bc5db4309174019d
Reviewed-on: https://code.wireshark.org/review/463
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoUpdate documentation about p_[add|get]_proto_data (new argument: scope)
Michael Mann [Sun, 9 Mar 2014 10:02:30 +0000 (11:02 +0100)]
Update documentation about p_[add|get]_proto_data (new argument: scope)

Change-Id: Ic27b0e601967c90567fac58447d28b10c02a3888
Reviewed-on: https://code.wireshark.org/review/564
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoIE chosen channel on Lb interface decoded incorrectly
Anders Broman [Sun, 9 Mar 2014 10:06:17 +0000 (11:06 +0100)]
IE chosen channel on Lb interface decoded incorrectly

IE "chosen channel" in message "perform location request" on Lb interface (BSC <-> SMLC) is decoded incorrectly. IE "chosen channel" on Lb interface is decoded as 2 octets data.
It should be 3 octet IE on Lb interface (IEI, length and data).

Change-Id: Ic815a7b4ac08a035c5b292985c64d14e986fe8d7
Closed-bug: 9531
Reviewed-on: https://code.wireshark.org/review/565
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoFix Bug 9853: 'Lua: trying to get/access a Preference before its registered causes...
Hadriel Kaplan [Sat, 8 Mar 2014 23:57:04 +0000 (18:57 -0500)]
Fix Bug 9853: 'Lua: trying to get/access a Preference before its registered causes a segfault'

Accessing a pref before it's registered causes a segfault, because prefs_p->next
is not being checked for NULL in wslua_proto.c:Prefs__index().

Change-Id: I270978ddb9238a9e8d2c533a96fc01ee0df385c7
Reviewed-on: https://code.wireshark.org/review/563
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoAdd pkg-config file
Balint Reczey [Tue, 4 Mar 2014 13:59:39 +0000 (14:59 +0100)]
Add pkg-config file

Change-Id: Ia55a2e560aef8d2f9a3cede18af4555507656047
Reviewed-on: https://code.wireshark.org/review/500
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
5 years agoEnsure that the input to strtoul ends with a null.
Evan Huus [Sat, 8 Mar 2014 15:43:39 +0000 (10:43 -0500)]
Ensure that the input to strtoul ends with a null.

Otherwise it runs past the end of the array into stack memory. Should fix the
intermittent DVB-CI decryption test suite failures.

Change-Id: Ice17497e661c8579baf3a546efcb5529beda6b49
Reviewed-on: https://code.wireshark.org/review/559
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoTight array index guard in packet-umts_fp.c
Evan Huus [Sat, 8 Mar 2014 17:37:50 +0000 (12:37 -0500)]
Tight array index guard in packet-umts_fp.c

Fixes bug #9828.

Change-Id: I69b02a0d51921bae77850b599144f35a4fe9ee33
Reviewed-on: https://code.wireshark.org/review/560
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agossl: add more ciphers for decryption
Hauke Mehrtens [Fri, 13 Dec 2013 15:48:36 +0000 (16:48 +0100)]
ssl: add more ciphers for decryption

This patch adds some more ciphers to the list of ciphers that can be
decrypted by wireshark. Most of them are PSK based ciphers. To do the a
actually decryption in most cases the TLS pre master secret or the
master secret is needed.

In the changed lines just a comment with the name of the cipher was
added.

This was generated with the help of Peter Wu's generate-wireshark-cs
script from https://git.lekensteyn.nl/peter/wireshark-notes.git .

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Change-Id: I347dc5a530380a04cc00418640f00bbda0db8de8
Reviewed-on: https://code.wireshark.org/review/558
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoAdd BTLE RF dissector to release notes
Pascal Quantin [Sat, 8 Mar 2014 09:01:53 +0000 (10:01 +0100)]
Add BTLE RF dissector to release notes

Change-Id: Idccb6b0e6bf8ae603377dce43c9d266d4c101374
Reviewed-on: https://code.wireshark.org/review/557
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoOmitting SubscriberData makes CONTENT OF fail and InsertSubscriberDataArg will not...
AndersBroman [Sat, 8 Mar 2014 08:52:41 +0000 (09:52 +0100)]
Omitting SubscriberData makes CONTENT OF fail and InsertSubscriberDataArg will not get all its tags

Change-Id: I2ace2271d9ce5650e5239c12e64080463aae9367
Reviewed-on: https://code.wireshark.org/review/556
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoDo not try to use unknown/non-existent webbrowser
Michal Labedzki [Wed, 5 Mar 2014 11:37:30 +0000 (12:37 +0100)]
Do not try to use unknown/non-existent webbrowser

Some systems do not have webbrowser or have strange browser.
Do not try to use it and dislayed URL for user information.

Change-Id: I3f5bcca6701b20cafa942629cbee78aa1fc689b1
Reviewed-on: https://code.wireshark.org/review/516
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoRemove trailing (tab)whitespace...
Alexis La Goutte [Fri, 7 Mar 2014 15:53:29 +0000 (16:53 +0100)]
Remove trailing (tab)whitespace...

Change-Id: I26325e40d6100dcd4f3e72080476a82e93edf28d
Reviewed-on: https://code.wireshark.org/review/550
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoFix indent (use tabs) and modelines info
Alexis La Goutte [Fri, 7 Mar 2014 15:47:53 +0000 (16:47 +0100)]
Fix indent (use tabs) and modelines info

(Need to continue on other packet-dcerpc-* file...)

Change-Id: I536d52017940cac9c810693045649a67e77a336a
Reviewed-on: https://code.wireshark.org/review/549
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoFix bytes view pane showing non-ASCII chars
Hadriel Kaplan [Fri, 7 Mar 2014 12:32:23 +0000 (07:32 -0500)]
Fix bytes view pane showing non-ASCII chars

The bytes view pane in Qt is showing non-ASCII characters in the right-hand
side.  That's because the code is using isprint(), which is locale specific
and frequently includes non-ascii charscters such as the copyright symbol and
such. I wouldn't care, except some of those non-ASCII characters affects
the font height and makes it looks sloppy (the display output is set to a
fixed *width* font, but not fixed height font apparently).

Change-Id: Idd471c5fb769d3d67aa08bc507d168e686d48098
Reviewed-on: https://code.wireshark.org/review/548
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoMake buildbot happy : packet-btle.c:275:16: error: declaration of 'index' shadows...
Alexis La Goutte [Fri, 7 Mar 2014 07:18:32 +0000 (08:18 +0100)]
Make buildbot happy : packet-btle.c:275:16: error: declaration of 'index' shadows a global declaration [-Werror=shadow]

Change-Id: I94e1da9f12c257fa4e2c597f29a200d35e2d5d0d
Reviewed-on: https://code.wireshark.org/review/546
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoFix DNP3 Dissector DNP3 Read Requests and Direct Op No ACKs
cbontje [Thu, 6 Mar 2014 20:21:58 +0000 (13:21 -0700)]
Fix DNP3 Dissector DNP3 Read Requests and Direct Op No ACKs

This corrects a couple issues with the DNP3 Dissector:
- Refactored Read Object String lookups to use value_string
- Corrected issue with multiple object types in a single read not being processed
- Added processing for Direct Operate No ACK Messages

Fixes issues noted in Bug 9839

Change-Id: I9895e509a8d3931c805ce53b718a4951f8f8039e
Reviewed-on: https://code.wireshark.org/review/538
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agopacket-smb2: setup decryption keys for kerberos session setups
Stefan Metzmacher [Mon, 13 Aug 2012 15:51:21 +0000 (17:51 +0200)]
packet-smb2: setup decryption keys for kerberos session setups

Change-Id: I1a641da6f85e047984631c4dec158718fd7d011d
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/365
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agopacket-smb-direct.c: add support for reassembling of fragments
Stefan Metzmacher [Wed, 3 Oct 2012 21:01:12 +0000 (23:01 +0200)]
packet-smb-direct.c: add support for reassembling of fragments

Change-Id: I6b66867774f369fa49c9ee45a6792a6ad4d4c6e2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/59
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoIntroduces two new Bluetooth DLTs for RF-based captures.
Christopher Kilgour [Sat, 22 Feb 2014 07:39:45 +0000 (23:39 -0800)]
Introduces two new Bluetooth DLTs for RF-based captures.

Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing
BTLE dissector.

Fixes BTLE dissector to correctly extract packet CRC.

Adds CRC checking to BTLE dissector.

Provides optional context to BTLE dissector that allows RF captures to provide
link-layer hints for dissection details.  Significantly, parameters for
determining CRC correctness are provided, as well as Access Address validity
information.

Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb
Reviewed-on: https://code.wireshark.org/review/310
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoBluetooth: A2DP/VDP: Display SEIDs used in conversation
Michal Labedzki [Mon, 3 Mar 2014 07:51:46 +0000 (08:51 +0100)]
Bluetooth: A2DP/VDP: Display SEIDs used in conversation

Change-Id: I855ccbee2248cafcc9b1d32245894e2933ca745a
Reviewed-on: https://code.wireshark.org/review/474
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoBluetooth: AVDTP: Fix trees and distinguish local and remote SEPs
Michal Labedzki [Mon, 24 Feb 2014 10:50:37 +0000 (11:50 +0100)]
Bluetooth: AVDTP: Fix trees and distinguish local and remote SEPs

When there is more then one interface or adapter then AVDTP dissector
incorrectly mixing it data together. Patch extends keys to support
multiple interfaces/adapters. Also do little simplification on trees.

There are two device, both use SEPs to configuration and
it is possible to use the same SEID. SetConfiguration use
remote "ACP" SEID and local "INT" SEID, so there is need to
distinguish them and please remember then INT SEID types can be
unknown in most case.

Change-Id: I150f3625f532386a1078deb8d0ac70a1c05c3f04
Reviewed-on: https://code.wireshark.org/review/473
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoFix bug 9835 disabled second media stream disables all media streams
Hadriel Kaplan [Thu, 6 Mar 2014 09:22:31 +0000 (04:22 -0500)]
Fix bug 9835 disabled second media stream disables all media streams

When a single media line is rejected in an SDP answer, for example a second
'm=video' line, wireshark disables ALL media sessions, instead of just that
one.  But per the RFCs, all it should do is disable just the one RTP media
session the m= line represents. This commit fixes that, so that a disabled
media session (one with a m= port of 0) in the SDP answer only disables its
associated/paired media stream in the offer.

Change-Id: I9bd0d3fc88b8eaa55207c9bf3f3e37da7746fd14
Reviewed-on: https://code.wireshark.org/review/526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years ago(Benign) Don't use "address-of" operator on arg of VALS() (not that it makes any...
Bill Meier [Fri, 7 Mar 2014 04:55:37 +0000 (23:55 -0500)]
(Benign) Don't use "address-of" operator on arg of VALS() (not that it makes any actual difference)..

Change-Id: I0766d0f130648aaa5a58d9f4062fa24e898cbdc3
Reviewed-on: https://code.wireshark.org/review/545
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoBluetooth: HCI_EVT: Fix empty advertising data
Michal Labedzki [Mon, 3 Mar 2014 07:51:27 +0000 (08:51 +0100)]
Bluetooth: HCI_EVT: Fix empty advertising data

LE Advertising Report with length 0 is valid, so check
it before dissecting adverising data.

Change-Id: I4937ec2de5d703b05c6e5f5bac7f81d153e49b40
Reviewed-on: https://code.wireshark.org/review/475
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoadd the (not yet official) TLS channel_id extension that's used by Chrome
Martin Kaiser [Thu, 6 Mar 2014 20:10:52 +0000 (21:10 +0100)]
add the (not yet official) TLS channel_id extension that's used by Chrome

Change-Id: Ib8779b0db790a78fff8bd1970a7240bbd8f49f75
Reviewed-on: https://code.wireshark.org/review/537
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoBluetooth: Avoid using find_dissector()
Michal Labedzki [Mon, 3 Mar 2014 11:12:03 +0000 (12:12 +0100)]
Bluetooth: Avoid using find_dissector()

Also remove SVN $Id$ lines.

Change-Id: I4f2925e6ad8dcfe4a62d879a2cef44447f8ae916
Reviewed-on: https://code.wireshark.org/review/476
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoReorganize Capture Options dialog
Peter Hatina [Mon, 3 Mar 2014 11:53:14 +0000 (12:53 +0100)]
Reorganize Capture Options dialog

Opening Capture Options dialog on low resolution displays (e.g. 1366x768) in GNOME-shell makes user unable to see the bottom of the dialog

Change-Id: Icc39d5ca89f98edb3ff246cd23ab9663a3dfbd1e
Reviewed-on: https://code.wireshark.org/review/453
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoRemove unused include header
Alexis La Goutte [Thu, 6 Mar 2014 20:04:22 +0000 (21:04 +0100)]
Remove unused include header

Change-Id: Ia8d5da43b1ab2db3aa508863fc94ca758cdff37d
Reviewed-on: https://code.wireshark.org/review/536
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agofix invalid offset for URI's EMI
Martin Kaiser [Thu, 6 Mar 2014 16:28:16 +0000 (17:28 +0100)]
fix invalid offset for URI's EMI

Change-Id: I397eeed3008d91aeb6c025c9146b9ed6d98881a6
Reviewed-on: https://code.wireshark.org/review/535
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoUpdate Wireshark pre-commit tools (Add check for trailing whitespace based from git...
Alexis La Goutte [Thu, 6 Mar 2014 17:00:43 +0000 (18:00 +0100)]
Update Wireshark pre-commit tools (Add check for trailing whitespace based from git pre-commit.sample)

Change-Id: If8f5f48dfd96c3657036f7b59b6ca905c9d24043
Reviewed-on: https://code.wireshark.org/review/531
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoCosmetic fix about openCaptureFile... (in Wireshark Qt)
Alexis La Goutte [Thu, 6 Mar 2014 16:58:39 +0000 (17:58 +0100)]
Cosmetic fix about openCaptureFile... (in Wireshark Qt)

Change-Id: I9f62b8393f33a964ec54a673f30d5d9a77d02f2c
Reviewed-on: https://code.wireshark.org/review/530
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoFix startup warning when launch Wireshark Qt
Alexis La Goutte [Thu, 6 Mar 2014 16:50:01 +0000 (17:50 +0100)]
Fix startup warning when launch Wireshark Qt

QObject::connect: No such signal WiresharkApplication::openCaptureFile(QString&,QString&,unsigned int) in main.cpp:502
QObject::connect:  (receiver name: 'MainWindow')

Change-Id: I0d6283c1b55619fa6878161d0a74db1ec9107bf2
Reviewed-on: https://code.wireshark.org/review/529
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoAdd OSC dissector to release notes
Pascal Quantin [Thu, 6 Mar 2014 13:19:13 +0000 (14:19 +0100)]
Add OSC dissector to release notes

Change-Id: I135d9f8321b4d42ffaa1d1571ac43f61a364d1ed
Reviewed-on: https://code.wireshark.org/review/528
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoOpen Sound Control dissector.
Hanspeter Portner [Mon, 3 Mar 2014 13:06:58 +0000 (14:06 +0100)]
Open Sound Control dissector.

Dissector for specification at http://opensoundcontrol.org/spec-1_0.

- use value_string
- add integer oferflow protection
- remove trailing white space
- add capture file to bug tracker: Bug 9837
- fix warnings by tools/fix-encodings-args.pl
- make use of VALS
- dissect MIDI controller messages separately

Change-Id: Iab0dc01d4bf1c08eac175b6af1dd07809090c35a
Reviewed-on: https://code.wireshark.org/review/454
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoBluetooth: Make Source/Destination BD_ADDRs and names filterable
Michal Labedzki [Mon, 3 Mar 2014 07:50:53 +0000 (08:50 +0100)]
Bluetooth: Make Source/Destination BD_ADDRs and names filterable

Source/Destination BD_ADDRs and name are filterable.
Also simplify code around wmem trees, and enable commented "data"
field in unreassembled case and fix btl2cap offsets
(discovered by enabling "data" field).

Change-Id: Ic28c9bf19bcd6281b652be538b221da74df4bb76
Reviewed-on: https://code.wireshark.org/review/471
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoBluetooth: Fix interface_id
Michal Labedzki [Mon, 3 Mar 2014 07:51:04 +0000 (08:51 +0100)]
Bluetooth: Fix interface_id

Interface ID should correspond to the Wireshark Interface Id
to avoid mixing data from various interfaces in dissectors.

Change-Id: Ibaa3ddab7f0ebd0985efea74439b94a5881145a7
Reviewed-on: https://code.wireshark.org/review/472
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoHave NFLOG TLV type and length be in host byte order.
Guy Harris [Sun, 9 Feb 2014 03:09:41 +0000 (19:09 -0800)]
Have NFLOG TLV type and length be in host byte order.

When capturing, they'll be in host byte order.  The top of the libpcap
trunk and 1.5 branch, when reading a file, will, if necessary, byte-swap
the type and length values so that they're in the byte order of the host
reading the file (rather than the host that wrote the file).

Do the same when we read a file, and have the NFLOG dissector assume
host byte order for those fields.

Change-Id: I493aed1e07b626af1157d75f3bc293b0a694ad07
Reviewed-on: https://code.wireshark.org/review/148
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoAdd a few grouped AVP definitions for 3GPP-Slh
Jeff Morriss [Wed, 5 Mar 2014 21:34:13 +0000 (16:34 -0500)]
Add a few grouped AVP definitions for 3GPP-Slh

... as suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9793#c5

Also remove trailing white space.

Change-Id: Ic83ad7e4c7792a78a9d11eef25f1edf92bd22ddb
Reviewed-on: https://code.wireshark.org/review/521
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoUe TFS & VALS macros for certain 'fieldconvert' fields.
Bill Meier [Thu, 6 Mar 2014 02:20:40 +0000 (21:20 -0500)]
Ue TFS & VALS macros for certain 'fieldconvert' fields.

Change-Id: I8d7468e62d5de99eb68b554134be71b17d1b87c8
Reviewed-on: https://code.wireshark.org/review/525
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoAdd test to dump glossaries.
Evan Huus [Wed, 5 Mar 2014 18:14:26 +0000 (13:14 -0500)]
Add test to dump glossaries.

All it checks is that they don't crash, but this is enough to catch malformed
extended value strings and other oddities.

Change-Id: If853e8e2b19517a784daa4bbb8e41eddc7c7ddd9
Reviewed-on: https://code.wireshark.org/review/520
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoCorrected mrp decoding of link up and down
Widok [Wed, 5 Mar 2014 13:18:39 +0000 (14:18 +0100)]
Corrected mrp decoding of link up and down
Added DCP decoding of reset to factory
removed unused value_strings
corrected decoding of PDSubFrameBlock
most of the length display added a dec_hex display

Signed-off-by: Widok <kellingwido@aol.com>
Change-Id: I17b59b45eff37b65047a7a3e5e275f01a37ee616
Reviewed-on: https://code.wireshark.org/review/517
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoAdd command-line arg for input file format for tshark/wireshark
Hadriel Kaplan [Tue, 4 Mar 2014 11:19:01 +0000 (06:19 -0500)]
Add command-line arg for input file format for tshark/wireshark

Now that we have the ability to choose input file format type
in the GUI, we might as well have it in the command-line too.
Plus it would help me in test-stuies if we had a commandline.
So I've added a '-X read_format:Foo' for this.  Using just
'-X read_format:', or with a bad name, will make it print out
the full list (in tshark); just like the '-F' does for output
file formats.

Note: I am *not* putting in code for Win32 GUI,
because I can't compile that and I wouldn't have even
done the GTK one if I could compile Qt originally. (I don't think we need
to add any more features to GTK or Win32, just Qt from now on,
right?)

Change-Id: I2fe6481d186f63bd2303b9e591edf397a2e14b64
Reviewed-on: https://code.wireshark.org/review/493
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years ago(Trivial) Fix a typo.
Bill Meier [Wed, 5 Mar 2014 15:26:11 +0000 (10:26 -0500)]
(Trivial) Fix a typo.

Change-Id: Ib084b7e9d463c54fc836745833005b1456a82709
Reviewed-on: https://code.wireshark.org/review/518
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoFix some code remove by 296591399f90a9d89be958d91047aa724a77ee6d
Alexis La Goutte [Wed, 5 Mar 2014 07:53:22 +0000 (08:53 +0100)]
Fix some code remove by 296591399f90a9d89be958d91047aa724a77ee6d
(Copyright or info about file...)

Change-Id: I90ba8b1c3ec8406b0c3365a69a8555837fc4bbb1
Reviewed-on: https://code.wireshark.org/review/515
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoDon't truncate the options field.
Guy Harris [Wed, 5 Mar 2014 02:32:00 +0000 (18:32 -0800)]
Don't truncate the options field.

Create a placeholder protocol tree item under which to put the options,
do the analysis of fields from the fixed-length portion of the TCP
header (such as sequence numbers), and then do a straightforward
dissection of the options, throwing an exception if we run past the end
of the options field.

This is a bit simpler, and doesn't add confusing notes about
truncation of the options.

XXX - we're currently not including selective acknowledgments in any of
the SEQ/ACK analysis; should we?  That means, of course, that we have to
dissect the options before doing that analysis, and if the options were
cut short by slicing, you lose....

Change-Id: I425a6c83f26512b802267f76739cbf40121b3040
Reviewed-on: https://code.wireshark.org/review/511
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAdd gitversion.h.
Gerald Combs [Tue, 4 Mar 2014 19:18:26 +0000 (11:18 -0800)]
Add gitversion.h.

Change-Id: Ia1609a20b060cb535a366c96be5618dccb6e055f
Reviewed-on: https://code.wireshark.org/review/507
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoAdd a cast.
Gerald Combs [Tue, 4 Mar 2014 19:15:46 +0000 (11:15 -0800)]
Add a cast.

Change-Id: Ib1885bcbe061942ecba55b90e6b1d9b20f033f41
Reviewed-on: https://code.wireshark.org/review/505
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agowin32: Implement format type selector in open file dialog
Michal Labedzki [Wed, 26 Feb 2014 15:27:20 +0000 (16:27 +0100)]
win32: Implement format type selector in open file dialog

Change-Id: Idef1829fcc2b7b08783e5288bb6486ce19c4779b
Reviewed-on: https://code.wireshark.org/review/405
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoOne more fix from g2965913
Evan Huus [Tue, 4 Mar 2014 17:20:52 +0000 (12:20 -0500)]
One more fix from g2965913

Change-Id: I68d5bd33a44783c42a75e8244ef53c73a4f484f9
Reviewed-on: https://code.wireshark.org/review/503
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoFix memory-alignment in the block allocator.
Evan Huus [Tue, 4 Mar 2014 04:44:12 +0000 (23:44 -0500)]
Fix memory-alignment in the block allocator.

The previous macro gave the correct alignment, but there was one case where it
would add a whole block of unnecessary ALIGN_SIZE bytes. The new one is also
slightly faster to compute.

Benchmark win of about 3%.

Change-Id: I5d8bad0f78dc0e383e14c2c7a951328a06400020
Reviewed-on: https://code.wireshark.org/review/492
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoFix warnings introduced in g2965913
Pascal Quantin [Tue, 4 Mar 2014 16:36:59 +0000 (17:36 +0100)]
Fix warnings introduced in g2965913

Change-Id: I7b0fedf0c508404b3f2dea789f50b7b5db4e2eb7
Reviewed-on: https://code.wireshark.org/review/502
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoFix compilation broken by g2965913
Pascal Quantin [Tue, 4 Mar 2014 15:43:25 +0000 (16:43 +0100)]
Fix compilation broken by g2965913

Change-Id: I5af8c0ae049bb3d2caed04bd3229c11a81f7b5b9
Reviewed-on: https://code.wireshark.org/review/501
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoRemove all $Id$ from top of file
Alexis La Goutte [Tue, 4 Mar 2014 12:14:53 +0000 (13:14 +0100)]
Remove all $Id$ from top of file

(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoRemove assertions from block allocator.
Evan Huus [Tue, 4 Mar 2014 13:11:57 +0000 (08:11 -0500)]
Remove assertions from block allocator.

It has been extremely well-tested at this point, and is a very hot code path so
the performance gain is measurable (~1-2% on most captures I tried).

Change-Id: I2f5e03d2f348f56e740bf0dfbc83a4fd9cc8c5a9
Reviewed-on: https://code.wireshark.org/review/499
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoWhen dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSM
Pascal Quantin [Tue, 4 Mar 2014 11:32:50 +0000 (12:32 +0100)]
When dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSM

Fixes bug 9829

Change-Id: Ib56bc7dc79ca27667fb89691817f6e568006d3a8
Reviewed-on: https://code.wireshark.org/review/494
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agocmake: Add missing exported_pdu dissector
Michal Labedzki [Tue, 4 Mar 2014 11:39:52 +0000 (12:39 +0100)]
cmake: Add missing exported_pdu dissector

Change-Id: I9a6a91b11555e2b271b3d359f26bf97796d6742f
Reviewed-on: https://code.wireshark.org/review/495
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoreplace label_mark_truncated_start() with a macros that calls
Martin Kaiser [Sat, 1 Mar 2014 21:08:42 +0000 (00:08 +0300)]
replace label_mark_truncated_start() with a macros that calls
label_mark_truncated()

Change-Id: I7ede5f9776d26ebce2ccf427cf6ff5dec56814cd
Reviewed-on: https://code.wireshark.org/review/465
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years ago(Trivial) Fix 2 typos; Reformat some long lines.
Bill Meier [Tue, 4 Mar 2014 02:52:11 +0000 (21:52 -0500)]
(Trivial) Fix 2 typos; Reformat some long lines.

Change-Id: If7d009b7764e858bd210d613ac9af219e9e20464
Reviewed-on: https://code.wireshark.org/review/491
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoShow ymsg.content as bytes; it's not a simple string.
Guy Harris [Mon, 3 Mar 2014 22:49:20 +0000 (14:49 -0800)]
Show ymsg.content as bytes; it's not a simple string.

The content of a YMSG message is a sequence of lines, each one of which
contains a text string (in some ASCII-based encoding) for a key, a
0xc080 separator, and a text string (in some ASCII-based encoding) for a
value.  That's not a string in any ASCII-based encoding I know of - 0xc0
0x80 is not, for example, a valid UTF-8 sequence (it's a too-long
sequence for NUL).

This should fix bug 9832:

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9832

by avoiding the general "GTK+ on Windows crashes when asked to copy
something that's not valid UTF-8" problem.

Fix some field descriptions while we're at it.

Change-Id: I4084dabc89b0186ecd1a7329452ca2f1cb48f1c0
Reviewed-on: https://code.wireshark.org/review/488
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agotruncate UTF-8 strings only at the boundary between two characters
Martin Kaiser [Sat, 1 Mar 2014 10:25:47 +0000 (13:25 +0300)]
truncate UTF-8 strings only at the boundary between two characters

Change-Id: Ib3ffc1593e877f4f7c708712b82209cf969cecff
Reviewed-on: https://code.wireshark.org/review/464
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCreate/use extended value_strings; add editor modelines as needed.
Bill Meier [Mon, 3 Mar 2014 21:10:35 +0000 (16:10 -0500)]
Create/use extended value_strings; add editor modelines as needed.

Change-Id: I36ebee937ddd1c5ccbfa36f284a4794bc63631dc
Reviewed-on: https://code.wireshark.org/review/482
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoMove value_string defs from .h file; create/use extended value_string; Other minor...
Bill Meier [Mon, 3 Mar 2014 18:27:24 +0000 (13:27 -0500)]
Move value_string defs from .h file; create/use extended value_string; Other minor changes.

- Multiple value string arrays were defined in packet-fcels.h (which was included
  in two differnt .c files). Only one of the arrays was actually used in two
  different .c files. All the value_string arrays (and most of the #defines)
  moved to packet-fcels.c.

- Other:
  Use -1 instead of tvb_length() for the length param of several proto_tree_add...() calls.
  Add editor modelines.

Change-Id: Idc642caf1c8d62b658147a234d5560b8f2fd0630
Reviewed-on: https://code.wireshark.org/review/479
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoCreate/use an extended value-string; Move value-string array from .h file; Do other...
Bill Meier [Mon, 3 Mar 2014 16:17:57 +0000 (11:17 -0500)]
Create/use an extended value-string; Move value-string array from .h file; Do other misc.

- Value string arrrays should never be defined in a .h file (especially one
   included in multiple .c files).
  So: a. The value_string array (and associated #defines) was moved from the .h file
         to packet-rtp_events.c
      b. A public extended value_string was created in packet-rtp_events.c
          and declared as external in packet-rtp_events.h

- Other:
  Remove a few unneeded initializers;
  Add editor modelines.

Change-Id: Ib580c3e50ab5ce79484c9c6af57f62ca604b57d1
Reviewed-on: https://code.wireshark.org/review/468
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoCreate/use several extended value-strings; Do several other small changes.
Bill Meier [Mon, 3 Mar 2014 06:53:50 +0000 (01:53 -0500)]
Create/use several extended value-strings; Do several other small changes.

- Move setting COL_PROTO & clearing COL_INFO to before a tvb fetch which
   could cause an exception;
- Remove some unneeded initializers;
- Fix up some long-lines and whitespace;
- Use a consistent indentation;
- Add editor modelines.

Change-Id: I8a8015a65d5dc581ed02cbd134231481b9f96263
Reviewed-on: https://code.wireshark.org/review/467
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoCreate/use an extended value_string; Do other misc minor changes.
Bill Meier [Mon, 3 Mar 2014 05:43:39 +0000 (00:43 -0500)]
Create/use an extended value_string; Do other misc minor changes.

- Localize some vars;
- Use a consisten 4-space indentation & whitespace style;
- Add editor modelines;

Change-Id: I0d6270eea3fae804788a56557d3c7e171afa8aaa
Reviewed-on: https://code.wireshark.org/review/466
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoSSL: dynamically allocate session ticket storage area to avoid buffer overflow
Pascal Quantin [Sun, 2 Mar 2014 17:25:31 +0000 (18:25 +0100)]
SSL: dynamically allocate session ticket storage area to avoid buffer overflow

Fixes bug 9825

Change-Id: I20ae65331ec11b2f6774054df4c026fd5fa76d3a
Reviewed-on: https://code.wireshark.org/review/447
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoshow if the current service is scrambled or free
Martin Kaiser [Fri, 28 Feb 2014 08:58:11 +0000 (11:58 +0300)]
show if the current service is scrambled or free

Change-Id: I9e50920fbc09fdf0650be3a63fee8153ce0fd3df
Reviewed-on: https://code.wireshark.org/review/462
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoadd cleartext values for retention limit
Martin Kaiser [Mon, 24 Feb 2014 08:50:49 +0000 (09:50 +0100)]
add cleartext values for retention limit

Change-Id: I8ecfdb1c366310d224660e89c99136a0a9f4a067
Reviewed-on: https://code.wireshark.org/review/461
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agomove URI dissection to a separate function
Martin Kaiser [Mon, 24 Feb 2014 08:23:04 +0000 (09:23 +0100)]
move URI dissection to a separate function

Change-Id: Ia1db91ef9344e46a3f32204bbf9cdbcc514980ce
Reviewed-on: https://code.wireshark.org/review/460
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agouse tvb_memdup() instead of tvb_get_ptr()
Martin Kaiser [Tue, 25 Feb 2014 08:06:22 +0000 (11:06 +0300)]
use tvb_memdup() instead of tvb_get_ptr()

Change-Id: I1e9ff715c3e315c9e36abb69fb5f441b71477501
Reviewed-on: https://code.wireshark.org/review/459
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoremove unnecessary if (tree) check
Martin Kaiser [Tue, 25 Feb 2014 18:41:27 +0000 (21:41 +0300)]
remove unnecessary if (tree) check

Change-Id: I1542d715594b1b90e2442edb6f220ddc4dd99675
Reviewed-on: https://code.wireshark.org/review/458
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoskip empty service provider name and empty service name
Martin Kaiser [Wed, 26 Feb 2014 10:21:09 +0000 (13:21 +0300)]
skip empty service provider name and empty service name

Change-Id: I355600320865a9c7c17093d37fc693b02f0a7f0c
Reviewed-on: https://code.wireshark.org/review/457
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoservice provider name is a DVB-SI string
Martin Kaiser [Wed, 26 Feb 2014 09:10:02 +0000 (12:10 +0300)]
service provider name is a DVB-SI string

Change-Id: Idea44f0e4678f738336215f4a250b9e9d9a60fbc
Reviewed-on: https://code.wireshark.org/review/456
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoservice name is a DVB-SI string
Martin Kaiser [Tue, 25 Feb 2014 19:04:19 +0000 (22:04 +0300)]
service name is a DVB-SI string

Change-Id: I81ef4cd363acf6cff99fd0f75b135962c4c22f53
Reviewed-on: https://code.wireshark.org/review/455
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoDon't pass an invalid length to proto_item_set_len
Evan Huus [Sun, 2 Mar 2014 14:58:49 +0000 (09:58 -0500)]
Don't pass an invalid length to proto_item_set_len

Fixes bug #9818.

Change-Id: I4fb4cf2b5b31ed6efc55a48df67f2ec4949d47c3
Reviewed-on: https://code.wireshark.org/review/442
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoImprove SCTP association lookup.
Evan Huus [Sun, 2 Mar 2014 15:19:41 +0000 (10:19 -0500)]
Improve SCTP association lookup.

It's still O(n) in the worst case since the comparison function doesn't appear
to be suitable for use in a tree or hash-table, but at least we no longer spend
O(n) by default just finding the end of the list so we can iterate backwards.

Discovered while investigating bug #9823, but probably not the cause of that
bug.

Change-Id: Ib6c3691cff8e7fa49703df7c75635ef797c8fbe8
Reviewed-on: https://code.wireshark.org/review/443
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoScan-build didn't like the fixes in g79ef36a5f.
Gerald Combs [Sun, 2 Mar 2014 20:11:37 +0000 (12:11 -0800)]
Scan-build didn't like the fixes in g79ef36a5f.

Change-Id: I1083136f9e4fb38b55e9b9c2fec74ddec35f198e
Reviewed-on: https://code.wireshark.org/review/452
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoRemove unneeded line of code.
Bill Meier [Sun, 2 Mar 2014 19:27:43 +0000 (14:27 -0500)]
Remove unneeded line of code.

Change-Id: Ic2769d5c125d8db7d32b6ad3ab0e4363f513f599
Reviewed-on: https://code.wireshark.org/review/451
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoClear INFO column at the beginning of the dissector.
Bill Meier [Sun, 2 Mar 2014 19:11:51 +0000 (14:11 -0500)]
Clear INFO column at the beginning of the dissector.

Change-Id: Iea901674e1d9c4745b891ac4330bd781d5eb76ec
Reviewed-on: https://code.wireshark.org/review/450
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agotvb_length() --> tvb_reported_length() in several cases + other misc changes.
Bill Meier [Sun, 2 Mar 2014 18:43:06 +0000 (13:43 -0500)]
tvb_length() --> tvb_reported_length() in several cases + other misc changes.

Misc changes:
 - sort entries in an enum by value;
 - add some XXX notes as to possible missing entries in a value-string array;
 - remove an unneeded initializer;
 - 0 --> FALSE for several boolean values;
 - whitespace.

Change-Id: I6c8f1c1f37edad120d979fcd2d7278e7981ca5a7
Reviewed-on: https://code.wireshark.org/review/449
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoAdded Cisco Starent Diameter dictionary entries.
Josip Medved [Sun, 2 Mar 2014 17:23:36 +0000 (09:23 -0800)]
Added Cisco Starent Diameter dictionary entries.

Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1
Reviewed-on: https://code.wireshark.org/review/438
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoClear INFO col; Create/use extended value-string; Do other minor changes
Bill Meier [Sun, 2 Mar 2014 17:33:25 +0000 (12:33 -0500)]
Clear INFO col; Create/use extended value-string; Do other minor changes

- val_to_str() -> val_to_str_const() in a few cases;
- localize some vars;
- remove some unneeded initializers;
- convert "4 space tabs" indentation to "4 spaces";
   revise editor modelines to match;
- do some whitespace changes.

Change-Id: Ic91df02022971c973b27c71e6127395ed3ef06d3
Reviewed-on: https://code.wireshark.org/review/448
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years ago[Automatic manuf, services and enterprise-numbers update for 2014-03-02]
Gerald Combs [Sun, 2 Mar 2014 16:06:15 +0000 (08:06 -0800)]
[Automatic manuf, services and enterprise-numbers update for 2014-03-02]

Change-Id: Ie382028102569030ac00084125a26d49a05432b9
Reviewed-on: https://code.wireshark.org/review/444
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoFix packet-h223.c:842:18: error: will never be executed [-Werror,-Wunreachable-code]
Alexis La Goutte [Sun, 23 Feb 2014 18:19:32 +0000 (19:19 +0100)]
Fix packet-h223.c:842:18: error: will never be executed [-Werror,-Wunreachable-code]

Change-Id: I8255a3841add78eaa167ef631effe58d9fb12736
Reviewed-on: https://code.wireshark.org/review/323
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoFix ui/iface_lists.c - type attribute is not copied
Roland Knall [Wed, 26 Feb 2014 12:14:01 +0000 (13:14 +0100)]
Fix ui/iface_lists.c - type attribute is not copied

 temp is a clone of the local if_info, but the type
 attribute is not copied correctly

 Additionally, the if_type member is exposed via the
 capture options

Change-Id: Id53f0dfd1e127921e1b89bbf78cb431ee257a96c
Reviewed-on: https://code.wireshark.org/review/404
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoFix text2pcap.c: Argument with 'nonnull' attribute passed null (clang analyzer)
Hadriel Kaplan [Tue, 25 Feb 2014 15:44:39 +0000 (10:44 -0500)]
Fix text2pcap.c: Argument with 'nonnull' attribute passed null (clang analyzer)

Clang scan analysis reports API error for text2pcap.c.

Change-Id: Ie0861d75888e258d9fd928d5d7441e1e3a8279ba
Reviewed-on: https://code.wireshark.org/review/367
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCreate/use two extended value-strings & do other minor changes.
Bill Meier [Sat, 1 Mar 2014 21:26:07 +0000 (16:26 -0500)]
Create/use two extended value-strings & do other minor changes.

- Use VALUE_STRING_ENUM/VALUE_STRING_ARRAY macros to create one of the
   value string arrays instead of using the usual separate #defines & array definition;
- Remove a few unneeded initializers;
- prefs_register_protocol() need not be called under 'if (gp_zbee_prefs == NULL)'
- Do some minor whitespace changes;
- Add editor modelines.

Change-Id: I33669b25fa18ecc452b83a0d88a6c0b33aae904a
Reviewed-on: https://code.wireshark.org/review/441
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoAdd the PPID for 3GPP Pua. Move the (unregistered) M2TP PPID into that dissector.
Jeff Morriss [Fri, 28 Feb 2014 19:47:56 +0000 (14:47 -0500)]
Add the PPID for 3GPP Pua.  Move the (unregistered) M2TP PPID into that dissector.

Also put a note in sctpppids.h saying that only IANA-registered PPIDs should go
in that file.  Inspired by the rejection of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4332

Change-Id: I763aad7d1b69e9d36c798061473438ce3cb66ca1
Reviewed-on: https://code.wireshark.org/review/434
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
5 years agoFix some scan-build warnings.
Gerald Combs [Sat, 1 Mar 2014 19:13:08 +0000 (11:13 -0800)]
Fix some scan-build warnings.

Fix a modeline while we're at it.

Change-Id: Ief6d5edbe33456170059cfab4f436f0844de32a1
Reviewed-on: https://code.wireshark.org/review/440
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoGlusterFS: add support for ZEROFILL fop
Niels de Vos [Wed, 26 Feb 2014 16:41:52 +0000 (17:41 +0100)]
GlusterFS: add support for ZEROFILL fop

Implementation details in http://review.gluster.org/5327

BUG: 9812
Change-Id: Ib1650fb7ca8221def4e9c6a323008847dc7b5f62
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.wireshark.org/review/429
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoDisable IPv4 checksum verfification to match TCP and UDP.
Gerald Combs [Thu, 27 Feb 2014 23:31:10 +0000 (15:31 -0800)]
Disable IPv4 checksum verfification to match TCP and UDP.

Offloading seems to be very common nowadays and having this option
enabled by default generates a lot of false positives. Suggested by
Laura Chappell.

Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff
Reviewed-on: https://code.wireshark.org/review/426
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoFix bug which (somewhat) randomly caused UAT pref to not display on a proto pref...
Bill Meier [Fri, 28 Feb 2014 18:55:43 +0000 (13:55 -0500)]
Fix bug which (somewhat) randomly caused UAT pref to not display on a proto pref page.

Introduced in ga2b2dd4b (SVN #53880)

Change-Id: I3dd24ab5e1b45367b03b8096a5892f346782217f
Reviewed-on: https://code.wireshark.org/review/433
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
5 years agoAdd 3GPP Slh AVPs 2400, 2405, 2407 and 2409-2411.
Jeff Morriss [Fri, 28 Feb 2014 18:51:59 +0000 (13:51 -0500)]
Add 3GPP Slh AVPs 2400, 2405, 2407 and 2409-2411.

This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9793

Change-Id: Ia104767d2c1b3c26da851887c08973485f99f58b
Reviewed-on: https://code.wireshark.org/review/432
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
5 years agopacket-homeplug-av: use HOMEPLUG_AV_MMVER_1_1 consistently
Florian Fainelli [Fri, 28 Feb 2014 00:40:42 +0000 (01:40 +0100)]
packet-homeplug-av: use HOMEPLUG_AV_MMVER_1_1 consistently

The HomePlug AV dissector was not consistently using the
HOMEPLUG_AV_MMVER_1_1 constant and was sometimes using it and sometimes
using mmver == 1 directly. Make sure we use that constant throughout the
code to help clarifiying which version tests are applying to.

Change-Id: I602413163e4e44dedfbf3e2364448a951fa70f54
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Reviewed-on: https://code.wireshark.org/review/428
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agopacket-homeplug-av: fix missing reserved byte for station dump
Florian Fainelli [Fri, 28 Feb 2014 00:37:00 +0000 (01:37 +0100)]
packet-homeplug-av: fix missing reserved byte for station dump

dissect_homeplug_av_nw_info_sta() was processing stations
information correctly, except that after the first station dump, all
dumps would be off-by-one byte because we were not reserving a missing
byte at the end of the station dump. Fixes #9798.

Change-Id: Iff3afd5ff536ae718fa446de3c59cd5e9851ff20
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Reviewed-on: https://code.wireshark.org/review/427
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoFix build with recent lua changes.
Evan Huus [Thu, 27 Feb 2014 21:59:08 +0000 (16:59 -0500)]
Fix build with recent lua changes.

Use FT_NONE instead of 0 to initialize an enum.
Drop use of lround/llround since they are not available on Windows.

Change-Id: I3961c1921304bafc090c763f0d6de8532f0b3510
Reviewed-on: https://code.wireshark.org/review/425
Reviewed-by: Evan Huus <eapache@gmail.com>