Commit Graph

54942 Commits

Author SHA1 Message Date
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
Jeff Morriss fee9277d76 Fix some logically dead code reported by Coverity (CIDs 1158807, 1158808, 1229737).
Replace some conditional + fprintf + DISSECTOR_ASSERT()s with
DISSECTOR_ASSERT_HINT() or just change the DISSECTOR_ASSERT() to
DISSECTOR_ASSERT_NOT_REACHED() when the hint requires formatting.

Change-Id: I80c7c6579d7755a60d644b5ef60ec4e3299ba0ab
Reviewed-on: https://code.wireshark.org/review/4115
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2014-09-16 00:40:25 +00:00
Bill Meier 126b4a6a98 expert.[hc] Minor changes:
- Fix a few parameter descriptions in expert.h;
- Do whitespace changes;
- Add editor modelines.

Change-Id: I1b75fa88021f1f44bd607cd33d0ab7f9ec672ab7
Reviewed-on: https://code.wireshark.org/review/4122
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-15 23:49:12 +00:00
Guy Harris 85dceb34a1 Handle SRVLOC-over-TCP like other XXX-over-TCP protocols.
No need to wrap each SRVLOC PDU, which contains a SRVLOC protocol layer,
in *another* SRVLOC protocol layer.

Change-Id: I25e05d94bb9968eb4e26b63beb09fd151820d750
Reviewed-on: https://code.wireshark.org/review/4118
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-15 20:45:20 +00:00
Martin Kaiser ed7c3282b1 dissect the alphanumeric message that's part of operation 30
Bug: 10464

Change-Id: I1a42877ee549b40e0c739dd2d1cbe4615ed9b9bd
Reviewed-on: https://code.wireshark.org/review/4098
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-15 19:29:52 +00:00
Martin Mathieson 64225639be Show RRC Release cause in the Info column
Change-Id: I138859ce735a9ff6541d6852dec29a13c1034c36
Reviewed-on: https://code.wireshark.org/review/4114
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-15 17:19:58 +00:00
Guy Harris 8f84fe9d96 Clean up handling of the message type.
Don't use try_val_to_str() and then never test the result to see whether
it's null.  Instead, use val_to_str_const().

Don't use proto_tree_add_uint_format_value() to emulate what
proto_tree_add_uint() does unless the string for the value isn't
computed from the value_string for the field.

Also, prepend to the Info column as soon as we have the data with which
to do so.

Change-Id: Iae9bdfc7c80cbd1ec63e1bbb8d43560adec558bd
Reviewed-on: https://code.wireshark.org/review/4113
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-15 10:14:17 +00:00
Sean O. Stalley f30bba341e USB feature selectors now per USB 3.1 spec
previously per USB 2 spec.

Change-Id: Ifb25614785bcaf80148c32938f966c8cdded6be2
Reviewed-on: https://code.wireshark.org/review/4087
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-15 03:59:29 +00:00
Guy Harris 176bd64d8c TRY_TO_FAKE_THIS_ITEM() doesn't take a tvbuff_t * argument.
Change-Id: I782f73dd072f515e34ce98892340dc176978a364
Reviewed-on: https://code.wireshark.org/review/4112
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 21:08:55 +00:00
Jeff Morriss af9d2dfa13 Don't try to set the length, end, or text of a faked item.
If we try we may (in the case of setting the length or end) mistakenly assert
out.

Bug: 10329
Change-Id: I52083ba17f6427712a6a363f48f1f7ae51f2b74b
Reviewed-on: https://code.wireshark.org/review/4093
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-14 18:41:13 +00:00
Jeff Morriss 36ddf54093 Revert "Only fake an item by returning 'tree' if they use the same TVB"
This reverts commit 5460d7fa0c.

Bug:10329
Change-Id: I6f13f9c18bb23fd10b3a574e42ad2d3f6c7beadb
Reviewed-on: https://code.wireshark.org/review/4092
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-14 18:40:45 +00:00
Guy Harris a41c1223cc Consistent white space.
Change-Id: I7c19a16a671db7b68ef2f680813a9a190ed1e13d
Reviewed-on: https://code.wireshark.org/review/4109
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 17:23:56 +00:00
Gerald Combs 32ee46bdbc [Automatic manuf, services and enterprise-numbers update for 2014-09-14]
Change-Id: Ib519e0a0ed3e11eb555c338f2e808b555cc6931d
Reviewed-on: https://code.wireshark.org/review/4106
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-14 15:05:38 +00:00
Guy Harris e74ae46002 Show BER identifiers and lengths in SNMP variable bindings.
If the user turns on the "show internal BER encapsulation tokens"
preference, show them the tokens inside SNMP variable bindings.

Change-Id: Ief9040f422cb214bbff8e4cfd45a2e05c7106480
Reviewed-on: https://code.wireshark.org/review/4105
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 09:57:41 +00:00
Guy Harris 3031247cc3 Don't use the captured length as the packet length.
Add a routine ber_tvb_new_subset_length() used to construct tvbuffs for
parts of the packet, and have it check the specified length against the
*reported* length.  NOTE: that routine should really take an item and an
expert info value as arguments and, if the length is greater than the
remaining packet length, add an expert info for that.

Also, when counting items in a SEQUENCE-OF:

	keep track of whether we succeeded in counting them, and report
	an "unknown number of items" if we didn't;

	if the length of an item in the SEQUENCE-OF is so big we get an
	overflow, just bail out of the count loop and indicate that we
	didn't succeed in counting them - let the error be reported in
	the process of dissection.

Change-Id: I32172737baaed35fc9a0e6c19a727a6ac71ddfb2
Reviewed-on: https://code.wireshark.org/review/4103
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 00:22:23 +00:00
Guy Harris 21adbaa052 Don't use the captured length, and don't fetch the version until we need it.
The captured length reflects the way the capture was done; it should not
affect actual lengths used in the dissection.

Don't fetch the version until we need it; that lets us dissect more of
the packet if the previous change caused us to throw an exception trying
to fetch the version from the correct location rather than not throwing
an exception by fetching it from an incorrect location that happens to
be within the captured data.

Change-Id: I9f63afd4ef51f46c19b3afd2a651a5bb768fecaf
Reviewed-on: https://code.wireshark.org/review/4101
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 00:11:21 +00:00
Guy Harris 12778395d3 Clean up indentation.
Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156
Reviewed-on: https://code.wireshark.org/review/4100
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:50:42 +00:00
Martin Kaiser e6d7116ebe update the URL of the specification
Change-Id: I7301a739a28c20ece274293447713fd02ffab385
Reviewed-on: https://code.wireshark.org/review/4097
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-13 19:55:47 +00:00