Commit Graph

58302 Commits

Author SHA1 Message Date
Evan Huus 4a4871a831 ntlmssp: swap bounds check and length for memcpy
The values make more sense swapped (and the code is super-old) so I'm assuming
this was just a long-uncaught typo. Fixes a valgrind error at any rate.

Also replace a malloc+memcpy with a memdup for simplicity.

Bug: 11203
Change-Id: I74c0aff548b844cf90610db56a143f3eac172658
Reviewed-on: https://code.wireshark.org/review/8493
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>
2015-05-18 01:57:54 +00:00
Guy Harris d934d40f96 Update some comments.
There's all sorts of interesting stuff out there on the Intertubes if
you happen to be searching for the right thing.

Change-Id: Ib5e18ece5dfaa284ece8cfda23887a9408c8318e
Reviewed-on: https://code.wireshark.org/review/8503
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-17 21:50:19 +00:00
Michael Mann ba3f9f594d Add IPDR dissector
Bug: 2771
Change-Id: Ic2904c981a182be5859c3840025e7ffa9ea387ed
Reviewed-on: https://code.wireshark.org/review/8501
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-05-17 21:45:39 +00:00
Joerg Mayer 1c455284f0 Fix some files to pass the pre-commit hook script.
Change-Id: I105bf4e03fcf95cf7541f6377215809759fd933e
Reviewed-on: https://code.wireshark.org/review/8502
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-05-17 21:01:03 +00:00
Guy Harris 36af2c61e8 Improve comments, fix capitalization of "Aruba".
Give better comments describing the 5 different formats Aruba equipment
can use.

It's "Aruba Networks", not "ARUBA" anything.

Change-Id: I300d77375e8182b60e830cb545d8802c1a49569c
Reviewed-on: https://code.wireshark.org/review/8500
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-17 19:43:19 +00:00
Guy Harris 83787bb6ee Make the human-readable names the same in the preferences and the packets.
Change-Id: Ie00c81e9893412cc322cfb08e8b5b5f4e5ce47e4
Reviewed-on: https://code.wireshark.org/review/8499
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-17 19:20:30 +00:00
Guy Harris e16d37b8d9 Update a URL.
Change-Id: I51e884815a83bd44b528d5dd86f98d0ea51719f9
Reviewed-on: https://code.wireshark.org/review/8498
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-17 18:18:11 +00:00
Gerald Combs ab1743ecbb [Automatic update for 2015-05-17]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ic345ff4e7b46ee43af35ebbdda32ffc25e793c65
Reviewed-on: https://code.wireshark.org/review/8495
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-17 15:07:58 +00:00
Alexis La Goutte 7b2453a862 HTTP2: Update to final RFC
Change-Id: I0b19d4576b652dc9dd94346c75945e0bdc554a0e
RFC7540: Hypertext Transfer Protocol Version 2 (HTTP/2)
RFC7541: HPACK: Header Compression for HTTP/2
Reviewed-on: https://code.wireshark.org/review/8478
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-05-17 15:03:51 +00:00
Alexis La Goutte bcc3912a73 nghttp2: use <> for include glib.h
Change-Id: I6fdb72322dca514a774ab074c26128f70992a8f7
Reviewed-on: https://code.wireshark.org/review/8476
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-17 15:02:42 +00:00
Joerg Mayer 53b7a059a2 packet-skinny.c is a generated file nowadays.
Apply commit 0970872a4c to the source file
as well.

Change-Id: I9cc69bf5de3318b9a930bde3455a320880976af7
Reviewed-on: https://code.wireshark.org/review/8492
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-05-17 07:15:19 +00:00
Guy Harris d8b70a8222 struct timeval not used, so no need for <sys/time.h>.
Change-Id: I5f635f354db68f1cff0874f3cd0ba09c87edad1d
Reviewed-on: https://code.wireshark.org/review/8491
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-16 22:53:19 +00:00
Guy Harris 08ccac8704 Do all floating-point work in double-precision.
That squelches some double -> float warnings.

Change-Id: I19b8049698c7931e8c146d9532fc65ee091e4c24
Reviewed-on: https://code.wireshark.org/review/8490
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-16 22:50:15 +00:00
Guy Harris 1715be25b1 Use nstime_t for time stamps.
Don't roll our own time stamp handling, use nstime_t.  That also gives
us nanosecond resolution, for what that's worth.

