metze/wireshark/wip.git
5 years agoAdd dissector for CP "Cooper" 2179 Protocol
Qiaoyin Yang [Wed, 16 Jul 2014 16:50:41 +0000 (10:50 -0600)]
Add dissector for CP "Cooper" 2179 Protocol

All credit for development should go Qiaoyin Yang

CP2179 protocol is a serial based protocol. The 2179 protocol is implemented with minor variations between vendors.
The RTAC implemented the 2179 client supporting a limited function codes and command codes. The RTAC doesn't support
multiple function codes in a single request and the dissector also doesn't support decoding these or corresponding responses.

Bug:10285
Change-Id: I217bf4185c52b0b183f69b3b5aa84613340d3944
Reviewed-on: https://code.wireshark.org/review/3089
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoFix up some formatting.
Jeff Morriss [Thu, 4 Sep 2014 01:39:04 +0000 (21:39 -0400)]
Fix up some formatting.

Change-Id: Ib38561ad5cf0f532e43ae3e10bbb857bb24ab9b6
Reviewed-on: https://code.wireshark.org/review/3980
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
5 years agoWork around an apparent bug in GtkFileChooserButton.
Gerald Combs [Wed, 3 Sep 2014 21:41:02 +0000 (14:41 -0700)]
Work around an apparent bug in GtkFileChooserButton.

It looks like some versions of GTK+ intialize GtkFileChooserButton with a
location set to NULL and crash when you select an item from the dropdown
menu. Make sure we have a valid location set in that case.

Change-Id: If2556ef939b95d8af12581a7116a48fb46586f57
Bug: 10434
Reviewed-on: https://code.wireshark.org/review/3977
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoRPKI RTR: Add support draft-ietf-sidr-rpki-rtr-rfc6810-bis-01
Alexis La Goutte [Tue, 26 Aug 2014 14:41:45 +0000 (16:41 +0200)]
RPKI RTR: Add support draft-ietf-sidr-rpki-rtr-rfc6810-bis-01

Add new PDU : Router Key (9)
Add new field (Expire, Retry... interval) for END OF DATA PDU

Ping-Bug:8296
Change-Id: Ic30ab0ff9d0f9989eb7d157f85b74a54d09fb0e7
Reviewed-on: https://code.wireshark.org/review/3948
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoRTPS: Add Modelines info
Alexis La Goutte [Wed, 3 Sep 2014 15:59:06 +0000 (17:59 +0200)]
RTPS: Add Modelines info

Change-Id: Ib29fb16d3b82b53aba52e2d13be2ce8e8727ccfb
Reviewed-on: https://code.wireshark.org/review/3973
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agotvbparse: do not increment the token length when the new sub token length is 0
Pascal Quantin [Thu, 28 Aug 2014 18:08:39 +0000 (20:08 +0200)]
tvbparse: do not increment the token length when the new sub token length is 0

It fixes the unwanted addition of ignore characters when using tvbparse_some as seen with the capture from bug 10417

Change-Id: If68b587e1821fb34aa1fb56666986e1fa6385c33
Reviewed-on: https://code.wireshark.org/review/3905
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoRTPS: fix Result of operation is garbage or undefined
Alexis La Goutte [Wed, 3 Sep 2014 15:56:21 +0000 (17:56 +0200)]
RTPS: fix Result of operation is garbage or undefined

Missing get num_virtual_guids value...

Change-Id: I81a3dea3c96fb946c5c26ffe4ab2bfb82d1d8222
Reviewed-on: https://code.wireshark.org/review/3972
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoICMPv6: fix missing space before 6LBR
Alexis La Goutte [Wed, 3 Sep 2014 15:22:52 +0000 (17:22 +0200)]
ICMPv6: fix missing space before 6LBR

Change-Id: Ibfb53df05691b67ac08a4f54ab0949ea17a89f89
Reviewed-on: https://code.wireshark.org/review/3971
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoDon't need include ipproto.h
Alexis La Goutte [Fri, 16 May 2014 13:13:48 +0000 (15:13 +0200)]
Don't need include ipproto.h

Change-Id: Ia2fe7df0ec72c0ba9eb77ea4beafe58be20d901d
Reviewed-on: https://code.wireshark.org/review/3970
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoUpdated translations (add Comment fields) for desktop integration.
AlexL [Wed, 3 Sep 2014 17:50:21 +0000 (13:50 -0400)]
Updated translations (add Comment fields) for desktop integration.

Patch submitted via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10442

Bug: 10442

Change-Id: Idf73b058cff5db520cde951e58e85e5f71c680e2
Reviewed-on: https://code.wireshark.org/review/3975
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
5 years agoDon't override the PA package naming convention. Use our full version in
Gerald Combs [Wed, 3 Sep 2014 16:10:35 +0000 (09:10 -0700)]
Don't override the PA package naming convention. Use our full version in
the package name. Set a minimum OS version (Vista). Update some comments.

Change-Id: I28096276d2588993136b008a307dbcc7983496b0
Reviewed-on: https://code.wireshark.org/review/3974
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoCheck whether the hop-count of most inner message is equal to 0
Jérôme LAFORGE [Mon, 1 Sep 2014 09:15:47 +0000 (11:15 +0200)]
Check whether the hop-count of most inner message is equal to 0

Extract RFC3315 about relay message and hop-count :

20.1.1. Relaying a Message from a Client

   If the relay agent received the message to be relayed from a client,
   the relay agent places a global or site-scoped address with a prefix
   assigned to the link on which the client should be assigned an
   address in the link-address field.  This address will be used by the
   server to determine the link from which the client should be assigned
   an address and other configuration information.  The hop-count in the
   Relay-forward message is set to 0.

