Commit Graph

53508 Commits

Author SHA1 Message Date
Tim Furlong 74fec38529 Get QtShark building on Win7 with Qt 5.3.0 using Qt Creator.
Several header file references in .ui files needed to be changed to not
be global, and the path to stats_tree_dialog.ui needed a "../qt" path
prepended to be found from the build...-Release directory.

Change-Id: I51c0bb15eed706f483085020ce2b3cea3c1cdc95
Reviewed-on: https://code.wireshark.org/review/2281
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 21:02:18 +00:00
Evan Huus 417938310a Initialize rq_hdr.session
Bug:10168
Change-Id: Ida4d82d102421152785ce680aa47bcb5cf8692f6
Reviewed-on: https://code.wireshark.org/review/2334
Reviewed-by: Dmitry Bazhenov <dima_b@pigeonpoint.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 20:54:39 +00:00
Joerg Mayer 43d9a4b151 Simplify obtaining the absolute path of the build dir
Change-Id: If0fabce21d7d12435f4f78768f7193564eeb2bb8
Reviewed-on: https://code.wireshark.org/review/2339
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 19:44:39 +00:00
Joerg Mayer 55cdf038a8 ip version and header-length are not full byte values. Show the
bit decoding for these values.

Change-Id: I7ab6c4badf5b66d6f434a47523e2b35730ecb65d
Reviewed-on: https://code.wireshark.org/review/2338
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 19:39:27 +00:00
Evan Huus 17a552666b fix underflow in BER constrained bitstrings
this can happen and cause invalid memory accesses with incorrectly-large padding
values

Bug:10187
Change-Id: Ib9b2a2fa10766efb4d95d588f57354a56373c626
Reviewed-on: https://code.wireshark.org/review/2325
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 18:17:31 +00:00
Evan Huus c30df31954 lua_pushstring takes a copy of its argument
free the value we pass it, fixing a memory leak

Change-Id: I446cb85d82a0697c24035461ad03450855b68884
Reviewed-on: https://code.wireshark.org/review/2304
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 17:25:35 +00:00
Hannes Mezger 7067e3a340 Create and register subtree identifiers for all opcua array types
Currently for all arrays, the generic ett_opcua_array is used, instead we want to be more selective for storing the expanded state of subtrees. This commit adds subtree identifiers for all array types.

Change-Id: Idcec51a200d1109cdb557d3366021d3b066b453d
Reviewed-on: https://code.wireshark.org/review/2176
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 17:25:16 +00:00
Stig Bjørlykke 8c0d3ae47e Return number of bytes dissected in dissector:call
This does not work for old-style dissectors as they always return
the number of bytes in incoming buffer and not the number of bytes
dissected.  This is noted in the documentation.

Change-Id: I5b236a73952cac3efc830e40276283bed9af1f87
Reviewed-on: https://code.wireshark.org/review/2237
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 17:16:56 +00:00
Hannes Mezger 647255d627 Unify how opcua arrays are displayed
- Display 'Array of <fieldname>' instead of 'Array of Simple Type'
- Display array indexes for simple types
- Display data type in simple type arrays

Change-Id: Id2cc746898f97ce329c6afb9cc49f1907a9f18e4
Reviewed-on: https://code.wireshark.org/review/2161
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 17:12:21 +00:00
Hannes Mezger 91c29ec205 Add myself as author for the opcua dissector plugin
Change-Id: If8349e778fd91426a6a4b6d6e98d3ab870d188d5
Reviewed-on: https://code.wireshark.org/review/2302
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 17:11:24 +00:00
Hannes Mezger 9991f43f27 Add dissect_nt_64bit_time_ex for retrieving the created proto_item
Using dissect_nt_64bit_time it is not possible to access the created proto_item afterwards, hence the new function.

Change-Id: I39aca92536a53841045c30b601b6ec1a7d8bfb4e
Reviewed-on: https://code.wireshark.org/review/2160
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 17:09:03 +00:00
Alex Badea d1cdbd715a isakmp: add support for IKEv1 AES decryption
Select an appropriate gcrypt cipher based on ISAKMP encryption ID and
key length attribute.  Fixes bug 10128.

