metze/wireshark/wip.git
9 years agoSet PLUGIN_INSTALL_DIR properly for wireshark.pc
Balint Reczey [Wed, 28 May 2014 17:32:20 +0000 (00:32 +0700)]
Set PLUGIN_INSTALL_DIR properly for wireshark.pc

Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747
Reviewed-on: https://code.wireshark.org/review/1861
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agocmake: Not all system have HtmlViewer
Michal Labedzki [Thu, 1 May 2014 15:01:36 +0000 (17:01 +0200)]
cmake: Not all system have HtmlViewer

Not all system have HtmlViewer, but we support that case
by inform user about file/website, so we "have" HtmlViewer.

Change-Id: I46e16a86b5c7f9dd47e1d1ded9d10fd4f565660f
Reviewed-on: https://code.wireshark.org/review/1875
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoBluetooth: AVDTP: First step to fully support AVDTP session
Michal Labedzki [Mon, 14 Apr 2014 16:59:07 +0000 (18:59 +0200)]
Bluetooth: AVDTP: First step to fully support AVDTP session

Session should be finished too on HCI Disconnect and Adapter disappear.

Change-Id: I0823872e60ec932fc0831975e54dc33d49fb5dbc
Reviewed-on: https://code.wireshark.org/review/1882
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: AVDTP: Add support for APT-X configuration
Michal Labedzki [Fri, 11 Apr 2014 17:15:39 +0000 (19:15 +0200)]
Bluetooth: AVDTP: Add support for APT-X configuration

Also add Service informations to Info column and service item.

Change-Id: I0a565df94d7980432c524bd675b291f0e80704e5
Reviewed-on: https://code.wireshark.org/review/1881
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: Avoid using macro GPOINTER_TO_UINT()
Michal Labedzki [Fri, 11 Apr 2014 11:19:34 +0000 (13:19 +0200)]
Bluetooth: Avoid using macro GPOINTER_TO_UINT()

Fix warnings and try to inform user about unknown values in
"Decode As".

Also use define instead of magic number for Unknown L2CAP CIDs.

Change-Id: Ie6f26a9e3330b84cef14bbf8861ffbdbdb789225
Reviewed-on: https://code.wireshark.org/review/1880
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: L2CAP: Another fix for CIDs
Michal Labedzki [Fri, 11 Apr 2014 07:22:46 +0000 (09:22 +0200)]
Bluetooth: L2CAP: Another fix for CIDs

Example: if there is Connection Request than field with CID always
is called SCID. If we Sent this packet, it is okay, but if we Receive
it, then it is not SCID for us, but DCID. If we receive
Connection Request (DCID) and than we want to make disconnection,
so we send Disconnection Request with DCID that is SCID in
Connection Request... etc.

I try to clarify this, so rename stored SCID to Local CID
and DCID  to Remote CID.

Change-Id: Idde0939a03955d8f4a10d8c9f7c43fd364254460
Reviewed-on: https://code.wireshark.org/review/1879
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: AVDTP: Upgrade session logic
Michal Labedzki [Thu, 10 Apr 2014 15:46:25 +0000 (17:46 +0200)]
Bluetooth: AVDTP: Upgrade session logic

To correctly resolve connections single "ID" value
like L2CAP PSM, is not enough, because next connection may use
the same PSM value. Solution is save frame number of frame that
make disconnection.

Conclusion:
Any session key values should be updated to pair:
{ID_1, disconnect_in_frame}, {ID_2, disconnect_in_frame}...
then we should check if  "disconnect_in_frame" is greater then
current frame number, otherwise it is not valid session.

Change-Id: I3d760112b6e53358a93c994f4aae455ac1bf5de6
Reviewed-on: https://code.wireshark.org/review/1878
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth AVDTP/RTP: Separate the streams
Michal Labedzki [Sun, 30 Mar 2014 10:03:18 +0000 (12:03 +0200)]
Bluetooth AVDTP/RTP: Separate the streams

The Stream is defined here as media stream that beginning on
AVDTP Start (ResponseAccept).

Also fix recognizing Channel streams by AVDTP according to the
specification that says:
1. First channel is always Signaling.
2. Second may be Media.
3. Third may be Reporting.
4. Fourth may be Recovery.
First and second will be supported right now.

Change-Id: Id6d4dae6be1b9df68382288c2d520b7ed3661237
Reviewed-on: https://code.wireshark.org/review/1053
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: Add music duration info for SBC
Michal Labedzki [Thu, 27 Mar 2014 06:59:16 +0000 (07:59 +0100)]
Bluetooth: Add music duration info for SBC

Music duration info can be used to detect underflow, what can
decrease music quality.

Change-Id: I8ea06655395d3e66473a09ee72b6833b894aa6e1
Reviewed-on: https://code.wireshark.org/review/1052
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: Fix Content Protection call for VDP
Michal Labedzki [Sat, 24 May 2014 17:01:28 +0000 (19:01 +0200)]
Bluetooth: Fix Content Protection call for VDP

Change-Id: I20a29fdb7d5737173c5b589fc8832b0b997bef2a
Reviewed-on: https://code.wireshark.org/review/1877
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoavoid proto_tree_add_uint_format() when we just want the default
Martin Kaiser [Fri, 30 May 2014 07:59:05 +0000 (09:59 +0200)]
avoid proto_tree_add_uint_format() when we just want the default
description