Change-Id: Ib9945bdef5a70e1656b96995f510507da36b4b59
Reviewed-on: https://code.wireshark.org/review/8489
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-16 22:24:29 +00:00
Alexis La Goutte b4a68bcd49 SIP: Fix typo lenght => length
Change-Id: Ib533bd2526c27cf5f1161616fcf52136e40c827a
Reviewed-on: https://code.wireshark.org/review/8484
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-16 20:55:51 +00:00
Evan Huus 185697ad9a megaco: handle missing tokens
Fix an infinite loop when no transaction end offset is present and
`megaco_tvb_find_token` returns -1.

Bug: 11193
Change-Id: I82c7b795e522efca674787e504427f64b8c28fc4
Reviewed-on: https://code.wireshark.org/review/8483
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-16 20:52:10 +00:00
Guy Harris cfc5a2e05f Have per-queued-packet flags, including "is a packet in error".
The contents of the packet_info structure change during the dissection
process, so you can't rely on its contents when running tap listeners.

Bug: 11184
Change-Id: I52fc45774add56ee2bcb5faef2af7c731b4304fd
Reviewed-on: https://code.wireshark.org/review/8486
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-16 18:38:26 +00:00
Graham Bloice 63295df655 Remove odd characters
Change-Id: Ie861badb555e235199549ee27ca374feb6356be6
Reviewed-on: https://code.wireshark.org/review/8482
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-05-16 14:16:54 +00:00
Evan Huus 85f38f9f75 tap: Add ability to reject/ignore "error" packets in tap
ICMP (and a few other protocols) can carry "error packets" as payloads in
certain cases. In the same way that we don't (by default) call TCP reassembly
code on TCP packets we know are out-of-order, we also shouldn't call tap code on
frames carried in ICMP error packets.

Bug: 11184
Change-Id: Ie83dbb505c8fdc15c5554705488c16fa0274a06a
Reviewed-on: https://code.wireshark.org/review/8446
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-05-16 12:13:45 +00:00
Alexis La Goutte aa6466a7b5 Main (menubar): fix C++ style comments are not allowed in ISO C90
Change-Id: Ia8ae6780027a63c4a88ea8d2a10ba1e0f8931f25
Reviewed-on: https://code.wireshark.org/review/8472
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-16 01:16:32 +00:00
Gerald Combs a04a894731 Qt: Stop tapping when the I/O Graph dialog closes.
Add a setCaptureStopFlag function to ProgressBar. Add a stopTapping
function and setCaptureStopFlag signal to CaptureFile. Use the new
plubming to stop tapping when the IO Graph dialog closes.

Bug: 10116
Change-Id: Ic46814eed18933f511d9d1ff37e2e7918741f353
Reviewed-on: https://code.wireshark.org/review/8480
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-15 21:48:03 +00:00
Gerald Combs a1eb0aaeb3 Qt: Make sure we can fetch ExportDissectionDialog's layout.
Make sure ExportDissectionDialog is a non-native, funny-looking file
dialog so that we can fetch its layout.

Fix and add some URLs while we're here.

Bug: 11122
Change-Id: Icf62f7a436c7ba27ec20f84e7c1af1a5d7c9b949
Reviewed-on: https://code.wireshark.org/review/8479
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-15 18:14:20 +00:00
Pascal Quantin 3acebb469a MBIM: add checks on the maximum string or PDU size allowed
Change-Id: I10912bbe5a4ee38732a200b595b8d34dfa40c698
Reviewed-on: https://code.wireshark.org/review/8475
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-05-15 17:49:38 +00:00
Gerald Combs 0ae949643f Qt: Fixup sequence dialog buttons.
Switch from "Save As" + Cancel + OK to "Save As" + Close.

Change-Id: I6f1093965f90fe9cbbfbf053779c05388c897641
Reviewed-on: https://code.wireshark.org/review/8474
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-15 16:45:42 +00:00
Gerald Combs 76a5465cf0 Qt: Fix packet deselection.
When no packets are selected, clear the related item delegate, packet
detail, and byte view. Also, don't crash.

Bug: 10529
Change-Id: I1f46d0d60d060d517f1ee2f8b5a9124bc1fad00e
Reviewed-on: https://code.wireshark.org/review/8470
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-15 16:07:29 +00:00
Edwin Groothuis f1a747e96e ui/mcast_stream.c: Add dependency on sys/time.h for struct timeval
Needed to compile on FreeBSD.

