metze/wireshark/wip.git
10 years agotvb_new_subset -> tvb_new_subset_length when length parameters are equal.
Michael Mann [Fri, 6 Jun 2014 14:35:50 +0000 (10:35 -0400)]
tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoUpdates as requested
Anish Bhatt [Fri, 6 Jun 2014 23:35:49 +0000 (16:35 -0700)]
Updates as requested

Change-Id: I447b2c1f713710820ce81dda40992b5311285d09
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2015
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoWhen installing the launch daemon, get rid of the old startup item.
Guy Harris [Sat, 7 Jun 2014 06:41:51 +0000 (23:41 -0700)]
When installing the launch daemon, get rid of the old startup item.

Only one is necessary; get rid of the startup item.

Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86
Reviewed-on: https://code.wireshark.org/review/2016
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoMisc lldp cleanup.
Anish Bhatt [Fri, 6 Jun 2014 22:54:07 +0000 (15:54 -0700)]
Misc lldp cleanup.
I'm cheating a bit here, hf_media_loc_long & hf_media_loc_lat need a 5byte bitmask, but the bitmask field in hf is restricted to guint32

Change-Id: I7e044fc680bb947973e437fc66057488a8deee67
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2012
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoMoved dissection of setup field to own function
Sean O. Stalley [Thu, 5 Jun 2014 17:53:32 +0000 (10:53 -0700)]
Moved dissection of setup field to own function

Dissection of all setup field types (standard & nonstandard) are
handled in a seperate function. Before, nonstandard dissection was
handled in dissect_usb_common.

This is part of an effort to make dissect_usb_common() more modular
so that code can be shared between the USB & the MAUSB dissector.

Change-Id: I15d7e3691afc29cd569aa5d3770d2aa569630b12
Reviewed-on: https://code.wireshark.org/review/1992
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoGet rid of some stuff left over from the days of drag-install.
Guy Harris [Fri, 6 Jun 2014 21:40:16 +0000 (14:40 -0700)]
Get rid of some stuff left over from the days of drag-install.

We're not using the Utilities directory; don't create it and don't fill
it in.

Change-Id: I7ba66b415a2e5a6aff77d4bdb57b2ca176bcd789
Reviewed-on: https://code.wireshark.org/review/2009
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoSwitch to a launch daemon for ChmodBPF.
Guy Harris [Fri, 6 Jun 2014 19:14:27 +0000 (12:14 -0700)]
Switch to a launch daemon for ChmodBPF.

"Ah finally blew that varmint to Kingdom Come!"

Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521
Reviewed-on: https://code.wireshark.org/review/2004
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoComment out an empty section.
Gerald Combs [Fri, 6 Jun 2014 18:39:55 +0000 (11:39 -0700)]
Comment out an empty section.

Change-Id: I2c98e5c70e5443eb927dbdc5525c67b463b837bf
Reviewed-on: https://code.wireshark.org/review/2003
Reviewed-by: Gerald Combs <gerald@wireshark.org>
10 years agoQ.2931: sort extended value string 'q2931_message_type_vals' in increasing order
Pascal Quantin [Fri, 6 Jun 2014 17:21:36 +0000 (19:21 +0200)]
Q.2931: sort extended value string 'q2931_message_type_vals' in increasing order

Change-Id: I003d55b338c79b9841dd16d0947e4734f118f7c6
Reviewed-on: https://code.wireshark.org/review/2002
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoAdd TFTP export for Qt too
Alexis La Goutte [Mon, 2 Jun 2014 09:24:58 +0000 (11:24 +0200)]
Add TFTP export for Qt too

Change-Id: I056829d48aa49eb106c76c8f572c0f8b6e1a4245
Reviewed-on: https://code.wireshark.org/review/1916
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoUpgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Pascal Quantin [Wed, 4 Jun 2014 17:17:44 +0000 (19:17 +0200)]
Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0

Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoFixed Fencing for Multiple MAUSB Packets in 1 TCP Packet.
Sean O. Stalley [Wed, 4 Jun 2014 19:07:26 +0000 (12:07 -0700)]
Fixed Fencing for Multiple MAUSB Packets in 1 TCP Packet.

Packet info for all MAUSB packets in a single TCP packet is now displayed
in the info column. Before, only info on the last packet was displayed.

See conversation for change Ib20e5e30474d93270dd24e203ab96f64f5cc77ad.
Patch 3 had fencing, I messed up and left it out of patches 4-6. This
patch adds it back in.

Change-Id: I37f0e028a8f9b5a8500700f03ac36f8bf1c4f63c
Reviewed-on: https://code.wireshark.org/review/1958
Reviewed-by: Michael Mann <mmann78@netscape.net>
10 years agoAdded tap queue helper function to USB dissector
Sean O. Stalley [Thu, 5 Jun 2014 21:42:41 +0000 (14:42 -0700)]
Added tap queue helper function to USB dissector

Added a helper function which handles all the USB-Specific tap data.

This is part of an effort to make dissect_usb_common() more modular
so that code can be shared between the USB & the MAUSB dissector.

Change-Id: If0f0b5542203ddaed28009d8a8a1bb8660fa5d70
Reviewed-on: https://code.wireshark.org/review/1990
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoFix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Fri, 6 Jun 2014 12:46:22 +0000 (14:46 +0200)]
Fix Dereference of null pointer found by Clang analyzer

packet-q931.c:2532:25: warning: Access to field 'message_type' results in a dereference of a null pointer (loaded from variable 'q931_pi')