Change-Id: Ice06e257a72f3b4ce1229ff90129628f0e3bbcfb
Reviewed-on: https://code.wireshark.org/review/1873
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoIntroduce 802.11 dissectors with wired-in "FCS present" indications.
Guy Harris [Thu, 29 May 2014 17:56:46 +0000 (10:56 -0700)]
Introduce 802.11 dissectors with wired-in "FCS present" indications.

For a number of protocols that encapsulate 802.11 frames inside packets,
whether the frame includes an FCS or not is specified by the protocol,
not by whether the link-layer frame carrying the packets *itself*
includes an FCS.  As we've done with Ethernet, add "_withfcs" and
"_withoutfcs" dissectors, which *don't* check the pseudo-header FCS
length indication, and call those, rather than dissectors that check the
pseudo-header length indication, from the dissectors for those protocols.

Change-Id: Ib8c8ecdd872e1782fdfc66e7573415d91911a62e
Reviewed-on: https://code.wireshark.org/review/1866
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoadd gdb to the list of new protocols
Martin Kaiser [Thu, 29 May 2014 17:34:23 +0000 (19:34 +0200)]
add gdb to the list of new protocols

Change-Id: Ia985f5bbc3f60409ee119883451ea36f0c4b0605
Reviewed-on: https://code.wireshark.org/review/1865
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agostart a dissector for GDB's remote serial protocol
Martin Kaiser [Tue, 11 Feb 2014 21:14:20 +0000 (22:14 +0100)]
start a dissector for GDB's remote serial protocol

Change-Id: I8e20917ac08e2349caf330ee967d24d7c738bb71
Reviewed-on: https://code.wireshark.org/review/1815
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoconvert cable freq, symbol rate into doubles
Martin Kaiser [Thu, 29 May 2014 15:56:17 +0000 (17:56 +0200)]
convert cable freq, symbol rate into doubles

Change-Id: Iaddd3c4847e803af855c847212ae822b2529ff06
Reviewed-on: https://code.wireshark.org/review/1860
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoconver sat freq and symbol rate into doubles in order to make the
Martin Kaiser [Thu, 29 May 2014 15:51:37 +0000 (17:51 +0200)]
conver sat freq and symbol rate into doubles in order to make the
filtering work, fix typos

Change-Id: I7ed989807826d1322dab00d13d998488caaf73ff
Reviewed-on: https://code.wireshark.org/review/1859
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agodissect more components of the track header box
Martin Kaiser [Fri, 14 Mar 2014 09:14:14 +0000 (10:14 +0100)]
dissect more components of the track header box

Change-Id: If8d35122ce096f52837bdff1c6599b47456697d5
Reviewed-on: https://code.wireshark.org/review/1858
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoBugfix EIP explicit connection conversation and allow ForwardClose to not be present...
Michael Mann [Thu, 29 May 2014 15:33:29 +0000 (11:33 -0400)]
Bugfix EIP explicit connection conversation and allow ForwardClose to not be present in capture for generated filter to work properly.

Change-Id: I8e442dff85ef856672f42e787feb88453eba6f0e
Reviewed-on: https://code.wireshark.org/review/1857
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoglusterfs: if filename itself will become <EMPTY>
Vikhyat Umrao [Thu, 29 May 2014 10:13:48 +0000 (15:43 +0530)]
glusterfs: if filename itself will become <EMPTY>

This patch will solve the issue in LOOKUP procedure if filename itself will become <EMPTY>.

Change-Id: Ib983ac4f9325db040a6b4eb3fc63179b36103bf4
Reported-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
Reviewed-on: https://code.wireshark.org/review/1854
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoHave the protocol item cover only the PEEKREMOTE header.
Guy Harris [Thu, 29 May 2014 09:34:14 +0000 (02:34 -0700)]
Have the protocol item cover only the PEEKREMOTE header.

Change-Id: I8e5991f636e68a956bf5e09dd6bf4be1d4619ba0
Reviewed-on: https://code.wireshark.org/review/1852
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoImprove the fix by removing code that miss dissects SPNEGO stuff ... as well
Richard Sharpe [Mon, 26 May 2014 23:05:36 +0000 (16:05 -0700)]
Improve the fix by removing code that miss dissects SPNEGO stuff ... as well
as remove redundant stuff from the spnego.cnf file.

Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Change-Id: I90a962a39dc4da0f13055c9b3893c26044f1fc97
Reviewed-on: https://code.wireshark.org/review/1809
Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoTry to fix the problems with the SPNEGO negTokenInit differences in Microsoft impleme...
Richard Sharpe [Thu, 29 May 2014 01:05:41 +0000 (21:05 -0400)]
Try to fix the problems with the SPNEGO negTokenInit differences in Microsoft implementations

Change-Id: Ifbfca88469a6bc479072c921deba280e667c7087
Reviewed-on: https://code.wireshark.org/review/1804
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoAdd Modelines and use tabs and fix typo
Alexis La Goutte [Wed, 28 May 2014 16:04:30 +0000 (18:04 +0200)]
Add Modelines and use tabs and fix typo

Change-Id: Ie3f60f66f0f4a572098d1d7425c53aaf51bdb747
Reviewed-on: https://code.wireshark.org/review/1846
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoAdd Modelines
Alexis La Goutte [Wed, 28 May 2014 16:04:34 +0000 (18:04 +0200)]
Add Modelines

Change-Id: I3b41a15f53afc718ccf5892174345220a09c6714
Reviewed-on: https://code.wireshark.org/review/1847
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agopacket-kerberos.c: Use tfs_set_notset in hf[] entry instead of a local version.
Bill Meier [Wed, 28 May 2014 21:38:58 +0000 (17:38 -0400)]
packet-kerberos.c: Use tfs_set_notset in hf[] entry instead of a local version.