Bug: 11199
Change-Id: I6b10a0954020d58dcec93364ebecc8a7069ac8f3
Reviewed-on: https://code.wireshark.org/review/8467
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
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>
2015-05-15 13:16:48 +00:00
Edwin Groothuis 4c601c833a androiddump: fix compilation under FreeBSD
Bug: 11200
Change-Id: Ic46b235c84488bb8537ec3c2605e6770eb843795
Reviewed-on: https://code.wireshark.org/review/8469
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-15 12:38:41 +00:00
Roland Knall 57716e1365 Qt: Implement "Apply as Column" for packet context
Implement the same functionality for "Apply as Column" as it
 exists in the GTK version of Wireshark. Especially for the
 context menu in the packet view panel.

Change-Id: Id25b7797616ff3b3acf7aa920395516c8a4e9bf9
Reviewed-on: https://code.wireshark.org/review/7604
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-15 06:05:01 +00:00
Gerald Combs 7f424b5a55 Pop the display filter status when it loses focus.
Change-Id: I7878fd99f8b773f8c550a6d2416e9e2d44abd321
Reviewed-on: https://code.wireshark.org/review/8466
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14 22:41:42 +00:00
Gerald Combs 4ba370e0d4 Don't complete the current field.
Change-Id: If2b16783d08d23df427ac9b9c86984245db56d53
Reviewed-on: https://code.wireshark.org/review/8465
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14 22:12:56 +00:00
Gerald Combs 63e94c5af1 Fix display filter completion behavior.
Allow completion for mismatched protocol and filter names.

Change-Id: I1d1e6b8f16d4d2d331b915c199f857835dcc1c53
Ping-bug: 11187
Reviewed-on: https://code.wireshark.org/review/8464
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14 22:03:35 +00:00
Gerald Combs 294706a1bf Fix packet list font zooming.
Change-Id: I376fc3b41e9ebbe1353527d8d3bbf8d4b86cc29a
Reviewed-on: https://code.wireshark.org/review/8463
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14 18:04:09 +00:00
Pascal Quantin 97f1fd3626 USB COM: add dissection of Ethernet Networking Functional Descriptor
Change-Id: Id5023090b5b80ca12695fc9e012a59f53b30479c
Reviewed-on: https://code.wireshark.org/review/8461
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-14 17:23:36 +00:00
Gerald Combs 2e7524085c Qt: Apply protocol preferences.
Make sure we call prefs_apply_all when saving preferences.

Bug: 11119
Change-Id: Iacf1e28e69c2aebcbbd7dceaa210c8219663665f
Reviewed-on: https://code.wireshark.org/review/8462
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14 16:31:38 +00:00
Gerald Combs 2156413bf9 Qt: Column preference fixes.
Don't call redrawVisiblePackets in PacketList::sectionResized. Otherwise
we trigger the crash in bug 11179. Call recent_set_column_width instead.

Clean up the slots called when column preferences change and when recent
column widths change.

Update our column visibility in redrawVisiblePackets.

Use recent_get_column_width when writing the recent file. columnWidth
doesn't return a valid value when we're not visible.

Bug: 11179.
Change-Id: I34ab93d944b341e42129a1c8ff94ba8f7ad4f5fc
Reviewed-on: https://code.wireshark.org/review/8457
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14 15:37:35 +00:00
Gerald Combs 2793069020 Add a comment explaining completion misbehavior.
Note that field name completion won't work correctly if a field's abbrev
doesn't match its protocol filter name. Fixing this is left as an exercise
for the reader.

Change-Id: Ia9b55f20bf58b8252e27506bcce4a0dd71cc199c
Reviewed-on: https://code.wireshark.org/review/8460
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14 15:36:24 +00:00
cff339 f11def94b1 GSM A RR: fix 'packet channel description' dissection
It should support decoding 'MA_NUMBER_IND' and 'CHANGE_MARK_1'.

Signed-off-by: cff339 <cff339@gmail.com>

Change-Id: I634f326b4741b8853a631e6da2e9c056f60781ef
Reviewed-on: https://code.wireshark.org/review/8458
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-05-14 10:28:11 +00:00
Guy Harris 0db5490f26 Register the IPv4 and IPv6 dissectors directly with WTAP_ENCAP_RAW_IP{4,6}.
No need to run them through the "raw IP" dissector.