Change-Id: I7533ff60c541e31efe4522e710f86175c1c0ccf4
Reviewed-on: https://code.wireshark.org/review/1997
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Fri, 6 Jun 2014 12:45:00 +0000 (14:45 +0200)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: Iada015df96b8c1b5070699589bb4b4f759217ecd
Reviewed-on: https://code.wireshark.org/review/1996
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Fri, 6 Jun 2014 12:44:45 +0000 (14:44 +0200)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I2e7e32f618f709739948b2b5ebd1db0e775bfaed
Reviewed-on: https://code.wireshark.org/review/1995
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years ago(trivial) changed when transfer info is set
Sean O. Stalley [Thu, 5 Jun 2014 21:57:36 +0000 (14:57 -0700)]
(trivial) changed when transfer info is set

usb_conv_info->usb_trans_info is set to the same thing regardless
of the branch taken, to pull it out of the condition.

Change-Id: Ieabf0a6e796b942d7bafedbeba18d9e0fa113e17
Reviewed-on: https://code.wireshark.org/review/1991
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoWiMAX: fix incorrect type for include_cor2_changes variable
Pascal Quantin [Fri, 6 Jun 2014 13:19:37 +0000 (15:19 +0200)]
WiMAX: fix incorrect type for include_cor2_changes variable

Issue found while playing with MSVC /GL option

Change-Id: I1f734eb4054349c706b529d8080036b00e66397a
Reviewed-on: https://code.wireshark.org/review/1998
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoLLDP-MED Cleanup
Anish Bhatt [Thu, 5 Jun 2014 08:26:49 +0000 (01:26 -0700)]
LLDP-MED Cleanup

Co-ordinate based LCI is untested, as the sample capture does not have this, could not find one anywhere.

Change-Id: Id0b52c234d6a36ee430ab9a7265bcd84f151c80c
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1929
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoIPMI trace dissector (without PCAP-dependent part).
U-beauty\bdn [Fri, 6 Jun 2014 03:41:07 +0000 (09:41 +0600)]
IPMI trace dissector (without PCAP-dependent part).

Added KCS and TMode protocol dissectors.
Request/response logic has been revised.
Saved request data logic has been revised.
Added Get Message command response dissector.
Added missing PICMG command dissectors.
Added new PICMG command dissectors.
Added new PPS OEM command entries.
Added VITA 46.11 command dissectors.

From: Bill Meier:
- refs to value_strings/range_strings in hf[] entries, by convention, should use VALS/RVALS macros;
- refs to true_false_strings should use TFS(&...) macro.
  also: true_false_string definitions should not be defined as arrays.
- remove some unneeded #includes (packet-ipmi.c).
- Do some re-indentation.
- Add editor-modelines as needed.

bug: 10004
Change-Id: Ib269b35784c0b70892d1e0111bcfb483ea64092c
Reviewed-on: https://code.wireshark.org/review/1185
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoWindows packaging and release note updates.
Gerald Combs [Thu, 5 Jun 2014 23:19:22 +0000 (16:19 -0700)]
Windows packaging and release note updates.

For now, use "Wireshark" and "Wireshark 2 Preview" instead of
"Wireshark (GTK+)" and "Wireshark (Qt)" respectively to match the 1.12
installer. Shorten the descriptions of the command line tools. Warn
against (but don't prohibit) installing on XP.

Change-Id: Ica37ffa5b04eb48cadf41842b6fb9b1431c69803
Reviewed-on: https://code.wireshark.org/review/1988
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 25bb29a1d65896959bc3f73bcf20b400fe0d32dd)
Reviewed-on: https://code.wireshark.org/review/1989

10 years agoAdd a missing header file, and add new file to cmake build
Martin Mathieson [Thu, 5 Jun 2014 21:51:49 +0000 (22:51 +0100)]
Add a missing header file, and add new file to cmake build

Change-Id: I3be8bef8c7542e7bcb11f3696783ca68c3920082
Reviewed-on: https://code.wireshark.org/review/1987
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
10 years agoAdd Object (file) export for files transferred over TFTP.
Martin Mathieson [Wed, 4 Jun 2014 22:35:38 +0000 (23:35 +0100)]
Add Object (file) export for files transferred over TFTP.
Updated following review comments.

Change-Id: I56e70d8f8e332d2aea604ceec16c980ad890fa58
Reviewed-on: https://code.wireshark.org/review/1885
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
10 years agoWhen have more than one SDU in the same RLC PDU, make sure output from all of them...
Martin Mathieson [Thu, 5 Jun 2014 17:58:22 +0000 (18:58 +0100)]
When have more than one SDU in the same RLC PDU, make sure output from all of them stays in the INFO column

Change-Id: I7b2555101f3a1a596a4108a13240d21786054671
Reviewed-on: https://code.wireshark.org/review/1985
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
10 years agoAdd a handle to dissect sip userinfo.
AndersBroman [Thu, 5 Jun 2014 14:26:12 +0000 (16:26 +0200)]
Add a handle to dissect sip userinfo.

Change-Id: Ia8c15b710d79f12e8f62a49b17f057b746f31f0c
Reviewed-on: https://code.wireshark.org/review/1980
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agosip: avoid calling tvb_format_text() when tree is not visible.
Jakub Zawadzki [Thu, 5 Jun 2014 07:02:02 +0000 (09:02 +0200)]
sip: avoid calling tvb_format_text() when tree is not visible.

sip dissector when filtering spends ~5% of Ir in tvb_format_text(),
avoid calling.

