Commit graph

52322 commits

Author SHA1 Message Date
Pascal Quantin
590fcbc66f Upgrade Windows builds to Lua 5.2.3
Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0
Reviewed-on: https://code.wireshark.org/review/974
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-05 22:41:06 +00:00
Hauke Mehrtens
d6fa45848c ssl-utils: add support for tls cipher suites from draft-mcgrew-tls-aes-ccm-ecc-08
This adds the new cipher suites from
http://tools.ietf.org/html/draft-mcgrew-tls-aes-ccm-ecc-08
They are defined by IANA in
https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4

Change-Id: I1a1576567782abb93ae5b09efd4199cb1040d5d2
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/966
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-05 22:31:23 +00:00
Hadriel Kaplan
293b5ea41d Get it compiling again: packet-asterix.c has unused const variable.
Change-Id: I07125f1779063527f24d9195a9999cef4c8fe343
Reviewed-on: https://code.wireshark.org/review/972
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-05 18:18:46 +00:00
Michael Mann
bc40848385 Rework debug_print_hash logic so that it's supported by older versions of perl.
Change-Id: I1720681dc367e01268ffbb1f31035464fa642496
Reviewed-on: https://code.wireshark.org/review/971
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
2014-04-05 12:03:49 +00:00
Michael Mann
f415e23d90 Decoder for category 021 added to ASTERIX dissector. Bug 9953.
Change-Id: If72685f41cd32854d6c0c04716ee640196431f87
Reviewed-on: https://code.wireshark.org/review/961
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-05 02:21:45 +00:00
Michael Mann
9fa48e3796 New DCE/RPC MDSSVC dissector. Bug 9950
Change-Id: I8832c139938e767de71b2cc74ca41208f509e478
Reviewed-on: https://code.wireshark.org/review/959
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-04 23:04:47 +00:00
Michael Mann
b6a5f8939a Expose dissect_spotlight as its own dissector. Needed for DCE/RPC MDSSVC
Change-Id: I5c9dbd59b18eff5dc9cb9476f1883cb9fa9d9c02
Reviewed-on: https://code.wireshark.org/review/958
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-04 23:03:03 +00:00
Jeff Morriss
b3460506e3 Get it compiling again.
Change-Id: Iecc560a672970817ddc401c654c19f446fe398e9
Reviewed-on: https://code.wireshark.org/review/963
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-04-04 15:56:55 +00:00
AndersBroman
b40b655298 Change tvb_get_string() -> tvb_get_string_enc and ENC_ASCII -> ENC_UTF_8
Change-Id: I07ecca5612ae9fa2b053a62c69014612c5125d5e
Reviewed-on: https://code.wireshark.org/review/962
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-04 14:37:02 +00:00
Alexis La Goutte
196677514c Remove $Id$ in wslua
Change-Id: I01052bb4c41a17e8289cc7ed1b465042c23b6d82
Reviewed-on: https://code.wireshark.org/review/957
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-04 07:25:27 +00:00
Evan Huus
131bba88c5 Remember to destroy the pinfo pool cache
Otherwise a library reinitialization leaks at least one large 8MB chunk.

Change-Id: I5336fef5925eb54e88a72f1a16fc0ddf77ae6c10
Reviewed-on: https://code.wireshark.org/review/945
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-04 07:22:53 +00:00
Alexis La Goutte
8db838ed1d Fix indent and add modelines
(Indent typo coming from 23d7d2ca26)

Change-Id: Ic4deae30d64db9f264223366d2d9d880708001d8
Reviewed-on: https://code.wireshark.org/review/956
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-04 07:22:22 +00:00
Jeff Morriss
e2ded09289 Don't do TSN analysis on data chunks embedded in PKTDROP chunks; set in_error_pkt too.
Add a comment indicating what we should be doing when the PKTDROP chunk contains
a truncated data chunk.

Change-Id: Icbba4c6dafc5c2656fc337734a1a570ef4a055d2
Reviewed-on: https://code.wireshark.org/review/950
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-04 04:09:36 +00:00
Guy Harris
38b1be99be Fix more verbs, and fix one field long name that matches its blurb now.
Change-Id: I78a011291217be901efba331e8e41ca527d52e10
Reviewed-on: https://code.wireshark.org/review/955
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-04 03:14:53 +00:00
Guy Harris
c5e29ac9a5 Clean up some strings - "UTF8" to "UTF-8", etc..
Clean up the display of addresses a bit, and the use of verbs in some
field descriptions.