Bug:10128
Change-Id: Ie74fc51eb9bfe6d68340056d3ef2ef28c7677fb8
Signed-off-by: Alex Badea <abadea@ixiacom.com>
Reviewed-on: https://code.wireshark.org/review/2296
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-17 14:49:06 +00:00
Alex Badea f9b05dc132 isakmp: allow IKEv1 decryption with non-PSK authentication
There is a check that disables decryption for non-PSK authentication. It
has been around ever since its introduction in commit acfe071e (svn
r17229). As suggested in bug 7951, remove this check to allow decryption
for e.g. certificates authentication.

Bug: 7951
Change-Id: I5e98407d0f8dbabac2cdaf632cf0af403192872b
Signed-off-by: Alex Badea <abadea@ixiacom.com>
Reviewed-on: https://code.wireshark.org/review/2297
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 14:44:41 +00:00
Joerg Mayer f847b92b08 It's so simple: If we require a package but provide alternative methods
of finding the package don't allow the first method to fail terminally.
Todo: Fix this in all other places as well.

Change-Id: I5a343fac33f6a5d6e50ff353d739459b2e36711a
Reviewed-on: https://code.wireshark.org/review/2300
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 14:29:52 +00:00
Anish Bhatt 5ca64ca97b Add support for WRITE_LONG16 & REPORT_REFERRALS to scsi dissector
Picking up leftover work on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8843

Change-Id: Ie3df55ae3309cf68f64b2aa184fb2904d1200cb5
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2239
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 05:47:57 +00:00
Jeff Morriss a9a73a8cc0 Get the Windows doc builds going again: define top_srcdir because it's used in Makefile.common.
Change-Id: I4e8905b28bd6fb8c7bf3d38dbf3882c393732bcf
Reviewed-on: https://code.wireshark.org/review/2291
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 05:44:05 +00:00
Joerg Mayer 289aa37d8d Remove detection of Python libraries: They are not used anymore.
Change-Id: If42bb16d5c6202889ff933af6c9d974866d2a950
Reviewed-on: https://code.wireshark.org/review/2290
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 00:44:53 +00:00
Alexis La Goutte 11243e3977 Qt: fix loading of language translation
But need always restart to apply change...

Based on http://qt-project.org/wiki/How_to_create_a_multi_language_application


Change-Id: I0f95afb68aa5b125e0707b0af1ce096dab9c29e4
Reviewed-on: https://code.wireshark.org/review/2286
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-17 00:08:51 +00:00
Jakub Zawadzki 923cf412f1 Fix copy/paste errors in value_string.
Also make repetition_coding_indications[] standard terminated.

Change-Id: Ice20e1f27f5ab4d111f893608a230b83899efc9f
Reviewed-on: https://code.wireshark.org/review/2288
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 00:08:49 +00:00
Evan Huus e047e3a007 Convert tcap dissector to wmem
As far as I can tell these calls were just missed in the first initial pass,
they're not in a weird scope.

Close review from somebody else please to verify that!

Change-Id: Ic3188879124dcb8fdf42e79d200d4f244200aa7b
Reviewed-on: https://code.wireshark.org/review/2266
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 00:06:17 +00:00
Gerald Combs 6c79a718ab Column visibility fixups.
Move visibility to its own method and call it when we show ourselves and
when we thaw.

Change-Id: I936cd33e5ccabddb32061ea347a465ac12f1be87
Reviewed-on: https://code.wireshark.org/review/2289
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-16 23:56:39 +00:00
Joerg Mayer 1567820a3a Add a FIXME referring to bug 4096
Change-Id: I4263d791e7bc7dc410d2735e94bc765aee2d84bc
Reviewed-on: https://code.wireshark.org/review/2287
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 23:37:31 +00:00
Jeff Morriss f113306e0e More Python-bindings removal.
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce
Reviewed-on: https://code.wireshark.org/review/2283
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16 23:14:05 +00:00
Guy Harris 048646d322 More Python removal.
Fix a duplicate @HAVE_LUA@ while we're at it.

