Commit Graph

52976 Commits

Author SHA1 Message Date
Guy Harris 716fdc8e39 Revert "Fix some white space issues."
This reverts commit 2456b22cd3.

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>
2014-05-23 10:48:57 +00:00
Alexis La Goutte ca97ba0fcb 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>
2014-05-23 07:23:42 +00:00
Evan Huus 1f265368c4 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>
2014-05-23 03:37:53 +00:00
Evan Huus 7a706d6e4d Add cast to please mac buildbot
Change-Id: Ifffcd79732f0eeaad9f618cb5b8e98217fae32da
Reviewed-on: https://code.wireshark.org/review/1738
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-23 03:35:11 +00:00
Guy Harris 2456b22cd3 Fix some white space issues.
Change-Id: I3b4f57c2d1ceffeea1770494fe19a0eee8717a76
Reviewed-on: https://code.wireshark.org/review/1737
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-23 03:05:56 +00:00
Guy Harris c0c480d08c 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>
2014-05-23 03:02:32 +00:00
Michael Mann 6287efb9c0 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>
2014-05-23 02:57:14 +00:00
Guy Harris b48a21588a 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>
2014-05-22 21:55:54 +00:00
Alexis La Goutte c4ca41e0cc 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>
2014-05-22 20:57:25 +00:00
Pascal Quantin b762dd0b58 GSM SIM: fix a typo and update obsolete API calls
Change-Id: Iccd51dde155e9aaed23eb753c27ae29c8cee94cd
Reviewed-on: https://code.wireshark.org/review/1725
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-22 19:08:26 +00:00
ruengeler a60c661dda Call dissect_ip_tcp_options to save the window scale.
Change-Id: I411b16cdb3bc128cb49218080179c43e13f96e99
Reviewed-on: https://code.wireshark.org/review/1723
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-22 16:35:44 +00:00
AndersBroman e1ab96cc40 Missed update of one dissector_try_heuristic() when merging.
ssed#	asn1/s1ap/s1ap.diff

Change-Id: I4bb473860bf116138fa82791aa0f4a952164476a
Reviewed-on: https://code.wireshark.org/review/1724
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-22 15:49:54 +00:00
Owen Kirby 177c6556f7 Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong.
Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a
Reviewed-on: https://code.wireshark.org/review/1167
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-22 15:05:33 +00:00
Alexis La Goutte 19c1989cfa Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ie97c65c1a995881eb400a44f17a493494f97d9dd
Reviewed-on: https://code.wireshark.org/review/1722
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-22 13:52:46 +00:00
Alexis La Goutte e92ee3590d Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I2c7ed98e28a5149562d61f8005629f351a31c11b
Reviewed-on: https://code.wireshark.org/review/1721
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-22 11:04:55 +00:00
Anish Bhatt db4abb64ea LLDP Cleanup : 802.3 TLV
Change-Id: Iac1740e7e1895388de3ef3c103ef6e60cc688d9e
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1720
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-22 07:13:39 +00:00
Roman Volkov adb3f70f92 Wrong length of Modulation Type and Modulation System fields in Satellite Delivery Descriptor
According EN300468 in Satellite Delivery Descriptor 'Modulation System' field has 1 bit length. 'Modulation Type' has 2 bits length.
But in my Wireshark 'Modulation System' is 2 bit long and 'Modulation Type' is 1 bit long.

bug: 10119
Change-Id: I762145418bbfc9c0621ee7ca1a07d35afb6d7d92
Reviewed-on: https://code.wireshark.org/review/1718
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-22 03:29:01 +00:00
Joerg Mayer 0cb180aae4 Print the values in the BSS Load Element in human readable format as well.
Change-Id: Ie20c340e06b970602a94c601be4c629ccae56e7c
Reviewed-on: https://code.wireshark.org/review/1719
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-21 23:02:59 +00:00
Mark Weel 011a330b13 DIS: implement IFF PDU
Change-Id: Ica5029ab31077f95cabde22ad7df42ced769a3d0
Reviewed-on: https://code.wireshark.org/review/1714
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-21 21:18:54 +00:00
AndersBroman 2cfda31ff0 Change the signature of dissector_try_heuristic() to return hdtbl_entry
which can be used to call the found heuristic dissector on the next pass.

Introduce call_heur_dissector_direct() to be used to call a heuristic
dissector which accepted the frame on the first pass.

Change-Id: I524edd717b7d92b510bd60acfeea686d5f2b4582
Reviewed-on: https://code.wireshark.org/review/1697
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-21 20:17:29 +00:00
Gerald Combs bb01c7ac38 Remove extra parentheses.
Fix the clang warning

