Commit Graph

20011 Commits

Author SHA1 Message Date
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 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 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 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 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
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
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
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
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
Graham Bloice 8c5e9fcb82 Fixed display of IIN during reads and writes of IIN object.
Added (hidden) dnp3.addr field set by both source and destination dnp3
addresses to allow easier filtering.

Change-Id: I04980c24c1b9f30a2ee5a0d5ea4ac32ae877504e
Reviewed-on: https://code.wireshark.org/review/908
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-04-01 13:05:45 +00:00
AndersBroman 2284f0bdfa For now use UTF-8 for all strings for performance reasons.
Change-Id: If47ffbee58d534ce3d44f00e1e5b966bc42a2ea8
Reviewed-on: https://code.wireshark.org/review/906
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01 08:06:16 +00:00
Bill Meier a8e9637090 Fix two bugs and do misc other minor changes;
Bugs fixed:
 - col_...() should not be called under 'if (tree)';
 - proto_reg_handoff_pdc(): pdc tcp.port preference change was handled incorrectly;

Minor changes:
- Move proto_reg_handoff...() to the end of the file as per convention;
- new_register_dissector...() call not needed;
- Remove some unneeded initializers;
- 'xxx++' ==> 'xxx += 1' in a few instances;
- widen a few variables (guint? ==> guint);
- Add XXX comment about possible simplification of the code;
- Remove unneeded #include <epan/reassemble.h>;
- Reformat hf[] entries for readability;
- Do whitespace changes;

Change-Id: Ib9224f0c6392a45c19656a63bbac97fbaf3acc08
Reviewed-on: https://code.wireshark.org/review/900
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-01 03:46:02 +00:00
Bill Meier a72dc7a2dd Fix expert_...() calls to not be under 'if (tree)';Do other minor changes;
Minor changes;
 - Remove #include <epan/etypes.h>; It's not needed;
 - Do some whitespace changes;
 - Use tab-width=8 in editor modelines

Change-Id: I84a1c9bc814fae384c4d5a434c2f9aed865c76ae
Reviewed-on: https://code.wireshark.org/review/899
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-01 03:44:58 +00:00
Alexis La Goutte b7b33b54bd Continue to remove $Id$ from top of file
Last one $Id$ (remove by hand) to make checkAPI haapy !

Change-Id: I5adfdcac0629a36e08c5fe3ea7960bdbc251364f
Reviewed-on: https://code.wireshark.org/review/887
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:49:52 +00:00
Alexis La Goutte 7d77d753c6 Continue to remove $Id$ from top of file
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ )

Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9
Reviewed-on: https://code.wireshark.org/review/886
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:49:26 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Alexis La Goutte b0ba475fbf Continue to remove $Id$ from top of file
(Using sed : sed -i '/^  \$Id\$/,+1 d') (No star only 2 spaces before)

Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54
Reviewed-on: https://code.wireshark.org/review/883
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:46:57 +00:00
Alexis La Goutte 09cd306d1c Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\* \$Id\$/,+1 d') (no space before star)

Change-Id: I318968db2b8512ba1303b5fc5c624c66441658f0
Reviewed-on: https://code.wireshark.org/review/879
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:30:52 +00:00
Alexis La Goutte f2dfc39d94 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^ \t$Id\$/,+0 d') (tab before $Id$)

Also modify generator (NDR.pm)

Change-Id: I348a1d129d1d1320bd80b428038ea5ed291d6ca8
Reviewed-on: https://code.wireshark.org/review/878
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:29:18 +00:00
Alexis La Goutte 94a791a76e Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)

Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31 16:00:04 +00:00
AndersBroman b3708a9c4a According to RFC 3261
7 SIP Messages

   SIP is a text-based protocol and uses the UTF-8 charset

So use ENC_UTF_8|ENC_NA.

Change-Id: I0101eca3dd7d8ff9ebf98fd733548131b862919e
Reviewed-on: https://code.wireshark.org/review/890
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 15:51:27 +00:00
Alexis La Goutte 0973a321a9 Fix Argument with 'nonnull' attribute passed null found by Clang
Change-Id: Ie59c379a4f00c807ebc50c95eea2017f8cac0c69
Reviewed-on: https://code.wireshark.org/review/796
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31 08:29:18 +00:00
Hanspeter Portner 650ed5f249 packet-osc dissector bug fix of path validity func
- 'is_valid_path' function has been corrected
- an OSC path is valid if:
 - it consists of printable characters only
 - does not contain ' ' and '#'
- characters '*' ',' '?' '[' ']' '{' '}' are valid, but have special meaning at the receiving end (used for pattern matching)

Change-Id: I4ff4308d0955da2ef377d606b7778819b97754a0
Reviewed-on: https://code.wireshark.org/review/868
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-31 06:43:10 +00:00
Evan Huus adc46f571c Tighten the NO_MORE_DATA_CHECK macros
We should return if we've already somehow overflowed the apparent length, not
just if we've hit it dead on.

Fixes bug #9932 and probably others.

Change-Id: I2719c3bd38f03e18ea557df962ee4a1beb64c2e8
Reviewed-on: https://code.wireshark.org/review/862
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-29 16:04:50 +00:00
Pascal Quantin 7785dd00cd Please checkAPI.pl
Change-Id: I78e9d3781df81fd4edda7e9b20749cb096a05499
Reviewed-on: https://code.wireshark.org/review/861
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-28 22:51:50 +00:00