Commit graph

54802 commits

Author SHA1 Message Date
Gerald Combs
37c23fc910 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>
2014-08-31 18:32:15 +00:00
Alexis La Goutte
446125aa25 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>
2014-08-31 17:44:32 +00:00
Alexis La Goutte
5bec37f1f5 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>
2014-08-31 17:22:16 +00:00
Alexis La Goutte
caf73525f3 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>
2014-08-31 16:55:28 +00:00
Gerald Combs
c14cac7594 [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>
2014-08-31 15:06:07 +00:00
Jérôme LAFORGE
26731e8cc6 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>
2014-08-30 23:29:26 +00:00
Guy Harris
f415e1c348 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>
2014-08-30 23:21:37 +00:00
Michael Tüxen
0d7c4fd5ee 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>
2014-08-30 18:42:17 +00:00
Pascal Quantin
2eced3689d 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>
2014-08-30 09:55:27 +00:00
Stig Bjørlykke
437b448095 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>
2014-08-30 09:54:05 +00:00
Alexis La Goutte
26ab2e40e3 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>
2014-08-30 09:52:11 +00:00
Alexis La Goutte
021351f422 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>
2014-08-30 09:51:36 +00:00
Diederik de Groot
0622e3439e 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>
2014-08-29 17:44:41 +00:00
Pascal Quantin
47f96d974c 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>
2014-08-29 12:07:51 +00:00
Jeff Morriss
8db01445c1 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>
2014-08-29 01:39:01 +00:00
Jeff Morriss
fcf67941af 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>
2014-08-29 01:38:53 +00:00
Gerald Combs
a71f6807b8 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>
2014-08-29 00:24:02 +00:00
Martin Kaiser
b65d0e0719 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>
2014-08-28 21:23:00 +00:00
Martin Kaiser
9eb855b0bd 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>
2014-08-28 20:16:36 +00:00
Jeff Morriss
e3cbc062c3 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>
2014-08-28 19:30:36 +00:00
Martin Kaiser
c2f15110ea 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>
2014-08-28 19:14:39 +00:00
Martin Kaiser
c361211007 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>
2014-08-28 19:14:08 +00:00
Martin Kaiser
6603ac9391 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>
2014-08-28 19:05:57 +00:00
AndersBroman
7312c07f8e - 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>
2014-08-28 16:28:34 +00:00
Martin Kaiser
384d95ca9f 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>
2014-08-28 13:54:56 +00:00
Martin Kaiser
c527d1ad6a 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>
2014-08-28 13:54:40 +00:00
Martin Kaiser
2fe2c62314 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>
2014-08-28 13:54:21 +00:00
Martin Kaiser
95194f9508 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>
2014-08-28 13:54:05 +00:00
Martin Kaiser
fa40c3a720 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>
2014-08-28 13:53:48 +00:00
Martin Kaiser
ab037977fb 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>
2014-08-28 13:53:26 +00:00
Alexis La Goutte
e7c11beedd 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>
2014-08-28 11:35:01 +00:00
Alexis La Goutte
cf3b238a6b OSI util: Add modelines info
Change-Id: I15e44f2f10b80b7c7ce78ce84b748ce8ec7a2eff
Reviewed-on: https://code.wireshark.org/review/3890
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-28 11:34:19 +00:00
Alexis La Goutte
c76e49697e 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>
2014-08-28 07:24:24 +00:00
Alexis La Goutte
7660da2b69 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>
2014-08-28 07:22:30 +00:00
Pascal Quantin
edcd2dd57f 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>
2014-08-28 07:14:55 +00:00
Alexis La Goutte
14b0d710f5 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>
2014-08-28 07:13:21 +00:00
Michal Labedzki
845b781dfb 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>
2014-08-28 07:07:37 +00:00
Alexis La Goutte
852493ad7f 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>
2014-08-27 22:20:19 +00:00
Luke Chou
4b11680427 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>
2014-08-27 22:18:42 +00:00
Gerald Combs
5ee328e90b 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>
2014-08-27 22:11:58 +00:00
Guy Harris
a8523d7df4 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>
2014-08-27 22:06:39 +00:00
Guy Harris
2e67941b4c 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>
2014-08-27 21:57:30 +00:00
Guy Harris
c7ce0e0c22 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>
2014-08-27 21:49:02 +00:00
Guy Harris
d04ec412d6 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>
2014-08-27 21:17:37 +00:00
Bill Meier
1b3bc9b71e checkhf.pl: (Trivial) remove trailing whitespace.
Change-Id: I37ece54d936541b5d92e8c323ffeb429d9cc5f33
Reviewed-on: https://code.wireshark.org/review/3879
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-27 16:18:34 +00:00
Bill Meier
f4b135c147 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>
2014-08-27 15:49:40 +00:00
Pascal Quantin
cac381b3de 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>
2014-08-27 15:42:49 +00:00
Pascal Quantin
41764ec24b 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>
2014-08-27 14:39:41 +00:00
Alexis La Goutte
2263b73ae5 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>
2014-08-26 19:40:08 +00:00
Sean O. Stalley
c612029774 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>
2014-08-26 19:37:40 +00:00