Commit Graph

58388 Commits

Author SHA1 Message Date
Pascal Quantin 486a530451 ISAKMP: fix compilation without libgcrypt
Change-Id: Ie0d9cc3d81b57f81fe50791bf0c5762578a22b19
Reviewed-on: https://code.wireshark.org/review/8692
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-29 20:34:13 +00:00
Pascal Quantin ba2e1108cd ISAKMP: fix some compilation warnings
Change-Id: If682a12e057f35991893db18dc5e6c4df5434973
Reviewed-on: https://code.wireshark.org/review/8690
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-29 20:18:25 +00:00
Martin Mathieson 00a2cf0367 ISAKMP: implement RFC7383: Internet Key Exchange Protocol Version 2 (IKEv2) Message Fragmentation
Change-Id: Ib6660e245729bf9d4399fa8aa1858877ec3244da
Reviewed-on: https://code.wireshark.org/review/8685
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-29 19:43:35 +00:00
Pascal Quantin 6c58665540 ANSI IS-637 A: fix byte highlighting of destination address when using ASCII encoding
Change-Id: I11d5de26bd73bada742e808f582e0dd746032aa2
Reviewed-on: https://code.wireshark.org/review/8684
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-29 12:08:11 +00:00
Stig Bjørlykke 65f873fb7b idmp: Sync with asn1 source
Change-Id: Ie46a86c696b6b8889032db0fc6678768f18e1fc1
Reviewed-on: https://code.wireshark.org/review/8682
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-05-29 07:31:42 +00:00
Andy Ling c58f51b321 HTTP: Add support of PATCH method (RFC 5789)
Bug: 11229
Change-Id: I915d2efb873bfa72d500070f382dad10a991ecd4
Reviewed-on: https://code.wireshark.org/review/8673
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-29 05:24:13 +00:00
Anish Bhatt b610db61da Update scsi lun id dissector, add support to handle all 4 addressing
methods

Bug 11078

Change-Id: I7a9ff07d83b4bb5f5512c04d71aa7f1d3baa0edd
Reviewed-on: https://code.wireshark.org/review/8181
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-29 05:22:15 +00:00
Guy Harris afb0791e0c Use FT_FLOAT for a floating-point number.
Change-Id: If74df214c41baac425fd89e8476578962a5cfde7
Reviewed-on: https://code.wireshark.org/review/8681
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-29 04:30:00 +00:00
Artur Nowosielski 7e3d4f6eb8 enabled decoding of longlong and ulonglong in GIOP
Change-Id: I21323ab6c44583494c4353650caea0d23ef3f30c
Reviewed-on: https://code.wireshark.org/review/8679
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-29 00:22:52 +00:00
Gerald Combs 61cef23486 Use an "Open" instead of a "Save" dialog for UAT prefs.
When selecting a file for a PT_TXTMOD_FILENAME UAT preference, use
QFileDialog::getOpenFileName instead of QFileDialog::getSaveFileName.
This matches current GTK+ behavior and the two preferences that use
PT_TXTMOD_FILENAME.

Add a comment noting that the PT_TXTMOD_FILENAME is Open-only.

Bug: 11027
Change-Id: I29eb056422949eda700d448621e508cf094fd7b7
Reviewed-on: https://code.wireshark.org/review/8678
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28 21:16:39 +00:00
Gerald Combs 1955dd2dec 1.99.6 → 1.99.7.
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933
Reviewed-on: https://code.wireshark.org/review/8677
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28 20:29:06 +00:00
Gerald Combs 51bdf499dc Build 1.99.6.
Change-Id: I8db40aea6c208d0badfc7d178b642328264e6c10
Reviewed-on: https://code.wireshark.org/review/8676
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28 19:01:41 +00:00
Gerald Combs c532bdc7ea Set a capture buffer size only when we have a valid handle.
Fixes the current Windows unit test crash.

Clean up a warning message.