Change-Id: I1de8e970b300354c0536aead65178401f140f509
Reviewed-on: https://code.wireshark.org/review/1974
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoMake socpe a local variable, can be used if we change the g_slist to a
AndersBroman [Thu, 5 Jun 2014 11:23:14 +0000 (13:23 +0200)]
Make socpe a local variable, can be used if we change the g_slist to a
wmem_list.

Change-Id: I176a2acc5ae334916978f543c959287bf0d8541e
Reviewed-on: https://code.wireshark.org/review/1979
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoSTUN: Add error code from MS-ICE2BWM
Alexis La Goutte [Thu, 5 Jun 2014 06:39:00 +0000 (08:39 +0200)]
STUN: Add error code from MS-ICE2BWM

Interactive Connectivity Establishment (ICE) 2.0 Bandwidth Management Extensions
http://msdn.microsoft.com/en-us/library/ff595756.aspx

Change-Id: I218229225ea5c64cfe2d5f269625deafe7eb8292
Reviewed-on: https://code.wireshark.org/review/1972
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoSTUN: Add support of MS-TURN (Used by Lync)
Alexis La Goutte [Wed, 4 Jun 2014 06:47:57 +0000 (08:47 +0200)]
STUN: Add support of MS-TURN (Used by Lync)

MS-TURN: Traversal Using Relay NAT (TURN) Extensions http://msdn.microsoft.com/en-us/library/cc431507.aspx

Change-Id: I2a6f28f5f7db4da45543816caecce1da7cf03c35
Reviewed-on: https://code.wireshark.org/review/1971
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoMoved dissection of standard setup responses to own function
Sean O. Stalley [Wed, 4 Jun 2014 23:41:41 +0000 (16:41 -0700)]
Moved dissection of standard setup responses to own function

Standard USB setup responses are now handled by a seperate function.
Before, dissection was handled in the dissect_usb_common().

This is part of an effort to make dissect_usb_common() more modular
so that code can be shared between the USB & the MAUSB dissector.

Change-Id: Ibfbcd915d8cef881a6ae0f0312e5a8070984f465
Reviewed-on: https://code.wireshark.org/review/1968
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoMoved dissection of standard setup requests to own function
Sean O. Stalley [Wed, 4 Jun 2014 22:57:44 +0000 (15:57 -0700)]
Moved dissection of standard setup requests to own function

Standard USB setup requests are now handled by a seperate function.
Before, dissection was handled in the dissect_usb_common().

This is part of an effort to make dissect_usb_common() more modular
so that code can be shared between the USB & the MAUSB dissector.

Change-Id: I51944c688cc0715887abd4c8e5a7e3639c06821b
Reviewed-on: https://code.wireshark.org/review/1967
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoAdded generic setup dissector for USB control transfers
Sean O. Stalley [Wed, 4 Jun 2014 21:26:17 +0000 (14:26 -0700)]
Added generic setup dissector for USB control transfers

Added helper function to remove inline duplicate code.

Change-Id: I898f1157bfa5f77613be2e82b29bfb21660124eb
Reviewed-on: https://code.wireshark.org/review/1962
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agosimplify PCR calculation
Martin Kaiser [Tue, 3 Jun 2014 15:16:18 +0000 (17:16 +0200)]
simplify PCR calculation

Change-Id: I892088e158519e331cba89be3c8d7c71f38a8925
Reviewed-on: https://code.wireshark.org/review/1964
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoFix typo that would have hit once conversion of the users guide to
Joerg Mayer [Wed, 4 Jun 2014 23:16:53 +0000 (01:16 +0200)]
Fix typo that would have hit once conversion of the users guide to
asciidoc would have started

Change-Id: Ie4f79bbf65a56a83995c70eb864d2476885c9170
Reviewed-on: https://code.wireshark.org/review/1966
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
10 years agoDo not rebuild developers-guide.xml on each run. Do this only when
Joerg Mayer [Wed, 4 Jun 2014 23:03:56 +0000 (01:03 +0200)]
Do not rebuild developers-guide.xml on each run. Do this only when
required.

