aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-02PROFINET: Fix undecoded signal value in DCP Set Request.Birol Capa1-1/+13
According to specification, when suboption is CONTROL, signal value is FLASH_ONCE. Change-Id: I942579cdf3d642e636d02b778ffaad99022678e3 Reviewed-on: https://code.wireshark.org/review/23812 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: Michael Mann <mmann78@netscape.net>
2017-10-02QUIC: rename Stream ID Needed by Stream ID Blocked (draft-06)Alexis La Goutte1-4/+4
Change-Id: I9aba424fc9df5030befac31373dc759249d936c5 Reviewed-on: https://code.wireshark.org/review/23810 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>
2017-10-02QUIC: Add draft-06 version (value_string)Alexis La Goutte1-0/+1
Change-Id: Iabfa1045a7c8db3b154a9f827f2a2f130bb4fae4 Reviewed-on: https://code.wireshark.org/review/23809 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02ZCL Events Dissector: Increase number of subtreesMartin Boye Petersen1-4/+3
Increase number of subtrees for PublishEventLog so we can dissect the 100 event logs that are specified as the maximum in the Great Britain Companion Specification (GBCS). Change-Id: I23b1729abd58168772e1937e1f52552fab2187a7 Reviewed-on: https://code.wireshark.org/review/23782 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-10-02btle: Add preference to detect retransmissionStig Bjørlykke1-20/+31
In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 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-10-02Tshark: Prepare Elasticsearch output deduplicationChristoph Wurm1-189/+247
Refactors the ES output to use hash tables and lists in preparation of deduplicating fields. ES 5.x allows those, but will only store the last instance and discard any other without warning. ES 6.x altogether refuses to accept documents containing duplicate fields. This change should not change the output of Tshark in any way. A subsequent change will introduce the actual deduplication. Bug: 12958 Change-Id: I329ef0878e33b42d65a53bcac977429d87cde3ca Reviewed-on: https://code.wireshark.org/review/23042 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-10-02Dissector: SolarEdge inverter monitoring protocolErik de Jong7-0/+1710
Adds support for the SolarEdge inverter monitoring protocol. Based on the work done by https://github.com/jbuehl/solaredge bug: 14079 Change-Id: Ia0102c057e4cd27c187b01c7fd28053678f22727 Reviewed-on: https://code.wireshark.org/review/23653 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-10-02FP: Add heuristic FACH 1 dissectorDarien Spencer1-3/+116
Note that FACH 1 and FACH 2 are official terms as documented in TS 25.944 Change-Id: I1afbd99d5603df442dce903ad08ba071961f0586 Reviewed-on: https://code.wireshark.org/review/23785 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-10-02Remove the SVR4 packaging assets.Gerald Combs9-193/+2
Remove the svr4-package and solaris-package targets along with their associated files and directories. We used to use this to build Solaris packages but we haven't shipped those in years. Given that the last substantive change to packaging/svr4 was in 2008 it's likely that this has been unused for a while. Change-Id: Ib9153c99f503200ea8c48d3ef81ad688ee55c09f Reviewed-on: https://code.wireshark.org/review/23808 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>
2017-10-01plugins: Improve output formatJoão Valverde1-11/+13
And some minor code style changes. Change-Id: I97e53848db42c3981af69152b171b3a77f831da5 Reviewed-on: https://code.wireshark.org/review/23806 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-01CMake: Fix extcap plugin directoryJoão Valverde1-1/+1
Fixes a338f87f33559bb9c915a97b614987736d07ff8f. Change-Id: Ib1d36a43828bd5896b327e49693485288a536342 Reviewed-on: https://code.wireshark.org/review/23805 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-01Fix WiX installerJoão Valverde1-1/+0
Change-Id: I27af4758393c12962edab10267ae41bd2f11a07e Reviewed-on: https://code.wireshark.org/review/23804 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-01Unsplit "m2m" plugin (wimax mac-to-mac encapsulation)João Valverde21-806/+8
... not to be confused with "machine-to-machine". M2M seems to be a simple Wimax encapsulation protocol developed by Intel. It's not documented publicly anywhere that I can find. The boilerplate to code ratio is huge and it even includes a complete source file from the Wimax dissector (yuck). Put it in the Wimax plugin instead. Minor version number bump for wimax plugin. Change-Id: I2694339dfe89be334093b257a5b34d1577f4dc20 Reviewed-on: https://code.wireshark.org/review/23790 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01stats tree: (trivial) reformat assignmentsMartin Kaiser1-24/+24
a= b; looks a bit strange. Replace such assignments with a = b; Change-Id: I09534e0201906490daeb5cd35c55df00e139cf30 Reviewed-on: https://code.wireshark.org/review/23800 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-01stats_tree: fix the comparison routine for COL_AVERAGEMartin Kaiser1-11/+3
Generally, the average is calculated as node->total / node->count. The curent code does not handle the case where we compare two nodes and both have count == 0. It defines one of the nodes to be bigger. This triggers (at least on Windows) an assertion about invalid operator<. To fix this, we define average = 0 for a node with count == 0. We can then simply compare the two averages. Change-Id: Ie7d9cd590deddcdb9214c4a2693c2eb47c66b287 Reviewed-on: https://code.wireshark.org/review/23799 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-01simplify some include file pathsMartin Kaiser2-3/+3
For both autotools and cmake, the top-level source directory is always part of the search path for include files. For include files in this directory, we can simply use the file name. There's no need for a relative path. Change-Id: Ibf46265d91b5cb9bff4fa791e5b1d69ee3c1e165 Reviewed-on: https://code.wireshark.org/review/23798 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-01GTPv2: Add individual IEs to subtree arrayJoakim Karlsson1-62/+75
Change-Id: Ia12dae5869d5ae554d4bd1a3647738e56ed0ce2b Reviewed-on: https://code.wireshark.org/review/23801 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-10-01[Automatic update for 2017-10-01]Gerald Combs14-1581/+133
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I5ba654c9fade87decd26995b5a2d38734dcfba3b Reviewed-on: https://code.wireshark.org/review/23794 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-30Fix make distcheckJoão Valverde1-1/+2
Change-Id: I6fc298c5c320fcdbc117ff2ec261e6fe335e178c Reviewed-on: https://code.wireshark.org/review/23792 Reviewed-by: João Valverde <j@v6e.pt>
2017-09-30WiMAX: Fix possible crash during protocol registrationJoão Valverde15-37/+84
proto_register_wimax() cannot be assumed to run before all other dissectors that depend on the global proto_wimax variable. It happens to work now but registration order is never guaranteed and cannot be relied upon. Wireshark will crash with a null pointer dereference if proto_register_wimax() is not run first. Have proto_register_wimax() call the registration routine for the other dissectors that depend on proto_wimax to impose the hard-coded order. Change-Id: I3e9a9ea742f3feeb5b802ad79cfc9ed916264d2f Reviewed-on: https://code.wireshark.org/review/23788 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-30Make make-dissector-reg.py pay attention to word boundariesJoão Valverde1-3/+3
Change-Id: Ia96c7b86994b9b5ab58735722f97e2c46cdfb54e Reviewed-on: https://code.wireshark.org/review/23787 Reviewed-by: João Valverde <j@v6e.pt>
2017-09-30Fix typo in make-dissector-reg.pyJoão Valverde1-1/+1
Change-Id: Ia4c0cd07e1a0e570db440bd05877fc760aae5f54 Reviewed-on: https://code.wireshark.org/review/23786 Reviewed-by: João Valverde <j@v6e.pt>
2017-09-29btle: Don't ignore frames with incorrect CRC when detecting retransmission.Stig Bjørlykke1-3/+3
The retrans detection using SN must use all available frames to make a best effort. The probability for having error in the SN bit is little compared to reassembly errors occuring when discarding frames with incorrect CRC. Change-Id: I40f89e69b19600939b6e0a85a2e655b6681ea5b2 Reviewed-on: https://code.wireshark.org/review/23783 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-09-29btle: Improve retransmit detectionStig Bjørlykke1-11/+5
Only use SN to detect retransmission. Lower retransmit expert info severity to Note. Change-Id: I4604903cce9cc58a6fcffff6597e7e99d228aa80 Reviewed-on: https://code.wireshark.org/review/23780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-09-29btle: Ignore retransmitted frames in reassemblyStig Bjørlykke4-60/+58
Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 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-09-28PortableApps: Don't ship development files.Gerald Combs1-0/+2
Exclude .exp and .lib files when we run xcopy. Change-Id: I913a1360507a8812a678efcd35d9afe58167d11b Reviewed-on: https://code.wireshark.org/review/23777 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-28Have dissect_7bit_string() return a const gchar *.Guy Harris1-16/+19
Nobody needs to modify the string, and nobody needs to free it - which is good, because it could be a string constant which can neither be modified nor freed. Change-Id: I13d4239557698e4631e8f8b062d436a2e94d5eca Reviewed-on: https://code.wireshark.org/review/23773 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> (cherry picked from commit e209b4c5274766a92b1ae3daff57bf5ca21dfc0f) Reviewed-on: https://code.wireshark.org/review/23774 (cherry picked from commit 54f1a4f285260d12d8da834637631e4020cf7786) Reviewed-on: https://code.wireshark.org/review/23776
2017-09-28radius: display in same fashion as DiameterJoakim Karlsson1-14/+15
* Change order to display AVP name/type first * Added "val=" before value * Added "vnd=" before vendor Change-Id: Iabafa6de5bc4b77dfa475cba390bc5c99da71d3f Reviewed-on: https://code.wireshark.org/review/23760 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-09-28epl: fix od_idx display in treeChristoph Schlosser1-6/+6
The idx value was set to the sod_index value when the previous value of idx was still needed to correctly set the text of the proto item. Change-Id: I1130678aaf5f623ab30814310ac14360d13b84b7 Reviewed-on: https://code.wireshark.org/review/23770 Reviewed-by: Christoph Schlosser <christoph@schlosser.xyz> 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>
2017-09-28Remove TPG plugin and dependenciesJoão Valverde14-1765/+0
It doesn't build with autotools and CMake. Under-documented and unmaintained. Seems to be a work-in-progress that stalled. Introduces spurious CMake dependency on yapp. Change-Id: I0dca1ccbdfd683586c05765437d4b7804ab5cc70 Reviewed-on: https://code.wireshark.org/review/23758 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>
2017-09-28HTTP: fix the Response VersionEugene Adell1-4/+10
Add a distinct field for a version in a response packet, http.response.version Bug: 14085 Change-Id: Ib255acf7fc329566869bfb82108826931368701d Reviewed-on: https://code.wireshark.org/review/23769 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-09-28ZigBee ZCL SE comments: Fixed comments and descriptions in ZCL SE.Martin Boye Petersen1-33/+32
There are no functional changes. Change-Id: I19532d04d9cd428a86f04456ff402d36877be3bf Reviewed-on: https://code.wireshark.org/review/23766 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-09-27Improve frame.protocols accuracy.Gerald Combs1-17/+29
During single-pass tshark dissection we can end up adding "Protocols in frame: ...:tcp:http" to the tree even though we haven't dissected HTTP. This may be true of other protocols as well. Remove our last layer when we haven't added any items to the tree. Decrement curr_layer_num as well. Update the layer logic in dissector_try_heuristic to match call_dissector_work. Change-Id: Ibc0591e774761e9496d056080c980243a0447066 Reviewed-on: https://code.wireshark.org/review/23508 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-27GRPC: fix character check (CID 1418526)Pascal Quantin1-4/+5
Change-Id: I998ca90149ec65529d79b294a6d00624858fc94a Reviewed-on: https://code.wireshark.org/review/23763 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-09-27LTE RRC: upgrade dissector to v14.4.0Pascal Quantin11-1991/+3804
Change-Id: If835450380263a012c3716cf2f2b6ee36a3201a0 Reviewed-on: https://code.wireshark.org/review/23765 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>
2017-09-27GRPC: fix a control flow issue (CID 1418525)Pascal Quantin1-2/+0
If no HTTP2 path is retrieved, we cannot really guess the direction. Let's not append it then. Change-Id: Ib06b103079cea8a82dbd45a7d4ac4d6a8e673857 Reviewed-on: https://code.wireshark.org/review/23764 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-09-27RRC: upgrade dissector to v14.4.0Pascal Quantin7-139/+139
Change-Id: I49cf3e5981efe5b28eb012bab50cf55636636a38 Reviewed-on: https://code.wireshark.org/review/23762 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-09-27nfsv4: Implement the xattr support for NFSv4Tom Haynes2-3/+142
See: https://datatracker.ietf.org/doc/draft-ietf-nfsv4-xattrs/ Change-Id: I775eb2ec994409717f5d4ab9feb07cb4201617f1 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/23756 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-09-27Capinfos: Add SHA256. Remove MD5.Gerald Combs3-19/+23
Print the SHA256, RIPEMD160, and SHA1 hashes for each file instead of SHA1, RIPEMD160, and MD5. SHA256 seems to be the preferred file hashing algorithm these days and MD5 is actively discouraged. Note that we might remove SHA1 (which is also discouraged) as well. Change-Id: I74d972ae5f3484c83175cd3f3c7a55f99c171e20 Reviewed-on: https://code.wireshark.org/review/23761 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>
2017-09-27sharkd: support for frame comments.Jakub Zawadzki1-6/+22
Change-Id: If51cd6a7f4989fee16563809a997dc2f46f67c22 Reviewed-on: https://code.wireshark.org/review/23759 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-26WSUG: More tools updates.Gerald Combs3-16/+41
Add links to the online man page for each tool. Make sure tshark generates pre-commit-compatible output on Linux. Change-Id: I00d2973475f27460065bc8a65471abef152ded33 Reviewed-on: https://code.wireshark.org/review/23754 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>
2017-09-26LPP: upgrade dissector to v14.3.0Pascal Quantin5-12/+33
Change-Id: I0d571e277c4ec00d3da9dfabfc9cd80689763f69 Reviewed-on: https://code.wireshark.org/review/23757 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: Anders Broman <a.broman58@gmail.com>
2017-09-26plugins: Move the build dir scanning code to a separate functionJoão Valverde1-68/+68
Change-Id: Iee476ac84d530810e5b70547c462050f1c03ee1b Reviewed-on: https://code.wireshark.org/review/23755 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-26Remove "easy_codec" sourceJoão Valverde13-570/+0
It's dead, unmaintained and unfinished. Not in a good enough state to live in the tree. Change-Id: I6a5c391503b5237638f8362fb9f0492c4cf36223 Reviewed-on: https://code.wireshark.org/review/23745 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-26plugins: No need to allocate a new structJoão Valverde1-30/+26
Change-Id: Ic39cf1c7f199dc5e4879d954a649d21453dcc5e5 Reviewed-on: https://code.wireshark.org/review/23753 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-26Rename "ws_version_info.h", also .cJoão Valverde44-73/+73
It's not installed so like most other files it doesn't need or benefit from the prefix. Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c Reviewed-on: https://code.wireshark.org/review/23751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-26Move some DIAG_OFFs to make code less uglyJoão Valverde4-9/+14
Change-Id: I0f343ab69a6592a466e12e5d258f0878b9c32c25 Reviewed-on: https://code.wireshark.org/review/23752 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-26DOCSIS: Adding Attribute masks to Service FlowBruno Verstuyft2-0/+58
Change-Id: I626b8a1d85e3062c58f9e3bd7bd6c6123c4b8272 Reviewed-on: https://code.wireshark.org/review/23749 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-09-26plugins: Use g_slist_prepend() instead.João Valverde3-3/+3
Change-Id: If145137bfd44025ccab762b67960072777efd302 Reviewed-on: https://code.wireshark.org/review/23750 Reviewed-by: João Valverde <j@v6e.pt>
2017-09-26GTP: fix display of GTP Prime in frame.protocols fieldPascal Quantin1-2/+1
Bug: 14083 Change-Id: Ieabdfd2399df9136f6fd9d556ea3b96230710860 Reviewed-on: https://code.wireshark.org/review/23743 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: Michael Mann <mmann78@netscape.net>