aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-05-08epan/nghttp2/nghttp2_net.h no longer exists, so don't list it.Guy Harris1-1/+0
Change-Id: I4a2f289a49edf10a62208dad186a9b6426b5af2b Reviewed-on: https://code.wireshark.org/review/8344 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-08Expert Info dialog.Gerald Combs2-0/+2
Show all expert messages in a combined view. Group top-level items by a (severity, group, protocol) tuple. Let the user enable and disable messages via a check menu. Add ProtoTree::goToField and expert_info_t.hf_index. Use them to jump to what we hope is the afflicted item. Enable the context menu only if the user has selected a packet item. Add a free-form search field that matches expert summaries. This differs from the GTK+ version but hopefully provides a smoother workflow. Bug: 10931 Change-Id: Ia12cb7c27cdea1634fa2798fb7e4c1b23bd16ad2 Reviewed-on: https://code.wireshark.org/review/8294 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08nghttp2: use g_ntoh[ls], g_hton[ls] from glibAlexis La Goutte3-97/+12
Change-Id: I9e4278d469579022dd82bed4e40ff582fff266b6 Reviewed-on: https://code.wireshark.org/review/8328 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-08IEEE 802.11: 802.1X (WPA-EAP) rekeying supportdeagol4-180/+109
This patch extends the existing decryption support for WPA to also handle rekeys by checking each decrypted packet for a 4-way-handshake. Rekeys can be used for WPA-PSK, but are more common with WPA-Enterprise (WPA-EAP). For decrypting WPA-EAP secured packets the user must provide all used PMK's of the connection (aka PSK's) as WPA-PSK 32 byte hex values to wireshark via the existing interface. (The capture must have all 4-way-handshakes included also, starting with the first unencrypted one.) Every decrypted unicast packet will habe the used PMK and TK shown in the CCMP/TKIP section below the key index in the GUI. Group packets will display the GTK instead. Additionally this fixes a small issue with group rekey handling, so every packet can be selected in the GUI in random order, removing the need to manually find the correct group keying packets prior to that. It was tested primary with WPA-CCMP, but TKIP is also working. One section in the code touch bluetooth 802.1X support. It should do exactly the same, but will now also examine all decypted packets for rekeys. Ping-Bug: 11172 Change-Id: I19d055581fce6268df888da63485a48326046748 Reviewed-on: https://code.wireshark.org/review/8268 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-08Allow empty-element Diameter Applications and use that format.Jeff Morriss1-0/+3
This also fixes a couple of applications that weren't properly terminated (as a result of some of my recent changes). Change-Id: I9662017a81c63aceeb950d3b29cb17dde16d4f0c Reviewed-on: https://code.wireshark.org/review/8335 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07ftypes: display 64 bits BASE_HEX fields as hexadecimalPascal Quantin1-2/+14
Change-Id: Ie9bedf6c17c0a941ebaabd5144460a42eb4ca1ed Reviewed-on: https://code.wireshark.org/review/8336 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-07fix FT_INT64 fields output in tsharkMoeller, Thies1-4/+4
Bug: 11170 Change-Id: Ife7f565d17b92cd5f84e92ce109f530e68d98cfa Reviewed-on: https://code.wireshark.org/review/8333 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-07SIGCOMP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+0
Change-Id: I66e4e4735a16de5e50f86e29c34202e6668cd44e Reviewed-on: https://code.wireshark.org/review/8329 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-07packet-iec104: make object number filterable if SQ flag is setJiří Engelthaler1-0/+3
Make object number filterable again if SQ flag is set which breaks my commit 785fab7f Sample capture https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=IEC104_SQ.pcapng Change-Id: I450b86452876fab26e1a9f1bfc2f729573c52124 Reviewed-on: https://code.wireshark.org/review/8313 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-07Fix detection of 'Write Multiple Registers' and 'Write Multiple Coils' ↵cbontje1-15/+43
function message 'direction' Also did some refactoring of existing code to make it more readable for the various existing function code types. ** Commit amendment to not use depreciated tvb_length() function. Change-Id: Ia4c9f3514968c2a7bebc404ca9185cf8d814dfca Reviewed-on: https://code.wireshark.org/review/8301 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07Reduce proto_tree_add_text calls in packet-sigcomp.cMichael Mann1-467/+493
Some other minor cleanup. Change-Id: I267fe1512e57ce15f9e6be83ac1b55e6e897e7a1 Reviewed-on: https://code.wireshark.org/review/8322 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-07fix FT_UINT64 fields output in tsharkMoeller, Thies2-19/+20
Bug: 11170 Change-Id: Ica259867e2c8e0b4b680bca94970e13962a8dbb1 Reviewed-on: https://code.wireshark.org/review/8290 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-07Remove proto_tree_add_text from idl2wrs generation.Michael Mann2-14/+15
Change-Id: Iab9df3e68d2a3878c3081c6352c45f7c329b983e Reviewed-on: https://code.wireshark.org/review/8323 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06Add/clarify some comments about how the Experimental-Result-Code AVP is handled.Jeff Morriss1-11/+15
Specifically we put Experimental-Result-Codes specified by 3GPP in the XML file and let other vendors' codes be handled through a dissector table. Change-Id: I2c3977fb959ad84faa5cb90aeb3d191c8b465ede Reviewed-on: https://code.wireshark.org/review/8319 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-06PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+12
Change-Id: Ia8eca42bae42fb139bfc63232c6d9bf05811ad39 Reviewed-on: https://code.wireshark.org/review/8280 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-06WildPackets → Savvius.Gerald Combs1-1/+1
Change-Id: I2494c2b1dcc9e324535b3f659b51b44059c478bd Reviewed-on: https://code.wireshark.org/review/8304 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-06[Thrift] Fix a copy-paste-o and add dissecton of T_BYTEAndersBroman1-2/+13
Change-Id: I2623d273a39393533c10568ef2f7642c05ac636c Reviewed-on: https://code.wireshark.org/review/8311 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06GTPv2 : fix unused parameter 'tree' [-Werror=unused-parameter]Alexis La Goutte1-1/+2
Change-Id: I01097889dd4a1c29135f50dcfb737ff50b0de2b7 Reviewed-on: https://code.wireshark.org/review/8310 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-06[GTPv2] Add dissetion of IE Overload Control Information and Metric.AndersBroman1-12/+88
Change-Id: I8bd423ea41929bfd20cecf9d80a686f1b286082f Reviewed-on: https://code.wireshark.org/review/8309 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06THRIFT: Fix Mac BuildbotAlexis La Goutte1-12/+12
packet-thrift.c:99: warning: declaration of 'tvb_captured_length' shadows a global declaration packet-thrift.c:114: warning: declaration of 'tvb_captured_length' shadows a global declaration packet-thrift.c:138: warning: declaration of 'tvb_captured_length' shadows a global declaration packet-thrift.c:166: warning: declaration of 'tvb_captured_length' shadows a global declaration Change-Id: I0ce4fc0bf6470f1b3a89de599346c1efe8bb93cf Reviewed-on: https://code.wireshark.org/review/8308 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-06Add a THRIFT dissector.AndersBroman3-0/+442
Change-Id: I69f2a99bde5a9f8c4c969cdd9145838ac776521b Reviewed-on: https://code.wireshark.org/review/8298 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06Fix the need to manually adjust packet-gias.c (take 2)Michael Mann6-174/+12
Need to have packet-gias.c in the DIRTY_CORBA_IDL_DISSECTOR_SRC grouping to work around the warnings still generated. Change-Id: I08ea1f7d90577cc112b85e7fc00171827f58d6d2 Reviewed-on: https://code.wireshark.org/review/8266 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-05kerberos encryption types (etype) additions + cleanupMark Cunningham1-3/+13
source http://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml and referenced RFCs Change-Id: I898218c3ef75da21130f3f6c83848c0fca095acf Reviewed-on: https://code.wireshark.org/review/8300 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-05-05Revert "Try to please both GCC (the compiler, not me) and clang."Gerald Combs2-14/+0
Unfortunately it prevents compilation with GCC. I'll just use "cmake -DDISABLE_WERROR=ON" on the affected machine for now. This reverts commit cdaad860720a17d889e759d9e263c5fcadaf36a2. Change-Id: I54c0e7882e42dd39b81c90c761e4aaec6d757bd1 Reviewed-on: https://code.wireshark.org/review/8297 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-05Updated to add the G8BPQ MKISS additional commands and "Checksum" mode.Richard Stearn1-14/+86
Change-Id: I40b1ff8ffca3c0e1cafb79af4ed5df26eda7182b Reviewed-on: https://code.wireshark.org/review/8212 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-05Try to please both GCC (the compiler, not me) and clang.Gerald Combs2-0/+14
The fix for GCC 5's -Wlogical-not-parentheses d7b2327 triggers -Wparentheses-equality in clang. Try to work around the issue with diagnostic suppression. Change-Id: I5eea1d3e76f6d2aa14a2595cd4455dcd2818f6a1 Reviewed-on: https://code.wireshark.org/review/8295 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-04DVB-CI: make some more items filterableMartin Kaiser1-6/+19
wrap long lines, remove a trailing space Change-Id: Ie9cd268ffbc6d021a3f90f3644dc8665daa8e5ca Reviewed-on: https://code.wireshark.org/review/8292 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-04added features in Feature-List-ID 2 used in S6a/S6dRay Gomez1-2/+130
Change-Id: I4e1be924ffa7cb09c4c73d494f5d97c9cc0bf626 Reviewed-on: https://code.wireshark.org/review/8291 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-04Add support for decoding all Feature-List Gx flagsMarius1-2/+116
Bug: 11167 Change-Id: I1c9af7c942cbc5e6abb2ea1520a8937968d52107 Reviewed-on: https://code.wireshark.org/review/8289 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-03Fix inconsistent indentation.Guy Harris1-49/+49
Change-Id: If757fb60023f2bf733ed3f51b6d6a18756283b42 Reviewed-on: https://code.wireshark.org/review/8285 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-03Don't dissect otherwise-undissected data twice.Guy Harris1-10/+6
Also, set decoded to TRUE after we return from a dissector; that makes it a bit clearer when we're setting it. Change-Id: Ief3e999c72954e08d4608b15b49921da294807c1 Reviewed-on: https://code.wireshark.org/review/8284 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-03Add support for IPv6 heuristic dissectors.Jesse Gross3-14/+43
This adds limited support for heuristic subdissectors with IPv6. The initial motivation is STT but it should transparently work for other protocols using IP heuristic dissectors in a manner similar to the non-heuristic dissectors. The limitation is in regards to IPv6 extension headers. IPv6 has multiple checks against the next protocol table when determining when the protocol is an unknown extension header or not. This assumes that the check is cheap and has no side effects, neither of which is true for heuristic dissectors. As a compromise, this assumes that the next protocol is registered as protocol, even if is not the one that is ultimately dissected. Although not strictly correct, in practice this is true for existing protocols and likely future ones because the heuristic dissectors are overriding non-heuristic ones. Change-Id: Iff8cfc148ced5ca16191cc2b1879ad87e38d23cd Reviewed-on: https://code.wireshark.org/review/8197 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-03DVB-CI: remove some proto_tree_add_text() callsMartin Kaiser1-7/+28
Change-Id: I727132effdb17138c35b0f3282f2f7b3dddb05b4 Reviewed-on: https://code.wireshark.org/review/8278 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-03[Automatic update for 2015-05-03]Gerald Combs3-13/+248
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I4d5f34d1b803d478101ba4a1388ac3d71c641918 Reviewed-on: https://code.wireshark.org/review/8273 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-02Don't try checksumming if we didn't capture all the data to be checksummed.Guy Harris1-2/+4
Check the captured length as well as the reported length, as is done in other checksumming code paths. Change-Id: I55371d99a28ffd1325e7266037cced580077d80b Reviewed-on: https://code.wireshark.org/review/8272 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-02Handle PIMvN, for N > 2, by just adding the checksum and subtree and bailing.Guy Harris1-25/+27
Don't bother doing the checksum, as we don't know how much to checksum; don't assume setting pim_length to 0 will force it not to be checksummed, as it doesn't; and don't test twice for a version != 2. Change-Id: I1c2ed3ecf1572aef6c5af140c410f9cdd0e9c3a6 Reviewed-on: https://code.wireshark.org/review/8271 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-02No need to call tvb_reported_length() twice.Guy Harris1-2/+2
Just reuse the result we got from an earlier call. Change-Id: Icb4617d731d9e3f152ce762f56a1c32567cbde4a Reviewed-on: https://code.wireshark.org/review/8270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-02Expand comments.Guy Harris1-8/+56
Update a URL, and tell The Story About PIM, or, at least, about various drafts floating around. I guess it took a while for the protocol to settle down, and a number of things changed significantly between early drafts and RFC 2117, including whether the protocol runs atop IGMP or directly atop IP. There doesn't appear to be *any* draft that corresponds to what dissect_pimv1() dissects; all have significant differences. Change-Id: Ia9c80cc384546b0a822a59fef01c1476f95ad8a6 Reviewed-on: https://code.wireshark.org/review/8269 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-01Revert "Fix the need to manually adjust packet-gias.c"Alexis La Goutte4-10/+169
This reverts commit 3ca9318d8215738b8d4edcde0598226cfc6cf031. Mac OS X buildbot are not happy packet-gias.c:356: warning: 'hf_UCO_InvalidInputParameter_details' defined but not used packet-gias.c:359: warning: 'hf_UCO_ProcessingFault_details' defined but not used packet-gias.c:360: warning: 'hf_UCO_SystemFault_details' defined but not used packet-gias.c:5275: warning: 'decode_UCO_Ratio_st' defined but not used packet-gias.c:5303: warning: 'decode_UCO_DirectAccessLocation_st' defined but not used packet-gias.c:5588: warning: 'decode_UCO_Coordinate3d_st' defined but not used packet-gias.c:5612: warning: 'decode_UCO_Circle_st' defined but not used packet-gias.c:5625: warning: 'decode_UCO_Ellipse_st' defined but not used packet-gias.c:5656: warning: 'decode_UCO_SimpleGSImage_st' defined but not used packet-gias.c:5671: warning: 'decode_UCO_SimpleCImage_st' defined but not used packet-gias.c:5694: warning: 'decode_UCO_CompressedImage_st' defined but not used packet-gias.c:5836: warning: 'decode_GIAS_ImageSpec_st' defined but not used Change-Id: Iee076c00eb4e48571a99f6b854b7e3e52983c2f8 Reviewed-on: https://code.wireshark.org/review/8265 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-01Fix the need to manually adjust packet-gias.cMichael Mann4-169/+10
Change-Id: I11beada78d2f2b4359d3638cdbcb6f43623fd10c Reviewed-on: https://code.wireshark.org/review/8262 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-01C12.22: check c1222_baseoid_len before doing a memcpyPascal Quantin1-4/+10
Should fix the following runtime error reported by Joerg: ../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 1, which is declared to never be null ../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 2, which is declared to never be null Change-Id: I2f952815ed81e47b504e6479835a357b7656828e Reviewed-on: https://code.wireshark.org/review/8251 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-01Fix some cases where we're shifting a signed 1 left.Guy Harris4-33/+33
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) Make some other left-hand operands of <<, and some variables holding results from shifts of that sort, unsigned, while we're at it. Change-Id: Ie72a9d0d518f59b35948267d10c80735d162e8bb Reviewed-on: https://code.wireshark.org/review/8264 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-01Add tshark -z "ncp,srt"Michael Mann3-27/+186
Change-Id: Iab2559c2bac5550987c108c6e917506fcec525e9 Reviewed-on: https://code.wireshark.org/review/8221 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-01Fix some cases where we're shifting a signed 1 left.Guy Harris1-106/+106
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) This fixes the *other* generator for the X11 header files; we manually fix the file in question, because life's too short to spend very much of it trying to debug Perl issues that cause a Can't use string ("1") as a HASH ref while "strict refs" in use at ../../tools/process-x11-xcb.pl line 675. at ../../tools/process-x11-xcb.pl line 1859 at ../../tools/process-x11-xcb.pl line 1859 failure. Change-Id: I3dd46025b2ae461e63034b36ab11cdbc9380b696 Reviewed-on: https://code.wireshark.org/review/8263 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-01Fix some cases where we're shifting a signed 1 left.Guy Harris1-2068/+2068
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) This fixes the generator for the X11 header files; we manually fix the header file in question, because life's too short to spend very much of it trying to debug Perl issues that cause a Can't use string ("1") as a HASH ref while "strict refs" in use at ../../tools/process-x11-xcb.pl line 675. at ../../tools/process-x11-xcb.pl line 1859 at ../../tools/process-x11-xcb.pl line 1859 failure. Change-Id: Ia903e9dacad49021bc0dfe129b9393ad426de9eb Reviewed-on: https://code.wireshark.org/review/8261 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-01rv is only used in an assert. The assert only evaluates to code ifJoerg Mayer1-1/+6
NDEBUG is undefined. Protect rv and its use accordingly. Change-Id: Iadbc55f74ccb797d7e812090140e636713658aa7 Reviewed-on: https://code.wireshark.org/review/8260 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-05-01Revert "Fix warning:"Joerg Mayer1-1/+2
This reverts commit 39a31c3205ed1f0691f5e55174abe84653bcf7b0. rv is used in an assert, thus breaking debug builds. Change-Id: Ide9c287a9b6bfe07554a9429d3d216266d63c017 Reviewed-on: https://code.wireshark.org/review/8259 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-05-01Fix warning:Joerg Mayer1-2/+1
/home/jmayer/work/wireshark/git/epan/nghttp2/nghttp2_hd.c: In function ‘hd_inflate_remove_bufs_with_name’: /home/jmayer/work/wireshark/git/epan/nghttp2/nghttp2_hd.c:1736:10: error: variable ‘rv’ set but not used [-Werror=unused-but-set-variable] size_t rv; ^ turning error. Change-Id: Ibd46013ddbdbdf634e7df1eb7dd50c60a1f62e26 Reviewed-on: https://code.wireshark.org/review/8257 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-04-30Fix some cases where we're shifting a signed 1 left.Guy Harris2-36/+36
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) Change-Id: I96114047d402d1bae537cdfeb28a8564b1c94712 Reviewed-on: https://code.wireshark.org/review/8256 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-30Fix some cases where we're shifting a signed 1 left.Guy Harris8-192/+192
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) Change-Id: I0d27565c382a04ceda9eec65f45a430ceb74cf53 Reviewed-on: https://code.wireshark.org/review/8255 Reviewed-by: Guy Harris <guy@alum.mit.edu>