Change-Id: I525c09e78c385593a7132ad3bfbca1114ea0de8b
Reviewed-on: https://code.wireshark.org/review/1965
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
10 years agoFix message about detection of asciidoc package (would always report
Joerg Mayer [Wed, 4 Jun 2014 22:11:48 +0000 (00:11 +0200)]
Fix message about detection of asciidoc package (would always report
not found before).

Change-Id: Iaac974e5db3e605e0b9f7256d2724ae777eaebc3
Reviewed-on: https://code.wireshark.org/review/1963
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
10 years agotshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug...
Bill Meier [Wed, 4 Jun 2014 19:18:16 +0000 (15:18 -0400)]
tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991.

Change-Id: I182357fc57d6e57033319afc762549d805c2c10c
Reviewed-on: https://code.wireshark.org/review/1954
Reviewed-by: Bill Meier <wmeier@newsguy.com>
10 years agotshark.c: Change "Live captures can only be saved in libpcap format" to "[...] in...
Bill Meier [Wed, 4 Jun 2014 19:15:42 +0000 (15:15 -0400)]
tshark.c: Change "Live captures can only be saved in libpcap format" to "[...] in pcap or pcapng format"

Change-Id: I18dd0d15e261ecbc1ec086b4870a994afc7665ee
Reviewed-on: https://code.wireshark.org/review/1953
Reviewed-by: Bill Meier <wmeier@newsguy.com>
10 years ago(Trivial) Fix a typo.
Bill Meier [Wed, 4 Jun 2014 18:59:41 +0000 (14:59 -0400)]
(Trivial) Fix a typo.

Change-Id: I111d3af8d9f1a96ebbe3f4b19ab1597a93348058
Reviewed-on: https://code.wireshark.org/review/1952
Reviewed-by: Bill Meier <wmeier@newsguy.com>
10 years agoThe subtype_seek_read() functions populate *phdr, not wth->phdr.
Michael Tüxen [Wed, 4 Jun 2014 17:20:20 +0000 (19:20 +0200)]
The subtype_seek_read() functions populate *phdr, not wth->phdr.
So don't use the values.
This problem show up on pcapng files resulting from captures of
multiple interfaces.

Change-Id: I30b0598602b0b69233107d35be4360475d8648d8
Reviewed-on: https://code.wireshark.org/review/1950
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoUse -O2 option when compiling with MSVC
Pascal Quantin [Wed, 4 Jun 2014 14:27:44 +0000 (16:27 +0200)]
Use -O2 option when compiling with MSVC

Change-Id: Ia2c14b782b1a73ecab41c25ed21e4fcf356f5ee3
Reviewed-on: https://code.wireshark.org/review/1948
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoClang complained about non initialized variable.
ruengeler [Wed, 4 Jun 2014 11:05:26 +0000 (13:05 +0200)]
Clang complained about non initialized variable.

Change-Id: Idc4c1a8db4d5f1b6f2b01428ea283c4a975723f2
Reviewed-on: https://code.wireshark.org/review/1947
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoFix packet-q931.c:604:25: error: 'ti' may be used uninitialized in this function...
AndersBroman [Wed, 4 Jun 2014 07:33:53 +0000 (09:33 +0200)]
Fix packet-q931.c:604:25: error: 'ti' may be used uninitialized in this function [-Werror=uninitialized]

Change-Id: I936a56aec7ff448d403f84a370b3cd3e9b73a718
Reviewed-on: https://code.wireshark.org/review/1945
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoTry to please the OSX build bot
AndersBroman [Wed, 4 Jun 2014 07:25:25 +0000 (09:25 +0200)]
Try to please the OSX build bot

Change-Id: I4c7d5c6b91df2baae74f6970d0e333346be47238
Reviewed-on: https://code.wireshark.org/review/1944
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoEPL: Reassemble the splitted payload
Roland Knall [Tue, 27 May 2014 11:50:00 +0000 (13:50 +0200)]
EPL: Reassemble the splitted payload

  The data that is sent when downloading or uploading from a server is
  sent in segments to the client.To clearly display all the segments
  belonging together the splitted payload needs to be reassembled.

  The behaviour is described in the powerlink specification 301 v1.2.0
  chapter 6.3.2.4.1.1 Download Protocol and chapter 6.3.2.4.2 Upload
  Protocol. The payload of the download/upload is now reassembled.

Signed-off-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Change-Id: I17c30f15e75da47bcaba8f1fda1e412849ec268c
Reviewed-on: https://code.wireshark.org/review/1120
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoThis fix now allows SASL/GSS-API with integrity only to be properly dissected
Richard Sharpe [Sat, 31 May 2014 23:27:34 +0000 (16:27 -0700)]
This fix now allows SASL/GSS-API with integrity only to be properly dissected
in that we now properly indicate the checksum and provide the wrapped token to
the LDAP dissector to dissect.

There is still a problem in that the wrong parts of the SASL packet can be
indicated when users click on some parts.

I am committing it for review and because it is much better than the current
code.

Bug:9398
Change-Id: I552fc249db26835b79abfc8793438a95f221663a
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1905
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoUse the -Ox compiler option.
AndersBroman [Tue, 3 Jun 2014 14:40:44 +0000 (16:40 +0200)]
Use the -Ox compiler option.
Change-Id: I5d216d132485f6d2f8c63fa5a10b22e884e26b02
Reviewed-on: https://code.wireshark.org/review/1937
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agopacket-q2931.c: proto_tree_add_text -> something filterable.
Michael Mann [Tue, 3 Jun 2014 14:11:01 +0000 (10:11 -0400)]
packet-q2931.c: proto_tree_add_text -> something filterable.

Parts of this dissector have TLV design, but the identifier is "hidden" by the field.  I left that behavior in and used more proto_tree_add_uint than proto_tree_add_item because of it.  But at least the fields themselves are more filterable.

Change-Id: I94f38d0063e32f6f3f682b380e0ce7bd051121c6
Reviewed-on: https://code.wireshark.org/review/1934
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agopacket-ansi_801.c: proto_tree_add_text -> somthing filterable
Michael Mann [Tue, 3 Jun 2014 14:06:45 +0000 (10:06 -0400)]
packet-ansi_801.c: proto_tree_add_text -> somthing filterable

Change-Id: I780c270f58ad0e8f8fabd121ad0cb5fdcfd593a2
Reviewed-on: https://code.wireshark.org/review/1933
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agopacket-q931.c: proto_tree_add_text -> something filterable.
Michael Mann [Tue, 3 Jun 2014 14:49:33 +0000 (10:49 -0400)]
packet-q931.c: proto_tree_add_text -> something filterable.

Change-Id: I576f8d7fcf01a4c1dc6e486f7dd0a5b46edce502
Reviewed-on: https://code.wireshark.org/review/1935
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoMAUSB dissector uses USB addresses
Sean O. Stalley [Tue, 3 Jun 2014 23:22:43 +0000 (16:22 -0700)]
MAUSB dissector uses USB addresses

The MAUSB dissector now prints the USB address for MAUSB data packets
in the Source & Destination columns. Before, the IP address was
printed.

All MAUSB data packets are now part of USB Conversations. Like the
USB dissector, all data to & from one endpoint are part of the same
conversation.

Issues that need to be resolved:
- In the case where multiple MAUSB packets exist in one TCP packet,
  only one USB address can be printed.
- The USB conversations do not appear in the conversations window.
  They should appear under the USB conversations tab.

Change-Id: I042daf7889cf70b3bbc450f9ccd974a0f93f4798
Reviewed-on: https://code.wireshark.org/review/1943
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoGuarantee that open routines are initialized
Michal Labedzki [Wed, 28 May 2014 15:47:41 +0000 (17:47 +0200)]
Guarantee that open routines are initialized

Open routines need to be initialized before try to open
capture or add/remove routine.

Change-Id: Ic3b88eef947ebd4a3dd2edf8120bb6bd8aec0765
Reviewed-on: https://code.wireshark.org/review/1874
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoAdded usb_set_addr helper function
Sean O. Stalley [Tue, 3 Jun 2014 21:46:47 +0000 (14:46 -0700)]
Added usb_set_addr helper function

Added a helper function used to set the address fields for an urb.
The code functions the same as before, but is now more modular.
This change makes it easier for other dissectors to reuse the usb
addressing code (ex: MAUSB).

Change-Id: Idef3156a0fc9a9eda77ec7b2bbf3797b7a59e264
Reviewed-on: https://code.wireshark.org/review/1942
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoMBIM: do not access to hash map when it is not initialized yet
Pascal Quantin [Tue, 3 Jun 2014 17:42:25 +0000 (19:42 +0200)]
MBIM: do not access to hash map when it is not initialized yet

Change-Id: I560941115316ead5a85b9e0b55be693217fddff2
Reviewed-on: https://code.wireshark.org/review/1940
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoQt: Export Object
Alexis La Goutte [Mon, 2 Jun 2014 14:54:00 +0000 (16:54 +0200)]
Qt: Export Object
* Fix indent (remove tabs)
* Add title to the window

Change-Id: I454046e47fa17969c710fa8dec4fac8cb7dbf22f
Reviewed-on: https://code.wireshark.org/review/1917
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoUSB: Try to make Mac os 10.5 buildbot Happy
Alexis La Goutte [Tue, 3 Jun 2014 15:02:23 +0000 (17:02 +0200)]
USB: Try to make Mac os 10.5 buildbot Happy

Fix warning: cast to pointer from integer of different size

Change-Id: Ieed19204cb3be469c1b12f6ff87168b217a2a33d
Reviewed-on: https://code.wireshark.org/review/1938
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoChange ep_alloc() to wmem_new() change depcrecated API.
AndersBroman [Tue, 3 Jun 2014 14:31:11 +0000 (16:31 +0200)]
Change ep_alloc() to wmem_new() change depcrecated API.

Change-Id: I1eb3d3f3ccdfa265099446e8d609273867304a73
Reviewed-on: https://code.wireshark.org/review/1936
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agomake the PCR value filterable
Martin Kaiser [Mon, 2 Jun 2014 21:20:05 +0000 (23:20 +0200)]
make the PCR value filterable

this fixes bug #10158

Change-Id: Ic67b074c464c52ac523e835b9815a5c3a3fa14d9
Reviewed-on: https://code.wireshark.org/review/1925
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agopacket-bencode: proto_tree_add_text -> somthing filterable
Michael Mann [Sun, 1 Jun 2014 18:38:24 +0000 (14:38 -0400)]
packet-bencode: proto_tree_add_text -> somthing filterable

Also, cleanup dissector being called only with tree and a few tvb_new_subset calls.

Change-Id: I1dab1b42ef1a27fc85b05d126f51f1582d7e5c58
Reviewed-on: https://code.wireshark.org/review/1932
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
10 years agoLLDP : Fix bug in mdi_power_source hf.
Anish Bhatt [Mon, 2 Jun 2014 02:13:55 +0000 (19:13 -0700)]
LLDP : Fix bug in mdi_power_source hf.
While it compiles fine, hits an assert in add_string :
failed assertion "hfinfo->type == FT_STRING || hfinfo->type == FT_STRINGZ || hfinfo->type == FT_STRINGZPAD"

Fix takes care of this issue, but seems like we're losing the bitmask info here, is there a better way to do this ?

Change-Id: I7156d734f4b058113730d5dfbf6498e801c36770
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1915
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoMake decode_udp_ports() function available for plugins
Pascal Quantin [Tue, 3 Jun 2014 05:53:04 +0000 (07:53 +0200)]
Make decode_udp_ports() function available for plugins

Change-Id: Ic5e087c333d46b4bf0946c80aaad5768534155b5
Reviewed-on: https://code.wireshark.org/review/1928
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoMake TCP functions available for plugins
Pascal Quantin [Mon, 2 Jun 2014 21:45:32 +0000 (23:45 +0200)]
Make TCP functions available for plugins

Change-Id: Ibce3f3351bfc89c069a02380c776680a1c78e12c
Reviewed-on: https://code.wireshark.org/review/1926
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoAdd a few more ad-hoc validations of the hf[] FIELDCONVERT field.
Bill Meier [Wed, 28 May 2014 00:55:42 +0000 (20:55 -0400)]
Add a few more ad-hoc validations of the hf[] FIELDCONVERT field.

Change-Id: Icd817a950331a2e7416a28c3d4a5a004d297e6f9
Reviewed-on: https://code.wireshark.org/review/1845
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
10 years agopacket-ipmi...: Various cleanups:
Bill Meier [Mon, 2 Jun 2014 22:57:35 +0000 (18:57 -0400)]
packet-ipmi...: Various cleanups:

- refs to value_strings in hf[] entries, by convention, should use VALS macro;
- add editor-modelines as needed; Fix some indentation.

Change-Id: Iaa0196bab6de066ed68a2755b69b07fadd33e498
Reviewed-on: https://code.wireshark.org/review/1927
Reviewed-by: Bill Meier <wmeier@newsguy.com>
10 years agoUpdate TLS extensions
Marc Bevand [Mon, 2 Jun 2014 20:18:09 +0000 (13:18 -0700)]
Update TLS extensions

Add better reference to IANA list of all extensions.
Add newer "channel_id" extension (0x7550) as used by current Chrome versions.

Change-Id: Ia5b2515c557fbaf42d320ede918120f83b2e02dd
Reviewed-on: https://code.wireshark.org/review/1924
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agogenerate the usb tree outside of the if statement
Martin Kaiser [Mon, 14 Apr 2014 12:34:49 +0000 (14:34 +0200)]
generate the usb tree outside of the if statement

Change-Id: I959729a8834054cf333ec2c47f9d93756eb94066
Reviewed-on: https://code.wireshark.org/review/1922
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agouse is_request from the conversation
Martin Kaiser [Tue, 22 Apr 2014 13:24:20 +0000 (15:24 +0200)]
use is_request from the conversation

Change-Id: I16e6fd4f2d9fb37539cfcb17c0ade1033aea2d6f
Reviewed-on: https://code.wireshark.org/review/1921
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agoget the USB conversation struct as quickly as possible
Martin Kaiser [Sun, 13 Apr 2014 17:40:36 +0000 (19:40 +0200)]
get the USB conversation struct as quickly as possible
at first, read only the info required to fetch the conversation struct

Change-Id: I3becbb59bf6a55f07805ca9f3c24f015484fcd13
Reviewed-on: https://code.wireshark.org/review/1920
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agoEIGRP Sequence TLV Dissector Patch
Peter Palúch [Sun, 1 Jun 2014 17:29:24 +0000 (19:29 +0200)]
EIGRP Sequence TLV Dissector Patch

In the EIGRP packet dissector, the dissector routine for the Sequence TLV
dissected the TLV only up to the first address in the list. However, the
Sequence TLV contains a variably sized list of addresses. This patch
modifies the routine so that it processes the entire TLV, not just the
first address in the contained list.

Also, in the dissect_eigrp(), replaced calls to tvb_new_subset() with
the reported length set to -1 with the call to tvb_new_subset_length().
TLVs always carry information about their length. And this time,
correct truly ALL calls in the switch{} section.

Sample packet capture is available in BugZilla.

Bug: 10156
Change-Id: Idaaf182c05bcf799f770f23a2ce2b1e05a3d569a
Reviewed-on: https://code.wireshark.org/review/1911
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoHTTP2 : Max value for type is now 0x0B (BLOCKED type), update the heuristic
Alexis La Goutte [Mon, 2 Jun 2014 14:57:41 +0000 (16:57 +0200)]
HTTP2 : Max value for type is now 0x0B (BLOCKED type), update the heuristic

Change-Id: I8de7b63ca90803f8fc6333bbe43aeb94459e6363
Reviewed-on: https://code.wireshark.org/review/1918
Reviewed-by: Michael Mann <mmann78@netscape.net>
10 years agouse bus_id from the conversation struct
Martin Kaiser [Sun, 13 Apr 2014 18:31:57 +0000 (20:31 +0200)]
use bus_id from the conversation struct

Change-Id: I796138bab6d4b75ade047f0706e68f301e4559df
Reviewed-on: https://code.wireshark.org/review/1919
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agoMake this comple whether assertions are enabled or not.
Guy Harris [Sun, 1 Jun 2014 21:34:01 +0000 (14:34 -0700)]
Make this comple whether assertions are enabled or not.

Make the check for a valid index range a macro, so the compiler doesn't
whine if it's not used, but it's available if it *is* used.

Change-Id: I3cee0460eacef23187c141458dc5ac7a7acbf7c8
Reviewed-on: https://code.wireshark.org/review/1914
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoFix type/length mismatch messages for FT_ETHER.
Guy Harris [Sun, 1 Jun 2014 21:28:11 +0000 (14:28 -0700)]
Fix type/length mismatch messages for FT_ETHER.

The main limitation that comes to mind for the length of "an Ethernet"
is that a 10BASE5 segment can't be longer than 500 m. :-) Say "a MAC
address" rather than "an Ethernet", as 1) we're fetching an address, not
an actual physical Ethernet and 2) FT_ETHER is really FT_MAC48 and it
used for protocols other than Ethernet.