20.3. Construction of Relay-reply Messages

   A server uses a Relay-reply message to return a response to a client
   if the original message from the client was relayed to the server in
   a Relay-forward message or to send a Reconfigure message to a client
   if the server does not have an address it can use to send the message
   directly to the client.

   A response to the client MUST be relayed through the same relay
   agents as the original client message.  The server causes this to
   happen by creating a Relay-reply message that includes a Relay
   Message option containing the message for the next relay agent in the
   return path to the client.  The contained Relay-reply message
   contains another Relay Message option to be sent to the next relay
   agent, and so on.  The server must record the contents of the
   peer-address fields in the received message so it can construct the
   appropriate Relay-reply message carrying the response from the
   server.

   For example, if client C sent a message that was relayed by relay
   agent A to relay agent B and then to the server, the server would
   send the following Relay-Reply message to relay agent B:

   msg-type:       RELAY-REPLY
   hop-count:      1
   link-address:   0
   peer-address:   A
   Relay Message option, containing:
     msg-type:     RELAY-REPLY
     hop-count:    0
     link-address: address from link to which C is attached
     peer-address: C
     Relay Message option: <response from server>

Change-Id: I774cc22c9c090af1a5d3732115c7cd3478343288
Bug:10437
Reviewed-on: https://code.wireshark.org/review/3936
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoActually use the define of custom plugins...
AndersBroman [Wed, 3 Sep 2014 11:07:26 +0000 (13:07 +0200)]
Actually use the define of custom plugins...

Change-Id: Id831e3bff943d9000969f951c3a2b9ead173e033
Reviewed-on: https://code.wireshark.org/review/3969
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoieee802.11: Add VHT Action (802.11ac)
Alexis La Goutte [Mon, 9 Jun 2014 10:16:19 +0000 (12:16 +0200)]
ieee802.11: Add VHT Action (802.11ac)

Add VHT MIMO Control (Part of VHT Compressed Beamforming)

No yet supported :
* VHT Compressed Beamforming Report, MU Exclusive Beamforming Report (8.5.23.2)
* Membership Status Array, User Position Array (8.5.23.3: Group ID Management)
* Operation Mode (8.5.23.4: Operation Mode Notification)