Change-Id: I696e70c7656352d9576c1ad29703298cc7109621
Reviewed-on: https://code.wireshark.org/review/8674
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28 16:53:39 +00:00
Mike Frysinger 222de83d95 switch to AC_PATH_TOOL
The TOOL variant will automatically search for host prefixed scripts
(e.g. armv7a-unknown-linux-gnueabi-pcap-config) before falling back
to the default (i.e. pcap-config).  This makes cross-compiling a bit
simpler.

Change-Id: Ia450839693b5550f798634a7e8b82c2a661b088c
Reviewed-on: https://code.wireshark.org/review/8481
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-28 15:24:58 +00:00
Alexis La Goutte abfd44571c Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameter
Change-Id: I8fbcac112d0b60e0129ce0fc17a5e0ffab02710f
Reviewed-on: https://code.wireshark.org/review/8589
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-28 15:10:33 +00:00
Jeff Morriss 187e8f61dc Windows: don't attempt to set the capture buffer size on remote (rpcap) devices.
Also move the code for setting the buffer size on Windows near the code for
setting it when we have pcap_create(): into open_capture_device().

Bug: 9067
Change-Id: Ica45f74b98094958d8bb0a38de23248aaa251d4b
Reviewed-on: https://code.wireshark.org/review/8551
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-28 11:22:04 +00:00
Jeff Morriss 2772a11bd5 Document the services file in the man pages.
Bug: 11227
Change-Id: Id9cc64820b238bd8c82a758a553e1352398ad885
Reviewed-on: https://code.wireshark.org/review/8664
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-28 04:10:08 +00:00
Jeff Morriss d9c13fab51 Document the subnets file in the man pages.
Text adapted from that in the WSUG documentation of the same.

Ping-Bug: 1445
Ping-Bug: 11227
Change-Id: I4d07cba437e70324d19c5ae23e44b86c47b749a8
Reviewed-on: https://code.wireshark.org/review/8662
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-28 04:08:06 +00:00
Gerald Combs e08bc0dd62 Don't warn about overwriting filename preferences.
When specifying a filename preference (e.g. the SSL pre-master secret
log filename) don't warn about overwriting the file. Most of the time
we're reading the file and when we're not (e.g. for the SSL debug log)
overwriting it is kind of the point.

Preference descriptions are plain text. We display them in tooltips as
rich text. Convert them accordingly.

Fixup some of the SSL preference descriptions.

Bug: 11010
Change-Id: I4f1b1f3dd270c01648d9dd52ae20381c3c0d2e37
Reviewed-on: https://code.wireshark.org/review/8665
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-28 02:21:33 +00:00
Jeff Morriss 6d5fa70976 is_linux_bonding_device() is only used if we HAVE_PCAP_CREATE so only define it
if we HAVE_PCAP_CREATE.

Change-Id: Ic4eb6e69bde7d244b68a9fd97f66682eda6bdf91
Reviewed-on: https://code.wireshark.org/review/8667
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-28 01:26:12 +00:00
Pascal Quantin 82503258ff ANSI IS-637 A: dump bytes when SMS encoding format is set to octet
Change-Id: I3d8a72a9549d170e0b1d54ad930da8c9dd510134
Reviewed-on: https://code.wireshark.org/review/8663
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-27 15:56:19 +00:00
Michael Mann 4963c77285 Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Final part.

While there change deprecated tvb_length-xxx() calls

Change-Id: I8b0cf823c2d37a92c58fcb653f7fe1e8fdad5a79
Reviewed-on: https://code.wireshark.org/review/8642
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-27 11:02:30 +00:00
Michael Mann a25c46bc7b Remove proto_tree_add_text from some dissectors.
Change-Id: Id7ef95a56d9d8cc01f9a1a4556ad056b8bb7f8bc
Reviewed-on: https://code.wireshark.org/review/8654
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 15:20:46 +00:00
Michael Mann c6b0a61ab3 Remove proto_tree_add_text from packet-ssl-utils.c
Change-Id: I64998e93e8d72faa76e0e7809abfd9ccae10ab36
Reviewed-on: https://code.wireshark.org/review/8653
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 15:14:23 +00:00
Peter Lemenkov 27f16ade80 [RTPproxy] Remove non-existent reply
This reply message was never implemented anywhere. Current protocol spec
doesn't mention this type of a reply either:

* https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#information

So we should remove this.

Change-Id: I4e5efef24c6859d5a4a0ba08e3e4cca6d7b217f2
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8656
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 15:10:38 +00:00
Alexis La Goutte 3d3c854215 Doc (packet-PROTOABBREV): fix quote for config include
Following https://code.wireshark.org/review/#/c/8204/

Change-Id: I7850c10d9d3ca9ad63a85c9c6ef98d70bf4201b8
Reviewed-on: https://code.wireshark.org/review/8647
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-05-26 12:46:35 +00:00
Michael Mann a713b1314d Duplicate the presence of the "ignored" field in order to remove proto_tree_add_text.
Change-Id: I0906c28656a104210f6fd1f95c9cee7899308538
Reviewed-on: https://code.wireshark.org/review/8619
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 12:09:28 +00:00
Alexis La Goutte da93752b6d ATM: Add reserved field
Always display reserved field

Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937
Reviewed-on: https://code.wireshark.org/review/8652
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 11:10:14 +00:00
Alexis La Goutte 4d15e49793 ATM: fix indent (use spaces)
Change-Id: I6d8bae2124a5472448e2f2629340a20f5a899076
Reviewed-on: https://code.wireshark.org/review/8651
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 11:09:47 +00:00
Alexis La Goutte dd22928472 AIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
remove also orig_offset (no longer needed)

Change-Id: Idc65b45fb67bae6acdca33962f3352a50296a6e5
Reviewed-on: https://code.wireshark.org/review/8650
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 11:07:56 +00:00
Michael Mann f91f7d4d9f Remove proto_tree_add_text from file-elf.c
Change-Id: Ib7df1e2c40ad86866f5a3d6902a7a92144028be7
Reviewed-on: https://code.wireshark.org/review/8620
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-26 10:33:20 +00:00
Alexis La Goutte ebcc36dc73 nghttp2: fix quote for config.h include
following https://code.wireshark.org/review/#/c/8204/

Change-Id: I5ffad2bcbed217893243b8a01451b282030d0108
Reviewed-on: https://code.wireshark.org/review/8646
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:31:57 +00:00
Anish Bhatt 751989629a Replace deprecated tvb_length* apis
Change-Id: Ia23a6cbc61dfaf65002ce63160e87877963a3cca
Reviewed-on: https://code.wireshark.org/review/8643
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-26 10:22:33 +00:00
Alexis La Goutte 8817fd06b2 CAPWAP: Add Vendor Specific from Cisco
Based on work of actube https://github.com/7u83/actube

Change-Id: I4f9b3bfa263446fb380127640ba99ecb0043eef2
Reviewed-on: https://code.wireshark.org/review/8307
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-26 09:22:36 +00:00
Michael Mann 00041a4efe Revert "[AIM] Fix string length"
It's a FT_UINT_STRING field type

This reverts commit dc14e3ce0d.

Change-Id: I1185efbad459887fb9c16fb01e670bc43e6f2d84
Reviewed-on: https://code.wireshark.org/review/8623
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-26 09:10:44 +00:00
Guy Harris 2638402727 Fix variable that needs to survive a longjmp().
Pointed out by a warning in a compilation for ARM.