Change-Id: I402341371006e7933faa5c60dab2e58cfb349eb3
Reviewed-on: https://code.wireshark.org/review/1913
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years ago[Automatic manuf, services and enterprise-numbers update for 2014-06-01]
Gerald Combs [Sun, 1 Jun 2014 15:04:43 +0000 (08:04 -0700)]
[Automatic manuf, services and enterprise-numbers update for 2014-06-01]

Change-Id: I5119b81cbb4457a1085219ba2a702c9abee2d0b3
Reviewed-on: https://code.wireshark.org/review/1907
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoFix /home/jmayer/work/wireshark/git/wsutil/nghttp2/nghttp2_hd.c:996:12: error: ‘check...
Joerg Mayer [Sun, 1 Jun 2014 19:55:21 +0000 (21:55 +0200)]
Fix /home/jmayer/work/wireshark/git/wsutil/nghttp2/nghttp2_hd.c:996:12: error: ‘check_index_range’ defined but not used [-Werror=unused-function]
 static int check_index_range(nghttp2_hd_context *context, size_t idx)
            ^
cc1: all warnings being treated as errors

Change-Id: Ie8e3fe12d339a689e0222eda501b253a7d6d923c
Reviewed-on: https://code.wireshark.org/review/1912
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
10 years agoJust have one value_string table for OUIs.
Guy Harris [Sun, 1 Jun 2014 09:19:03 +0000 (02:19 -0700)]
Just have one value_string table for OUIs.