Change-Id: I21acf388498a996701adea401551a65c9ba4f5f0
Reviewed-on: https://code.wireshark.org/review/2285
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-16 22:57:59 +00:00
Guy Harris d58ac9ad38 Get rid of the last bits of Python, as they break the build.
Bereft of life, it rests in peace.

Change-Id: I8b9bc8c6cef0635d5526aa6b389aa33bc41fbc66
Reviewed-on: https://code.wireshark.org/review/2284
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-16 22:54:42 +00:00
AndersBroman 1777f60824 The broken python support is beeing removed.
Change-Id: I5f4d3d381d8629158c9d1bea344b5a2e64a0f462
Reviewed-on: https://code.wireshark.org/review/2282
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16 22:14:23 +00:00
AndersBroman f5476e90a0 Explicitly declare/cast 'unsigned <variable>' as 'unsigned int <variable>'
Applying part of Bug 7825

Change-Id: I460b5c61b04d793ccc27c25debbd5e8f08bc6974
Reviewed-on: https://code.wireshark.org/review/2280
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16 22:03:12 +00:00
Jeff Morriss 319ad97717 Add a cast to satisfy the buildbots.
Change-Id: I1c128db8a8b0cbbef01a26f7b3a50ed2b59af229
Reviewed-on: https://code.wireshark.org/review/2279
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16 21:46:26 +00:00
Gerald Combs 7f6ebece15 Hide hidden columns in Qt.
Change-Id: I1da0d95c606eb2f17c03874f20d38b9a7ba9e8ee
Reviewed-on: https://code.wireshark.org/review/2278
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-16 21:31:12 +00:00
Jeff Morriss aeb1888a50 Remove the (old, broken) Python bindings option to ./configure (and a few other references).
Change-Id: I470502bfae6617a798d0c2538f0f04ff7d36fee5
Reviewed-on: https://code.wireshark.org/review/2277
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16 21:19:28 +00:00
Gerald Combs a82c8d1cff More wspython removal.
Change-Id: I09b7bac7906f0e134459c4a81a7ef626e6590d5b
Reviewed-on: https://code.wireshark.org/review/2276
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-16 21:09:48 +00:00
Joerg Mayer 1496111f99 Fix a whitepace error that got committed in the last change
Change-Id: I5344d04916998263710c16b506250062c1c11b37
Reviewed-on: https://code.wireshark.org/review/2275
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 21:05:38 +00:00
Evan Huus bbc7293510 fix format string typos
Change-Id: I470463ecfdd2d8facef93e09d6265a9d7ed868c8
Reviewed-on: https://code.wireshark.org/review/2274
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 21:04:21 +00:00
Jakub Zawadzki d5fb63a8c4 Fix copy/paste errors in stun attributes value_string[] array.
Found thanks to warning:
** (process:20239): WARNING **: Extended value string 'attributes' forced to fall back to linear search:
  entry 53, value 32858 [0x805a] < previous entry, value 32861 [0x805d]

Change-Id: I12396380b42bbcb90dd139775c4b8d0bfdc79972
Reviewed-on: https://code.wireshark.org/review/2273
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 21:01:56 +00:00
Evan Huus 3a3b36f01e kill one last python remnant
Change-Id: I21ec54e59acc799ccb0799f06e95713a60f8e86d
Reviewed-on: https://code.wireshark.org/review/2272
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 21:01:19 +00:00
Evan Huus ad97c1eb87 kill unmaintained python bindings
Change-Id: I1fa4f0d76b6b29d2935723b83b5ea7165039c807
Reviewed-on: https://code.wireshark.org/review/2258
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 20:44:08 +00:00
Michael Mann a279fa7705 Have ipmi "dissectors" register through the build process instead of "manually"
Change-Id: I6d6d32e8a1bc21dee9bf52b502e1a02e9511ecb2
Reviewed-on: https://code.wireshark.org/review/2253
Reviewed-by: Dmitry Bazhenov <dima_b@pigeonpoint.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 20:38:54 +00:00
Michael Mann cf99e6b198 packet-ipdc.c: proto_tree_add_text -> something filterable.
This appears to be a TLV architecture, not sure if the T and L should be broken up and filtered separately.  Right now, just filtering on value.

