Commit Graph

54809 Commits

Author SHA1 Message Date
Evan Huus 2154e2346e ssl: allocate regexes with glib
they're stored in a static variable so we only ever need compile them once and
they can just hang around forever

Change-Id: Icf43745ad80f4984443a67af21c979625363fc6f
Ping-Bug: 10474
Reviewed-on: https://code.wireshark.org/review/4139
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-20 18:09:28 +00:00
Guy Harris 3c5541906b Set err_info if the attempts to read record headers fail.
If it fails due to, for example, the file being gzipped and having a bad
gzip CRC, the error returned is WTAP_ERR_DECOMPRESS and, for that error,
err_info is expected to be set to a string giving details of the
problem, so we need to pass back to our caller the string in question.

Bug: 10484
Change-Id: I3aa2a92d04fcc08946ff073a40efa708079bbb3e
Reviewed-on: https://code.wireshark.org/review/4201
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-20 17:46:02 +00:00
Michael Mann 06237e4878 proto_tree_add_text -> proto_tree_add_subtree[_format] for DCE/RPC dissectors.
Change-Id: I84755d059ef70ca98b0e7626b6425360daf0529d
Reviewed-on: https://code.wireshark.org/review/4199
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-20 11:59:25 +00:00
Pascal Quantin 1e47e050dc 6LoWPAN: fix encapsulating address decoding when a Mesh header is present
Bug: 10462
Change-Id: I37d532edc41193123b1a7bb380d48cb76c118bf4
Reviewed-on: https://code.wireshark.org/review/4161
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-20 11:52:34 +00:00
Guy Harris 6f16f26d64 The Shomiti document is available on the Wayback Machine.
I don't know why it was unavailable at some point, but it appears to be
available again.  Update the comment to reflect that.

Change-Id: I7dc1fcb554e73d3b0fc2bd2fbdf6235e791a4253
Reviewed-on: https://code.wireshark.org/review/4200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-20 09:17:36 +00:00
Michal Labedzki 4fd89b0ba1 Logcat: Fix crashes when try to use logcat_text open routine on binary file
Change-Id: Ied0778af9d5ff0e49c6efd4ea9411ae1a72cb8e5
Reviewed-on: https://code.wireshark.org/review/4190
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-20 08:33:12 +00:00
Michael Mann e489df5024 Don't assert that values fit in 32 bits if the NDR64 flag is set.
For now, this just pacifies fuzz-testing.  If real world examples have this, there needs to be a drastic overhaul to support fields that could be either 32 or 64-bit values.

Bug:9329
Change-Id: I3e28808ca0291868a5f84258b0ee1e2a922703c2
Reviewed-on: https://code.wireshark.org/review/4189
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-19 21:54:02 +00:00
Michal Labedzki 9fce9ba188 Bluetooth: ACL/AVDTP: Fix ACL session handling
In case like reusing "connection handle" number in next connection
(2 -> 3 -> 2 again) AVDTP dissector does not properly dissected packets
(it should be Signal, but dissect as Media).

Add expert error to all packets that are not in ACL connection. This will
show invalid packages (send after dissconnect), however incomplete
(mostly beginning) connection will be marked too, but I think it have more
pros than cons.

Change-Id: I29cf706600cb12c8b93d0188dd2fba18dd5eba88
Reviewed-on: https://code.wireshark.org/review/4167
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-19 20:13:18 +00:00
Gerald Combs cbe7741926 Update the documentation to use "Wireshark.pro".
Change-Id: I024a882030e489cbd273a4245b0cd3be656f060f
Reviewed-on: https://code.wireshark.org/review/4191
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-19 15:46:43 +00:00
Michael Mann a58c986f62 Update generated DCE/RPC dissectors.
Now all generated dissectors can successfully compile.

Change-Id: I74728926915d5a9f1694cc49c753b80f213df767
Reviewed-on: https://code.wireshark.org/review/2598
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-19 13:07:11 +00:00
Bill Meier b7940046fa packet-http2.c: Do encoding-arg changes (all benign)
For:
- FT_BYTES: Always use just ENC_NA
- integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN

Change-Id: I0885f7d110014cb8a7eba1c1892ed8d0852d076a
Reviewed-on: https://code.wireshark.org/review/4187
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19 02:41:47 +00:00
Bill Meier ea1b746ed2 packet-http2.c: Fix a very minor bug
- incorrect fetch/display of hf_http2_push_promise_r field