Bug:10169
Change-Id: I182a487687d44f0ef77a045a99f82c92fba8ff2c
Reviewed-on: https://code.wireshark.org/review/2146
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCAPWAP: fix some message type with wrong length (don't use optlen for "fixed type...
Alexis La Goutte [Tue, 2 Sep 2014 14:15:14 +0000 (16:15 +0200)]
CAPWAP: fix some message type with wrong length (don't use optlen for "fixed type length")

Change-Id: Id666086abdd55e38bcb470f8015363585d40728f
Reviewed-on: https://code.wireshark.org/review/3957
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCAPWAP: Add some news expert info
Alexis La Goutte [Mon, 25 Aug 2014 10:54:11 +0000 (12:54 +0200)]
CAPWAP: Add some news expert info

When it is the mininum wrong length for Message Element Type or
when the Message Element Type is not yet decoded by Wireshark

Change-Id: I49aca0df5ba5ec70d8fb764fef39c17c46ee22a0
Reviewed-on: https://code.wireshark.org/review/3956
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCAPWAP: Add new ett variable
Alexis La Goutte [Wed, 20 Aug 2014 08:08:15 +0000 (10:08 +0200)]
CAPWAP: Add new ett variable

Avoid to have all subtree has expended

Only 2 ett actually and there is > 20 subtree...

Change-Id: Ia4af85345a6f1963d24d1fd589ff8ee09a8ef412
Reviewed-on: https://code.wireshark.org/review/3955
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCAPWAP: Split CAPWAP Control and Data in 2 different protocol
Alexis La Goutte [Wed, 20 Aug 2014 07:46:47 +0000 (09:46 +0200)]
CAPWAP: Split CAPWAP Control and Data in 2 different protocol

Avoid to have 2 CAPWAP in Decode as (and more easy to use too...)

Change-Id: I3a332e9b4b069b9215c38b5c08872bd07ac4c2c3
Reviewed-on: https://code.wireshark.org/review/3954
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCAPWAP: Use standard boilerplate (see doc/packet-PROTOABBREV.c)
Alexis La Goutte [Mon, 11 Aug 2014 21:55:30 +0000 (23:55 +0200)]
CAPWAP: Use standard boilerplate (see doc/packet-PROTOABBREV.c)

For hf field, reindent code
Use 0x0 by default for bitmask
Remove also some "boilerplate" comment..

Change-Id: I552ccca2e444f3686ee9ecdad456f2ecfbaa5cba
Reviewed-on: https://code.wireshark.org/review/3953
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCAPWAP: Wrong usage of FT_BOOLEAN for Reserved field...
Alexis La Goutte [Mon, 11 Aug 2014 15:34:28 +0000 (17:34 +0200)]
CAPWAP: Wrong usage of FT_BOOLEAN for Reserved field...

Change-Id: Ie1c472f4db105a1a8db9dba265039282872dffb2
Reviewed-on: https://code.wireshark.org/review/3952
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoFix dist. Remove unused files.
Gerald Combs [Wed, 3 Sep 2014 05:36:03 +0000 (22:36 -0700)]
Fix dist. Remove unused files.

Change-Id: I44b2dbfa3859841c67e933d8e7c510834b7cc2ee
Reviewed-on: https://code.wireshark.org/review/3967
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoOS X packaging fix.
Gerald Combs [Wed, 3 Sep 2014 01:05:03 +0000 (18:05 -0700)]
OS X packaging fix.

Change-Id: I82936bb1dcfa3a7ca1aea8a3ded388015aa37531
Reviewed-on: https://code.wireshark.org/review/3966
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoFix the PortableApps package name.
Gerald Combs [Wed, 3 Sep 2014 00:55:48 +0000 (17:55 -0700)]
Fix the PortableApps package name.

Remove Installer.nsi while we're here.

Change-Id: I739d5d825fd76eac9b50d26fab2d44e853dc83f9
Reviewed-on: https://code.wireshark.org/review/3965
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoPortableApps: Remove invalid makefile commands.
Gerald Combs [Wed, 3 Sep 2014 00:19:56 +0000 (17:19 -0700)]
PortableApps: Remove invalid makefile commands.

Change-Id: I6ed0f72a6915cd12d7866c978dce0d25c328dffd
Reviewed-on: https://code.wireshark.org/review/3964
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoAdded name to AUTHORS
Sean O. Stalley [Tue, 2 Sep 2014 23:35:58 +0000 (16:35 -0700)]
Added name to AUTHORS

Change-Id: I7f65d22d4dd96908033c764461196a75716b298a
Reviewed-on: https://code.wireshark.org/review/3961
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoOS X packaging fix: wireshark-qt → wireshark.
Gerald Combs [Tue, 2 Sep 2014 23:56:42 +0000 (16:56 -0700)]
OS X packaging fix: wireshark-qt → wireshark.

Change-Id: Ie95c28ca47baf453335abab23eb7baba63d52f47
Reviewed-on: https://code.wireshark.org/review/3963
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoFix PortableApps packaging.
Gerald Combs [Tue, 2 Sep 2014 19:18:20 +0000 (12:18 -0700)]
Fix PortableApps packaging.

Our Windows portable packaging environment has a lot of cruft which is
no longer relevant. We removed support for U3 packages and the method
we use to generate PortableApps packages has been deprecated for a while.

Create PortableApps packages using current file formats (AppInfo v3.0)
and tools. Generate the PA launcher using the PortableApps.com Launcher
generator. Copy files and directories from the top level instead of using
a manifest derived from the NSIS installer.

The manifest is a good idea, but we should create a central manifest
and use that to generate the NSIS and PortableApps packages instead of
trying to parse wireshark.nsi.

The new package still needs a bit of work but it installs and runs in
the current version of the PA Platform.

Remove the define for MAKENSIS_UNICODE. It doesn't look like we were
using it.

Start tearing down makefiles and scripts that we no longer use.

Ping-Bug: 4191
Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4
Reviewed-on: https://code.wireshark.org/review/3962
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agopacket-netflow.c: netflow v9: Allow options template with zero-length scope section
Bill Meier [Tue, 2 Sep 2014 18:41:52 +0000 (14:41 -0400)]
packet-netflow.c:  netflow v9: Allow options template with zero-length scope section

   Fixes Bug #10432

   Also: rework several comments.

Change-Id: I292829f6dffaf5f500cb089cc8a45e1203a2e731
Reviewed-on: https://code.wireshark.org/review/3959
Reviewed-by: Bill Meier <wmeier@newsguy.com>
5 years agoSimplify ./configure logic for telling rpmbuild which GUI(s) we're building.
Jeff Morriss [Mon, 11 Aug 2014 20:18:08 +0000 (16:18 -0400)]
Simplify ./configure logic for telling rpmbuild which GUI(s) we're building.

Rather than checking for all the "--with" arguments just use the "$have_xxx"
variables.

Don't allow rpmbuild's ./configure to decide to build a GUI just because it's
available: make it build only what was ./configure'd.

Change-Id: I68582b4c13da7b52d56591dce68ac426e9f607f1
Reviewed-on: https://code.wireshark.org/review/3958
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
5 years agoQt → wireshark. GTK+ → wireshark-gtk.
Gerald Combs [Thu, 28 Aug 2014 23:48:53 +0000 (16:48 -0700)]
Qt → wireshark. GTK+ → wireshark-gtk.

Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".

It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.

Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).

Tested:

- Nmake builds

- NSIS packaging

- CMake builds (Windows, OS X)

- Autotools build and distcheck

- RPM packaging

To do:

- Test Debian packaging

- Fix PortableApps

Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoRTPS: added new PIDs and included minor improvements
Juanjo [Mon, 25 Aug 2014 15:11:20 +0000 (17:11 +0200)]
RTPS: added new PIDs and included minor improvements
- (Updated) Fixed code review issues
- (Updated) Fixed whitespaces and code review issues
- Representing now some NTP times as duration (not as date)
- Added some vendor specific PIDs (RTI)
- Added dissect_APP_ACK_CONF, dissect_APP_ACK and
  dissect_HEARTBEAT_VIRTUAL
- Added is_discovery to dissect_serialize_data to avoid malformed
  packets when using mutable types (Wireshark assumes serialized
  data with CDR-PL encapsulation is always discovery data, what
  is not true when using Mutable types)

Change-Id: I491750d95b12f386c41d7de4ae7e280781efa375
Reviewed-on: https://code.wireshark.org/review/3836
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoopenSAFETY: Adapt CRC for false-positives
Roland Knall [Fri, 29 Aug 2014 12:52:29 +0000 (14:52 +0200)]
openSAFETY: Adapt CRC for false-positives

 - There are rare false-positives, where the entire
   frame consists of 0 except the addr and id field,
   which will lead to a correct crc#1 calculation,
   but still to a false-positive detection. This
   patch fixes that

 - Two undefinite-loop errors are corrected as well

Change-Id: Ibe5e56e0172ad3a3046bdc024da3711987116e8e
Reviewed-on: https://code.wireshark.org/review/3918
Reviewed-by: Roland Knall <rknall@gmail.com>
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>
5 years agoNDMP: Fix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Mon, 1 Sep 2014 06:29:50 +0000 (08:29 +0200)]
NDMP: Fix Dereference of null pointer found by Clang analyzer

Change-Id: I314e7e00633f93dead6a092e059336a304e4a946
Reviewed-on: https://code.wireshark.org/review/3940
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoNDMP: Fix indent (use tab)
Alexis La Goutte [Mon, 1 Sep 2014 06:38:14 +0000 (08:38 +0200)]
NDMP: Fix indent (use tab)

Change-Id: I00f4d206e9c27801f8557414b8cd1b5c52752b44
Reviewed-on: https://code.wireshark.org/review/3941
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoRemoved unnecessary chmod commands
Graham Bloice [Mon, 1 Sep 2014 08:51:51 +0000 (09:51 +0100)]
Removed unnecessary chmod commands

Change-Id: Ia6e3f8c567159fc2cf19a8d427a29c5c6dcdf038
Reviewed-on: https://code.wireshark.org/review/3942
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoEscape double quotes when printing ABSOLUTE_TIME field
Michael Mann [Sat, 16 Aug 2014 01:32:57 +0000 (21:32 -0400)]
Escape double quotes when printing ABSOLUTE_TIME field

This regression was introduced by the commit e5353bf1198d6abf748de78084ff64f597f13663 done for bug 10081

