aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-04-02Use col_append_sep_str() for fixed stringsStig Bjørlykke26-128/+127
Change from col_append_sep_fstr() to col_append_sep_str() when appending strings without formatting. Change-Id: I315aca9b815c204a5bc78f7326402c40d1325f0e Reviewed-on: https://code.wireshark.org/review/20846 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-02[Automatic update for 2017-04-02]Gerald Combs12-634/+1004
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9e722e963dcf7437feb98a3176e6c507d86a9485 Reviewed-on: https://code.wireshark.org/review/20848 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-02BGP: remove some true_false_string values obsoletes after gf998923Pascal Quantin1-4/+0
Change-Id: I10753353d0593b736630118ccf0a797d48e087b8 Reviewed-on: https://code.wireshark.org/review/20847 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-04-02tcp: Add separator to Info column when segmentedStig Bjørlykke1-2/+2
Prefix the Info column entry "[TCP segment of a reassembled PDU]" with a space if the column is not empty. Change-Id: If4fc46b2d8a2d261044767c534da34e2d27435f8 Reviewed-on: https://code.wireshark.org/review/20845 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-02BGP: Remove redundant text in Path Attributes.Simon Zhong1-10/+17
Also added display of lower-order four bits of the Attribute Flags ("unused"). Current implementation of displaying path attribute flags shows flag description twice if the flag was set. For example, with Optional and Length set, the attribute flags were displayed as follows: Flags: 0x90, Optional, Length: Optional, Non-transitive, Complete, Extended Length 1... .... = Optional: Optional .0.. .... = Transitive: Non-transitive ..0. .... = Partial: Complete ...1 .... = Length: Extended length Now they are displayed as follows: Flags: 0x90, Optional, Extended-Length, Non-transitive, Complete 1... .... = Optional: Set .0.. .... = Transitive: Not set ..0. .... = Partial: Not set ...1 .... = Extended-Length: Set .... 0000 = Unused: 0x0 Change-Id: Iec3c92ac2383dd3f736598b089a74f0f3c165bae Reviewed-on: https://code.wireshark.org/review/20732 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>
2017-04-02ACN with blobs and magic bulletNick1-61/+3166
Bug: 13315 Change-Id: I2322e5f08fefbe6979cf4bed46596ac6636cccf9 Reviewed-on: https://code.wireshark.org/review/19542 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>
2017-04-01ssl: Fix Info column separatorStig Bjørlykke1-74/+20
Always prefix Info column entries with comma if the column is not empty. Bug: 13539 Change-Id: I47b43841b092671fe5a74c99ec8aaa15f144bced Reviewed-on: https://code.wireshark.org/review/20844 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-01Check before setting the length of a protocol item.Guy Harris1-1/+6
Don't assume that 8 + {32-bit unsigned integer} won't overflow. Use tvb_ensure_bytes_exist() to ensure that the data in question is present; it also checks for overflows. Also, set the length after we've succeeded in dissecting the item - if we throw an exception, it's because we don't have all the data, so the tvb_ensure_bytes_exist() would have failed, but this way we at least get to dissect what data we *do* have. Change-Id: If27a2e3ed7978c2051ccb2ddba0d498255d0e350 Reviewed-on: https://code.wireshark.org/review/20840 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-01Fix IPv6/IPX statistics generationPascal Quantin1-28/+38
g70381f7 switched from a sorted GSList to a wmem_tree. But the strings "ipx" or "ipv6" must be tested before "ip" to select the right tap so the sorting does matter. Use a wmem_list and parse it by reverse order like what was done with the GSList to ensure proper selection of the tap. Change-Id: Ic8d291c265e9c83c960d9a2f6713c25e3aa0e60d Reviewed-on: https://code.wireshark.org/review/20813 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: Pascal Quantin <pascal.quantin@gmail.com>
2017-04-01Add DirectPlay 8 Enumation Query/Response packetsAlistair Leslie-Hughes4-0/+348
Bug: 13541 Change-Id: Ie8133be9ef7b3943d8cf66c5c4fe024250912253 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Reviewed-on: https://code.wireshark.org/review/20820 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-01Improve the display of metrics.Guy Harris1-33/+45
Give the value and the "supported" bit names that reflect what they are. Show both the "supported" bit and the value as bitfields, because that's what they are. Show the "supported" bit before the value. Show the metric value as decimal; there's nothing particularly hexadecimal about it. The "supported" bit is 1 if it's *not* supported and 0 if it *is* supported. Fetch the byte for the metric within dissect_metric(), rather than in the call to dissect_metric(). Change-Id: Ief3bb74b273df06e07066ccdede38a2eeedc6db2 Reviewed-on: https://code.wireshark.org/review/20836 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-01You can't get a string value from an FT_NONE string.Guy Harris1-1/+1
Make it an FT_STRING. Change-Id: I2a44c4542c79daa486382bd5b28f6c37c9c46111 Reviewed-on: https://code.wireshark.org/review/20827 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-01Provide better error messages for field type mismatches.Guy Harris1-6/+18
Don't just report an assertion failure with a line in proto.c; give the name of the field with the wrong type, and a list of the types that are valid for the routine in question. Change-Id: Id3ed7c376fdc72bf6cff69c647833946cfa99ee6 Reviewed-on: https://code.wireshark.org/review/20824 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-01FT_CHAR is an integral type, so list it in the diagnostic message.Guy Harris1-1/+1
Change-Id: I8d095a2424033bee5b3569c906327ac15de33890 Reviewed-on: https://code.wireshark.org/review/20823 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-01ieee80211: Fix parsing of supported operating classes IEMikael Kanstrup1-18/+24
Fix parsing of Supported Operating Classes information element - Fix min tag length check message (min length is 2 not 3) - Fix max tag length check (no max defined) - Fix malformed packet exception on frames with min tag length - Handle OneHundredAndThirty and Zero field delimiters - Use same base (dec) for both current and alternate op classes Bug: 13534 Change-Id: I05b2238eb07f65fde0a33479e9459d2a99911a50 Reviewed-on: https://code.wireshark.org/review/20784 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-01Add citrix mep dissectorsPriyanka Mondal6-0/+2471
Change-Id: Id574fc20e17333646d615cab415b2d40b4487375 Reviewed-on: https://code.wireshark.org/review/20333 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-01Don't add an FT_UINT32 with proto_tree_add_none_format().Guy Harris1-1/+1
Make it an FT_NONE. Change-Id: I83339d84b88c7decffa6e6a48d12acc4b063a4ad Reviewed-on: https://code.wireshark.org/review/20822 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-01Don't use proto_tree_add_uint() to add an FT_BOOLEAN field.Guy Harris1-8/+8
We don't allow that. Use proto_tree_add_boolean() instead. Change-Id: I59ed0f0dc731b1ce4b5d921cd4e85b1c101cb2a8 Reviewed-on: https://code.wireshark.org/review/20821 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-31Add packet capture support for Darwin USBScott Deandrea5-1/+369
Change-Id: Iec9e4ac2362cf8e88a3cf6ae3483cefe938967e5 Reviewed-on: https://code.wireshark.org/review/20814 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-31Fix some dissection errors.Guy Harris3-18/+52
"XXX supported" for a metric type is a Boolean, not an int; add it as such. Add the value of the item without the extra bits. The length of an address prefix is in semi-octets (nibbles/hex digits), not in octets. Change-Id: I642f0dab5030f7609e89f45cf2cff15cd74dfbda Reviewed-on: https://code.wireshark.org/review/20819 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-31Optimize frame_data layout.Jakub Zawadzki1-1/+1
Move tsprec to remove padding. It saves 8 bytes on amd64, shrink size of frame_data structure from 96 to 88 bytes. Change-Id: Ib69687b2e5b7d65b5c15eda7d5834100a02c059e Reviewed-on: https://code.wireshark.org/review/20807 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-31Fix endpoints statistics optional filter parsingPascal Quantin1-1/+1
Bug: 13538 Change-Id: I4cd66d2dffc976610d41126c50b5722bc06a72f8 Reviewed-on: https://code.wireshark.org/review/20810 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
2017-03-31Fix comments.Guy Harris1-2/+2
Change-Id: Iac768dd2f06ce081a7b82c58c225f2674f3f1174 Reviewed-on: https://code.wireshark.org/review/20815 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-31AMQP: fix field amqp.value is not of type FT_NONEAlexis La Goutte1-1/+1
Bug: 13435 Change-Id: Ib61404fc3a8c461593d2a8a60224463ef2b9c4b6 Reviewed-on: https://code.wireshark.org/review/20309 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>
2017-03-31Qt: do not expand collapsed trees when switching packetsPeter Wu1-2/+9
Scenario: user selects a field, collapsed tha parent tree and selects the next packet. Before this patch, the tree would be expanded again, selecting the child. After this patch, the tree will not be expanded, instead selecting the tree node that got collapsed. Change-Id: I7968fca1056a937cf3b399afb6f3089c2d199067 Reviewed-on: https://code.wireshark.org/review/20801 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-31checkAPIs: improve trailing item suggestion for XXX_stringPeter Wu1-4/+25
Tighten the check (do not just check for "0,NULL}};" but also "{0,NULL}};" in case someone decides to use "{0x10,NULL}};" as trailing item. Improve the suggestion, "{NULL,NULL}" is better for string_string than "{0,NULL}". For now treat 0 the same as NULL since files like packet-fix.h would need editing otherwise. Accept octal notation for value_string since packet-nfs.c uses this in nfs2_mode_names. Change-Id: Ic507dbd8b07f3ae062b3f0310aa3398115d54273 Reviewed-on: https://code.wireshark.org/review/20796 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: Peter Wu <peter@lekensteyn.nl>
2017-03-31Fix typo.Guy Harris1-1/+1
Change-Id: I55137590280024dd383c0d005a2d9d79f9b7d38a Reviewed-on: https://code.wireshark.org/review/20804 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-31Fix incorrect NSAP AFI values.Guy Harris2-5/+5
Change-Id: I302041f5a08973229317455d8df8690256557e76 Reviewed-on: https://code.wireshark.org/review/20803 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-31dns: prevent repeatedly overwriting resolved entriesPeter Wu1-2/+4
When a packet contains multiple conflicting names for the same address, it would result in modification of the resolved name every time this DNS packet is selected. In Qt, this causes a periodic (one second) redissection of the current (DNS!) packet which interferes with user interaction. To avoid this, only add the address on the first visit. Bug: 13533 Change-Id: Ic71515131da4d666bfd589df9ff90a866a30778c Reviewed-on: https://code.wireshark.org/review/20800 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-31Distinguish between the two flavors of ITU-T AFIs.Guy Harris3-71/+72
As ISO 8348/X.213 Annex A says: A.5.2.1.2 Format and allocation of the IDI A specific combination of IDI format and DSP abstract syntax is associated with each allocated AFI value, as summarized for use in individual addresses in Table A.4 (the corresponding AFI values for use in group addresses is found via Table A.2). Two AFI values are associated with each combination that involves a variable-length IDI format. In each case, both of the AFI values identify the same combination of IDI format and DSP abstract syntax. The numerically lower AFI value is used when the first significant digit in the IDI is non-zero. The numerically greater AFI value is used when the first significant digit in the IDI is zero. and A.5.3 talks further about this. Change-Id: I3fdad04064451b3c891731dc8f107bc57586eb84 Reviewed-on: https://code.wireshark.org/review/20802 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-30Qt: Fix uninitialized memory access in val_units_Peter Wu1-3/+5
Fixes the following UBSAN errors: ui/qt/io_graph_dialog.cpp:1720:75: runtime error: load of value 3200171710, which is not a valid value for type 'io_graph_item_unit_t' #0 0x5611f0b0cd1d in IOGraph::setFilter(QString const&) ui/qt/io_graph_dialog.cpp:1720:75 #1 0x5611f0b737a1 in IOGraph::IOGraph(QCustomPlot*) ui/qt/io_graph_dialog.cpp:1682:5 #2 0x5611f0afb3f3 in IOGraphDialog::addGraph(bool, QString, QString, int, IOGraph::PlotStyles, io_graph_item_unit_t, QString, int) ui/qt/io_graph_dialog.cpp:340:24 #3 0x5611f0af7c19 in IOGraphDialog::IOGraphDialog(QWidget&, CaptureFile&) ui/qt/io_graph_dialog.cpp:289:13 ui/qt/io_graph_dialog.cpp:1818:19: runtime error: load of value 3200171710, which is not a valid value for type 'io_graph_item_unit_t' #0 0x5611f0b1167e in IOGraph::setPlotStyle(int) ui/qt/io_graph_dialog.cpp:1818:19 #1 0x5611f0b062ee in IOGraphDialog::syncGraphSettings(QTreeWidgetItem*) ui/qt/io_graph_dialog.cpp:420:10 ui/qt/io_graph_dialog.cpp:1872:29: runtime error: load of value 3200171710, which is not a valid value for type 'io_graph_item_unit_t' #0 0x5611f0b13e6a in IOGraph::setValueUnits(int) ui/qt/io_graph_dialog.cpp:1872:29 #1 0x5611f0b06640 in IOGraphDialog::syncGraphSettings(QTreeWidgetItem*) ui/qt/io_graph_dialog.cpp:422:10 Note that calling setFilter with an empty string is pretty useless, especially since the filter is initialized later, so remove it. The choice for IOG_ITEM_UNIT_FIRST is quite arbitrary and needed because setValueUnits reads the "old" (uninitialized) value. Change-Id: I32c65a30593cb718b838c0f324e0d1b0eaab90e5 Reviewed-on: https://code.wireshark.org/review/20767 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-30Add a bunch of #defines for OSI NSAP AFI values, and use them.Guy Harris4-85/+151
Have the ISUP value_string for those AFI values show "decimal" and "binary" indicators. Update some references. Change-Id: I07797455f5ffa5fa9cd4e0702a6f5db831054937 Reviewed-on: https://code.wireshark.org/review/20798 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-30Make some routines static.Guy Harris4-7/+7
Change-Id: I04860f058345cb633ab379c83dcfc24b6cf1a846 Reviewed-on: https://code.wireshark.org/review/20797 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-30.mailmap: Update (of February and March)Alexis La Goutte2-7/+9
Change-Id: Ib728c6ebf0a029e7241a042a0ca80c602df8e89e Reviewed-on: https://code.wireshark.org/review/20202 Reviewed-by: Mark Phillips <mark.phil@samsung.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-30ssl-utils: fix a couple of uninitialized variablesChema Gonzalez1-2/+2
Fixed these (false-positive) warnings: epan/dissectors/packet-ssl-utils.c:4149:30: error: 'mac_frag' may be used uninitialized in this function [-Werror=maybe-uninitialized] epan/dissectors/packet-ssl-utils.c:4149:30: error: 'mac_fraglen' may be used uninitialized in this function [-Werror=maybe-uninitialized] else if(tls_check_mac(decoder,ct,TLSV1_VERSION,mac_frag,mac_fraglen,mac)>= 0) { Change-Id: I282d5d60d96953858844deeaaf2069ffed3fabca Reviewed-on: https://code.wireshark.org/review/20793 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-30pcapng: Align code name and hf name.Stig Bjørlykke1-1/+1
Use common name for "Number of Received Packets". Change-Id: Ib57b142e8fc5c85a03c5622c264ce1d7e113f795 Reviewed-on: https://code.wireshark.org/review/20795 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-03-30[UMTS FP] Fixed some commentsS. Shapira1-9/+12
And also removed an unused length check in the DCCH over DCH heuristic dissection method Change-Id: I534200acb66e11a0c49d15e478e1f1d902e0ba05 Reviewed-on: https://code.wireshark.org/review/20788 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>
2017-03-30Terminate string_strings with { NULL, NULL }.Guy Harris1-1/+1
checkAPIs.pl looks for { 0, NULL }, so use that. Change-Id: Ia8ec0bddcb346649ac760df8b42a8589d6b67983 Reviewed-on: https://code.wireshark.org/review/20794 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29Prevent crash/assert on access to "uninitialized" device.if_info.name.Joerg Mayer2-0/+2
While this is one possible way to fix it, it probably is not the "right" way to do it. I just don't know which one would be right. I regard several options to be cleaner: - Remove if_info from interface_t altogether and add the required fields to interface_t directly. - Never use device.if_info.name but always use device.name (same with friendly_name) - Initialize both fields the same (same with friendly_name) - Also not nice: device is optically a struct, not a pointer. So into the function, when we create a new struct (that's where the error "is made"), the same name continues to be used. Not improving my confidence into my solution: - I haven't bee able to figure out why the automated Windows builds don't crash/assert. Last but not least: The two qt/gtk functions should probably have their common core extracted into a common function. Change-Id: I1b36d1765d1a1ec975927cb5785a1540ba4952f5 Ping-Bug: 13448 Reviewed-on: https://code.wireshark.org/review/20721 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-03-29c15ch: fix value_string terminationPeter Wu1-1/+1
Change-Id: I305ec694e2eea75dd1826d3ae82b39d2716ef7c1 Reviewed-on: https://code.wireshark.org/review/20789 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-29sysex: fix value_string terminationPeter Wu1-1/+1
Change-Id: I7063db4b748a96ad3fb190f575d04ca4a411a404 Reviewed-on: https://code.wireshark.org/review/20790 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-29checkAPIs.pl: check value_string terminationPeter Wu1-12/+10
Check for the expected "{0, NULL}" termination, disallowing things like "{9, NULL}". Also add val64_string and bytes_string while at it. Remove a stale comment since we allow some c99 syntax now. Change-Id: I1685255bbb11d84eba46b7cd00934d2f74187e03 Reviewed-on: https://code.wireshark.org/review/20792 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-29mrcpv2: fix value_string terminationPeter Wu1-1/+1
Not actually used in a header field, but in str_to_str. Caught by an updated checkAPIs.pl script. Change-Id: I8b7173716034b71b556c3d95fa0541ca9117e1f1 Reviewed-on: https://code.wireshark.org/review/20791 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-29Throw in a cast to squelch a compiler warning.Guy Harris1-1/+1
MSVC warns that comparing a gboolean (which is a typedef for int) to a bool is unsafe; convert the gboolean to a bool (the post-C++11 draft C++ standard I have says that the conversion from integral to bool does pretty much what you'd expect - zero goes to false, non-zero goes to true - and is exactly what we want). Change-Id: Ia7d7b62baf87ca3a29da5140f68c2c5b38b2d6de Reviewed-on: https://code.wireshark.org/review/20787 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29Squelch 64-to-32-bit narrowing warnings.Guy Harris1-2/+2
Change-Id: Ifc6938ab8deb62fc8b53c9d68504210b6fcc58f7 Reviewed-on: https://code.wireshark.org/review/20786 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29Fix processing of AMQP 0-10 arrays, maps, and conneciton locales.Guy Harris1-6/+5
You can't call proto_tree_add_XXX routines on a proto_item * that hasn't been given a subtree with proto_item_add_subtree(). Fix that. The packet offset for a FT_UINT_STRING is a pointer to the first byte of the *length*, not to the first byte *after* the length. Properly pluralize "entry". Change-Id: I7f2a55eaad850e3e52e62eb061e0444d176c593a Reviewed-on: https://code.wireshark.org/review/20785 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29Qt: propagate selection from main screen to dialogPeter Wu6-3/+45
Ensure that the selection in main screen is updated on refreshing interfaces (InterfaceFrame::interfaceListChanged). Add additional patches to ensure that selection changes from the main screen propagate to the dialog and be careful to avoid infinite recursions. Life of a signal for InterfaceFrame: ui->interfaceTree->selectionModel emits selectionChanged -> slot InterfaceFrame::interfaceTreeSelectionChanged -> emits InterfaceFrame::itemSelectionChanged -> slot MainWelcome::interfaceSelected -> emits MainWelcome::interfacesChanged -> slot CaptureInterfacesDialog::interfaceSelected (updats dialog selection) Life of a signal for CaptureInterfacesDialog: ui->interfaceTree emits itemSelectionChanged -> slot CaptureInterfacesDialog::interfaceSelected (emission of next signal because sender is ui->interfaceTree) -> emits CaptureInterfacesDialog::interfacesChanged -> slot InterfaceFrame::updateSelectedInterfaces (updates main screen selection) This should probably be updated to model/view with shared selection model in the future. Change-Id: Ibb32c201a92bd2f1310523b3e6e63b03209c9ce4 Reviewed-on: https://code.wireshark.org/review/20487 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-29packet-icmpv6.c: Fix some value_stringsMichael Mann1-3/+3
Change-Id: Ieae37af709b670792cca3937674ba0cc1026d45f Reviewed-on: https://code.wireshark.org/review/20783 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-29Bluetooth: fix conflicting entries in its value_string.Michael Mann2-3/+3
Change-Id: Ie0f9bc800b5d86effa18a8ae333bbf8da18d0c3b Reviewed-on: https://code.wireshark.org/review/20775 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
2017-03-29TLS: fix decryption with Encrypt-then-MAC (RFC 7366)Peter Wu2-14/+53
Bug: 13522 Change-Id: I0dfe30e086c3ef1a4f96f22e2db46e4d4cc7dffa Reviewed-on: https://code.wireshark.org/review/20771 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 18:49:28 +0000