While we're at it, get rid of duplicate #defines for some OUIs, sort the
OUI #defines, and fix some routine names.

Change-Id: I8f4e5408b44896c3629a0014299b060ebc15bab6
Reviewed-on: https://code.wireshark.org/review/1906
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoMove the definitions of OUI value_strings to epan/oui.c.
Guy Harris [Sat, 31 May 2014 22:07:08 +0000 (15:07 -0700)]
Move the definitions of OUI value_strings to epan/oui.c.

Change-Id: Iad921bebad03dd482b58a38ed25ae3f4a99c5cf2
Reviewed-on: https://code.wireshark.org/review/1904
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoHTTP2: try to please OSX 10.6 x64 buildbot
Pascal Quantin [Sat, 31 May 2014 18:58:16 +0000 (20:58 +0200)]
HTTP2: try to please OSX 10.6 x64 buildbot

Change-Id: I79e7a619b5dadb68b70f8b057494cc970a655cc7
Reviewed-on: https://code.wireshark.org/review/1903
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoHTTP2: Showing decompressed headers
Alexis La Goutte [Tue, 6 May 2014 15:54:47 +0000 (17:54 +0200)]
HTTP2: Showing decompressed headers

Decode the HTTP/2 header block using nghttp2 HPACK decoder

In this patch, We use nghttp2 HPACK decoder to decompress HTTP/2 header
block.  To make HPACK decompressor work, we need to track down HTTP/2
connection from the beginning.  If we see the HTTP/2 magic (connection
preface), we initialize HPACK decompressor objects.  We actually use 2
HPACK decompressor for both client and server.  HPACK decompressor
objects are stored in hash tables using TCP stream index as a key.