Change-Id: I63639651873f00326a20b88a08ecb4ab3b9a83b3
Reviewed-on: https://code.wireshark.org/review/8459
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-14 07:47:17 +00:00
Jeff Morriss 2ddf0e6db3 Don't put an expert info on every single raw frame (even if it was just a Note).
It's completely normal that there's no link information when you're dissecting
raw packets.  This does leave the Raw protocol tree without any children
(which looks a little funny) but I don't want to take it out and I don't see
anything useful to put under it.

Also change the Raw protocol item to cover all the bytes of the TVB (like the
frame item).

Change-Id: I44c1ac954c9989273d0c461ba366caba0a480ea6
Reviewed-on: https://code.wireshark.org/review/8454
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-14 01:46:48 +00:00
Gerald Combs 4a37dfc57e Qt: Add the correct column width padding.
When applying recent column widths, add the correct padding in the
right place.

Bug: 11175
Change-Id: I5a6fe7975764ddc5d9024d8839a837579b2bf799
Ping-Bug: 11179
Reviewed-on: https://code.wireshark.org/review/8456
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-13 20:41:51 +00:00
Gerald Combs 703b5dc48a Qt: Don't set ProtoTree::uniformRowHeights.
Some packet detail items contain multiple lines. Show them, which
duplicates the GTK+ UI behavior. Add a note about adding a custom item
delegate if this affects performance.

Make item labels QStrings while we're here.

Bug: 10225
Change-Id: Ia39320028ecff5fe7fa3e4c09ff37405986b7f6e
Reviewed-on: https://code.wireshark.org/review/8445
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-13 19:37:58 +00:00
Gerald Combs 84db6a661d Fix an error found by Valgrind.
Change-Id: I9f0adac70129c90b4bf1e678bece6c6b8b8b4b75
Reviewed-on: https://code.wireshark.org/review/8455
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-13 19:04:51 +00:00
Alexis La Goutte a3666e5e39 QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171)
Try 2

Change-Id: I10c439ccd4b8e5ac24275332e35fb35ad95b8d1b
Reviewed-on: https://code.wireshark.org/review/8447
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>
2015-05-13 17:38:04 +00:00
Gerald Combs 4c4328e316 Try to avoid duplicate display filter completions.
When adding recent filters to the completion list, skip over items that
look like fields and assume they'll be added further down the line.

Change-Id: Ief1e7aeebf91504becc2e07ba9cad66a90d8c7f3
Reviewed-on: https://code.wireshark.org/review/8453
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-13 16:37:03 +00:00
AndersBroman cf82e68d58 [Thrift] Strengthen the heuristic.
Change-Id: I9e0676f36f8c5cb7fb344640333c8d32990e0a1e
Reviewed-on: https://code.wireshark.org/review/8452
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-13 15:59:09 +00:00
Francesco Fondelli 46d89bd27f PCEP: fix SID parsing, label is the first 20 bits
Change-Id: I13d2ff79b171b232dd4e1e1082beeae2e36dec51
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8451
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-13 15:10:55 +00:00
Alexis La Goutte 232f260050 MEGACO: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Iee615c46fcb5dd0ced55d971c5f70bc7c970f9a6
Reviewed-on: https://code.wireshark.org/review/8448
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-13 12:37:00 +00:00
AndersBroman 51c3fc6da2 [GCP] Add a command string when there's no context tracking.
Change-Id: I26235f172d97e5c4f6e52d3816675deb1849d988
Reviewed-on: https://code.wireshark.org/review/8450
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-13 12:35:14 +00:00
AndersBroman 6d1b6f4692 [VoIP] There has to be two separate routines for MEGACO and H248 as
tap_id_offset is used to access tapinfo. Fixes a crash rported in

Bug: 11132
Change-Id: I32ada3e0eb16d0e128ff67c5aec499890602eab0
Reviewed-on: https://code.wireshark.org/review/8449
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-13 11:31:31 +00:00
Michael Mann 0bf4299ec9 Change the formatting strings used to create the Conversation Filter submenu
Bug: 11178
Change-Id: I4a5ae1399da8206efb29c059437d56da06a539a9
Reviewed-on: https://code.wireshark.org/review/8417
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: Evan Huus <eapache@gmail.com>
2015-05-13 01:44:49 +00:00