Bug: 10213
Change-Id: I3925a47ef13055f10f49fa9fefd022731746fbb8
Reviewed-on: https://code.wireshark.org/review/2572
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoTLS: fix dissection of status_request_v2 hello extension
Jamil Nimeh [Tue, 26 Aug 2014 16:26:19 +0000 (18:26 +0200)]
TLS: fix dissection of status_request_v2 hello extension

Bug: 10416
Change-Id: I58a3faef227f7eafd61942cafa6e38a17557ee61
Reviewed-on: https://code.wireshark.org/review/3865
Reviewed-by: Evan Huus <eapache@gmail.com>
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>
5 years agoWSUG: Convert ``Telephony'' to AsciiDoc.
Gerald Combs [Mon, 1 Sep 2014 04:52:32 +0000 (21:52 -0700)]
WSUG: Convert ``Telephony'' to AsciiDoc.

Leave most of the content intact for now.

Change-Id: I21aad681194d1bb1841e29f4ac41be4677fcb909
Reviewed-on: https://code.wireshark.org/review/3939
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoAdd CMake stuff for custom plugins.
AndersBroman [Mon, 1 Sep 2014 14:33:56 +0000 (16:33 +0200)]
Add CMake stuff for custom plugins.

Change-Id: I1eff6b902d9bd9fb8f3073ab0f4fc3dd143d0fc4
Reviewed-on: https://code.wireshark.org/review/3946
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoAdd abillity to add custom crypto files.
AndersBroman [Mon, 1 Sep 2014 13:54:15 +0000 (15:54 +0200)]
Add abillity to add custom crypto files.

Change-Id: I6c5b1cdb0a90f7604bdde088332c171332b43dcc
Reviewed-on: https://code.wireshark.org/review/3945
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoMake it possible to build builtin custom dissectors and GUI files with cmake too.
AndersBroman [Mon, 1 Sep 2014 08:51:21 +0000 (10:51 +0200)]
Make it possible to build builtin custom dissectors and GUI files with cmake too.

Change-Id: I28eee44f7c3a7e44da89f8b71cdacbe78115c7e3
Reviewed-on: https://code.wireshark.org/review/3943
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>
5 years agoWSUG: Convert ``Advanced Topics'' to AsciiDoc.
Gerald Combs [Mon, 1 Sep 2014 01:40:56 +0000 (18:40 -0700)]
WSUG: Convert ``Advanced Topics'' to AsciiDoc.

Leave most of the content intact for now.

Change-Id: Ie91fda8a3fe6ea2eb4c47acf7c41d7e6979235b0
Reviewed-on: https://code.wireshark.org/review/3938
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoUse a common hf for international E164 numbers (MSISDN).
AndersBroman [Tue, 26 Aug 2014 12:49:24 +0000 (14:49 +0200)]
Use a common hf for international E164 numbers (MSISDN).

Change-Id: Ie0103c04033d7bf69c92947b789ba4f5a300a74b
Reviewed-on: https://code.wireshark.org/review/3863
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoWSUG: Convert ``Working with captured packets'' to AsciiDoc.
Gerald Combs [Sun, 31 Aug 2014 20:47:39 +0000 (13:47 -0700)]
WSUG: Convert ``Working with captured packets'' to AsciiDoc.

Leave most of the content intact for now.

Change-Id: Ic264814aa8e442df100ae8533098843ef6a2e6c9
Reviewed-on: https://code.wireshark.org/review/3937
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoWSUG: Convert the ``File I/O'' chapter to AsciiDoc.
Gerald Combs [Sun, 31 Aug 2014 01:02:52 +0000 (18:02 -0700)]
WSUG: Convert the ``File I/O'' chapter to AsciiDoc.

Leave most of the content intact for now. Remove images for
no-longer-supported versions of GTK+. Add an example for building the
Guides to README.cmake.

Change-Id: Id9e6a308c91b594d1fb7f107d7b9b28074a92a8b
Reviewed-on: https://code.wireshark.org/review/3931
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoDon't show the echo/python command lines when making plugin.c
Роман Донченко [Sun, 24 Aug 2014 19:34:00 +0000 (23:34 +0400)]
Don't show the echo/python command lines when making plugin.c

For consistency with epan/dissectors/Makefile.am. Also, remove the
"with python" parts, since that's the only option now.

Change-Id: I761e1bf7995c1cc1ebd790013181fd6116b289a1
Reviewed-on: https://code.wireshark.org/review/3925
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: Graham Bloice <graham.bloice@trihedral.com>
5 years agoRemove make-tapreg-dotc and its uses, since Python is now mandatory
Роман Донченко [Sun, 24 Aug 2014 19:23:45 +0000 (23:23 +0400)]
Remove make-tapreg-dotc and its uses, since Python is now mandatory

Change-Id: I13fd57a288be68d18819826bf566ed7b5688ebaa
Reviewed-on: https://code.wireshark.org/review/3926
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: Graham Bloice <graham.bloice@trihedral.com>
5 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 31 Aug 2014 18:19:23 +0000 (20:19 +0200)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I0593b659dcd28929cf51a8b1147392f070574c9e
Reviewed-on: https://code.wireshark.org/review/3934
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 31 Aug 2014 18:18:35 +0000 (20:18 +0200)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I32ca31b879ccc458f12f37375c32bc089978b114
Reviewed-on: https://code.wireshark.org/review/3933
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoconv is always used, remove _U_ (unused) flag
Alexis La Goutte [Sun, 31 Aug 2014 18:35:14 +0000 (20:35 +0200)]
conv is always used, remove _U_ (unused) flag

Change-Id: I648b365b662bd902e26e0c61f6d3499e8543e504
Reviewed-on: https://code.wireshark.org/review/3935
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoWSUG: Fix URLs
Gerald Combs [Sun, 31 Aug 2014 18:31:33 +0000 (11:31 -0700)]
WSUG: Fix URLs

Fix broken download URLs in the introduction. Update some macros to use
https:// URLs.