Change-Id: Iddf2db4807713017519b5abcbff3ba824b3624c6
Reviewed-on: https://code.wireshark.org/review/4186
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19 02:39:45 +00:00
Bill Meier cd7a11c0d1 Add editor modelines; Adjust indentation as needed.
Change-Id: Ie8d4056ab706bbc85c8247682b1a64ea98bc89f2
Reviewed-on: https://code.wireshark.org/review/4185
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19 02:01:58 +00:00
Bill Meier 18d72987cb Do encoding-arg changes (all benign)
For:
- FT_BYTES: Always use just ENC_NA
- integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN

Also:
- FT_UINT... --> FT_UINT8 in a few cases (to match proto_tree_add_item...)
- Change one case of incorrect '||' to '|'

Change-Id: I427e0e61618ff8faf55691c8a695930f67d455b0
Reviewed-on: https://code.wireshark.org/review/4184
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19 01:38:08 +00:00
Bill Meier 4bdf514512 fix-encoding-args.pl: Add a few additional fixups;
Specifically: A number of cases of the use of the encoding arg
              "ENC_ASCII | ENC_NA" for FT_BYTES FIELDTYPEs seem to
              have crept into Wireshark source.

Also: Add a ToDo comment as to code rework needed to be able to
      better *validate* encoding args.

Change-Id: I9d4b10b869fe2aef3f20bcd2d7ad6531375aba87
Reviewed-on: https://code.wireshark.org/review/4183
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19 01:37:38 +00:00
Pascal Quantin 7b20afc73f Qt: add support for some more command line options
Change-Id: I63b2c51ba857dc5282897c32594102aad2ef9e2f
Reviewed-on: https://code.wireshark.org/review/4127
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-18 20:55:47 +00:00
Michal Labedzki 33976181a1 Bluetooth: Fix some Clang Analyzer warnings
Logic error Dereference of null pointer epan/dissectors/packet-bthci_acl.c 379
Logic error Dereference of null pointer epan/dissectors/packet-bthci_acl.c 390
Logic error Dereference of null pointer epan/dissectors/packet-btsdp.c 3673
Logic error Dereference of null pointer epan/dissectors/packet-btsdp.c 1439
Logic error Dereference of null pointer epan/dissectors/packet-btsdp.c 1662

Thanks for Alexis La Goutte for pointing that.

Change-Id: Ia646b33de9e368d32983efddfaa41edf7896d7fd
Reviewed-on: https://code.wireshark.org/review/4165
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-18 16:15:38 +00:00
Bill Meier 051b0000f9 fix-encoding-args.pl: Add a few fixups for FT_UINT_STRING
Change-Id: Ic22e154859877c48a85b808d0029e10e07876b73
Reviewed-on: https://code.wireshark.org/review/4174
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-18 15:08:39 +00:00
Bill Meier 36ce5e1b90 Fix encoding-arg mostly for FT_UINT_STRING; Also: Do misc as needed.
Misc: (as needed)
- Add editor modelines;
- Adjust whitespace.

Change-Id: I0e5d877a2a6273842ad8e771ac0c0acbfcb83200
Reviewed-on: https://code.wireshark.org/review/4173
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-18 15:07:58 +00:00
Bill Meier dbb01af72f fix-encoding-args.pl: Fix bug: certain patterns found only in 1st,3rd,... file checked
Another perl "You can't DO that" ...

Change-Id: I56e11bec19515f883f15286c6aa45018a255ab53
Reviewed-on: https://code.wireshark.org/review/4172
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-18 15:06:25 +00:00
Jeff Morriss 4b15171cbb Fix compilation when we don't HAVE_GEOIP.
We really need a buildbot or Petri-Dish which doesn't have GeoIP because
this problem keeps popping up.

Bug: 10480
Change-Id: Iccba50dfcafd2dbacb315b9416324de4114be220
Reviewed-on: https://code.wireshark.org/review/4171
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-18 14:27:41 +00:00
Michal Labedzki 1315ee1974 Bluetooth: Fix packet types additional description
Change-Id: Idddd491da8b6c1d5d2824121f9c334d864aafb8c
Reviewed-on: https://code.wireshark.org/review/4169
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-09-18 13:12:11 +00:00
Michal Labedzki fe829dc970 Update Polish Translation
It still not complete.

Change-Id: I53c3efe9c6cf0456fcea55336114086445d3bfe9
Reviewed-on: https://code.wireshark.org/review/2719
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-09-18 13:11:16 +00:00
Michal Labedzki 39864c12fd Logcat: Add more save formats over exported pdu
Add all logcat format like brief, threadtime, long, etc. when try to save
logcat logs where there is EXPORTED_PDU layer.