epan/wmem/wmem_allocator_simple.c:49:27: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality]
    if ((allocator->count == allocator->size)) {
         ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~

We might want to add -Wno-parentheses-equality to the compiler flag
list but I'm not sure if doing so would hide valid problems.

Change-Id: Id59b55af1411f13309fbec77870f869e04a6f49f
Reviewed-on: https://code.wireshark.org/review/1717
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-21 17:44:26 +00:00
Lorand Jakab a15098800c Dissect Multicast Group Membership Information LCAF
Bug: 10126
Change-Id: I81d643978d663d6905070d3cd7e751286c316fcd
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1716
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-21 17:21:15 +00:00
Lorand Jakab 3a60f8df42 LISP: Add support for MAC address AFI
Change-Id: I105ba5a9623d482c912c94d2c21a1c02d869db56
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1715
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-21 17:09:04 +00:00
Lorand Jakab 87573a6561 Dissect Replication List Entries LCAF
Bug: 10124
Change-Id: Ided4fff8259bbf1b5cb4b5209be6e3931ab09fe5
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1711
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-21 13:03:14 +00:00
Lorand Jakab 93630b591b Add value to correct tree in Key/Value LCAF
Change-Id: Icd4ae54bff25e30406c70739c6c799db2484255b
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1713
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-21 12:05:37 +00:00
Lorand Jakab fa3eecf29a Add MAC address family numbers (RFC 7042)
See http://tools.ietf.org/html/rfc7042#section-5.2 for details

Change-Id: I6002bef860b67e21058a66489eb16df88ba0ddf0
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1712
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-21 12:04:54 +00:00
Evan Huus a1e6b10239 Fix lua directory tests.
The underlying directory iterator is not guaranteed to return directories in the
same order according to the glib documentation, so don't rely on the directory
order being the same when testing it.
https://developer.gnome.org/glib/2.37/glib-File-Utilities.html#g-dir-read-name

Bug:10009
Change-Id: I4b1078e1f3981921b1e83c4f77b4bc30a5d21b46
Reviewed-on: https://code.wireshark.org/review/1671
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-21 03:17:15 +00:00
Evan Huus 0ac1779822 Add cast to satisfy buildbot
Change-Id: Ib0f66fb6e4a577da7381a75789b08a0d0371ddd2
Reviewed-on: https://code.wireshark.org/review/1709
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-21 03:02:57 +00:00
Lorand Jakab 5d8c3cc450 Dissect Source/Destination 2-Tuple Lookups LCAF
Change-Id: I0e8595ab5cf5385a7fda636a1804b0788f9eb869
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1707
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-21 02:49:32 +00:00
Alexis La Goutte 2b0ad54034 Fix indent (use tabs)
Change-Id: Ie23faaeeab61c684d57c4ff7b3c1b4ff95906dbe
Reviewed-on: https://code.wireshark.org/review/1706
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-21 02:06:10 +00:00
Alexis La Goutte 438d1f8203 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I9bccb246817ee442fbb7c216e9a2599c791a54b2
Reviewed-on: https://code.wireshark.org/review/1708
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-20 22:05:30 +00:00
Peter Lemenkov 572e76bdf0 Don't panic in case of mediaproxy-ng/rtpengine extension
Change-Id: Id0441ec3e68b594051930623c17f45e806b79616
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1633
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-20 22:01:43 +00:00
Guy Martin 33fc6e614d Fix the SET_ADDRESS_HF() macro.
Change-Id: I01ac342f791b578be0aab80ce8fe07a97ba5ed50
Reviewed-on: https://code.wireshark.org/review/1691
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-20 19:18:47 +00:00
Alexis La Goutte 57e380af36 SSL/TLS: Add Padding Extension (20)
http://tools.ietf.org/html/draft-agl-tls-padding-03

Change-Id: I181718edf5b5f297aaf2e247524dfce069c90cce
Reviewed-on: https://code.wireshark.org/review/1703
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-20 19:15:37 +00:00
Anish Bhatt 7e4b8a1497 Fix error in dcbx feature TLV dissection. Willing and Error bits were flipped
Change-Id: Ia6d727909816b86c48232685adca653700f071d9
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1705
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-20 18:36:34 +00:00
Lorand Jakab c7cea8f233 Update ELP LCAF dissection to new draft revision
There was a change in the ELP LCAF packet format between
draft-ietf-lisp-lcaf revisions -03 and -04 reversing the flags and AFI
fields, to be more consistent with other LCAF types.

    http://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-lisp-lcaf-04.txt

Change-Id: I2c572050f413696f2d388969e7db24238783bd56
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1704
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-20 18:35:38 +00:00
Lorand Jakab e9f5dcf46f Dissect Key/Value Address Pair LCAF
Change-Id: Ic1640a823816c5cd225c573147ff9b6b8c88879e
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1702
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-20 16:23:29 +00:00
Alexis La Goutte 88ff6c08a1 PCP: Remove whitespace before (
Change-Id: I199895718311867be4c589137074c18ac4d45eea
Reviewed-on: https://code.wireshark.org/review/1701
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-20 16:19:45 +00:00
Alexis La Goutte 98991c3359 PCP: Discovering NAT64 IPv6 Prefixes Using the Port Control Protocol (RFC7225)
Change-Id: Ib404c3db8c13ebb0a2e1f6d9f767a183896f869f
Reviewed-on: https://code.wireshark.org/review/1700
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-20 16:19:00 +00:00
Alexis La Goutte 9c08654314 PCP: Add Description Option for the Port Control Protocol (RFC 7220)
Change-Id: I2931b14855981e71d1135a8ff7cc3b494a2a7572
Reviewed-on: https://code.wireshark.org/review/1699
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-20 16:17:41 +00:00
Alexis La Goutte 12d297ed75 PCP : Enhance display of Option...
* Display reserved using FT_BYTES
* Set option code in option subtree

Change-Id: Ie6cf32ed260ddccceaa9f617f0a74982c95f08f5
Reviewed-on: https://code.wireshark.org/review/1698
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-20 16:15:32 +00:00
Mark Weel eef176df4e DIS: update enumerations to SISO-REF-010-00v20-0
Change-Id: I99cd075bef5b8d3f2546032cc6ce9774bcf8efc1
Reviewed-on: https://code.wireshark.org/review/1695
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-19 22:01:06 +00:00
Sean O. Stalley 868fa65b01 Remove incorrect _U_ flag in dissect_mausb signature
Removes _U_ flag for data field in dissect_mausb(),
since tcp_dissect_pdus(), uses the data field.

Change-Id: Iccb5aae1aa203f98484666763410c4a555413ac0
Reviewed-on: https://code.wireshark.org/review/1696
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-19 20:13:06 +00:00
Guy Martin 78ba6e45c2 Fix warning about the adaptation field control for docsis packet. The specs actually say that it should be set to 1.
Change-Id: I136b48c6284c09798ee8e88f012a20e2cb16cd5e
Reviewed-on: https://code.wireshark.org/review/1693
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-19 17:22:09 +00:00
Guy Martin 69623c92d7 Increase frag_id for self contained subpackets in mp2t packets. This fix length calculation on second pass.
Change-Id: I6224657c0765fa9696829844b4819f6ab0a3d3f4
Reviewed-on: https://code.wireshark.org/review/1690
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-19 17:14:46 +00:00
Martin Kaiser 0adac831e0 convert SEK and SIV to their binary form only once when a new key/iv is
set, don't do the same conversion for each apdu

Change-Id: I6b19a0b4e138cd9d333b7ab95d6a8ee3eb516293
Reviewed-on: https://code.wireshark.org/review/1694
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-19 09:37:03 +00:00
Martin Kaiser 42220913c3 change the satellite frequency into a float (freq in GHz)
and make it filterable

Change-Id: I0644e5c69ff58301c00ea3d37e80f25b856168e4
Reviewed-on: https://code.wireshark.org/review/1689
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-19 09:14:20 +00:00
Jakub Zawadzki d7bd2ecf9f Add new proto_tree_add_format_text() function
There are lot of text dissectors which want just to add escaped (not filtrable) text,
add new function proto_tree_add_format_text() which just do this in optimized way.

Change-Id: Ia0e189b620cc0a5b74cfdaef1ad4571d766bb2ab
Reviewed-on: https://code.wireshark.org/review/1678
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-19 02:27:12 +00:00
Peter Wu e6d6183e1b ip: display calculated checksum
This patch adds a new "ip.checksum_calculated" field that can be used
for display in a column.

Based on d7c4bde279 ("tcp: display
calculated checksum").

Change-Id: Ide5eb6640d51ded88b1df309092a0a3aaf482b03
Reviewed-on: https://code.wireshark.org/review/1676
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-19 02:21:40 +00:00
Peter Wu 12d9fb7df0 udp: display calculated checksum
This patch adds a new "udp.checksum_calculated" field that can be used
for display in a column or tshark.

Based on d7c4bde279 ("tcp: display
calculated checksum").

Change-Id: Iefcfd8395adeff7a3ac58a1bfff1a3c97976aa56
Reviewed-on: https://code.wireshark.org/review/1675
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-19 02:21:36 +00:00