Change-Id: Iab2748adbdc88c9e6749da1c3835896683a1a091
Reviewed-on: https://code.wireshark.org/review/8648
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-26 08:54:24 +00:00
Martin Kaiser ecdaa11f50 jpeg: remove some more unnecessary initialisations
Change-Id: If66a3951037d01c1aa502c0695ea11c62cc4d208
Reviewed-on: https://code.wireshark.org/review/8633
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 16:31:20 +00:00
Martin Kaiser 1e5ca4fc6a jpeg: replace an empty switch-case with a todo comment
Change-Id: I656fa2f69453916dd5466265220e2b4590d3631c
Reviewed-on: https://code.wireshark.org/review/8632
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 16:30:59 +00:00
Martin Kaiser 73ef7b06ef jpeg: some more code cleanup
delete unnecessary initialisations
declare variables at the start of a function

Change-Id: Ib427790c51c1fc7433d0f3c17dc9fa4748585180
Reviewed-on: https://code.wireshark.org/review/8631
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 16:30:23 +00:00
Martin Kaiser 630be088bf DVB-CI: clean up the expert info definitions
sort them by layer
wrap long lines
make the filter strings consistent

Change-Id: Ibbeb405c6356abe61dd9a0194af1c072d2c1c971
Reviewed-on: https://code.wireshark.org/review/8630
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 15:37:52 +00:00
Anders 02640a0b45 [GTP] Dissect eNodeB ID IE
Change-Id: I7b6800ca71c9a0d2be4f30be55b49eec237ac908
Reviewed-on: https://code.wireshark.org/review/8629
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25 15:32:49 +00:00
Martin Kaiser 5dd44006b6 DVB-CI: kill the last two proto_tree_add_text() calls
Change-Id: I53f9df7bf193551e786ad4ece368f3de702ce8de
Reviewed-on: https://code.wireshark.org/review/8628
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 14:59:19 +00:00
Martin Kaiser 886b25e2bb iso7816: remove one proto_tree_add_text() call
Change-Id: I3905fb83f5f70ee80e54fba479c0e8caca5baa6c
Reviewed-on: https://code.wireshark.org/review/8627
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 14:58:58 +00:00
Martin Kaiser 16715e01b6 DVB-CI: remove NULL-checks for proto_item_append_text()'s first argument
Change-Id: I6648c20a003392a7435ca0461d2b004a1d415d51
Reviewed-on: https://code.wireshark.org/review/8626
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 14:58:29 +00:00
Martin Kaiser e37a8050b6 jpeg: clean up the sos header dissection
Change-Id: Id3e6258036112a64e4111d0483c572697681eb89
Reviewed-on: https://code.wireshark.org/review/8625
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 14:58:01 +00:00
Graham Bloice 2fde6ffc8f Fix out of tree builds
Stop out of tree builds picking up the in-tree version and config.h

Change-Id: Icadc46cab66db72af2d475eac31b28d0ca10df90
Reviewed-on: https://code.wireshark.org/review/8204
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25 10:42:59 +00:00
Anders dc14e3ce0d [AIM] Fix string length
Change-Id: I64f73bd5cb131ad6efc64eea6a7eb66af9cee5c4
Reviewed-on: https://code.wireshark.org/review/8622
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25 07:40:10 +00:00
Stephane Bryant 7410afb64e reload-framing: add range checks before bit-shifts
Change-Id: I1422b581157ffa389f121306de4dc9241ffb4061
Reviewed-on: https://code.wireshark.org/review/7595
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25 04:37:22 +00:00
Andreas Gruenbacher cc3a96c744 NFS: Remove the hidden acl, dacl, and sacl items
These attributes are already represented by hf_nfs4_reco_attr items.

Change-Id: Ib3804e2d30921764913f483863c003ffb55118ca
Reviewed-on: https://code.wireshark.org/review/8586
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: Anders Broman <a.broman58@gmail.com>
2015-05-25 04:30:45 +00:00
Michael Mann df38a2d3a8 Remove proto_tree_add_text from AIM dissectors.
Change-Id: Ic7385d0555d72aa8ea2b9beb284ca1f6a115b174
Reviewed-on: https://code.wireshark.org/review/8616
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-25 04:19:37 +00:00