Change-Id: I145e74e14ec04ce5fcf94a65cd5623059875c6e1
Reviewed-on: https://code.wireshark.org/review/3932
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoDNS: Add OpenPGP KEY (61) RRtype (draft-ietf-dane-openpgpkey-00)
Alexis La Goutte [Thu, 21 Aug 2014 07:06:57 +0000 (09:06 +0200)]
DNS: Add OpenPGP KEY (61) RRtype (draft-ietf-dane-openpgpkey-00)

Not yet tested on real dns traffic

Update also last updated DNS parameters (2014-08-12)

Change-Id: I6109d585584e5fca11c606a2230d8ef89cdbf7b6
Reviewed-on: https://code.wireshark.org/review/3870
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoFix error: parameter 'XX' not found in the function declaration (-Wdocumentation)
Alexis La Goutte [Thu, 28 Aug 2014 10:53:45 +0000 (12:53 +0200)]
Fix error: parameter 'XX' not found in the function declaration (-Wdocumentation)

Change-Id: I0a56fb79d2ac3d874a48695ad0499bda96b4b655
Reviewed-on: https://code.wireshark.org/review/3892
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoFix parameter 'key' not found in the function declaration (-Wdocumentation)
Alexis La Goutte [Thu, 28 Aug 2014 16:49:03 +0000 (18:49 +0200)]
Fix parameter 'key' not found in the function declaration (-Wdocumentation)

Change-Id: Ie7f3e192d8980968da15921a8497153506df1fde
Reviewed-on: https://code.wireshark.org/review/3903
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years ago[Automatic manuf, services and enterprise-numbers update for 2014-08-31]
Gerald Combs [Sun, 31 Aug 2014 15:06:02 +0000 (08:06 -0700)]
[Automatic manuf, services and enterprise-numbers update for 2014-08-31]

Change-Id: I35507fe1b4ac8ff3ec9391679769764656b9ff27
Reviewed-on: https://code.wireshark.org/review/3928
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoCheck whether the hop-count exceeds the HOP_COUNT_LIMIT or not.
Jérôme LAFORGE [Sat, 30 Aug 2014 22:17:07 +0000 (00:17 +0200)]
Check whether the hop-count exceeds the HOP_COUNT_LIMIT or not.

Change-Id: If1c089e069b93a7b90cb525cd642ac26c5efa2d0
Reviewed-on: https://code.wireshark.org/review/3924
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: Evan Huus <eapache@gmail.com>
5 years agoRemove some unnecessary definitions.
Guy Harris [Sat, 30 Aug 2014 23:21:10 +0000 (16:21 -0700)]
Remove some unnecessary definitions.

text2pcap.c uses pcapio.c to write pcap files, so it doesn't itself need
to know what those files look like.

Change-Id: I013d0c094c27515af91f352b565bc9a8bad3e842
Reviewed-on: https://code.wireshark.org/review/3927
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoFix char signess issue.
Michael Tüxen [Sat, 30 Aug 2014 18:38:33 +0000 (20:38 +0200)]
Fix char signess issue.

This bug was found by compiling wireshark on a Wandboard Quad
using FreeBSD.

Change-Id: I34ac8a04612a918782160947599245539d6e9427
Reviewed-on: https://code.wireshark.org/review/3923
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
5 years ago6LoWPAN: fix dissection when using multicast address compression
Pascal Quantin [Fri, 29 Aug 2014 11:19:13 +0000 (13:19 +0200)]
6LoWPAN: fix dissection when using multicast address compression

Also update the value_string arrays with the various SAM/DAM combinations

Bug: 10426
Change-Id: I87f13c29f42770ec655d85e2247b847bfe28e3ba
Reviewed-on: https://code.wireshark.org/review/3915
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoMark Trap-PDU as obsolete for SNMP versions > 1
Stig Bjørlykke [Fri, 29 Aug 2014 17:36:59 +0000 (19:36 +0200)]
Mark Trap-PDU as obsolete for SNMP versions > 1

Change-Id: I967a1547eb97619042b620bb3d803a29cce9ebe1
Reviewed-on: https://code.wireshark.org/review/3920
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoQt Follow Stream Dialog : Add some missing text to translate
Alexis La Goutte [Fri, 29 Aug 2014 05:48:18 +0000 (07:48 +0200)]
Qt Follow Stream Dialog : Add some missing text to translate

Fix also indent

Change-Id: I864cd785f3b17e6360be63922ca63e349ae13f25
Reviewed-on: https://code.wireshark.org/review/3913
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoPROTOABBREV: minor fix
Alexis La Goutte [Fri, 29 Aug 2014 05:54:59 +0000 (07:54 +0200)]
PROTOABBREV: minor fix

Fix typo PROTO_ABBREV -> PROTOABBREV
Uncomment FIELDCONVERT

Change-Id: I7b64c09ecf0c22a38042156d958e1c6c850c839a
Reviewed-on: https://code.wireshark.org/review/3914
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoSkinny:
Diederik de Groot [Thu, 28 Aug 2014 23:57:03 +0000 (01:57 +0200)]
Skinny:

Fix: ensure that string created in dissect_skinny_displayLabel is always NULL terminated (Fixing Bug: 10429 (Pascal))
Fix: MiscCommandType should use videoFastUpdateGOB Union when command enum is videoFastUpdatePicture
Manual Merge PatchSet 4 (Me) and Patchset 7 (Pascal)
Fix Merged PatchSet 8 (Pascal)

Bug: 10429
Change-Id: I87bc7c6eaff976d7a70856f5fbe8c0ded6257064
Reviewed-on: https://code.wireshark.org/review/3893
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-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: Evan Huus <eapache@gmail.com>
5 years ago802.11: rename Control Frame Extension field to match the spec
Pascal Quantin [Fri, 29 Aug 2014 11:37:16 +0000 (13:37 +0200)]
802.11: rename Control Frame Extension field to match the spec

As reported by Richard Sharpe on -dev: https://www.wireshark.org/lists/wireshark-dev/201408/msg00236.html