Change-Id: I00a3ae7afb46eb50d7477c22cfa340c705cbb34a
Reviewed-on: https://code.wireshark.org/review/1851
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoUpdate m3ap.cnf to match packet-m3ap.c change done in commit b40cb1ad
Bill Meier [Wed, 28 May 2014 20:39:48 +0000 (16:39 -0400)]
Update m3ap.cnf to match packet-m3ap.c change done in commit b40cb1ad

Change-Id: Ib94647edcdba8c71439d37a48e213c8a475c351e
Reviewed-on: https://code.wireshark.org/review/1850
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoUse Q_UNUSED instead of _U_
ruengeler [Wed, 28 May 2014 17:14:37 +0000 (19:14 +0200)]
Use Q_UNUSED instead of _U_

Change-Id: I19732f097b1238159b634e32ee13fe6ae3f1883d
Reviewed-on: https://code.wireshark.org/review/1849
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
9 years agoUpdate reference for I-Bit support.
Michael Tüxen [Wed, 28 May 2014 16:45:57 +0000 (18:45 +0200)]
Update reference for I-Bit support.
Also remove the reference to the original ID.
Change-Id: I51357fc04699a40af2d34ec2bd36518d09d3b180
Reviewed-on: https://code.wireshark.org/review/1848
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
9 years agoMinor: use VALS macro (as per convention); Add editor modelines; Do whitespace changes.
Bill Meier [Wed, 28 May 2014 00:33:22 +0000 (20:33 -0400)]
Minor: use VALS macro (as per convention); Add editor modelines; Do whitespace changes.

Change-Id: I6007c1b2098d06e4a892474dd07f06a7538f94ef
Reviewed-on: https://code.wireshark.org/review/1843
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agopacket-klerberos.c: Use typedef (true_false_string) to properly define a true_false_s...
Bill Meier [Wed, 28 May 2014 00:50:49 +0000 (20:50 -0400)]
packet-klerberos.c: Use typedef (true_false_string) to properly define a true_false_string.

Change-Id: Ic89e5add39b8b0b2c3db254292f12ce6ae25b73c
Reviewed-on: https://code.wireshark.org/review/1844
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agopacket-ppcap.c: Minor cleanup
Bill Meier [Tue, 27 May 2014 23:40:34 +0000 (19:40 -0400)]
packet-ppcap.c: Minor cleanup

- Remove SVN ID;
- Add editor-modelines;
- Do some whitespace changes.

Change-Id: I7b8b38cfb1d5d206b35fb04c759f22f094810875
Reviewed-on: https://code.wireshark.org/review/1842
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoTry to fix Ubuntu buildbot (make dist failed)
Alexis La Goutte [Tue, 27 May 2014 16:14:48 +0000 (18:14 +0200)]
Try to fix Ubuntu buildbot (make dist failed)

No rule to make target `cmake/modules/FeatureSummary.cmake', needed by `distdir'.  Stop.

Change-Id: I66124151ded4d9e3aeed3f9f27aa2fca81a962cb
Reviewed-on: https://code.wireshark.org/review/1817
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoCommit 5ff629ec5ac636b901b2a004aa4d5248f68a5d0f requires the minimum
Joerg Mayer [Wed, 28 May 2014 15:12:49 +0000 (17:12 +0200)]
Commit 5ff629ec5ac636b901b2a004aa4d5248f68a5d0f requires the minimum
cmake version to be 2.8.3. Make this explicit.

  commit 5ff629ec5ac636b901b2a004aa4d5248f68a5d0f
  Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
  Date:   Thu May 22 22:05:08 2014 +0200

  CMake: Remove FeatureSummary.cmake and fix display of feature

Change-Id: If6f67c837f1bee92a22bbff8965baa3cc71bf663
Reviewed-on: https://code.wireshark.org/review/1841
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
9 years agoClang complains about the size of empty structs.
ruengeler [Wed, 28 May 2014 11:19:50 +0000 (13:19 +0200)]
Clang complains about the size of empty structs.

Change-Id: I2951b1b384cf9b32677aea81c66c34ab07b0090f
Reviewed-on: https://code.wireshark.org/review/1835
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
9 years agoQIcon is not needed.
ruengeler [Wed, 28 May 2014 11:22:15 +0000 (13:22 +0200)]
QIcon is not needed.

Change-Id: I07207177e97e22bb8810226818b2280db5f5055e
Reviewed-on: https://code.wireshark.org/review/1836
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoglusterfs: show filenames in the summary for common procedures
Vikhyat Umrao [Tue, 27 May 2014 15:04:29 +0000 (20:34 +0530)]
glusterfs: show filenames in the summary for common procedures

With this patch we will have filename on the summary for procedures MKDIR, CREATE and LOOKUP.

Example output:

173  18.309307 192.168.100.3 -> 192.168.100.4 GlusterFS 224 MKDIR V330 MKDIR Call, Filename: testdir
2606  36.767766 192.168.100.3 -> 192.168.100.4 GlusterFS 376 LOOKUP V330 LOOKUP Call, Filename: 1.txt
2612  36.768242 192.168.100.3 -> 192.168.100.4 GlusterFS 228 CREATE V330 CREATE Call, Filename: 1.txt

Change-Id: I1995c309028f1472a61719d6d7d6ae2c68412a95
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
Reviewed-on: https://code.wireshark.org/review/1833
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoLLDP Cleanup : 802.1 Qbg TLV
Anish Bhatt [Wed, 28 May 2014 05:45:48 +0000 (22:45 -0700)]
LLDP Cleanup : 802.1 Qbg TLV

