Commit Graph

53038 Commits

Author SHA1 Message Date
Bill Meier e5705070c8 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>
2014-05-28 15:30:12 +00:00
Bill Meier 4467e02bf4 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>
2014-05-28 15:27:22 +00:00
Alexis La Goutte 76cabf3682 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>
2014-05-28 15:18:29 +00:00
Joerg Mayer 6dabe124dc Commit 5ff629ec5a requires the minimum
cmake version to be 2.8.3. Make this explicit.

  commit 5ff629ec5a
  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>
2014-05-28 15:15:32 +00:00
ruengeler 925b48ec75 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>
2014-05-28 14:33:50 +00:00
ruengeler 9d77e7cff8 QIcon is not needed.
Change-Id: I07207177e97e22bb8810226818b2280db5f5055e
Reviewed-on: https://code.wireshark.org/review/1836
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28 12:36:12 +00:00
Vikhyat Umrao 9cd3c5c5fc 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>
2014-05-28 08:51:16 +00:00
Anish Bhatt 482e6a6510 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>
2014-05-28 05:54:53 +00:00
Michael Mann 0701d6170d Add EtherNet/IP connection conversation filters
Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236
Reviewed-on: https://code.wireshark.org/review/1810
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28 00:25:18 +00:00
Alexis La Goutte c3b2b54c92 Fix indent (use 4 spaces)
Change-Id: I9e37c911865a0e3b13331ec03df05d79749904c5
Reviewed-on: https://code.wireshark.org/review/1811
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28 00:02:07 +00:00
Alexis La Goutte eb1bbb677d Fix indent (use tabs)
Change-Id: Iecb242bddb06779ba8b5ce8913fa9c4f64d7f79a
Reviewed-on: https://code.wireshark.org/review/1812
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 23:58:08 +00:00
Jakub Zawadzki 1b439df610 Use proto_tree_add_format_text()
Change-Id: Ie111c4db4afd0702f5a016da1547486631f571d8
Reviewed-on: https://code.wireshark.org/review/1818
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 23:55:27 +00:00
Bill Meier cc3931c797 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>
2014-05-27 22:02:38 +00:00
Martin Kaiser b4fb165ef3 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>
2014-05-27 21:42:33 +00:00
Martin Kaiser b3008f31ec make cable symbol rate filterable
Change-Id: I034b351d4bc12f6c00a0224a5c5b9f85496657b6
Reviewed-on: https://code.wireshark.org/review/1824
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-27 21:42:15 +00:00
Martin Kaiser 9c98f9fdbd make cable frequency filterable
Change-Id: I8464fb8e98e485523127dd95948a717554b6aee4
Reviewed-on: https://code.wireshark.org/review/1823
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-27 21:21:44 +00:00
Hauke Mehrtens 3ce020a5fc 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>
2014-05-27 20:56:02 +00:00
Martin Kaiser 0911ce12ff 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>
2014-05-27 15:13:33 +00:00
Alexis La Goutte 281616f09b 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>
2014-05-27 11:46:53 +00:00
Alexis La Goutte 5ff629ec5a 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>
2014-05-27 11:20:55 +00:00
Martin Kaiser 75272241a1 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>
2014-05-27 09:45:17 +00:00
Evan Huus abed02a8f7 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>
2014-05-26 23:15:49 +00:00
Jakub Zawadzki 5dfdd2b5a5 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 - 5235dc6ca0

[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>
2014-05-26 21:53:38 +00:00
Joerg Mayer 70d67a21ae 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>
2014-05-26 19:38:43 +00:00
Evan Huus 26840fa88f 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>
2014-05-26 12:20:35 +00:00
Pascal Quantin 37d40eb210 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>
2014-05-25 21:20:34 +00:00
Bill Meier f8d6351635 Fix [-Werror=clobbered] gcc warning
Change-Id: Ibeef517a5100ae6d2c01f329022281b81a8b56a9
Reviewed-on: https://code.wireshark.org/review/1795
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-25 18:25:24 +00:00
Evan Huus 08ce84ebbe 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>
2014-05-25 18:12:00 +00:00
Pascal Quantin c4ead251da 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>
2014-05-25 16:39:00 +00:00
Gerald Combs ff2061ac0a [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>
2014-05-25 15:24:55 +00:00
Guy Harris 32298547e4 Get rid of trailing blank.
Change-Id: I9eb6baee8866241a42d007d9bc69f64ab46f9a2e
Reviewed-on: https://code.wireshark.org/review/1786
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-25 00:38:16 +00:00
Guy Harris 088b06418a 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>
2014-05-25 00:36:23 +00:00
Guy Harris 318cf8a678 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>
2014-05-25 00:05:07 +00:00
Guy Harris 6dffc3b7e3 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>
2014-05-24 21:54:45 +00:00
Guy Harris d5b173009c Fix a compiler warning.
Change-Id: I5b4b518982dc6033842b1e791e67d2faddfb5487
Reviewed-on: https://code.wireshark.org/review/1777
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-24 21:21:33 +00:00
Guy Harris 1b6cc6320e 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>
2014-05-24 20:57:57 +00:00
Guy Harris 6db77b000f 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>
2014-05-24 18:31:25 +00:00
Sean O. Stalley 33ae4cb024 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>
2014-05-24 06:51:17 +00:00
Guy Harris f67fc8a4d2 Fix some whitespace issues.
Change-Id: I363361e898c4b37fcde29847a1473530e5052733
Reviewed-on: https://code.wireshark.org/review/1771
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-23 23:44:57 +00:00
Guy Harris d470a468a6 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>
2014-05-23 23:41:21 +00:00
Guy Harris 9e2db542a2 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>
2014-05-23 23:24:21 +00:00
Guy Harris dc0ff56d75 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>
2014-05-23 22:36:01 +00:00
Guy Harris f635efb6a6 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>
2014-05-23 21:04:06 +00:00
Gerald Combs 285405a0d7 1.11.4 → 1.99.0.
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044
Reviewed-on: https://code.wireshark.org/review/1761
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-23 20:57:42 +00:00
Guy Harris 8a7e1f4879 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>
2014-05-23 18:53:45 +00:00
Guy Harris 8ce793c09b 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>
2014-05-23 18:10:39 +00:00
Guy Harris 7f6f5fc5f4 Fix comment.
Change-Id: Ifa526ff6a9f685a0956e1b2e49f35fecfd290cb0
Reviewed-on: https://code.wireshark.org/review/1755
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-23 18:07:53 +00:00
Guy Harris ae1ec156e8 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>
2014-05-23 18:03:08 +00:00
Guy Harris 1a9336b0cf Fix a comment.
Change-Id: I91a5c52939a516807431494a4120aecc5b0dba41
Reviewed-on: https://code.wireshark.org/review/1753
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-23 17:59:41 +00:00
Guy Harris f8d7255e78 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>
2014-05-23 17:57:53 +00:00