Change-Id: I3d2d4fc4cd13503924abecee55adfaa899385ffb
Reviewed-on: https://code.wireshark.org/review/954
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-04 02:27:28 +00:00
Jeff Morriss
5bb64c00b6 Strengthen the Diameter heuristics to avoid trying to reassemble enormous messages.
Fixes some heuristics mistakes pointed out in
http://ask.wireshark.org/questions/31227/diameter-reassembly-malformed-packets

Change-Id: Iffc97d46cee5dd532fec0031286927fbcb86c095
Reviewed-on: https://code.wireshark.org/review/949
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-04 00:11:12 +00:00
Martin Kaiser
df52f81ba5 fix a typo
Change-Id: If339a36a6e3d8bedef6eed36eb121e9f25afa6e5
Reviewed-on: https://code.wireshark.org/review/951
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-03 21:12:11 +00:00
AndersBroman
23d7d2ca26 Add a preference to enable loading of the database. Effectivly
dissabling the dissector. Defaulted to FALSE e.g dissebling the
dissector.
The usage of this dissector is limited and most people don't use it so
it might as well be dissabled by default. See Bug 9569 for a discussion on
the subject.

Change-Id: I82f675bcf8ba37220105c98360195ea805aa7330
Reviewed-on: https://code.wireshark.org/review/939
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-03 20:50:03 +00:00
Bill Meier
e6623536f1 Remove garbage character inadvertantly introduced in the previous commit.
Change-Id: I6338fdb4506973ea5ed991512bbefa6b855640e9
Reviewed-on: https://code.wireshark.org/review/944
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-03 16:36:28 +00:00
Bill Meier
a45602cad0 Create/use an extended value-string; Do other minor changes;
Minor changes:
 - Remove a few unneeded initializers;
 - Convert "4 space tab" indentation to spaces;
 - Fix some indentation;
 - Remove some boilerplate comments;
 - Adjust exitor modelines.

Change-Id: Ie314a2d91bf89f8612dec9e9f161d987ea107dd5
Reviewed-on: https://code.wireshark.org/review/942
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-03 15:33:20 +00:00
Bill Meier
c0b0a11e4e (Pedantic): set editor modelines tab-width & etc to 8; Also: fix some indentation in packet-sip.c
Change-Id: I623fc5e4c1247dbe5e15f0f33270f4f0994268ab
Reviewed-on: https://code.wireshark.org/review/943
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-03 15:31:56 +00:00
Evan Huus
dc84709705 please checkAPI
Change-Id: I2dbd1fcb47b75300e753b5ef2dc60e68ca1b5fa5
Reviewed-on: https://code.wireshark.org/review/941
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-03 12:55:42 +00:00
AndersBroman
5e4769dc87 Use ENC_UTF_8 for strings, it's faster and *should* be OK.
Change-Id: I7615f407a017454d3fb11ec0b45b584bfa5d79b5
Reviewed-on: https://code.wireshark.org/review/940
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03 11:57:40 +00:00
Guy Harris
4daf6f38d9 Make payload type arguments guint rather than guint8.
That should suppress some "cast to pointer from integer of different
size" warnings.

Change-Id: I2ef38e16ce866e244cb7c0a2275dfb5975980fc4
Reviewed-on: https://code.wireshark.org/review/938
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03 07:01:38 +00:00
Guy Harris
a5a692c4ec Handle DLT_USER2 as PKTAP, to handle Mavericks.
Change-Id: Ic58c3584994f822d5d5a1434050aaa61f86ba17c
Reviewed-on: https://code.wireshark.org/review/937
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03 06:55:18 +00:00
Guy Harris
618c27b5e6 Add a capture_pktap() routine and use it.
That way, the packet counts are will be valid when capturing.

Change-Id: I0a21cc817d918e7f849620db5ca6dfd84bd2cd87
Reviewed-on: https://code.wireshark.org/review/936
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03 06:45:46 +00:00
Hadriel Kaplan
04c05a21e3 Fix Bug 9920 Buildbot crash due to SDP/RTP mismatch
For details see comments in Bug 9920.

The executive summary:
Bug 9920 is a crash caused by a couple of issues:

1) The memory ownership model for the rtp_dyn_payload hashtable is split: SDP
creates the rtp_dyn_payload hashtable, but RTP can free it. Since there isn't
*one* pointer to the hashtable, RTP freeing it means SDP has a dangling
pointer.

2) Either the SDP dissector shouldn't be creating two separate, unique
hashtables for multiple media channels of the same addr:port, or RTP shouldn't
be free'ing the previous one.

Change-Id: I436e67de6882f84aa82dcbdfe60bf313fe4fd99c
Reviewed-on: https://code.wireshark.org/review/918
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03 04:40:20 +00:00
AndersBroman
df80f3133c Fix a typo
Change-Id: Ie32a140e49140a92c69cb6fa84cdc55402516830
Reviewed-on: https://code.wireshark.org/review/935
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03 04:39:06 +00:00
AndersBroman
67cc462941 Don't use external function internaly to avoid multiple checks.
tvb_captured_length()                      -> tvb->length
tvb_captured_length_remaining(tvb, offset) -> (Inline) _tvb_captured_length_remaining()
tvb_get_ptr()                              -> ensure_contiguous()

Change-Id: I3540854c9b51ca9c3319b030c7d91b4aff976a26
Reviewed-on: https://code.wireshark.org/review/922
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03 04:08:45 +00:00
AndersBroman
84bc050a89 In the string handling routines don't call tvb_get_...() inside the loops insted get the ptr and read
directly avoiding the overhead of calling fast_ensure_contiguous()
repeatibly.

Change-Id: Ib5eee87ef9d49cb4e46b3b9c3d3db0134d3c4a32
Reviewed-on: https://code.wireshark.org/review/889
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03 04:08:00 +00:00
Guy Harris
e982992f71 For single-precision calculations, use single-precision constants.
Otherwise the calculation is done in double precision, and some
compilers complain of a double-precision value being assigned to a
single-precision variable.

Change-Id: I78317a0e9b625ae4f34df3597fdb5eba711bcae2
Reviewed-on: https://code.wireshark.org/review/934
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03 03:19:23 +00:00
Guy Harris
9bd093289c For single-precision calculations, use single-precision constants.
Otherwise the calculation is done in double precision, and some
compilers complain of a double-precision value being assigned to a
single-precision variable.

Change-Id: I41699fa69e21a2c42d54867765f9fa35a9ab7414
Reviewed-on: https://code.wireshark.org/review/933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03 03:05:43 +00:00
Pascal Quantin
0d6f511f22 Add PKTAP to release notes
Change-Id: Ibec2b400493b0936505e467d1ae9bc6551e6cc03
Reviewed-on: https://code.wireshark.org/review/931
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-03 01:44:42 +00:00
Gerald Combs
0a4993500b Add a backporting chapter.
Change-Id: Id0e017b18e95d6703e166fa09f767200d8ed1f8d
Reviewed-on: https://code.wireshark.org/review/925
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-02 23:08:57 +00:00
Martin Kaiser
50a5598b08 dissect gama chunk
Change-Id: I4fcdb926db9d2f23f5901586b5d97b727237db3d
Reviewed-on: https://code.wireshark.org/review/930
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-02 20:57:06 +00:00
Gerald Combs
29519c4476 Remove extra parenthesis in EQ_SEQ.
Fixes the following clang warning:

epan/follow.c:397:20: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality]
  if ( ((sequence) == (seq[src_index])) ) {
        ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~
epan/follow.c:397:20: note: remove extraneous parentheses around the comparison to silence this warning
  if ( ((sequence) == (seq[src_index])) ) {
       ~           ^                  ~
epan/follow.c:397:20: note: use '=' to turn this equality comparison into an assignment
  if ( ((sequence) == (seq[src_index])) ) {
                   ^~
                   =

Change-Id: Ic257bbc598e17f854b671056887ca1a13dcea850
Reviewed-on: https://code.wireshark.org/review/928
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-02 19:53:52 +00:00
Martin Kaiser
b8b68f79a1 dissect the chrm chunk
Change-Id: I922169d4e246470e018d3db53964ae3f794642f6
Reviewed-on: https://code.wireshark.org/review/927
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-02 19:24:17 +00:00
Martin Kaiser
eee21a6e1e redefine proto_tree_add_float_format_value() if we're using the new
proto tree api, similar to other proto_tree_add_...() functions

Change-Id: Iaef0711b8221a7bbb24f1004c81a1438f5674e42
Reviewed-on: https://code.wireshark.org/review/926
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-02 19:23:57 +00:00
Evan Huus
b238cd1541 Scrap wmem splay trees for now.
There is confusion about API usage, and problems on my part concerning whether
keys should be compared signed or unsigned, and how to do that efficiently.
Unsigned keys in particular were behaving oddly.

Change-Id: I075693bbd04c15f79f24f9a24006003a914cc572
Reviewed-on: https://code.wireshark.org/review/924
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-02 17:14:16 +00:00
AndersBroman
941088262b Add a cople of missing pcap.extension IE:s
Change-Id: I7086349f3fb9e3fd8c1ea902ef08b54c27b0a8c5
Reviewed-on: https://code.wireshark.org/review/923
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-02 15:53:07 +00:00
Michael Mann
5838881f2e Have Infiniband dissector show payload. Bug 9929.
The trees in the infiniband dissectors were incorrectly setup causing the data dissector to always have a NULL tree (so it wouldn't appear in packet view).

Also cleaned up some other unnecessary global variables.

Change-Id: I778073bdca864dfc5087cdcfc7ef0018f9bd704c
Reviewed-on: https://code.wireshark.org/review/915
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-02 14:05:43 +00:00
AndersBroman
8570f17510 Fix packet-bootp.c:5368:18: error: 'ti' may be used uninitialized in this
function

Change-Id: I15f32e7b5c9ce23e1ddc00792b2d5c37945ae081
Reviewed-on: https://code.wireshark.org/review/920
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-02 11:33:29 +00:00
Alexis La Goutte
255eca0c1c Revert Remove check and inverse code to display a error if there is a $Id$
Change-Id: I7061ad312df5079924c927ca95a8fa111c756012
Reviewed-on: https://code.wireshark.org/review/498
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-02 08:57:22 +00:00
AndersBroman
781a41a008 From Martin Mathieson:
Show the message type name in option 53, as well as in the bootp protocol root.

Change-Id: I5864a2024d3e64fa8eeee40b465dcd3459b8472e
Reviewed-on: https://code.wireshark.org/review/910
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-02 08:48:17 +00:00
Bart Van Assche
761464f8ad Fix InfiniBand dissector. Bug 9719
Change-Id: I7b9df14b4d9aa520c3fe28c86014665461b758f2
Reviewed-on: https://code.wireshark.org/review/917
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-02 08:14:53 +00:00
Bill Meier
7f6a1cee54 packet-pdc.c: Add asterix protocol layer to base tree (not to PDC tree).
PDC capture file: See attachment to Bug #9746

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

Change-Id: I815779f4213d1caec3e1c8dc46506bcc8647bcbb
Reviewed-on: https://code.wireshark.org/review/914
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-02 00:44:54 +00:00
Martin Kaiser
577f16a25c use tvb_find_guint8() to find the 0 termination in a text chunk
keyword and text are latin1 strings

Change-Id: I01637efa2ebf4d1e1a83f6001737066dc1258e6c
Reviewed-on: https://code.wireshark.org/review/913
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-01 21:26:12 +00:00
Guy Harris
fc48f57214 Add a dissector for Apple's PKTAP headers.
It automatically works for LINKTYPE_PKTAP and, by default, for
LINKTYPE_USER2; if any other dissector is specified for LINKTYPE_USER2,
that dissector overrides PKTAP.

Change-Id: Ic00ac8a81c6101e45d638d337aef42df3920da12
Reviewed-on: https://code.wireshark.org/review/903
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-01 17:03:29 +00:00
Pavel Karneliuk
47d296709d replace comparing sequence numbers of TCP segments with wrap-firendly XX_SEQ macros; replace tabs with 2 whitespace indentations
Change-Id: I8af522cc34863501195d0a79db5c0ab4135246a8
Reviewed-on: https://code.wireshark.org/review/907
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01 15:44:10 +00:00
Pavel Karneliuk
0b5f26b67d fix comparing a sequence number of TCP fragment when its value wraps over uint32_t limit
Change-Id: I0ff939e2d1265a2d9380c83f8f538bb43b0dadf9
Reviewed-on: https://code.wireshark.org/review/875
Reviewed-by: Pavel Karneliuk <pavel_karneliuk@epam.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01 15:42:51 +00:00