Change-Id: Ibdea530928d1bd98cb353ad8d7d938f739aa693f
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1830
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoAdd EtherNet/IP connection conversation filters
Michael Mann [Tue, 27 May 2014 02:58:48 +0000 (22:58 -0400)]
Add EtherNet/IP connection conversation filters

Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236
Reviewed-on: https://code.wireshark.org/review/1810
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFix indent (use 4 spaces)
Alexis La Goutte [Tue, 27 May 2014 06:32:54 +0000 (08:32 +0200)]
Fix indent (use 4 spaces)

Change-Id: I9e37c911865a0e3b13331ec03df05d79749904c5
Reviewed-on: https://code.wireshark.org/review/1811
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFix indent (use tabs)
Alexis La Goutte [Tue, 27 May 2014 06:35:58 +0000 (08:35 +0200)]
Fix indent (use tabs)

Change-Id: Iecb242bddb06779ba8b5ce8913fa9c4f64d7f79a
Reviewed-on: https://code.wireshark.org/review/1812
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoUse proto_tree_add_format_text()
Jakub Zawadzki [Tue, 27 May 2014 18:06:15 +0000 (20:06 +0200)]
Use proto_tree_add_format_text()

Change-Id: Ie111c4db4afd0702f5a016da1547486631f571d8
Reviewed-on: https://code.wireshark.org/review/1818
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFIELDDISPLAY can be or'd with BASE_VAL64_STRING.
Bill Meier [Tue, 27 May 2014 21:58:17 +0000 (17:58 -0400)]
FIELDDISPLAY can be or'd with BASE_VAL64_STRING.

Change-Id: I43014922fc51ddeed70235006296500ec00bd437
Reviewed-on: https://code.wireshark.org/review/1826
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agouse proto_tree_add_float_format_value() correctly
Martin Kaiser [Tue, 27 May 2014 21:37:31 +0000 (23:37 +0200)]
use proto_tree_add_float_format_value() correctly

Change-Id: I927a2f32aa0016b5b0c476fa4c16fc1dbe0aebb0
Reviewed-on: https://code.wireshark.org/review/1825
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agomake cable symbol rate filterable
Martin Kaiser [Tue, 27 May 2014 21:36:32 +0000 (23:36 +0200)]
make cable symbol rate filterable

Change-Id: I034b351d4bc12f6c00a0224a5c5b9f85496657b6
Reviewed-on: https://code.wireshark.org/review/1824
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agomake cable frequency filterable
Martin Kaiser [Fri, 23 May 2014 16:40:15 +0000 (18:40 +0200)]
make cable frequency filterable

Change-Id: I8464fb8e98e485523127dd95948a717554b6aee4
Reviewed-on: https://code.wireshark.org/review/1823
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agossl-utils: fix TLS number of padding extension
Hauke Mehrtens [Mon, 26 May 2014 16:29:45 +0000 (19:29 +0300)]
ssl-utils: fix TLS number of padding extension

The padding extension got the number 21 (0x15) by the IANA and not 20
(0x14), see this list for details:
https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml

The number 20 is assigned to the server certificate type extension.

Change-Id: I17271a3a336bcf5a323f15da3a5301115ca4cb45
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/1822
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agomake the satellite symbol rate filterable
Martin Kaiser [Fri, 23 May 2014 16:23:59 +0000 (18:23 +0200)]
make the satellite symbol rate filterable

Change-Id: I301d0804e097c62cd8bf7b27003918eedab9616a
Reviewed-on: https://code.wireshark.org/review/1816
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoFix build on my old Windows XP Buildbot (With VS2008EE) (Try 2...)
Alexis La Goutte [Tue, 27 May 2014 11:13:37 +0000 (13:13 +0200)]
Fix build on my old Windows XP Buildbot (With VS2008EE) (Try 2...)

../../asn1/atn-ulcs/packet-atn-ulcs-template.c(126) : fatal error C1083: Cannot
open include file: 'stdint.h': No such file or directory

Change-Id: Id3c3082fe91a79e44abbfd4e2b2f1fc7d5c183d4
Reviewed-on: https://code.wireshark.org/review/1814
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoCMake: Remove FeatureSummary.cmake and fix display of feature
Alexis La Goutte [Thu, 22 May 2014 20:05:08 +0000 (22:05 +0200)]
CMake: Remove FeatureSummary.cmake and fix display of feature

Bug:8819

Change-Id: I35778a4ce198245fbe86eaded2b733745ff8e934
Reviewed-on: https://code.wireshark.org/review/1728
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agomake satellite orbital position filterable
Martin Kaiser [Fri, 23 May 2014 16:16:40 +0000 (18:16 +0200)]
make satellite orbital position filterable

Change-Id: Ibd4edd30eca969699fea1971e1885299e4d3e552
Reviewed-on: https://code.wireshark.org/review/1813
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoFix fencepost error in HTTP dissector
Evan Huus [Mon, 26 May 2014 20:33:42 +0000 (16:33 -0400)]
Fix fencepost error in HTTP dissector

Strndup adds +1 for the null-terminator itself, no need to do it in the caller.
This was causing us to go past the end of the buffer when the HTTP header line
didn't have any spaces in it. Caught by Alexis using ASAN.

Bug:10135
Change-Id: Iee1b26da4740b774581ca6ec784ee40f7b920832
Reviewed-on: https://code.wireshark.org/review/1806
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoOptimize dissect_eth_common(): cache result of get_ether_name()
Jakub Zawadzki [Mon, 26 May 2014 20:46:21 +0000 (22:46 +0200)]
Optimize dissect_eth_common(): cache result of get_ether_name()