Change-Id: I16638982e14e566bb7e584a2d030c546d2223ebe
Reviewed-on: https://code.wireshark.org/review/3916
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoConsolidate several 3GPP Diameter xml files into one.
Jeff Morriss [Fri, 29 Aug 2014 01:20:56 +0000 (21:20 -0400)]
Consolidate several 3GPP Diameter xml files into one.

Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b
Reviewed-on: https://code.wireshark.org/review/3911
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
5 years agoRemove AVPs that aren't really 3GPP2 (they are 3GPP).
Jeff Morriss [Fri, 29 Aug 2014 01:37:25 +0000 (21:37 -0400)]
Remove AVPs that aren't really 3GPP2 (they are 3GPP).

(The 3GPP2 Ty trace in the menagerie wrongly marks several of these AVPs
as being 3GPP2.)

Change-Id: I27963fbf8e1da51e430c609784e0c8bb4575549d
Reviewed-on: https://code.wireshark.org/review/3912
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
5 years agoQt: Rework the "Manage Interfaces" dialog.
Gerald Combs [Thu, 14 Aug 2014 20:20:09 +0000 (13:20 -0700)]
Qt: Rework the "Manage Interfaces" dialog.

Convert QTableWidget to QTreeWidget.

It looks like the GTK+ version has a separate set of apply/save buttons
for each tab which *only* operates on that tab. This can result unexpected
behavior which throws away changes if the user updates more than one
tab. Use a single "OK" button that applies all of our changes instead.

Reorder the tabs. Put Local Interfaces first and select it by default.
Always show Remote Interfaces. Disable it on platforms that don't have
PCAP_REMOTE.

Automatically start editing when we add a new pipe. Don't immediately
update pipe interface settings. Wait until we hit "OK" instead.

Rename NewFileDelegate to PathChooserDelegate. Note that we might want
to move it use it elsewhere in the application.

Try switching the user-facing terminology from "Hide" to the more
positive "Show".

Tell the user that we don't save pipe or remote interface settings.

Add a help URL for the "Manage Interfaces" dialog box.

Use the GLib and Qt string functions and classes to split and join
comma-separated preferences. This makes sure capture_dev_user_descr_find
doesn't skip over the first interface. It also keeps the Qt code from
adding a leading comma to our capture preferences.

Add a note about strings to README.qt. Summary: Use QStrings.

For another day:

- If we *do* save remote settings we need to store credentials securely,
  e.g. with CryptProtectData.

- Get rid of the remote settings dialogs. Their controls should fit in the
  remote settings tab.

- Add an extcap tab.

- We need getter/setter functions for global_capture_opts.all_ifaces. We
  iterate over it *way* too much.

Change-Id: Ib7b61972f3ece4325e0230f725e7f2678acbb24b
Reviewed-on: https://code.wireshark.org/review/3873
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoset usb_dissector_table for control messages to "other" and "reserved"
Martin Kaiser [Thu, 28 Aug 2014 21:21:36 +0000 (23:21 +0200)]
set usb_dissector_table for control messages to "other" and "reserved"
add a comment to explain this

Change-Id: I7aa04ab1653cd8e6ae82c230d93c4c8ead677ace
Reviewed-on: https://code.wireshark.org/review/3910
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoremove offset parameter from try_dissect_next_protocol()
Martin Kaiser [Thu, 28 Aug 2014 17:02:10 +0000 (19:02 +0200)]
remove offset parameter from try_dissect_next_protocol()

Change-Id: I7452e6c5a9a24d44f83338aeb1dae389b87c8701
Reviewed-on: https://code.wireshark.org/review/3909
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoAdd 3GPP2 Tx AVPs. Move all the 3GPP2 stuff into its own XML file.
Jeff Morriss [Thu, 28 Aug 2014 19:28:27 +0000 (15:28 -0400)]
Add 3GPP2 Tx AVPs.  Move all the 3GPP2 stuff into its own XML file.

Change-Id: I7197f84472139c99bafa5b68f724abaab0453faa
Reviewed-on: https://code.wireshark.org/review/3908
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
5 years agohandle standard and non-standard setup requests in the same function
Martin Kaiser [Wed, 27 Aug 2014 21:15:19 +0000 (23:15 +0200)]
handle standard and non-standard setup requests in the same function

Change-Id: I5204a2fc1082e8a6b8082ad58fb252d4ba6c8bcb
Reviewed-on: https://code.wireshark.org/review/3901
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agosimplify dissect_nonstandard_usb_setup_request()
Martin Kaiser [Wed, 27 Aug 2014 21:03:59 +0000 (23:03 +0200)]
simplify dissect_nonstandard_usb_setup_request()
create setup_tvb in the calling function

Change-Id: Id34635afbd25817b09535fc52d1ba396b2597e5a
Reviewed-on: https://code.wireshark.org/review/3900
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agocorrect detection of USB header type
Martin Kaiser [Thu, 28 Aug 2014 18:56:00 +0000 (20:56 +0200)]
correct detection of USB header type
this fixes a regression for linux USB headers without 64 bytes extension

Change-Id: Icb79d983dac6dca25d04657d3324286c73d31f29
Reviewed-on: https://code.wireshark.org/review/3906
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years ago- Use e212 routine for IMSI.
AndersBroman [Thu, 28 Aug 2014 16:25:03 +0000 (18:25 +0200)]
- Use e212 routine for IMSI.
- Add top_tree to function calls to avoid a crash.
- Set a21_prefs_initialized.

Change-Id: I193ae87189dda9b3806f43c9be3916f1adf7bda2
Reviewed-on: https://code.wireshark.org/review/3902
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoremove unnecessary try_dissect_linux_usb_pseudo_header_ext() call
Martin Kaiser [Wed, 27 Aug 2014 10:07:37 +0000 (12:07 +0200)]
remove unnecessary try_dissect_linux_usb_pseudo_header_ext() call

Change-Id: Iafe173d4625d7e57ee3bd9c2fe9a6e6176624dcc
Reviewed-on: https://code.wireshark.org/review/3899
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agomerge dissect_linux_usb_pseudo_header_ext() and
Martin Kaiser [Wed, 27 Aug 2014 09:40:46 +0000 (11:40 +0200)]
merge dissect_linux_usb_pseudo_header_ext() and
try_dissect_linux_usb_pseudo_header_ext()