Change-Id: I338f0bbd46dd8db984efc1c03980c7e9c7401a44
Reviewed-on: https://code.wireshark.org/review/4164
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-09-18 13:10:14 +00:00
Joerg Mayer 3b46e6eaf6 Having CmakeListsCustom.txt in git defeats the purpose of its existence:
If it is used, there is a modified file in git.
Fix this by only including the file if it exists.
Other changes:
- Rename the existing Custom files to CMakeListsCustom.txt.example.
- Move the plugins custom file to the top level (same level as its
  including parent).
- Optionally allow a list of custom includes instead of the default one.

Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6
Reviewed-on: https://code.wireshark.org/review/4163
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-09-18 07:02:00 +00:00
Joseph Huffman 84629f43cb AJTOOLS-4 Data field not being parsed properly by WireShark plugin if two or more AllJoyn Messages are combined in single TCP packet.
Fixed bugs where multiple messages are combined in a single packet.
Fixed bugs where a single message is distributed across multiple packets.
Fixed bug where arrays of zero length were not dissected properly.

Change-Id: Icfb83e73519d8217d6c477edf531ba6d3f3dcd48
Reviewed-on: https://code.wireshark.org/review/4159
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-18 04:21:19 +00:00
chrysn 5d80686f45 CoAP dissector: Update option numbers from RFC7252
* "Accept" option: The option number was changed late in the
  specification process.
* "Proxy-Scheme" / "Size1": After including those, all option numbers
  specified in the RFC can be dissected by wireshark.

Change-Id: I1b475ac6920fd021e3217cd3b44c173d264a5298
Reviewed-on: https://code.wireshark.org/review/4123
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: Michael Mann <mmann78@netscape.net>
2014-09-17 23:37:23 +00:00
Hannes Mezger b2f03f1967 opcua: prefix all hf_register_info with opcua, unify naming
Change-Id: I575bd2f93202837b2ce15a39b1b0bd9b5c53f5bf
Reviewed-on: https://code.wireshark.org/review/4151
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17 23:20:16 +00:00
Hannes Mezger 095a0e8b18 opcua: use BASE_NONE instead of 0
Change-Id: I5ca5d41edf1f56b24da6360a10f0c6e2600572d2
Reviewed-on: https://code.wireshark.org/review/4150
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17 23:16:40 +00:00
Hannes Mezger 769a98498d opcua: format all hf_register_info tables by aligning them to longest value
Change-Id: I0b533edd7bad52922dd1e0aaa2c980e56dd88b78
Reviewed-on: https://code.wireshark.org/review/4149
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17 23:14:34 +00:00
Hannes Mezger d8afd59b55 opcua: remove unused code
Change-Id: I78963640e32393f3ac399e59a659ddf619d15c3d
Reviewed-on: https://code.wireshark.org/review/4148
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17 23:07:06 +00:00
Hannes Mezger 17c14d6499 opcua: add hint to OPCUA settings tooltip
It's unclear how the ports should be separated, this additional text in the tooltip clarifies it

Change-Id: I686482522d006024f920a3cc26b83cd21c19f8a5
Reviewed-on: https://code.wireshark.org/review/4147
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17 23:05:33 +00:00
Joerg Mayer ec2a20fb37 Add a missing cast to the sample code
Change-Id: Id4f258e0e45e44c1ab63bd77a6fab10013a4810c
Reviewed-on: https://code.wireshark.org/review/4160
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-09-17 22:10:24 +00:00
Gerald Combs 7e63805708 Qt: Add the "Map" button to the Endpoints dialog.
Move the map creation code from ui/gtk/hostlist_table.c to
ui/traffic_table_ui.c.

Add CMake commands to copy ipmap.html to the run directory so that
WIRESHARK_RUN_FROM_BUILD_DIRECTORY works for the endpoint map. Not sure
if they're entirely correct but they appear to work.

Add boundary checkes to geoip_db_lookup_ipv[46].

To do:

- It looks like there are prettier maps and newer APIs that we
  might want to use.

Change-Id: Ie06992c9bc9c9aa683328aecab3f5f69c9cab966
Reviewed-on: https://code.wireshark.org/review/4011
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-09-17 20:04:28 +00:00
Gerald Combs 478fab5206 Qt: Remove duplicate GeoIP columns.
Different GeoIP databases have the same column name, e.g. "City"
currently matches two revisions each for IPv4 and IPv6. Map each
uniquely named column to a list of databases and populate
EndpointTreeWidgetItem columns based on the first database match.

Fix a copy/pasteo introduced in g30f3d52: Make sure
geoip_db_lookup_ipv[46] returns longitude instead of latitude.

Change-Id: Idd31f976dfd1cb011cfa7b5aec14b7031ee0e25e
Reviewed-on: https://code.wireshark.org/review/4157
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-09-17 18:49:37 +00:00
Evan Huus f0b4411783 Revert "packet-infiniband: added support for RoCE-v2 (RRocE)"
This reverts commit 07078921e4.