In Anders profile output[1] is looks like that get_ether_name() is called
four times, twice for src and dst. get_ether_name() takes ~2% of Ir, so
caching result should reduce Ir count by 1%.

Similar thing was already done for UDP and TCP - 5235dc6ca0d7ec4e6c1fe38cae34763366830629

[1] http://www.wireshark.org/lists/wireshark-dev/201405/msg00063.html

Change-Id: I9ca582b0522387dbfaad866a48a0934693a2849f
Reviewed-on: https://code.wireshark.org/review/1808
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoMake packet-ieee80211.c a tiny bit less unreadable.
Joerg Mayer [Mon, 26 May 2014 19:29:49 +0000 (21:29 +0200)]
Make packet-ieee80211.c a tiny bit less unreadable.
<rant>
This file is riddled with lots of magical flags causing the code to do
one thing or another, and then in several cases with non-telling variable
names (e.g. is_centrino). My absolute favourite is

  dissect_ieee80211_common (tvb, pinfo, tree, FALSE,
                            pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE, FALSE, FALSE, FALSE);

Is there anyone who is able to understand what the line above does without
looking up the function definition?
</rant>

Change-Id: Id49cc0a2992005c28f66a8558e4b2970b677a360
Reviewed-on: https://code.wireshark.org/review/1805
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
9 years agoReplace manual string handling with strbuf
Evan Huus [Fri, 23 May 2014 20:18:00 +0000 (16:18 -0400)]
Replace manual string handling with strbuf

Much simpler and should probably fix bug 10121.
Also add modelines.

Bug:10121
Change-Id: Ib92977e734ebe1b8529c7b6b41fbd81eac13b186
Reviewed-on: https://code.wireshark.org/review/1758
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoMAC LTE: fix dissection of Extended Power Headroom control element
Pascal Quantin [Sun, 25 May 2014 21:13:57 +0000 (23:13 +0200)]
MAC LTE: fix dissection of Extended Power Headroom control element

Change-Id: Ia57b4769732f2e18dd2864b576c5c77fc68deb20
Reviewed-on: https://code.wireshark.org/review/1798
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoFix [-Werror=clobbered] gcc warning
Bill Meier [Sun, 25 May 2014 18:21:38 +0000 (14:21 -0400)]
Fix [-Werror=clobbered] gcc warning

Change-Id: Ibeef517a5100ae6d2c01f329022281b81a8b56a9
Reviewed-on: https://code.wireshark.org/review/1795
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoGrab-bag of dead initializers and two actual bugs.
Evan Huus [Sun, 25 May 2014 15:13:04 +0000 (11:13 -0400)]
Grab-bag of dead initializers and two actual bugs.

All caught by cppcheck. The two (semi)-interesting bugs are:
- in asn1/atn-cpdlc/packet-atn-cpdlc-template.c where the break statement should
  have been inside the brace, causing potential control-flow weirdness with
  exceptions
- in epan/dissectors/packet-ieee80211.c where the bounds check for tag_len did
  not match the expert info given

Change-Id: Ie173fb8d917aabb9b4571435d671d6f16e1c7569
Reviewed-on: https://code.wireshark.org/review/1793
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoGSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing
Pascal Quantin [Sun, 25 May 2014 16:01:31 +0000 (18:01 +0200)]
GSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing

While we are at it, replace an undefined hf_timeslot_allocation_usf_tn by its hf_usf equivalent

Bug: 10120
Change-Id: I3fe113279c779a9d8143d07489747a67d7351664
Reviewed-on: https://code.wireshark.org/review/1794
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years ago[Automatic manuf, services and enterprise-numbers update for 2014-05-25]
Gerald Combs [Sun, 25 May 2014 15:04:32 +0000 (08:04 -0700)]
[Automatic manuf, services and enterprise-numbers update for 2014-05-25]

Change-Id: Iec70af09a92ed92fdee6f2a34846d64e62ee075a
Reviewed-on: https://code.wireshark.org/review/1789
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoGet rid of trailing blank.
Guy Harris [Sun, 25 May 2014 00:37:52 +0000 (17:37 -0700)]
Get rid of trailing blank.

Change-Id: I9eb6baee8866241a42d007d9bc69f64ab46f9a2e
Reviewed-on: https://code.wireshark.org/review/1786
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd support for dissecting pcap-ng file-type-specific blocks.
Guy Harris [Sun, 25 May 2014 00:35:08 +0000 (17:35 -0700)]
Add support for dissecting pcap-ng file-type-specific blocks.

Add a dissector for pcap-ng file-type-specific blocks; it creates a
dissector table using the block type as the key, attempts to call the
appropriate dissector using that table, and does a minimal dissection if
that fails.

Change-Id: I67e139f06ba88d40faa5b4ab169e8df08f5bfe7b
Reviewed-on: https://code.wireshark.org/review/1784
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd support for dissecting non-packet records.
Guy Harris [Sun, 25 May 2014 00:04:44 +0000 (17:04 -0700)]
Add support for dissecting non-packet records.

Add a dissector table indexed by the file type, and, for the
file-type-specific records, have the frame dissector skip the usual
pseudo-header processing, as the pseudo-header has a file-type-specific
record subtype in it, and call the dissector for that file type's
records.