Change-Id: Ic5853d2216b6b5f845587e4b789435bed5fe60ff
Reviewed-on: https://code.wireshark.org/review/2252
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 20:37:16 +00:00
Stig Bjørlykke ee137c45e1 Register P_Mul as new-style dissector
Change-Id: Ic1f85475223d5ba36d9aa4ae617d6db450940fae
Reviewed-on: https://code.wireshark.org/review/2268
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-16 20:28:44 +00:00
Stig Bjørlykke 87aed58548 Register DMP as new-style dissector
Change-Id: I0491c9c5e817e31011e64aebc9010437581ba718
Reviewed-on: https://code.wireshark.org/review/2269
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-16 20:28:21 +00:00
Stig Bjørlykke b2b7a6b080 Do not handle P_Mul packet as ASCII string when calculating checksum.
This bug was introduced when rewriting tvb_get_string() to
handle encoding (and thus handling ASCII string different).

Change-Id: Ic107d7b9e2f63aea33fdf55b9c20c22202f7b458
Reviewed-on: https://code.wireshark.org/review/2270
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
(cherry picked from commit fb0266fb244bf444a2801ee7ffc983f5a58621de)
Reviewed-on: https://code.wireshark.org/review/2267
2014-06-16 20:27:21 +00:00
Bill Meier 4c0d8fd9d7 Ignore 'docbook/ws?g_chm/'
Change-Id: If6529b7cfce199de2f3f54ab0ccf2aa26fe8ec19
Reviewed-on: https://code.wireshark.org/review/2265
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-16 19:31:47 +00:00
Bill Meier 27c5eaf947 Update info as to packages needed for Windows and Fedora.
Change-Id: Ie477760abd8232eb646526aeb7cd0eab377ce541
Reviewed-on: https://code.wireshark.org/review/2264
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-16 19:16:58 +00:00
Joerg Mayer 67a924be4a The visibility warning is only valid on non-msvc platforms
Change-Id: Iec90ac8654d08b63cfda7d14c370f3c800c74038
Reviewed-on: https://code.wireshark.org/review/2263
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 19:15:32 +00:00
Evan Huus b166553279 remove more unused code
Change-Id: I7275aafe7d7216b85bbb34ba959b74358d102a91
Reviewed-on: https://code.wireshark.org/review/2255
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 19:11:03 +00:00
Evan Huus e0aabd97d8 Convert more time_to_str functions to wmem
Change-Id: Ibaae0e79935dc62f12f713f2df5b57d0f3f799b9
Reviewed-on: https://code.wireshark.org/review/2254
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 19:10:59 +00:00
Joerg Mayer 9301c5b605 NEWS was updated again
Change-Id: I3e00f8222784b4c138bdf63453bf08ec5723dbb1
Reviewed-on: https://code.wireshark.org/review/2262
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 19:08:17 +00:00
Joerg Mayer caf5e59001 Undo Graham's change to find the "correct" fix
Change-Id: Ifc368687da972231298ab5935d071a84edd3e56e
Reviewed-on: https://code.wireshark.org/review/2261
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 18:52:12 +00:00
AndersBroman c607a3fa57 Add a preference to use Japanese ISUP TTC version with 13 bit CIC.
Change-Id: I98cb9f803378d69048ef94b7e3ad7d35b393733a
Reviewed-on: https://code.wireshark.org/review/2260
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16 18:50:49 +00:00
Bill Meier 452b8dec39 Use correct dependencies for 'release_notes' target so that 'nmake ... release_notes' will work.
Change-Id: I8397c2b9c635996744d119e67ffc4fedf63493ef
Reviewed-on: https://code.wireshark.org/review/2259
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-16 18:50:48 +00:00