summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-09-17Qt: Add the "Map" button to the Endpoints dialog.Gerald Combs10-270/+364
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-17Qt: Remove duplicate GeoIP columns.Gerald Combs3-19/+39
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-17Revert "packet-infiniband: added support for RoCE-v2 (RRocE)"Evan Huus1-68/+17
This reverts commit 07078921e42cae2ff31ac6e11951bb9986ffe5db. Change-Id: I5b88f0203558c86562694ca841d28314bff336a5 Reviewed-on: https://code.wireshark.org/review/4152 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-17Add missing initializerEvan Huus1-1/+1
Change-Id: I60917502ef869bb519b37bb0252371dbc91a608d Reviewed-on: https://code.wireshark.org/review/4146 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-17packet-infiniband: added support for RoCE-v2 (RRocE)Wasim Abu Moch1-18/+69
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-17GTPv2: further fixes for Trace Information IE dissectionPascal Quantin1-19/+10
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-17Show endpoint direction based on EPHandle bitSean O. Stalley3-2/+5
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-17Fixed dissection of 8-byte device descriptorsSean O. Stalley1-0/+7
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-17GTPv2: fix dissection of Triggering Events IEPascal Quantin1-14/+89
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-17Update the docbook directory to use https://www.wireshark.org.Gerald Combs6-20/+20
Change-Id: Ied91158cb055b0235b4a5106c3eb6b9300997c32 Reviewed-on: https://code.wireshark.org/review/4141 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-17Update the doc directory to use https://www.wireshark.org.Gerald Combs19-45/+45
Change-Id: I9bfc57cb6b6ab6962b80ff58d98eb351d6f69829 Reviewed-on: https://code.wireshark.org/review/4140 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-16Use tvb_new_subset_length() rather than tvb_new_subset().Guy Harris1-1/+1
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-16Fix compilation in weird casesEvan Huus1-3/+3
Change-Id: I6c52ea9954a4c96f525e6d064dbf3fc2c71bea68 Reviewed-on: https://code.wireshark.org/review/4136 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-16Fix the patch-bzip2 target.Gerald Combs11-12/+12
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-16Fix typo in French translation.Jeff Morriss2-1/+1
Bug: 10471 Change-Id: I0e191d4f6b53a16236953d4e5b80956fa421008e Reviewed-on: https://code.wireshark.org/review/4125 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-16Fix spelling: cant-->can't, wont-->won't, etcBill Meier33-65/+65
Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2 Reviewed-on: https://code.wireshark.org/review/4126 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16Fix spelling: cant-->can't, wont-->won't, etcBill Meier54-146/+146
Change-Id: I4497f1b8b6eab0e576d9dd31b732965f9a6679c6 Reviewed-on: https://code.wireshark.org/review/4124 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16Fix some logically dead code reported by Coverity (CIDs 1158807, 1158808, ↵Jeff Morriss1-13/+11
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-15expert.[hc] Minor changes:Bill Meier2-94/+119
- 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-15Handle SRVLOC-over-TCP like other XXX-over-TCP protocols.Guy Harris1-19/+1
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-15dissect the alphanumeric message that's part of operation 30Martin Kaiser1-1/+1
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-15Show RRC Release cause in the Info columnMartin Mathieson2-1/+12
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-15Clean up handling of the message type.Guy Harris1-7/+5
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-15USB feature selectors now per USB 3.1 specSean O. Stalley1-9/+92
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-14TRY_TO_FAKE_THIS_ITEM() doesn't take a tvbuff_t * argument.Guy Harris1-1/+1
Change-Id: I782f73dd072f515e34ce98892340dc176978a364 Reviewed-on: https://code.wireshark.org/review/4112 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14Don't try to set the length, end, or text of a faked item.Jeff Morriss1-15/+16
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-14Revert "Only fake an item by returning 'tree' if they use the same TVB"Jeff Morriss1-45/+44
This reverts commit 5460d7fa0cd13f84ff567c96ee89d07b37cd4b62. Bug:10329 Change-Id: I6f13f9c18bb23fd10b3a574e42ad2d3f6c7beadb Reviewed-on: https://code.wireshark.org/review/4092 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-14Consistent white space.Guy Harris2-1511/+1521
Change-Id: I7c19a16a671db7b68ef2f680813a9a190ed1e13d Reviewed-on: https://code.wireshark.org/review/4109 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14[Automatic manuf, services and enterprise-numbers update for 2014-09-14]Gerald Combs4-11/+420
Change-Id: Ib519e0a0ed3e11eb555c338f2e808b555cc6931d Reviewed-on: https://code.wireshark.org/review/4106 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-14Show BER identifiers and lengths in SNMP variable bindings.Guy Harris2-53/+45
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-14Don't use the captured length as the packet length.Guy Harris1-50/+45
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-14Don't use the captured length, and don't fetch the version until we need it.Guy Harris2-27/+35
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-13Clean up indentation.Guy Harris2-259/+259
Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13update the URL of the specificationMartin Kaiser1-1/+2
Change-Id: I7301a739a28c20ece274293447713fd02ffab385 Reviewed-on: https://code.wireshark.org/review/4097 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-13GTK+: Make sure we package up Wireshark-gtk.pdb.Gerald Combs1-5/+5
Make sure we use $(PROGRAM_NAME_GTK) consistently. We still need to add the Qt UI .pdb to the archive but I'm not in front of a proper Windows development environment right now. Change-Id: Ie917f68e3e8349fc7955b3b7e68d446b6fe88235 Reviewed-on: https://code.wireshark.org/review/4096 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-13when we check the parameter for upper(), lower() or len(),Martin Kaiser1-1/+1
return an error if the parameter is _no_ string Bug: 10401 Change-Id: I5643ef05009072538155e63c3178071ed6bab061 Reviewed-on: https://code.wireshark.org/review/4071 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-13README.dissector was split from README.developer in 2013 - update someJoerg Mayer7-32/+34
documents referring to the split out sections. Remove trailing whitespace while at this. Change-Id: I36cfe0ac55e8f653bffbf850e01f582aacf85557 Reviewed-on: https://code.wireshark.org/review/4094 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-09-12IPSec: fix compilation when building without libgcryptPascal Quantin1-17/+16
Change-Id: Iea3de2f0a54f9c0703afbeb42722d18da99f5c9a Reviewed-on: https://code.wireshark.org/review/4090 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> 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-12Treat a length of -1 as a Very Large Length in most cases.Guy Harris1-1/+7
For field types where it doesn't mean "to the end of the tvbuff", treat it like other negative length values - as if it were unsigned and thus Very Large and thus likely to be past the end of the tvbuff. That way, some of the "we hax0red your SNMP packets" captures, with length fields of 0xffffffff, report malformed packets rather than dissector bugs. Change-Id: Id53f828b06b6febe7d79f8539e54523e0b43e5c2 Reviewed-on: https://code.wireshark.org/review/4091 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-12Register hfi_rip_zero_padding.Guy Harris1-1/+3
Also, sort the hfi[] array to be in the same order as the declarations of the fields, to make it easier to check that all fields are being registered. Change-Id: Ida530590ebd00bbf206e0f6041b8da880bce2c6f Reviewed-on: https://code.wireshark.org/review/4089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-12Do FT_{U}INT64 the same way we do other FT_{U}INTn types.Guy Harris1-119/+117
Change-Id: Iae9c66fa82abfe20e9e8c922ddedfe87b0ab2abe Reviewed-on: https://code.wireshark.org/review/4088 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-12proto_tree_add_text cleanupMichael Mann15-591/+648
Create filters (expert and hf_) that have the "most bang for the buck" (ie have many instances for a single filter) Change-Id: I61995e41c5b298df77e084e65cdf30ebe95da1e6 Reviewed-on: https://code.wireshark.org/review/4086 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>
2014-09-11Add some additional checks in SnifferDecompress().Guy Harris1-10/+29
Check the input pointer in the while clause of the loop, so that we handle an empty input buffer. When reading a bit mask, check before fetching the bit mask that we have two bytes of bit mask and the byte after it. Before putting an uncompressed input byte into the output, make sure we wouldn't run past the end of the output buffer. Before copying an earlier string from the output buffer, make sure it doesn't run past the end of the data we've decompressed so far. Bug: 10461 Change-Id: I8bb8d0d291368ae8bf0ac26970ff54d3262a7e6e Reviewed-on: https://code.wireshark.org/review/4083 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-11Show the sctp.checksum_bad filter rather than hiding it.Jeff Morriss1-23/+25
Follow TCP's lead by putting the filter in a subtree under the checksum. Change-Id: I9351ee865011cd04bc3d3e88c51e8dbb3dc23f07 Reviewed-on: https://code.wireshark.org/review/4082 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-11packet-cfm.c: Update some comments; Add editor modelines.Bill Meier1-11/+21
- Indicate that ITU-T G.8013/Y.1731 (11/2013) is the latest spec (and that the cfm dissector has not been updated to reflect same). - Remove a comment about a "discrepancy in the recommendation ITU-T Y.1731". The discrepancy has been corrected in the latest spec. Change-Id: I5a5f873d2a0a5fdee3aef1688403bb317a155cdf Reviewed-on: https://code.wireshark.org/review/4081 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-11Don't use tvb_bytes_exist() to check if we captured the whole frame, justJeff Morriss1-11/+11
compare captured_length to reported_length (which we've already retrieved anyway). Replace calls to tvb_length() with non-deprecated versions. Change-Id: I9f6f3461915573fb21716a87cb6af416a3656097 Reviewed-on: https://code.wireshark.org/review/4080 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-11packet-cfm.c: Fix Bug 10385: "Ethernet OAM (CFM) frames including TLV's are ↵Bill Meier1-1/+1
wrongly decoded as malformed" Regression introduced in ga06cccb (svn #50352) [Jul 3 16:43:40 2013] Bug 10385 Change-Id: I3f5c5518a5804a1f31cac554323a6fa8d3d55d5d Reviewed-on: https://code.wireshark.org/review/4078 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-11Fix an incorrect commentMartin Mathieson1-1/+3
Change-Id: Ic60c67fcc554b5ceb0b359a992fafd0f84521eef Reviewed-on: https://code.wireshark.org/review/4077 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-11Code simplification from Hadriels abandoned change.AndersBroman1-36/+29
Change-Id: If859ff904b254d3bc62d1d0dc5cf26cace11cae3 Reviewed-on: https://code.wireshark.org/review/4075 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-11Do simple sequence analysis on ESP Sequence Number fieldMartin Mathieson1-12/+181
Change-Id: I84e204fb7a84eb821f4728a50945f34f4bdba73f Reviewed-on: https://code.wireshark.org/review/4057 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>