Change-Id: Ibe97cf6340ffb0dabc08f355891bc346391b91f9
Reviewed-on: https://code.wireshark.org/review/1782
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDistinguish between "events" and "reports".
Guy Harris [Sat, 24 May 2014 21:53:15 +0000 (14:53 -0700)]
Distinguish between "events" and "reports".

Have two different classes of file-type-specific records - "events" and
"reports".  An "event" indicates something that happened in the capture
process, such as a status transition on the network; a "report" just
gives information not corresponding to something happening in the
capture process, such as capture statistics.

Note that both of those should be dissected and displayed like packets,
and leave open the possibility of file-type-specific records whose
contents should be processed and saved but not displayed in the packet
list.

Shorten "file_type_specific" to "ft_specific".

Change-Id: I2342d82ef992c794b76f354c057823dd5eb371e6
Reviewed-on: https://code.wireshark.org/review/1779
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix a compiler warning.
Guy Harris [Sat, 24 May 2014 21:21:06 +0000 (14:21 -0700)]
Fix a compiler warning.

Change-Id: I5b4b518982dc6033842b1e791e67d2faddfb5487
Reviewed-on: https://code.wireshark.org/review/1777
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd support for plugins to handle pcap-ng block types.
Guy Harris [Sat, 24 May 2014 20:57:11 +0000 (13:57 -0700)]
Add support for plugins to handle pcap-ng block types.

We rename "file format" plugins to "libwiretap" plugins, as they can
register as read handlers for a new file type, read/write handlers for a
pcap-ng block type (or both).

To register as a pcap-ng block type handler, in the
register_wtap_module() routine of your plugin, call
register_pcapng_block_type_handler() with the pcap-ng block type and
pointers to your routines to read and write those blocks.  Those
routines should read and write REC_TYPE_FILE_TYPE_SPECIFIC records, with
the block type in the pseudo-header for the record in the struct
wtap_pkthdr structure, with time stamps stored in that structure, and
with a blob of data for the rest of the record.

This is for bug 8590.

Change-Id: I71847d834854a29ceb85894fd094c2ae91a04273
Reviewed-on: https://code.wireshark.org/review/1775
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAllow wtap_read() and wtap_seek_read() to return records other than packets.
Guy Harris [Sat, 24 May 2014 18:28:30 +0000 (11:28 -0700)]
Allow wtap_read() and wtap_seek_read() to return records other than packets.

Add a "record type" field to "struct wtap_pkthdr"; currently, it can be
REC_TYPE_PACKET, for a record containing a packet, or
REC_TYPE_FILE_TYPE_SPECIFIC, for records containing file-type-specific
data.

Modify code that reads packets to be able to handle non-packet records,
even if that just means ignoring them.

Rename some routines to indicate that they handle more than just
packets.

We don't yet have any libwiretap code that supplies records other than
REC_TYPE_PACKET or that supporting writing records other than
REC_TYPE_PACKET, or any code to support plugins for handling
REC_TYPE_FILE_TYPE_SPECIFIC records; this is just the first step for bug
8590.

Change-Id: Idb40b78f17c2c3aea72031bcd252abf9bc11c813
Reviewed-on: https://code.wireshark.org/review/1773
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFixed mausb valid bit & added invalid_valid TFS
Sean O. Stalley [Fri, 23 May 2014 22:40:08 +0000 (15:40 -0700)]
Fixed mausb valid bit & added invalid_valid TFS

Fixed valid bit check for MAUSB EPHandleResp packet. the valid bit
is active low (ie: valid = 0, invalid = 1).

I noticed Some other dissectors also defined an tfs_invalid_valid,
so got rid of their local definitions & added it to epan/tfs.c.

Change-Id: Ifd78325f9c7c046224073fc9b29e0cc60dc5c286
Reviewed-on: https://code.wireshark.org/review/1766
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoFix some whitespace issues.
Guy Harris [Fri, 23 May 2014 23:44:23 +0000 (16:44 -0700)]
Fix some whitespace issues.

Change-Id: I363361e898c4b37fcde29847a1473530e5052733
Reviewed-on: https://code.wireshark.org/review/1771
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoMore handling of missing time stamps.
Guy Harris [Fri, 23 May 2014 23:40:56 +0000 (16:40 -0700)]
More handling of missing time stamps.

Make nstime_cmp() handle "unset" time stamps (they're equal to other
"unset" time stamps, and less than all other time stamps), use it in
reordercap, and "unset" the time stamp if it's absent.

Also, nstime_cmp() does not modify its argument, so make it const.

Change-Id: I016dab5fefaf4696e78cbd8c6dd3395808e54369
Reviewed-on: https://code.wireshark.org/review/1769
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoSet the presence flags.
Guy Harris [Fri, 23 May 2014 23:23:58 +0000 (16:23 -0700)]
Set the presence flags.

If we're going to stuff a time stamp in there, let's at least indicate
that it's there.

Change-Id: Idc3d4ba5fdc109b21b5c6034906664a763b2ddda
Reviewed-on: https://code.wireshark.org/review/1767
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoMore checks for the presence of a time stamp.
Guy Harris [Fri, 23 May 2014 22:35:32 +0000 (15:35 -0700)]
More checks for the presence of a time stamp.

Change-Id: If8dd4c37bcb1b35dd9f988184ad53118172ae9db
Reviewed-on: https://code.wireshark.org/review/1764
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoMore checks for the presence of a time stamp.
Guy Harris [Fri, 23 May 2014 21:03:42 +0000 (14:03 -0700)]
More checks for the presence of a time stamp.

And make sure we have a pointer to the struct wtap_pkthdr for the packet
before we check it for a time stamp.