Change-Id: I5b88f0203558c86562694ca841d28314bff336a5
Reviewed-on: https://code.wireshark.org/review/4152
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-17 14:12:57 +00:00
Evan Huus 933ae8ea8b Add missing initializer
Change-Id: I60917502ef869bb519b37bb0252371dbc91a608d
Reviewed-on: https://code.wireshark.org/review/4146
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-17 13:36:57 +00:00
Wasim Abu Moch 07078921e4 packet-infiniband: added support for RoCE-v2 (RRocE)
Added support for the new Routable RDMA over Converged Ethernet.

Change-Id: I97bc29fdc92bdcb12888f38383107a965837963e
Reviewed-on: https://code.wireshark.org/review/3723
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-17 13:11:44 +00:00
Pascal Quantin c4c82577d3 GTPv2: further fixes for Trace Information IE dissection
Bug: 10470
Change-Id: I8b61e5601379a568da39cce2335122e91ab37ec4
Reviewed-on: https://code.wireshark.org/review/4142
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-09-17 12:32:59 +00:00
Sean O. Stalley d05a44c3ce Show endpoint direction based on EPHandle bit
Interpret the meaning of the endpoint handle direction bit,
instead of just saying if it is set.

Change-Id: I9fc0d6f95f6c3a94d6db90c8394fe3ca8fc83715
Reviewed-on: https://code.wireshark.org/review/4119
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-17 02:21:48 +00:00
Sean O. Stalley b53405cd5a Fixed dissection of 8-byte device descriptors
during usb device enumeration, a host may attempt to only read the
first 8 bytes of a device descriptor. Dissecting a partial device
descriptor was throwing a bounds error.

Change-Id: I09cdd356d15153afc93ee478fdd98329495a642a
Reviewed-on: https://code.wireshark.org/review/4137
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-17 02:21:17 +00:00
Pascal Quantin 4cf9e71730 GTPv2: fix dissection of Triggering Events IE
Bug: 10470
Change-Id: Ieb9819e578f078e956861a4e2d7ab3d8b96416d6
Reviewed-on: https://code.wireshark.org/review/4130
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-09-17 02:19:18 +00:00
Gerald Combs 71bb17102e Update the docbook directory to use https://www.wireshark.org.
Change-Id: Ied91158cb055b0235b4a5106c3eb6b9300997c32
Reviewed-on: https://code.wireshark.org/review/4141
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-17 00:17:09 +00:00
Gerald Combs 175039128a Update the doc directory to use https://www.wireshark.org.
Change-Id: I9bfc57cb6b6ab6962b80ff58d98eb351d6f69829
Reviewed-on: https://code.wireshark.org/review/4140
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-17 00:12:26 +00:00
Guy Harris b5296f465e Use tvb_new_subset_length() rather than tvb_new_subset().
We rarely, if ever, want to, or need to, explicitly set the captured
length of a packet; we want to set the *reported* length and let the
tvbuff code figure out how much of that data was actually captured.

Change-Id: I9b93d296197989f677d888b10954589dfc1edc59
Reviewed-on: https://code.wireshark.org/review/4138
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-16 21:30:47 +00:00
Evan Huus 1cbd9c7955 Fix compilation in weird cases
Change-Id: I6c52ea9954a4c96f525e6d064dbf3fc2c71bea68
Reviewed-on: https://code.wireshark.org/review/4136
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-16 21:24:02 +00:00
Gerald Combs 983ae6cade Fix the patch-bzip2 target.
The main site URI scheme is now https. Update the URL in some other
places while we're here.

Change-Id: Ib03d4fd1c58dabd3cf5050dc4f79216e0b94d525
Reviewed-on: https://code.wireshark.org/review/4133
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-16 20:16:26 +00:00
Jeff Morriss eefdaf6a64 Fix typo in French translation.
Bug: 10471
Change-Id: I0e191d4f6b53a16236953d4e5b80956fa421008e
Reviewed-on: https://code.wireshark.org/review/4125
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-16 15:41:54 +00:00
Bill Meier a379ac74d2 Fix spelling: cant-->can't, wont-->won't, etc
Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2
Reviewed-on: https://code.wireshark.org/review/4126
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16 15:31:58 +00:00
Bill Meier b14bf98c06 Fix spelling: cant-->can't, wont-->won't, etc
Change-Id: I4497f1b8b6eab0e576d9dd31b732965f9a6679c6
Reviewed-on: https://code.wireshark.org/review/4124
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16 13:51:51 +00:00