Most code by: Tatsuhiro Tsujikawa

Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Signed-off-by: Pascal Quantin <pascal.quantin@gmail.com>
Change-Id: Idb4dd4b0a200924820cb0b34db664cc37518168d
Reviewed-on: https://code.wireshark.org/review/1527
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agonghttp2: do not copy nghttp2* objects in wsutil folder
Pascal Quantin [Sat, 31 May 2014 15:42:00 +0000 (17:42 +0200)]
nghttp2: do not copy nghttp2* objects in wsutil folder

Change-Id: I114d3a795a93c7612453fcd08f6e30e520dde900
Reviewed-on: https://code.wireshark.org/review/1902
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agonghttp2: more warning fixes
Pascal Quantin [Sat, 31 May 2014 15:17:23 +0000 (17:17 +0200)]
nghttp2: more warning fixes

Change-Id: Ib94a02f5977bd7d456895bbe453c35d77f559bd1
Reviewed-on: https://code.wireshark.org/review/1901
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agonghttp2: upgrade library to g4f7223e and add casts to please buildbots
Pascal Quantin [Sat, 31 May 2014 14:48:50 +0000 (16:48 +0200)]
nghttp2: upgrade library to g4f7223e and add casts to please buildbots

Change-Id: Ic412d4bfc56695cbcab709d42a6f31aa9e50c64e
Reviewed-on: https://code.wireshark.org/review/1900
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoNGHTTP2: Add missing nghttp2_int.h (need by make dist...)
Alexis La Goutte [Sat, 31 May 2014 14:50:51 +0000 (16:50 +0200)]
NGHTTP2: Add missing nghttp2_int.h (need by make dist...)

Change-Id: I7906f28b42960ea69b7f23e888bc0e184f67021a
Reviewed-on: https://code.wireshark.org/review/1899
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoNGHTTP2: fix -Wshadow about index with some old GCC release or Mac OS X buildbot
Alexis La Goutte [Sat, 31 May 2014 14:18:51 +0000 (16:18 +0200)]
NGHTTP2: fix -Wshadow about index with some old GCC release or Mac OS X buildbot

(No problem with gcc-4.7 or gcc-4.8)

Change-Id: Iae1f801abeb80429c08e93668133a9c5ac7977ef
Reviewed-on: https://code.wireshark.org/review/1898
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoNGHTTP2: fix typo (nghttp2_ent.h => nghttp2_net.h)
Alexis La Goutte [Sat, 31 May 2014 14:14:19 +0000 (16:14 +0200)]
NGHTTP2: fix typo (nghttp2_ent.h => nghttp2_net.h)

Change-Id: I52d3c40794841614d55e88c9fe9cf2de43a0fa46
Reviewed-on: https://code.wireshark.org/review/1897
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agodo a plausibility check for interaction channel data
Martin Kaiser [Sat, 31 May 2014 13:30:14 +0000 (15:30 +0200)]
do a plausibility check for interaction channel data
in the linkage descriptor