Change-Id: I26b205e5467a3a1236e9fd1f7633e86ece5e9040
Reviewed-on: https://code.wireshark.org/review/1762
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years ago1.11.4 → 1.99.0.
Gerald Combs [Fri, 23 May 2014 20:56:41 +0000 (13:56 -0700)]
1.11.4 → 1.99.0.

Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044
Reviewed-on: https://code.wireshark.org/review/1761
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoDon't assume all packets have time stamps.
Guy Harris [Fri, 23 May 2014 18:53:08 +0000 (11:53 -0700)]
Don't assume all packets have time stamps.

Pcap-ng files might have Simple Packet Blocks, which don't have time
stamps, and some other file formats might not have time stamps as well.

Only check the time stamp if we have one, and don't use "the start time
stamp is unset" as an indication that we've just read the first packet,
use "the count of packets we've read is 1" as an indication that we've
just read the first packet.

Change-Id: I097c54867655efb5c343fb880a113b3583736bbd
Reviewed-on: https://code.wireshark.org/review/1757
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agofile_seek() sets the error variable; no need to set it ourselves.
Guy Harris [Fri, 23 May 2014 18:10:05 +0000 (11:10 -0700)]
file_seek() sets the error variable; no need to set it ourselves.

Change-Id: I637326841e6db562b0896e77c86c4ebf9c3b0561
Reviewed-on: https://code.wireshark.org/review/1756
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix comment.
Guy Harris [Fri, 23 May 2014 18:07:31 +0000 (11:07 -0700)]
Fix comment.

Change-Id: Ifa526ff6a9f685a0956e1b2e49f35fecfd290cb0
Reviewed-on: https://code.wireshark.org/review/1755
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoGet rid of extra trailing blank lines.
Guy Harris [Fri, 23 May 2014 18:02:40 +0000 (11:02 -0700)]
Get rid of extra trailing blank lines.

Change-Id: I2cb1fdc3bc27c0075cc1e4910dc32088d2695bff
Reviewed-on: https://code.wireshark.org/review/1754
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix a comment.
Guy Harris [Fri, 23 May 2014 17:59:16 +0000 (10:59 -0700)]
Fix a comment.

Change-Id: I91a5c52939a516807431494a4120aecc5b0dba41
Reviewed-on: https://code.wireshark.org/review/1753
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoGet rid of extra trailing blank lines.
Guy Harris [Fri, 23 May 2014 17:55:30 +0000 (10:55 -0700)]
Get rid of extra trailing blank lines.

Change-Id: I161bdbf08b35bfbfa1a19fc4facc5b72ef2b0390
Reviewed-on: https://code.wireshark.org/review/1752
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoGet rid of trailing blank lines.
Guy Harris [Fri, 23 May 2014 17:53:13 +0000 (10:53 -0700)]
Get rid of trailing blank lines.

Change-Id: I53c560557d70e2a1cb78de37aad17d92a714ce2a
Reviewed-on: https://code.wireshark.org/review/1751
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix the type of i4b_read_rec() to reflect what it actually returns.
Guy Harris [Fri, 23 May 2014 17:51:56 +0000 (10:51 -0700)]
Fix the type of i4b_read_rec() to reflect what it actually returns.

Change-Id: Iafd4996a724418460043abda455a237a539c7925
Reviewed-on: https://code.wireshark.org/review/1750
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRemove trailing blank lines.
Guy Harris [Fri, 23 May 2014 17:47:44 +0000 (10:47 -0700)]
Remove trailing blank lines.

Change-Id: I62171eb8686fc31af901367182186ccd79098fe2
Reviewed-on: https://code.wireshark.org/review/1749
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoImprove handling of short MQTT PDUs.
Bill Meier [Fri, 23 May 2014 15:42:49 +0000 (11:42 -0400)]
Improve handling of short MQTT PDUs.

This is a "good-enough" fix for now until a more comprehensive fix
is committed to handle the case of the (variable size) PDU
length field being split across TCPO segments.

Change-Id: I57e8f5e9d7a9855fac320e8843b82a273ffb7cc5
Reviewed-on: https://code.wireshark.org/review/1748
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoFix -Wdocumentation
Alexis La Goutte [Fri, 23 May 2014 14:44:09 +0000 (16:44 +0200)]
Fix -Wdocumentation

epan/packet.h:369:11: error: parameter 'returns' not found in the function declaration [-Werror,-Wdocumentation]

Change-Id: Ieedd203c4e952ae0ac17273311163d25ab2da066
Reviewed-on: https://code.wireshark.org/review/1746
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoSIP: remove leading spaces/tabs between security parameters
Pascal Quantin [Fri, 23 May 2014 14:03:03 +0000 (16:03 +0200)]
SIP: remove leading spaces/tabs between security parameters

Change-Id: Icf15d18a16937e48d6b96749e8fa7c931916b491
Reviewed-on: https://code.wireshark.org/review/1743
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoSIP: parse ports definition in security mechanism
Pascal Quantin [Fri, 23 May 2014 15:06:16 +0000 (17:06 +0200)]
SIP: parse ports definition in security mechanism

Change-Id: Iaef57f01b903b66ec55275d77f80f4e81a8130dc
Reviewed-on: https://code.wireshark.org/review/1747
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoLISP : error: declaration of 'address' shadows a global declaration [-Werror=shadow]
Alexis La Goutte [Fri, 23 May 2014 14:10:24 +0000 (16:10 +0200)]
LISP : error: declaration of 'address' shadows a global declaration [-Werror=shadow]