Change-Id: Ica9e3089cc6bfde9b52158ef5e161dfcddeb716a
Reviewed-on: https://code.wireshark.org/review/3898
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoremove two obsolete comments
Martin Kaiser [Wed, 27 Aug 2014 09:32:04 +0000 (11:32 +0200)]
remove two obsolete comments

Change-Id: I339655b699d998bd4194363df64d98543dcae624
Reviewed-on: https://code.wireshark.org/review/3897
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoNULL check for usb_conv_info
Martin Kaiser [Wed, 27 Aug 2014 09:29:18 +0000 (11:29 +0200)]
NULL check for usb_conv_info

Change-Id: I6cb4347f73afcfe561d3dca846c846d481c1c3bd
Reviewed-on: https://code.wireshark.org/review/3896
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoreq_type is the same as type
Martin Kaiser [Tue, 26 Aug 2014 14:00:28 +0000 (16:00 +0200)]
req_type is the same as type

Change-Id: Icdc94d65043feb5927aa0194cbef796e634bf3a9
Reviewed-on: https://code.wireshark.org/review/3895
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agouse proto_tree_add_subtree()
Martin Kaiser [Tue, 26 Aug 2014 10:15:02 +0000 (12:15 +0200)]
use proto_tree_add_subtree()

Change-Id: I0182397a7a208a2be8587fa4060a8497b54bb273
Reviewed-on: https://code.wireshark.org/review/3894
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoFix error: not a Doxygen trailing comment found by Clang (-Wdocumentation)
Alexis La Goutte [Thu, 28 Aug 2014 07:44:28 +0000 (09:44 +0200)]
Fix error: not a Doxygen trailing comment found by Clang (-Wdocumentation)

Change-Id: Ieff4b888b39c8da82f00b00e0609d89d1203aef9
Reviewed-on: https://code.wireshark.org/review/3891
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoOSI util: Add modelines info
Alexis La Goutte [Wed, 20 Aug 2014 07:19:44 +0000 (09:19 +0200)]
OSI util: Add modelines info

Change-Id: I15e44f2f10b80b7c7ce78ce84b748ce8ec7a2eff
Reviewed-on: https://code.wireshark.org/review/3890
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoDNS: Update CDS and add CDNSKEY (draft-ietf-dnsop-delegation-trust-maintainance-14)
Alexis La Goutte [Thu, 21 Aug 2014 06:54:16 +0000 (08:54 +0200)]
DNS: Update CDS and add CDNSKEY (draft-ietf-dnsop-delegation-trust-maintainance-14)

Use DS dissector for CDS (see section 3.1) and DNSKEY dissector for CDNSKEY (see section 3.2)

Change-Id: I2ee11dc0eb2b5c74447b58604b1611ed249bc329
Reviewed-on: https://code.wireshark.org/review/3869
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoDNS: Update EUI48 and EUI64 to final draft (RFC7043)
Alexis La Goutte [Thu, 21 Aug 2014 06:43:57 +0000 (08:43 +0200)]
DNS: Update EUI48 and EUI64 to final draft (RFC7043)

Change-Id: I2b18ccb874a51e5e752462a34175df8d8a90ce41
Reviewed-on: https://code.wireshark.org/review/3868
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoNTP: fix parsing of control assignments with empty value
Pascal Quantin [Wed, 27 Aug 2014 21:57:19 +0000 (23:57 +0200)]
NTP: fix parsing of control assignments with empty value

Consider that ',' is a separator between assignments and make value presence optional

Bug: 10417
Change-Id: I23f2b4029548a1263d65ee11c6356270e7a89bd7
Reviewed-on: https://code.wireshark.org/review/3884
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoRPKI-RTR: enhance dissector
Alexis La Goutte [Thu, 28 Aug 2014 06:47:57 +0000 (08:47 +0200)]
RPKI-RTR: enhance dissector

* fix no display all append COL_INFO... (reset by col_set_clear...)
* fix dissection when type is unknown
* fix warning about soft-deprecated (tvb_length..)
* fix indent
* fix some typo (IPV6 => IPv6...)

Ping-Bug:8296
Change-Id: I246b04098200afd1528f632cc709f631422e745b
Reviewed-on: https://code.wireshark.org/review/3888
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoBluetooth: btle: Clear info column before use it
Michal Labedzki [Tue, 26 Aug 2014 11:13:57 +0000 (13:13 +0200)]
Bluetooth: btle: Clear info column before use it

This fix "btle" over "ubertooth" dissector, so messeges from both
will not be merged.

Change-Id: I587b81a405f37d16e8ab417d94edfc633bfc14fc
Reviewed-on: https://code.wireshark.org/review/3877
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoTCP/UDP/SCTP: fix Dereference of null pointer found by Clang Analyzer
Alexis La Goutte [Wed, 20 Aug 2014 17:05:20 +0000 (19:05 +0200)]
TCP/UDP/SCTP: fix Dereference of null pointer found by Clang Analyzer

The warning coming after change in g018b84de8

Change-Id: Ia96cdb2993a6283d8de2647c6723ec6b2b0977eb
Reviewed-on: https://code.wireshark.org/review/3752
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years ago11ac decode update for IE196 Channel Switch Wrapper.
Luke Chou [Thu, 14 Aug 2014 07:38:54 +0000 (03:38 -0400)]
11ac decode update for IE196 Channel Switch Wrapper.

Bug:10258
Change-Id: Ic8d3ee5323b95c9e827b47ad284be58e11bc97f4
Reviewed-on: https://code.wireshark.org/review/3593
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: Evan Huus <eapache@gmail.com>
5 years agoIncrease the error buffer size for rpcap.
Gerald Combs [Wed, 27 Aug 2014 20:55:12 +0000 (13:55 -0700)]
Increase the error buffer size for rpcap.

If the rpcap port is unreachable pcap_findalldevs_ex can write more
than PCAP_ERRBUF_SIZE bytes to errbuf. E.g. if we try to capture from
Google's all-eights public DNS server we get:

----
Can't get list of interfaces: Is the server properly installed on 8.8.8.8?
connect() failed: A connection attempt failed because the connected
party did not properly respond after a period of time, or established
connection failed because connected host has failed to respond.  (code 1
----

Set the buffer to PCAP_ERRBUF_SIZE*4 bytes. Hopefully that's large enough.

Change-Id: I19f34cda16050c1ba8b9d7d6ed2d8e77b945a2af
Ping-Bug: 3554
Ping-Bug: 6922
Ping-Bug: 7021
Reviewed-on: https://code.wireshark.org/review/3880
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoAt least some compilers don't allow warning pragmas inside functions.
Guy Harris [Wed, 27 Aug 2014 22:06:09 +0000 (15:06 -0700)]
At least some compilers don't allow warning pragmas inside functions.

So wrap the entire function in USES_APPLE_DEPRECATED_API/USES_APPLE_RST.

Change-Id: I6ae3e8ecc40bc407e6f7156ccc5d9dd8c51d650d
Reviewed-on: https://code.wireshark.org/review/3885
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoUse the <wsutil/ws_diag_control.h> stuff to disable -Wdeprecated-declarations.
Guy Harris [Wed, 27 Aug 2014 21:56:29 +0000 (14:56 -0700)]
Use the <wsutil/ws_diag_control.h> stuff to disable -Wdeprecated-declarations.

Change-Id: I4b1fcbf5b25f2515d45015c9e1c4a94d6cfbc79c
Reviewed-on: https://code.wireshark.org/review/3883
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoBe more selective about turning off deprecation warnings.
Guy Harris [Wed, 27 Aug 2014 21:48:22 +0000 (14:48 -0700)]
Be more selective about turning off deprecation warnings.

Only turn them off in the vicinity of those nasty cross-platform APIs.

(This also checks in the generated Kerberos dissector, which we forgot
to do in the last checkin.)

Change-Id: I5dc9162ff64afe764e37866706590ed2ed965acb
Reviewed-on: https://code.wireshark.org/review/3882
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoUse FreeRADIUS's warning pragma controls to suppress Apple complaints.
Guy Harris [Wed, 27 Aug 2014 21:16:33 +0000 (14:16 -0700)]
Use FreeRADIUS's warning pragma controls to suppress Apple complaints.

Apple would really rather that you use their Shiny Happy Frameworks
rather than those crufty old cross-platform APIs.  We are a
cross-platform program, and will use platform-specific APIs only if
there's enough benefit to doing so - and, in this case, that means
"using the platform-specific APIs on OS X and the other APIs on other
platforms", so that's two code paths to maintain, so "enough benefit"
has to outweigh the issues with that.

Change-Id: I370ba469a6f5892143d72179d15c9fe22d664fdf
Reviewed-on: https://code.wireshark.org/review/3881
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agocheckhf.pl: (Trivial) remove trailing whitespace.
Bill Meier [Wed, 27 Aug 2014 16:12:57 +0000 (12:12 -0400)]
checkhf.pl: (Trivial) remove trailing whitespace.

Change-Id: I37ece54d936541b5d92e8c323ffeb429d9cc5f33
Reviewed-on: https://code.wireshark.org/review/3879
Reviewed-by: Bill Meier <wmeier@newsguy.com>
5 years agopacket-mausb.c: proto-reg-handoff() fixes
Bill Meier [Tue, 26 Aug 2014 02:39:59 +0000 (22:39 -0400)]
packet-mausb.c: proto-reg-handoff() fixes

- proto_reg_handoff...():
    Fix handling of tcp port pref change;
    Rename 'gPORT_PREF' to 'mausb_tcp_port_pref';
    Do 'dissector_add_uint("llc.mausb_pid",..)' only once;

Change-Id: Ic4498560f61d0ce95f8109c3a1bb3c407221269b
Reviewed-on: https://code.wireshark.org/review/3854
Reviewed-by: Bill Meier <wmeier@newsguy.com>
5 years agoE.164: update list to Operational Bulletin No. 1057 (1.VIII.2014)
Pascal Quantin [Wed, 27 Aug 2014 13:40:33 +0000 (15:40 +0200)]
E.164: update list to Operational Bulletin No. 1057 (1.VIII.2014)

Change-Id: If1767dcf9a533d10e0ac946a2f31d7f58ea7b01c
Reviewed-on: https://code.wireshark.org/review/3875
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>
5 years agoE.212: update list to Operational Bulletin No. 1058 (15.VIII.2014)
Pascal Quantin [Wed, 27 Aug 2014 13:36:45 +0000 (15:36 +0200)]
E.212: update list to Operational Bulletin No. 1058 (15.VIII.2014)

Change-Id: I79d12c4699df01f3435fae5342aa5ec295316959
Reviewed-on: https://code.wireshark.org/review/3874
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>
5 years agoCAPWAP : Fix wrong offset for AC Name with Priority
Alexis La Goutte [Tue, 26 Aug 2014 19:36:53 +0000 (21:36 +0200)]
CAPWAP : Fix wrong offset for AC Name with Priority

Thanks to Massimo Velluci for sample

Change-Id: Ibab2658c2c11c9940d3fdebb0bdc42752d57e1ae
Reviewed-on: https://code.wireshark.org/review/3871
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoExclude MA USB TransferAck's from USB conversation
Sean O. Stalley [Tue, 26 Aug 2014 17:16:58 +0000 (10:16 -0700)]
Exclude MA USB TransferAck's from USB conversation

the usb_trans_info struct only understands Requests & Responses.
TransferAcks are currently treated as responses, which throws off
the Request/Response pairing & dissection.

This patch fixes tracking in the case when a TransferAck & TransferReq
are in the same TCP packet. It does not fix the case where there are
multiple TransferReq's or TransferResp's in 1 TCP packet.

Eventually I want to revamp usb_trans_info structure to support:
 -multiple requests/responses per transaction (IE: retries)
 -TransferAck tracking
 -handling of multiple requests/responses in 1 TCP packet

Change-Id: I09be6fecf55a40b4ea2a4f27bd753f3991ccabbd
Reviewed-on: https://code.wireshark.org/review/3866
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>