Commit Graph

30217 Commits

Author SHA1 Message Date
Alexander Wetzel cb3dd958af WPA/WPA2 decoding fixes and improvements
- start decoding when we have eapol1+2 packets
  Do not insist on a complete captured handshake, decode what we can.

- more robust way to detect eapol #2 packets
  At least Win 10 is violating the spec on rekey by setting the secure
  bit in #2. Unpatched version shows and handles #2 as #4, breaking
  decoding after rekey.

- fixed eapol rekey key handling
  Inital patch (see https://code.wireshark.org/review/8268)
  is adding redundant keys, since it scans all the time
  and not only once.

- ignore tailing garbage after eapol sections in frame
  See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9065#c8

Included testcase to test decode for incomplete handshakes and eapol2
packets with secure bit set on rekey.

Ping-Bug: 9065
Change-Id: Id775088db9b5aaa80da9efdeed6902d024b5c0cd
Reviewed-on: https://code.wireshark.org/review/11484
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-09 11:28:14 +00:00
Dario Lombardo d4985a5acb idl2wrs: fix some glibc calls in favour of glib.
This change should fix some complains from coverity.

Change-Id: Ic46212e12892779b2aa0276e028fea2d9fbb6985
Reviewed-on: https://code.wireshark.org/review/10545
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-09 11:28:05 +00:00
Gerald Combs 1e87ff4727 [Automatic update for 2015-11-08]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I5da56a10b8c73f804e98124895c513ad4c97a37b
Reviewed-on: https://code.wireshark.org/review/11643
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-08 18:51:12 +00:00
Gloria Pozuelo 0b3091fa35 GTP sequence number fix for allowing to have sequence number equal to 0
Change-Id: Id8aad52198905eb33ecccf5ace01287954f31d2e
Reviewed-on: https://code.wireshark.org/review/11526
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-08 17:02:53 +00:00
Martin Mathieson 7d8a094acb DCT2000: change switch to if - I'm surprised it compiled at all
Change-Id: If08fa66fbc21fc078f12866c868dd269aa72e319
Reviewed-on: https://code.wireshark.org/review/11640
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-11-08 16:31:50 +00:00
Martin Mathieson 44644ed4e1 DCT2000: eliminate dead code return from function (CID 1158885)
Change-Id: I622f048581dfcc4b49315a5ef45aa44499c6e096
Reviewed-on: https://code.wireshark.org/review/11639
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-11-08 15:08:48 +00:00
Guy Harris dc131874cb This doesn't need <wsutil/file_util.h>.
The only file system operations it does are printing of debugging output
to the standard output, so it doesn't need <wsutil/file_util.h>.

Change-Id: Ia5caf62a3aab418f039669aa0b54e163e54d0d21
Reviewed-on: https://code.wireshark.org/review/11635
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-08 09:35:01 +00:00
Guy Harris f385922d77 More needed <stdlib.h>. Note why it and <stdio.h> are needed.
Change-Id: Id3f5eb3740fbc66202311f1d7d7933193cf4da2d
Reviewed-on: https://code.wireshark.org/review/11633
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-08 01:13:22 +00:00
Guy Harris 71c09602ba <stdlib.h> is needed for atoi().
Change-Id: I93433fbbec8a78344c2d4e27c1c6fe03583010be
Reviewed-on: https://code.wireshark.org/review/11632
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-08 01:06:59 +00:00
Guy Harris 8e689a9d4a Remove some unnecessary includes.
Either remove them completely, or put them inside an #ifdef.

Change-Id: Iceff4909e250c17812f38d94e067f7c37ab72e1b
Reviewed-on: https://code.wireshark.org/review/11630
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-07 23:12:50 +00:00
Guy Harris e9ad65adbb Get rid of some commented-out stuff.
Change-Id: I8893d7cea5f7e56708c8a428256b7e9d543db887
Reviewed-on: https://code.wireshark.org/review/11629
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-07 22:57:54 +00:00
Guy Harris e52d0faed8 Remove #if 0'ed out includes.
Change-Id: I5670b2d87ed13bb0d1091a2308524bf3b7642eb0
Reviewed-on: https://code.wireshark.org/review/11628
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-07 22:52:40 +00:00
Guy Harris 0162e54075 Clean up includes of unistd.h, fcntl.h, and sys/stat.h.
Have wsutil/file_util.h include them on UN*X, just as it includes io.h
on Windows, so we can have a rule of "if you do file operations, include
<wsutil/file_util.h> and use the routines in it".

Remove includes of unistd.h, fcntl.h, and sys/stat.h that aren't
necessary (whether because of the addition of them to wsutil/file_util.h
or because they weren't needed in the first place).

Change-Id: Ie241dd74deff284e39a5f690a297dbb6e1dc485f
Reviewed-on: https://code.wireshark.org/review/11619
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-07 21:52:23 +00:00
João Valverde 24bfb7e35d column-utils: Refactor col_append_port() to col_append_ports()
Having a single function call to format source-destination port column info serves the
current (and presently only) use case better by having a single place to manage the
display format.

This commit does not introduce any actual formatting changes.

Change-Id: I1d479d0fd5690d12afb47e538057fdc2dd369ca2
Reviewed-on: https://code.wireshark.org/review/11539
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-07 21:15:11 +00:00
Michael Mann 31f004f1ca Further refactor GSS_API dissectors to pass gssapi_encrypt_info_t structure between dissectors instead of using packet_info.h
The only remaining explicit user of the packet_info members is the NTLMSSP dissector.  However, there may be "hidden" use of it in the spnego dissector passing between ASN.1 functions.
Someone more familiar with the protocols could possibly trim some of the "extra copies" between packet_info and gssapi_encrypt_info_t structure, but I went the "better safe than sorry" route.

Change-Id: I160d2cfccadc5f49b128609223cdff0162c3ca85
Reviewed-on: https://code.wireshark.org/review/11575
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-07 21:13:14 +00:00
João Valverde e6a2f17237 Add user preference to display IPv6 ext headers under root protocol tree
Also allow displaying the IPv6 header (correctly) as exactly 40 bytes long in
the bytes pane.

Ping-Bug: 10705
Change-Id: I1b4ea74202d519e7faf86c1c0f4f3c23403c2b2a
Reviewed-on: https://code.wireshark.org/review/11608
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-07 21:09:27 +00:00
Michael Mann 8ebc1084b2 DNS: Add support of DNS over TLS and over DTLS
See http://tools.ietf.org/html/draft-ietf-dprive-dns-over-tls-01
and https://www.ietf.org/id/draft-ietf-dprive-dnsodtls-02.txt

Bug: 11679
Change-Id: I5ebc43008951ddbb4570f5aeb55093aaf84f3401
Reviewed-on: https://code.wireshark.org/review/11528
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-07 14:13:08 +00:00
Michael Mann f4921c10e6 Add support for registering protocols (dissectors) over DTLS.
This is intentionally broken off of SSL to avoid confusion when UDP is involved.

Change-Id: Icfd3054be6aed2ebbd850a608efbc24f1a8f3831
Reviewed-on: https://code.wireshark.org/review/11612
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-07 14:12:43 +00:00
Michael Mann 3aefd3b5b2 Create real dissector tables for SSL and DTLS to use.
Since ssl_dissector_[add|delete] only take TCP dissectors, remove the parameter and just use it within the "internal" ssl_association_add call.

Change-Id: I0fdf941389934c20cbacf910250e17520614e706
Reviewed-on: https://code.wireshark.org/review/11591
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-07 14:11:01 +00:00
Michael Mann b56d323412 Consider "HTTP over UDP" to be SSDP.
SSDP now has its own protocol id to filter on (and use in Decode As), but all other fields are still HTTP as SSDP still doesn't have its own dissector.

Bug: 6190
Change-Id: I43394fb78ac699f0b06b9aa29df11a4e5345e260
Reviewed-on: https://code.wireshark.org/review/11616
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-07 14:10:31 +00:00
Jim Young e3c46268be isis-hello: Fix typo "Srea" -> "Area"
Change-Id: Ia251638186857d6be6a07c25e77bbd7e72a14290
Reviewed-on: https://code.wireshark.org/review/11620
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-07 07:46:00 +00:00
Stefan Metzmacher 5735738fdf packet-smb2: make smb2_set_dcerpc_file_id() more reliable
In response PDUs we may only get a smb2_fid_info_t
via si->saved->file instead of si->file.

Change-Id: I1e1ecdabec6267f4e4ee9246d020fe6e51a13c1d
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11598
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-07 07:45:05 +00:00
Peter Wu e0cf8b6ccf ssl: add expert info for session resumption
Add expert info to the Change Cipher Spec tree when session resumption
is detected. This can be used as hint that decryption using a RSA key
file will not succeed because of missing key material.

The name of this expert info is "ssl.resumed" or "dtls.resumed" and the
expert info message is "This session reuses previously negotiated keys
(Session resumption)".

Change-Id: I4a83edb13417631c97d6cfc4a57e2086bd217878
Reviewed-on: https://code.wireshark.org/review/11583
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-07 07:40:32 +00:00
Guy Harris 161f449c4e 4294967296 is not guaranteed to be a valid integer constant.
It's a floating-point operation, so just use 4294967296.0.

Change-Id: I97258c8058821b6d46d740668271c0803617cdc1
Reviewed-on: https://code.wireshark.org/review/11615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-06 21:21:15 +00:00
Guy Harris 3a598d96e5 Sort isi_sim_cause.
Change-Id: I97168f31925916bad1a8c894f3b5733d8ed8ad55
Reviewed-on: https://code.wireshark.org/review/11614
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-06 20:29:14 +00:00
Guy Harris fdeab5a22f Fix 32-bit OS X buildbot.
I guess it's not at risk of being clobbered by a longjmp() in a way that
affects the behavior of the code, but the older GCC on that buildbot
doesn't do the dataflow analysis to figure it out.

Change-Id: I770380e2a22d00aeccf5937203bc70968712d37f
Reviewed-on: https://code.wireshark.org/review/11611
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-06 19:34:45 +00:00
Guy Harris bebc416db9 "#if 0" out an unused value_string table.
The field that uses it is also "#if 0"'ed out.

"#if 0" out, rather than commenting out, the variable for that field, for
consistency.

Change-Id: If3c6ba6c780f41b35d3f28adcf4d8a29117c4652
Reviewed-on: https://code.wireshark.org/review/11609
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-06 19:15:20 +00:00
João Valverde ee0dbdc7ed MPTCP: Use wmem_list instead of GSList
Change-Id: Idb4e4d6d19169d6cacd98664232fd1fbd2cc2dca
Reviewed-on: https://code.wireshark.org/review/11534
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-06 18:43:02 +00:00
Tyson Key 2cd80a7d36 Add Nokia Intelligent Service Interface (ISI) dissector
From: https://github.com/shr-project/isi-wireshark-plugin/

Bug: 11676
Change-Id: If3f4d7e3e1dd674cb99e96eabdc3491dec76ea3a
Reviewed-on: https://code.wireshark.org/review/11580
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-06 18:38:13 +00:00
AndersBroman cb3bdecdba [Dissector tables] DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE -> DISSECTOR_TABLE_ALLOW_DUPLICATE
Change-Id: Id4d8d9a2d2befee7b82ac4e0e6f2f1b8f03b4532
Reviewed-on: https://code.wireshark.org/review/11603
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-06 18:26:31 +00:00
Pascal Quantin 677027a180 DCERPC: fix compilation with OSX buildbots and Ubuntu 15.10
Change-Id: I032874d0f023d99478be03c192cb529055a6c53e
Reviewed-on: https://code.wireshark.org/review/11601
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-06 17:41:00 +00:00
Gregor Beck af9ca05d3a packet-dcerpc: implement dissecting of rpc_sec_verification_trailer
See [MS-RPCE], https://msdn.microsoft.com/en-us/library/cc243559.aspx
and frame 34 in
https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=dcerpc-winreg-with-rpc-sec-verification-trailer.pcap

Change-Id: Ia96c1b220da5d22f2fbf216b9e6fa70b5e068deb
Signed-off-by: Gregor Beck <gbeck@sernet.de>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11362
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-06 08:05:50 +00:00
cbontje 35a1383814 Major Re-factoring of the dissector and some new features.
A change-list is as follows:
- Removed un-necessary dissector revision updates from the file header since GIT tracks these nicely.
- Added proper size detection of Modbus RTU messages (including exception responses), when dealing with partial TCP segment reassembly.
- Moved the 'register' decode preferences to the Modbus dissector as TCP vs. RTU granularity isn't needed in this case.
- Obsoleted un-unused 'address type format' user preferences
- Cleaned up dissect_modbus_data to remove proto_tree_set_text instances.
- For decoded register tree objects, use register 'address' instead of 'value' for the filter field to provide a more useful filter.
- Added in conversation support, to attempt to track responses back to matching requests.
- Use conversation support to attempt to populate proper register address offsets in the response messages.  Currently each request is saved and each response looks for the last prior request that matches the function code.
- Re-factored Modbus dissector to split apart request vs. response decoding.  This has led to cleaner code paths, but some duplication where replies and requests are identical format.

Change-Id: I0c86ae85b8ae4cc59b037e5f68f408833205fadd
Reviewed-on: https://code.wireshark.org/review/9914
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-06 07:52:09 +00:00
João Valverde 8fb1f8e552 reassemble: Add key destroy function to g_hash_table
Fixes memleak in reassemble.c

480 bytes in 60 blocks are definitely lost in loss record 3,010 of 3,059
   at 0x4C28C10: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
   by 0xADA3328: g_malloc (in /usr/lib/libglib-2.0.so.0.4600.1)
   by 0xADBA512: g_slice_alloc (in /usr/lib/libglib-2.0.so.0.4600.1)
   by 0x6575C7D: fragment_reassembled (reassemble.c:804)
   by 0x6577785: fragment_add_seq_check_work (reassemble.c:2027)
   by 0x6577880: fragment_add_seq_next (reassemble.c:2068)
   by 0x6E614E6: dissect_sccp_message (packet-sccp.c:2875)
   by 0x6E63641: dissect_sccp (packet-sccp.c:3401)
   by 0x6546CF7: call_dissector_through_handle (packet.c:620)
   by 0x6546EA1: call_dissector_work (packet.c:706)
   by 0x6547A04: dissector_try_uint_new (packet.c:1163)
   by 0x6547A65: dissector_try_uint (packet.c:1189)

Change-Id: I0117b48e1e5d5688c49f264f24387dd6de1d6e08
Reviewed-on: https://code.wireshark.org/review/11541
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-06 04:38:07 +00:00
Guy Harris ce22578996 Don't include io.h in Flex scanners - they're not interactive.
We don't have any Flex scanners that support an interactive command-line
interface, so none of our scanners are, or need to be, interactive.
Mark text2pcap's scanner as not interactive.

That means none of our scanners should call isatty(), so they don't have
any need to include <io.h> on Windows; remove that include from the
Lucent/Ascent text capture scanner.

Update a comment to reflect that what matters isn't whether we can read
from a terminal or whether we actually do so, what matters is whether
they read *interactively* from a terminal (if you want to run text2pcap
reading from the standard input and type at it, be my guest).

Change-Id: I59979d1fdb37e1913125a400963ff7a3fa6b9bbd
Reviewed-on: https://code.wireshark.org/review/11587
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-06 01:14:31 +00:00
Dario Lombardo 4ea610a54a dcerpc: add check for mutually exclusive function pointers
Found by clang analyzer.

Change-Id: Idb2e80edbb5b264fd257a7b4208ff75bd543df88
Reviewed-on: https://code.wireshark.org/review/10970
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-05 19:57:35 +00:00
Alexis La Goutte 52970ef9f8 DNS: Register dissector by name
Change-Id: I0eb03f2452c4f7fef0f527c7ce7154d479fcc3fd
Reviewed-on: https://code.wireshark.org/review/11544
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-05 17:16:57 +00:00
AndersBroman 2eec154561 [IPsec] Hand the subdissector the payload data only,
not including the padding and auth data.

Change-Id: Ib883fcb44def8d6fbdde19729519b40b32d78577
Reviewed-on: https://code.wireshark.org/review/11563
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-05 09:50:23 +00:00
Stefan Metzmacher 51dcd59d2d packet-dcerpc: let dcerpc_get_proto_name() handle unknown uuids
This fixes a regression in commit e0e574d167.

Change-Id: I447001a84e17a76ec77c48f736bbfcd8cc6324a1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11574
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-05 02:53:41 +00:00
Stefan Metzmacher ea0e29f3e6 packet-dcerpc: fix dissecting of decrypted payload
This fixes a regression in commit e0e574d167.

Change-Id: Iccdeeb488ec70727fc637ca548637e5a5e54ef1c
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11573
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-05 02:01:23 +00:00
Dario Lombardo 0e01c018fa gssapi: add init in wrap_dissect_gssapi_payload().
Found by clang analyzer.

Change-Id: I1c5cb13e174df588c8834508b10790d3fd5b272a
Reviewed-on: https://code.wireshark.org/review/11564
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 22:22:33 +00:00
Guy Harris a892e9ba71 Declaring volatile pointers to functions is hard, let's go shopping!
Change-Id: I9686f0c2be43df7a00a00ad2f6aadf6db464d809
Reviewed-on: https://code.wireshark.org/review/11570
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 18:42:48 +00:00
Guy Harris 283e63c7e0 Squelch a "setjmp/longjump may clobber" warning.
Clean up indentation while we're at it.

Change-Id: If2068fe17664d78c8fc9747b0ee63bac0213d174
Reviewed-on: https://code.wireshark.org/review/11567
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 17:54:54 +00:00
Pascal Quantin 87aca409dc SSL: fix SCTP port association so as to match what is done for UDP/TCP
Change-Id: I84f85b7b87ecd9e7801559f7eae2cc98f5a12ab7
Reviewed-on: https://code.wireshark.org/review/11560
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04 17:26:59 +00:00
Pascal Quantin df487145ee Skinny: fix dissector registration for SSL
Change-Id: Ia3f29b703b8271f52dfed9d8b46e18f405785d3a
Reviewed-on: https://code.wireshark.org/review/11559
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04 17:24:26 +00:00
Michael Mann 02dcf3cc72 Don't allow DCE/RPC dissector table to have duplicates
Add "placeholders" in Profinet dissector to make that possible.

Change-Id: I000069ec72b5810c5675a30df1c121aa179000b3
Reviewed-on: https://code.wireshark.org/review/11557
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 15:51:07 +00:00
Michael Mann 676e7ec427 (Temporarily) Allow DCE/RPC dissector table to have duplicates.
Change-Id: I0df81ce03b567e75566fc0969f49d54488604c16
Reviewed-on: https://code.wireshark.org/review/11555
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 13:15:30 +00:00
Michael Mann e0e574d167 Refactor DCE/RPC dissection to include a real dissector table.
This is hopefully just the first step in getting DCE/RPC dissection to use "standard" APIs instead of homegrown ones.
For starters, it allows Decode As functionality to be less hacky (although incomplete in Qt)

Change-Id: Ia0923a3d8d514ab7acce32e26ee7e08f6e24feca
Reviewed-on: https://code.wireshark.org/review/11468
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 12:43:35 +00:00
Michael Mann 74541a9596 Don't allow multiple registrations of a protocol in dissector tables.
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing.

The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not.  It's just ENFORCED for Decode As.

Bug: 3949
Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127
Reviewed-on: https://code.wireshark.org/review/11405
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 12:39:40 +00:00
Pavlos Antoniou cde99ec535 [OpenFlow] Use correct name for flag OFPMPF_REPLY_MORE in v5 dissector
Change-Id: Ia8cb88d4d884be95814f4a144a4c3b07b32ffca7
Reviewed-on: https://code.wireshark.org/review/11543
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04 11:38:12 +00:00
Guy Harris ff9f9fc431 Don't include "file.h" if you don't need it.
It ends up dragging in libwireshark headers, which programs not linking
with libwireshark shouldn't do.  In particular, including
<epan/address.h> causes some functions that refer to libwireshark
functions to be defined if the compiler doesn't handle "static inline"
the way GCC does, and you end up requiring libwireshark even though you
shouldn't require it.

Move plurality() to wsutil/str_util.h, so that non-libwireshark code can
get it without include epan/packet.h.  Fix includes as necessary.

Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3
Reviewed-on: https://code.wireshark.org/review/11545
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 08:46:30 +00:00
João Valverde 321934f2ff MPTCP: Use copy_address_wmem() instead of copy_address()
Change-Id: I9f53ecf1971c96d06c1c8e3be6e5481cc453f96a
Reviewed-on: https://code.wireshark.org/review/11533
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 02:49:33 +00:00
Michael Mann 795b5c1963 Refactor some GSS-API dissectors to accept dissector data instead of using packet_info.
This can hopefully lead to the removal of the GSS-API specific members of the packet_info structure.

Change-Id: I7622d66e9f02c6e4cb76adcf0737b35c6ec88cdd
Reviewed-on: https://code.wireshark.org/review/11509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 02:45:58 +00:00
Guy Harris 58431e2f6a Don't include libwireshark headers from libwiretap.
Move the definitions of hashipv4_t and hashipv6_t to wiretap/wtap.h, as
that's the main place they're used.  Change them a bit not to depend on
other stuff from libwireshark, and change the code as required by those
changes.

This should fix the Solaris build; apparently, the Sun^WOracle compiler
is generating code for static inline functions even if they're never
called, so that libwiretap ends up including code that calls tvbuff and
wmem functions.

There's probably further cleanup that could be done here, but this
should at least fix the build, as well as getting rid of a dependency
between two libraries that are at least somewhat independent (libwiretap
should *not* depend on libwireshark, as some programs use libwiretap but
not libwireshark, and, ultimately, we probably want it to be possible to
use libwireshark without libwiretap but that'd be more work).

Change-Id: I91c745282f17d7c8bff7809aa277eab2b3cf47c1
Reviewed-on: https://code.wireshark.org/review/11537
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 00:56:44 +00:00
Lotte Steenbrink 40b45dfb6e packetbb; display Addressblock Tail as Tail
when displaying the contents of a RFC5444 message containing an address block
with a tail, the tail's value is incorrectly displayed as:

Head: <value of tail>

while it should say:

Tail: <value of tail>

This commit fixes that.

Bug: 11673
Change-Id: Ibeb921cb712f98c9651970529e5240f871b85c0b
Reviewed-on: https://code.wireshark.org/review/11538
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 00:49:12 +00:00
Guy Harris 688f2e8768 Include packet-dcerpc-witness.h, so it's in the source tarball.
Change-Id: I3b0cc7cec85fb94776fae66e8c8f20710b3508e8
Reviewed-on: https://code.wireshark.org/review/11531
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-03 19:21:46 +00:00
Alexis La Goutte 657c55e862 GTPv2: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I6b2ddc2f84e954194260b956b6f46f0747d8a66a
Reviewed-on: https://code.wireshark.org/review/11504
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-03 14:35:21 +00:00
AndersBroman 6c64a41017 [SIP] Rework how the length of the diagnostic string is determined, it did
not work with multiple SIP packages in one frame.

Change-Id: Ie142aeea0c6ad28cfdd6206738a6f147094c479f
Reviewed-on: https://code.wireshark.org/review/11516
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-03 14:33:45 +00:00
Gregor Beck f528f55cd5 packet-dcerpc-witness: initial implementation based on the idl file from samba
See [MS-SWN], https://msdn.microsoft.com/en-us/library/hh536748.aspx

Change-Id: Ie92dad2c229ec08e7f7e31be9422450305b3908a
Signed-off-by: Gregor Beck <gbeck@sernet.de>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/11366
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-03 12:38:01 +00:00
João Valverde 3df2333155 Remaining ADDRESS macro to address function conversions
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788
Reviewed-on: https://code.wireshark.org/review/11463
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-03 12:20:34 +00:00
Alexis La Goutte dd17c69ed9 RADIUS: Fix length of display data for Ascend-Data-Filter
Change-Id: I5fd1f82ff193cfface0b5d1e5be227dfc3e04f9a
Ping-Bug:11630
Reviewed-on: https://code.wireshark.org/review/11292
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-03 01:03:58 +00:00
Pascal Quantin 332b9cef51 PDCP LTE: fix dissection of signalling PDUs sent on common control channels
For those crazy enough to try to decode PDUs sent in transparent mode ;)

Change-Id: Iab0a1325a6764846e23d8f04bd3147625b970638
Reviewed-on: https://code.wireshark.org/review/11498
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-02 21:29:22 +00:00
Stig Bjørlykke 22a9376bb4 BER: Removed erroneous callback from dissect_ber_external_U
This callback was added by a mistake when adding support for
P3 over RTSE in commit 0a6d1f98.

Change-Id: Ifff0bed3b2a2a0fd2354f9c6b7072de3303dae27
Reviewed-on: https://code.wireshark.org/review/11500
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-02 18:19:27 +00:00
Gregor Beck 3dd5e255c0 packet-dcerpc: add proto_tree_add_dcerpc_drep()
Change-Id: I1d3515371f50454acbcbdde75f2f1a3e614a5512
Signed-off-by: Gregor Beck <gbeck@sernet.de>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11495
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-02 17:45:33 +00:00
Alexis La Goutte 8fdeb61ab6 packet(.h): fix api reference / -Wdocumentation
From api ref :
warning: argument 'uint_val' of command @param is not found in the argument list of dissector_get_guid_handle(dissector_table_t const sub_dissectors, guid_key *guid_val)
The following parameters of dissector_get_guid_handle(dissector_table_t const sub_dissectors, guid_key *guid_val) are not documented:
  parameter 'guid_val'

From -Wdocumentation
parameter 'uint_val' not found in the function declaration [-Wdocumentation]

Change-Id: I9c7b82e4ecb5a126cb96c7d6c057440eb5d24bdd
Reviewed-on: https://code.wireshark.org/review/11499
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-02 17:41:49 +00:00
AndersBroman 1316fdf209 [GTPv2] Dissect UTRAN F-Container content.
Change-Id: Idaf07e31876b453f88c5fd7e886c72dffcb35a96
Reviewed-on: https://code.wireshark.org/review/11492
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-02 13:03:16 +00:00
Martin Kaiser 1c5b3c3783 wsgcrypt.h checks internally if we HAVE_LIBGCRYPT
we can #include <wsutils/wsgcrypt.h> without doing the check ourselves

Change-Id: I248431bdb6cfa1bd85b794ec04ce1e4fcd3a7d2d
Reviewed-on: https://code.wireshark.org/review/11483
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-02 11:42:00 +00:00
Alexis La Goutte 7f10520d04 srt_table(.h): fix api reference
The following parameters of register_srt_table(const int proto_id, const char *tap_listener, int max_tables, tap_packet_cb srt_packet_func, srt_init_cb init_cb, srt_param_handler_cb param_cb) are not documented:
  parameter 'max_tables'

The following parameters of init_srt_table(const char *name, const char *short_name, GArray *srt_array, int num_procs, const char *proc_column_name, const char *filter_string, srt_gui_init_cb gui_callback, void *gui_data, void *table_specific_data) are not documented:
  parameter 'table_specific_data'

Change-Id: I7c14a46c89c58985a5000b1760ba088d9f0da293
Reviewed-on: https://code.wireshark.org/review/11491
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-02 11:40:07 +00:00
Alexis La Goutte 4a8b20a9a9 rtd_table(.h): fix api reference
The following parameters of register_rtd_table(const int proto_id, const char *tap_listener, guint num_tables, guint num_timestats, const value_string *vs_type, tap_packet_cb rtd_packet_func, rtd_filter_check_cb filter_check_cb) are not documented:
  parameter 'num_tables'

Change-Id: I93e9297d0755077ad619839c44d2feb7b2a0c18d
Reviewed-on: https://code.wireshark.org/review/11490
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-02 11:38:09 +00:00
Juanjo Martin e52931bab0 RTPS: added new encoding to proto.c and used it in the rtps dissector
RTPS uses NTP encoding with a BASETIME equal to 0.

Also, changed "magic" by "Magic"

Change-Id: I2512176f2018396edaa6b2a1478facd26118cb13
Reviewed-on: https://code.wireshark.org/review/11184
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-02 03:48:47 +00:00
Michael Mann ad1b785fe8 udp_dissect_pdus follow-up
Add heuristic support
Better documentation

Change-Id: I236c1f4d3613aa58d608aee0e5edc40c3b158d25
Reviewed-on: https://code.wireshark.org/review/10120
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01 21:42:51 +00:00
Martin Kaiser 69e61db3ae [bitcoin] don't THROW() an exception from a dissector
Change-Id: Ibdc7fec48cef53041c1791fb4f6decb0a4df0c89
Reviewed-on: https://code.wireshark.org/review/11458
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01 20:32:16 +00:00
Martin Kaiser d09cc65254 [bitcoin] Convert commands into a dissector table
Change-Id: I30095150ea639d773b887f191e0028c765beba12
Reviewed-on: https://code.wireshark.org/review/11457
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01 19:52:30 +00:00
Martin Kaiser c9c1ae46ce [iso7816] remove unnecessary initial values
Change-Id: Ibc370cf99b1f62745174709a35155aa25bc1b3b2
Reviewed-on: https://code.wireshark.org/review/11481
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-11-01 17:20:44 +00:00
Gerald Combs 21d881e683 [Automatic update for 2015-11-01]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I2ed2f09a178a8c4a455d0ad8be90cf79d235e621
Reviewed-on: https://code.wireshark.org/review/11477
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-01 16:12:01 +00:00
Stefan Metzmacher ae574e3de7 packet-dcerpc: improve dissection of bind time feature negotiation
Change-Id: I6bcc5538149e36eed31933897a95fa7592baa84a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11363
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01 14:54:18 +00:00
Nathan Cole c042416443 TDS: Register each login param in a separate field
Addition of several fields to cover all login parameters.

Bug: 11661
Change-Id: I1cb1620b0e1a8c40b311f4dd4b6eb91e6e55a74d
Reviewed-on: https://code.wireshark.org/review/11455
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01 14:51:12 +00:00
Michael Mann 89c96d2772 Add GUID dissector table support.
It seems like DCE/RPC could benefit from a GUID dissector table, where a dissector can register it's GUID with a dissector handle.   So here is a basic start.

Change-Id: Id407117687a1a648d87f6f99c2ecbf858d8c0911
Reviewed-on: https://code.wireshark.org/review/4718
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01 11:50:46 +00:00
Jim Young 56d0127247 ISIS Hello: Restore correct dissection of SPB BVID
Commit 301a5b7cea introduced a small
regression with the dissection of the BVID.  BVID should be extracted
from the 12 most significant bits not the 12 least significant bits.
Make it so.

Change-Id: Idcf0492eea1f6cb7282641ae243aa7092e5a1418
Reviewed-on: https://code.wireshark.org/review/11472
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-01 08:48:50 +00:00
João Valverde af11478bfd bluetooth: Fix uninitialized value warning
Change-Id: Iee1d1cf3e24dacca3c1a353001a8af71e074a96b
Reviewed-on: https://code.wireshark.org/review/11454
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01 03:25:06 +00:00
Pascal Quantin ced7412c10 TCP: replace some dissector asserts by a return
It prevents an assert in case of malformed packet

Bug: 11662
Change-Id: If5d7196c7e6ecd0ffe8ed97213dbd64bc1f69cbb
Reviewed-on: https://code.wireshark.org/review/11464
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01 03:21:15 +00:00
Martin Kaiser 9180c27c5e [ssh] don't THROW() an exception from a dissector
Change-Id: Ibdbdcf59d7d7d28a812e31c7d7b2123b035f80fa
Reviewed-on: https://code.wireshark.org/review/11461
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-10-31 12:11:44 +00:00
Martin Kaiser d2106a6f52 [ssh] remove some unnecessary if(tree) checks
Change-Id: Id335830e70a944dd5c26e66d7515d168725acf3f
Reviewed-on: https://code.wireshark.org/review/11460
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-10-31 12:11:24 +00:00
Martin Kaiser feaa485697 [lmp] don't THROW() an exception from a dissector
do the bounds check for obj_length before we use it

Change-Id: I9e15fae6de05c5833c6959239fcdc0a7d2ca59cb
Reviewed-on: https://code.wireshark.org/review/11459
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-10-31 12:11:02 +00:00
Martin Kaiser ade86d0977 [bitcoin] remove two unnecessary return; statements
Change-Id: I97e9ac50b096c798c255227df5760523f623d4bd
Reviewed-on: https://code.wireshark.org/review/11456
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-10-31 12:09:10 +00:00
Stefan Metzmacher cef1cfa81d packet-dcerpc: add dissect_ndr_ucarray_block()
Change-Id: Ibfb49738ea35d1d02220d69187a6083d5ebbae25
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11365
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-31 00:41:34 +00:00
Stefan Metzmacher 252ac26fc2 packet-dcerpc: pass dcerpc_info to dcerpc_dissect_fnct_blk_t
Change-Id: I92711ee39850f6710eaebf5c678496e7cd9b5f59
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11364
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-30 23:24:28 +00:00
Michael Mann 6503689958 Add some "protocol placeholders" to remove confusion with Decode As.
Change-Id: Icc4bf0149af81c35bc6b615add473168600468fb
Reviewed-on: https://code.wireshark.org/review/11429
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-30 23:24:09 +00:00
Guy Harris b6497d44b5 Add a comment giving details on the Centrino stuff.
Change-Id: Ie65c106f62c8d783c1c53d7a9c3f213f49ae0c1b
Reviewed-on: https://code.wireshark.org/review/11445
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-30 18:12:04 +00:00
Pascal Quantin 9e54fcee52 STUN: register a new conversation dissector after receiving a ConnectionBind Success Response message
According to RFC 6062, once the connection is established, data is sent as-is
To stop the STUN dissector from interfering, add the ability to specify a starting
frame for a conversation dissector and use it

Bug: 11641
Change-Id: I65ca96bddacf70444009c0642ea22173fa68992e
Reviewed-on: https://code.wireshark.org/review/11372
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-30 18:08:06 +00:00
Guy Harris d6dd50b1e3 The item argument is used.
Change-Id: I066c8364bcd12d78b41c336b42f235bdfe112515
Reviewed-on: https://code.wireshark.org/review/11441
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-30 17:20:37 +00:00
Gerald Combs 0cff6d6309 GTPv2: Mark a parameter unused.
Change-Id: I0dde941a1d1c9b776363d61cc3e849189b2ea0e7
Reviewed-on: https://code.wireshark.org/review/11439
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-30 17:08:15 +00:00
Pascal Quantin 81dfe6d450 NLM: fix double memory free when using "Match MSG/RES packets for async NLM" option
Change-Id: Ie4f5f8e1ccf9d7b6c7fbee6126697c65f2cc17df
Reviewed-on: https://code.wireshark.org/review/11431
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-30 16:53:11 +00:00
AndersBroman f0eae93df5 [GTPv2] Dissect Load Control Information IE
Bug: 11655
Change-Id: I9d50d53ce6b98d7a3e06e90450607f6d5b6be1bc
Reviewed-on: https://code.wireshark.org/review/11430
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-30 15:55:07 +00:00
Pascal Quantin 59f4c1cd04 RPC: fix crash when calling NLMv4 SRT statistics
packet scope is not valid when called from GUI.
To keep API constant, introduce a rpc_proc_name_internal() function allowing to
define the memory scope used for string allocation.

Bug: 11654
Change-Id: Iff36c090650939c9f2bebfd9c3fd25c51fd97dc0
Reviewed-on: https://code.wireshark.org/review/11425
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-30 15:40:42 +00:00
Michael Adam a15f83265e packet-smb2: Add dissector for SMB2_FSCTL_OFFLOAD_READ
Change-Id: I0bbbe3f92cf88c3d3d051ad613e237411b828e43
Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11360
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-30 12:41:08 +00:00
Roland Knall 7a381cbcc8 openSAFETY: Remove need for SIII dissector register
Remove the need for the registration of a dedicated SIII dissector,
 as this might interfere with "Decode As" handling, as well as being
 redundant and no longer needed.

 The udpdata dissector can handle both and gate to the correct
 sub-dissector if necessary.

Change-Id: I756cd845e7e8d64848d9928ad9ff04d571434835
Reviewed-on: https://code.wireshark.org/review/11421
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-30 12:39:09 +00:00
Sergey Avseyev a4b1cde793 couchbase: implement comand 0x48 to get vbucket seqnos
Also add missing extras definition for DCP buffer acknowledgement

Change-Id: I29cd1e4751b92f119627e42329b2dcfdd7c378df
Reviewed-on: https://code.wireshark.org/review/11419
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-30 12:11:45 +00:00
Pavlos Antoniou d95b8597c9 [OpenFlow] Use correct name for flag OFPMPF_REPLY_MORE.
Change-Id: Id190d1a1e24df0c79026bb8dbf62ccd154c1e90d
Reviewed-on: https://code.wireshark.org/review/11399
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-30 12:09:09 +00:00
Alexis La Goutte 7f371dbb92 DCERPC: Regenerate PIDL dissector
Fix some not updated link to wiki...

Change-Id: Iafaa743c4adda36e6dffe2ec2a3a25b8228b9778
Reviewed-on: https://code.wireshark.org/review/11424
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-30 11:35:49 +00:00