Change-Id: I3f490ec40ae3241e9836e0914d43424ff9565fb5
Reviewed-on: https://code.wireshark.org/review/1744
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoDissect Nonce Locator LCAF
Lorand Jakab [Fri, 23 May 2014 14:34:57 +0000 (17:34 +0300)]
Dissect Nonce Locator LCAF

Change-Id: I23f05cf3a0bc43baac4c4c31f5ce0dc0dffcade1
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1745
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoDissect AS Number LCAF
Lorand Jakab [Fri, 23 May 2014 13:06:38 +0000 (16:06 +0300)]
Dissect AS Number LCAF

Change-Id: I03c839a23c037a4d7da63d74e5407f0470301697
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1742
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoZero out pinfo->src and dst before adding a frag.
Guy Martin [Mon, 19 May 2014 09:14:44 +0000 (11:14 +0200)]
Zero out pinfo->src and dst before adding a frag.

If an mp2t packet contains one full subpacket and the fragment of
another one, it happens that the first subpacket will set src or dst to
an ethernet or IP address. Adding the fragment of the second subpacket
will then use this information for calculating the hash in the fragment
table. However, later fragments in other mp2t packets will not have
these info and reassembly will fail.

Change-Id: Ic52763017cb854851b6686654c2d8a1624305d65
Reviewed-on: https://code.wireshark.org/review/1692
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoRevert "Allow wtap_read() and wtap_seek_read() to return non-packet records."
Guy Harris [Fri, 23 May 2014 10:50:02 +0000 (10:50 +0000)]
Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records."

This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4.

A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes.  That is in-progress.

Change-Id: Ic558f163a48e2c6d0df7f55e81a35a5e24b53bc6
Reviewed-on: https://code.wireshark.org/review/1741
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRevert "Fix some white space issues."
Guy Harris [Fri, 23 May 2014 10:48:46 +0000 (10:48 +0000)]
Revert "Fix some white space issues."

This reverts commit 2456b22cd36b08fc2816d5a730918af3d7a9d480.

Next step: revert my other change.

Change-Id: I7a2302c527c8a85ce9f37d6e4f68c1e2d0adb741
Reviewed-on: https://code.wireshark.org/review/1740
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUpdate comment about -Wunreachable-code and -Wdocumentation
Alexis La Goutte [Thu, 22 May 2014 17:23:22 +0000 (19:23 +0200)]
Update comment about -Wunreachable-code and -Wdocumentation

Change-Id: I5b942bdacc5f4a9ecfa084dbff479eba6582b0df
Reviewed-on: https://code.wireshark.org/review/1726
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoAdd jumbo-allocation support to wmem fast block
Evan Huus [Mon, 19 May 2014 02:17:30 +0000 (22:17 -0400)]
Add jumbo-allocation support to wmem fast block

As it turns out, we do occasionally need it.

Bug:10115
Change-Id: Ifec79e4d2470bbc09f15674534d01418a6571a0d
Reviewed-on: https://code.wireshark.org/review/1688
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoAdd cast to please mac buildbot
Evan Huus [Fri, 23 May 2014 03:34:24 +0000 (23:34 -0400)]
Add cast to please mac buildbot

Change-Id: Ifffcd79732f0eeaad9f618cb5b8e98217fae32da
Reviewed-on: https://code.wireshark.org/review/1738
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix some white space issues.
Guy Harris [Fri, 23 May 2014 03:05:20 +0000 (20:05 -0700)]
Fix some white space issues.

Change-Id: I3b4f57c2d1ceffeea1770494fe19a0eee8717a76
Reviewed-on: https://code.wireshark.org/review/1737
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAllow wtap_read() and wtap_seek_read() to return non-packet records.
Guy Harris [Fri, 23 May 2014 03:01:31 +0000 (20:01 -0700)]
Allow wtap_read() and wtap_seek_read() to return non-packet records.

This is the first step towards implementing the mechanisms requestd in
bug 8590; currently, we don't return any records other than packet
records from libwiretap, and just ignore non-packet records in the rest
of Wireshark, but this at least gets the ball rolling.

Change-Id: I34a45b54dd361f69fdad1a758d8ca4f42d67d574
Reviewed-on: https://code.wireshark.org/review/1736
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agotvb parameter should not be NULL as the lengths are nonzero.
Michael Mann [Fri, 23 May 2014 02:54:28 +0000 (22:54 -0400)]
tvb parameter should not be NULL as the lengths are nonzero.

Change-Id: If085a9fc69bbbf28a7c801930a664c412a4a5b7a
Reviewed-on: https://code.wireshark.org/review/1734
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoDon't use sizeof(guintN) for sizes of data in packets.
Guy Harris [Thu, 22 May 2014 21:53:30 +0000 (14:53 -0700)]
Don't use sizeof(guintN) for sizes of data in packets.

Either

1) sizeof(guintN) = N/8, in which case it's redundant

or

2) sizeof(guintN) != N/8, in which case it's wrong.

This also keeps us from having to throw casts at complaints about
shortening 64-bit values.

Change-Id: I33911acfc54c0f3f21b73026a100a82b1ee2c35e
Reviewed-on: https://code.wireshark.org/review/1731
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRADIUS: Remove double space before type (t=...)
Alexis La Goutte [Thu, 22 May 2014 20:09:27 +0000 (22:09 +0200)]
RADIUS: Remove double space before type (t=...)

Change-Id: I536a359e7c808b3ace8387e30117f307c0a66e8b
Reviewed-on: https://code.wireshark.org/review/1729
Reviewed-by: Anders Broman <a.broman58@gmail.com>