Change-Id: I7ebca539076b2b881e82fd6baec5bb223e778a52
Reviewed-on: https://code.wireshark.org/review/1896
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agoAdd nghttp2 lib (HPACK)
Alexis La Goutte [Fri, 30 May 2014 19:14:40 +0000 (15:14 -0400)]
Add nghttp2 lib (HPACK)

Change-Id: I2a361951924045035a2a5d38f943e6b97c170f36
Reviewed-on: https://code.wireshark.org/review/1623
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
10 years agoMove cpuid to seperate header file.
Jakub Zawadzki [Sat, 31 May 2014 09:22:56 +0000 (11:22 +0200)]
Move cpuid to seperate header file.

It'll be later used also for detecting sse4.2

Change-Id: I1930abb29026b455d453a79b5f301cdf37585160
Reviewed-on: https://code.wireshark.org/review/1803
Reviewed-by: Michael Mann <mmann78@netscape.net>
10 years agoWe need a "wlan_datapad" dissector as well.
Guy Harris [Sat, 31 May 2014 09:27:31 +0000 (02:27 -0700)]
We need a "wlan_datapad" dissector as well.

Change-Id: I8d7e0ebeef2a912737b3afc08fcaf166dfb525b1
Reviewed-on: https://code.wireshark.org/review/1895
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agomake population id filterable
Martin Kaiser [Sat, 31 May 2014 09:00:30 +0000 (11:00 +0200)]
make population id filterable

Change-Id: I3381e1c35795ac33331cdddb8cefa8b0a16907cc
Reviewed-on: https://code.wireshark.org/review/1894
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agoAdd a copyright/idempotency wrapper.
Guy Harris [Sat, 31 May 2014 06:08:16 +0000 (23:08 -0700)]
Add a copyright/idempotency wrapper.

Change-Id: I13928c78fc9e2c15adcc9d028dd07058800f402b
Reviewed-on: https://code.wireshark.org/review/1893
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoFix (legitimate) compiler warning.
Guy Harris [Sat, 31 May 2014 05:56:19 +0000 (22:56 -0700)]
Fix (legitimate) compiler warning.

Change-Id: Ie5abf8f95731a689e9851cc6ee5f169eafd617ac
Reviewed-on: https://code.wireshark.org/review/1892
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoSplit off the dissectors for 802.3 "slow protocols".
Guy Harris [Sat, 31 May 2014 04:48:41 +0000 (21:48 -0700)]
Split off the dissectors for 802.3 "slow protocols".

Add a dissector table for the 802.3 "slow protocols" subtype, split the
dissectors for those protocols into separate files, and have them
register in that dissector table.

Remove some unnecessary #includes while we're at it.

Change-Id: Ic36c9c255efdd348055fa4f21fd6cc094f74e378
Reviewed-on: https://code.wireshark.org/review/1891
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoUse tcp_info_append_uint() more
Jakub Zawadzki [Fri, 30 May 2014 19:59:01 +0000 (21:59 +0200)]
Use tcp_info_append_uint() more

Change-Id: I27656eacb698f8db7bfbe4f5502658c78b03fc13
Reviewed-on: https://code.wireshark.org/review/1890
Reviewed-by: Michael Mann <mmann78@netscape.net>
10 years agoAdd AMQP listening port option to preferences
Pavel Moravec [Fri, 30 May 2014 19:51:51 +0000 (15:51 -0400)]
Add AMQP listening port option to preferences

Change-Id: Ief46b7b53ddecd649e54d3c23a3504c4165c812f
Reviewed-on: https://code.wireshark.org/review/1855
Reviewed-by: Michael Mann <mmann78@netscape.net>
10 years agossl/dtls: add support for Raw Public keys
Hauke Mehrtens [Sat, 26 Apr 2014 09:38:40 +0000 (11:38 +0200)]
ssl/dtls: add support for Raw Public keys

Instead of X.509 certificates now also Raw public keys are supported
and shown correctly.

This is described in this draft:
https://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11

Change-Id: Ibe7610aace31a19791b02e71ccd8d9ceb8cf979d
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/1372
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agossl-utils: dissect the certificate type TLS extension
Hauke Mehrtens [Sat, 26 Apr 2014 08:45:41 +0000 (10:45 +0200)]
ssl-utils: dissect the certificate type TLS extension

This analyses the certificate type extensions and then stores the
certificate type in the ssl session. This way we can later show the
certificate in the correct from.

This is described in this draft:
https://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11

Change-Id: Ifdda165807bc29f1fc138da000a9a538ecd18b6e
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/1371
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agomake terrestrial centre frequency filterable
Martin Kaiser [Fri, 30 May 2014 17:20:11 +0000 (19:20 +0200)]
make terrestrial centre frequency filterable

Change-Id: I007ff5215f52f80f25622cab6980128eabd39c5f
Reviewed-on: https://code.wireshark.org/review/1888
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agomake next time offset filterable
Martin Kaiser [Fri, 30 May 2014 16:28:36 +0000 (18:28 +0200)]
make next time offset filterable

Change-Id: I18c2b7992b237eaaacbec04d504fc293b03558a3
Reviewed-on: https://code.wireshark.org/review/1887
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agomake local time offset filterable
Martin Kaiser [Fri, 30 May 2014 16:17:17 +0000 (18:17 +0200)]
make local time offset filterable

Change-Id: Icccc07706287df4b6a7481108f9921b939aae2d5
Reviewed-on: https://code.wireshark.org/review/1886
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>