aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/docsis
AgeCommit message (Collapse)AuthorFilesLines
2016-07-15Widen some variables.Guy Harris1-7/+7
Perhaps they cannot ever have values > 65535, but there's really no benefit to restricting them to 16 bits on the 32-bit and 64-bit platforms on which we run, and this might address what CID 1364088 is *really* complaining about. Change-Id: I5238261d04783401873de89469f8e2906554add4 Reviewed-on: https://code.wireshark.org/review/16454 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-10Remove a compiler warning some platforms give.Guy Harris1-5/+5
Some UN*Xes declare an index() function, that being the name strchr() originally had in V7 UNIX. This causes warnings from compilers if you have a variable named "index", so rename the variable. Change-Id: Ibb046005d1ef911ce0739ce70a0a55c13310cdf0 Reviewed-on: https://code.wireshark.org/review/16372 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-10DOCSIS: Added dissector for Downstream Profile Descriptor (DPD)Bruno Verstuyft3-0/+393
Change-Id: I97e6e07be45a5c4de6c8c467e0c782b35036bd98 Reviewed-on: https://code.wireshark.org/review/16202 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-03DOCSIS: Update to Type 35 UCDAdrian Simionov1-19/+25
Change-Id: Ie0dda94894cfaec9bccbd69d52367034e1c629da Reviewed-on: https://code.wireshark.org/review/16242 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-30Remove Makefile.common filesJoão Valverde2-92/+64
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 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>
2016-06-28DOCSIS: Added dissector for OFDM Channel DescriptorBruno Verstuyft4-0/+419
Change-Id: Idbbc1ad126e0b01952957a914bd9c16a990a9b9e Reviewed-on: https://code.wireshark.org/review/16036 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-27DOCSIS: Fix unknown TLVs in UCD type29 caused parsing errors + bugfixesBruno Verstuyft1-271/+272
Change-Id: I9ab56ded7ebf9f087afceed979e451e369eaf1d6 Reviewed-on: https://code.wireshark.org/review/15967 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15Remove Nmake build systemPascal Quantin3-118/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 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: Balint Reczey <balint@balintreczey.hu>
2016-06-01[docsis->type35ucd] Fix TLV 15 & 16 bugsAdrian Simionov1-5/+9
+ TLV 15 has value decoded as on off + TLV 16 shows text parameters instead of decimal value Change-Id: I6f0baa410f12e20825379a3ff0cd6174aa2bc576 Reviewed-on: https://code.wireshark.org/review/15678 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-31[docsis->rngrsp] Packet decoded in greater detailAdrian Simionov1-101/+107
Next steps would be to add expert and add missing TLVs. Change-Id: Ia05d81c380d412ab02e55bbfc08363d9153ff1c3 Reviewed-on: https://code.wireshark.org/review/15617 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>
2016-05-29[docsis->type35ucd] TLV 7 ON OFFAdrian Simionov1-1/+4
Change-Id: I5083346cb03de522d76632eba5ec9cbbf17666ea Reviewed-on: https://code.wireshark.org/review/15603 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>
2016-05-02Add checkAPI calls to CMake.Graham Bloice1-0/+11
This generates a top level target, checkAPI, that is excluded from the ALL build target, so must be run separately. On Windows using a Visual Studio generator, call msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj Change-Id: I44a57c564dcfc75499463b942436f4b920a82478 Reviewed-on: https://code.wireshark.org/review/14873 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-04-29Update BPKM Auth Reply key length for DOCSIS 3.1Philip Rosenberg-Watt1-1/+1
Wireshark was failing to parse DOCSIS 3.1 BPKM Response (Auth Reply) messages with a key length of 256 bytes, which is in the DOCSIS 3.1 specification located here: http://www.cablelabs.com/specification/docsis-3-1-security-specification/ See Appendix I.4 "Authorization Reply" Change-Id: Ic50eb4a2d637a7bc47385b7c0a96c830f7a920be Reviewed-on: https://code.wireshark.org/review/15149 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>
2016-04-15Remove empty filesJoão Valverde2-0/+0
Change-Id: I9b5b78ca26dd1190e43d2e7e953f4fb119921103 Reviewed-on: https://code.wireshark.org/review/14927 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-28[docsis->mdd] Add support for TLV 1.7Adrian Simionov1-1/+67
Change-Id: I9e67ccee06c93c25c766fae8bdd8a9890416655f Reviewed-on: https://code.wireshark.org/review/14648 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>
2016-03-20Create call_data_dissector() to call data dissector.Michael Mann2-7/+2
This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20Manually add protocol dependencies derived from find_dissector.Michael Mann1-1/+1
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-17Associate dissector tables and heuristic subdissector lists with a protocol.Michael Mann2-11/+10
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-12[docsis->mdd] Add support for TLV 1.6Adrian1-0/+20
Change-Id: I5c7529bc630ad7312011b04ce101ba3608041d35 Reviewed-on: https://code.wireshark.org/review/14435 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>
2016-02-21autotools: Use pkg-config autoconf macros for GLib/GTKJoão Valverde1-0/+4
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add dependency flags explicitly instead of using WS_CPPFLAGS. Some minor improvements and fixes for missing/unnecessary variables (no impact on our test builds). Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671 Reviewed-on: https://code.wireshark.org/review/14005 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20autotools: Move common automake code for plugins to an include fileJoão Valverde1-65/+2
Change-Id: Icac1eb17ff78ae5ae54b61820618bf3c5733bd96 Reviewed-on: https://code.wireshark.org/review/14003 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-8/+1
GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 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>
2016-01-07[docsis->INIT-RNG-REQ] Correction for INFO fieldAdrianSimionov1-1/+1
Most probably this issue was introduced as a copy paste from RNG-REQ packet when INIT-RNG-REQ packet was first created. Change-Id: I5eb0ac666c76b48d70b3383312f0598b6110cc03 Reviewed-on: https://code.wireshark.org/review/13085 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-28[docsis->bpkmattrib] Correction for TLV 15 text from 14->15AdrianSimionov1-1/+1
Change-Id: Ic1122e36c8099c1f891d3d5f81bd7fb4977d2ffd Reviewed-on: https://code.wireshark.org/review/12880 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>
2015-12-28[docsis->sync] Remove colon from INFO fieldAdrianSimionov1-1/+1
SYNC is a simple message, there is no info to follow the colon. Most probably was introduced as a copy paste from more complex packets. Change-Id: I552aad68f9484f347266838e9c319de680825dde Reviewed-on: https://code.wireshark.org/review/12879 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-11new_register_dissector -> register_dissector for remaining uses.Michael Mann45-45/+45
Mostly plugins, but also LUA and generated skinny dissector. Change-Id: Ifeb4205442f9a60875266b4e82841ff38b4fdb63 Reviewed-on: https://code.wireshark.org/review/12515 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24Developers Guide updates for plugins with CMakeGraham Bloice1-1/+1
Remove references to nmake, add references to CMake. Change-Id: Iea2d2b2fbdbab131bae823d5d6a5306630a70347 Reviewed-on: https://code.wireshark.org/review/12079 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-24[docsis->type35ucd] Add support for type 35 UCD message.AdrianSimionov3-0/+1186
* Added support for TLV 20 * Added support for TLV 21 * Added support for TLV 22 * exceptions.h not needed compared to packet-ucd.c and packet-type29ucd.c * value_string iuc_vals3 became static const compared to packet-ucd.c and packet-type29ucd.c * if(tree) was removed to allow usage of expert on TLV length * HEX crafted packet capture in Bug 11745 Bug: 11745 Change-Id: If21a44cf26941468747772cefffe29bafacb1c7c Reviewed-on: https://code.wireshark.org/review/11956 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-11-22[docsis] Remove unused exceptions.hAdrianSimionov3-10/+23
* Add static const to IUC vals * I defined the IUC values local to packet-map.c packet because it needs to be revised, not all IUC apply to all packets. It works for now but some of the IUC might be gone. Change-Id: Ib4da9ae8e29afca065153c3934336565371da9a9 Reviewed-on: https://code.wireshark.org/review/11993 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-11-20[docsis->ucd] Dissect TYPE and LENGTH values for burst TLVs also.AdrianSimionov1-60/+108
* Fixed filter for TLV Length Wrong. Change-Id: Ic2fa2a6e1faa7bad604468fbcbc431fd38a5a113 Reviewed-on: https://code.wireshark.org/review/11922 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>
2015-11-19[docsis-type29ucd] Changed TLV Length Bad filter to make more senseAdrianSimionov1-1/+1
Change-Id: Idd7dcada277a25b547b0492ca272e5fbba48361d Reviewed-on: https://code.wireshark.org/review/11938 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-11-18[docsis->type29ucd] Update to DOCSIS 2.0AdrianSimionov1-180/+380
* Added 3 missing TLVs from Type 29 UCD. * Added to dissector the TLV Type and TLV Length as I want to be able to add filters on this information as an user. * Changed some variable names as I wanted it to be unified between the Type 2 UCD (ucd.c) and this file. There are another two types of UCD messages (which I hope I will add) and keeping variables similar helps a lot. * Added the expert info. Change-Id: I808a2e710f7348eb046e0afdaa609fa28b3a18ca Reviewed-on: https://code.wireshark.org/review/11913 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-11-16[docsis->ucd] Removed S-CDMA bursts and added expertAdrianSimionov1-112/+27
UCD Type 2 is for TDMA/ATDMA, S-CDMA goes in UCD Type 29. More info: Table 8-19 from RFIv2.0-C02 for DOCSIS 2.0 Table 6-25 from MULPIv3.1-I07 for DOCSIS 3.1 The comment was removed because the Burst Descriptors below are not new anymore, are just Burst Descriptors like all the rest. Change-Id: I992a84c9bf0b999b9cec5bd44f2e584ef22ce401 Reviewed-on: https://code.wireshark.org/review/11847 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>
2015-11-15[docsis->type29ucd] Remove Type 4 Burst from Type 29 UCDAdrianSimionov1-154/+2
Most probably this was a copy/paste from packet-ucd.c Type 4 and Type 5 bursts exist only in Type 2 UCD message. Type 29, 35 and 51 UCD messages have only type 5 bursts. Change-Id: I016e6b47c28f2cf69befa495848058c038603b46 Reviewed-on: https://code.wireshark.org/review/11841 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-15[docsis->ucd] Add support for 6 new TLVsAdrianSimionov1-5/+244
Change-Id: I65a40b1765f8433c47acbc34452d5336d7df84c1 Reviewed-on: https://code.wireshark.org/review/11788 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-11-15[docsis->packet-tlv.c] Updated Confirmation Code list per MULPIv3.1-I07 ↵AdrianSimionov1-5/+62
Annex C.4 Change-Id: Id6ec9776545c79a4f8e21fd212b87ddcd9fd376f Reviewed-on: https://code.wireshark.org/review/11829 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-11-14register_dissector -> new_register_dissector for plugins.Michael Mann44-137/+181
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: Ie98e071a7cb568c13c8958de56b1fc25a4ce2ce9 Reviewed-on: https://code.wireshark.org/review/11831 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-13[docsis] Support for Queue Depth-based Request FrameAdrianSimionov1-6/+37
Change-Id: Ieeb79e4e248bdd8ee239c003e41ede0955e1cf86 Reviewed-on: https://code.wireshark.org/review/11766 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-10[docsis->packet-tlv.c] Update for modem capabilities TLV 5, subTLV 2 and ↵AdrianSimionov1-3/+11
subTLV 33 Change-Id: I63410d90e65a46aaeb534cca56e8797ebe00bf6f Reviewed-on: https://code.wireshark.org/review/11685 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-04Don't allow multiple registrations of a protocol in dissector tables.Michael Mann2-2/+2
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing. The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not. It's just ENFORCED for Decode As. Bug: 3949 Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127 Reviewed-on: https://code.wireshark.org/review/11405 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-03Remaining ADDRESS macro to address function conversionsJoão Valverde1-2/+2
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788 Reviewed-on: https://code.wireshark.org/review/11463 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-10-24More ADDRESS macro to address function conversions.Gerald Combs1-2/+2
Replace remaining calls to SET_ADDRESS, CMP_ADDRESS, ADDRESSES_EQUAL, COPY_ADDRESS, and COPY_ADDRESS_SHALLOW with their lower-case equivalents. Replace all ADD_ADDRESS_TO_HASH calls with add_address_to_hash. Change-Id: I4cff857d7a84085abe0bccd52d2605d2a468bf6f Reviewed-on: https://code.wireshark.org/review/11229 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: Michael Mann <mmann78@netscape.net>
2015-10-16CMake: Add /WXGerald Combs1-2/+2
Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off, similar to config.nmake. We haven't compiled C++ code with -Wshorten-64-to-32 for quite some time so there's no need to add -Wno-shorten-64-to-32 in ui/qt/CMakeLists.txt. Additionally, squelch ---- C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled with [ _Iter=QList<QString>::iterator , _RanIt=QList<QString>::iterator , _Diff=int , _Pr=bool (__cdecl *)(const QString &,const QString &) ] .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) ---- in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp so that we'll compile successfully. Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357 Reviewed-on: https://code.wireshark.org/review/10533 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-05Clean up some fields.Guy Harris1-19/+18
The "LEN" field is the "length of the MAC frame", in bytes; confusingly, it includes the extended header length, but not the fixed-length part of the header (including the FCS), so it's not the "length after HCS". Rename it to "docsis.len", as it's always LEN, not SID; there's a separate field for the SID. Rename the Extended Header Length field to docsis.ehdrlen, and the Number of Concatenated Frames to docsis.concat_cnt, so that different uses of the "MACPARM" part of the header are flagged differently. Update some comments while we're at it. Change-Id: Ib7c4a0cda65cef25dcaf0051b3de89758ef4c29c Reviewed-on: https://code.wireshark.org/review/9881 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-17Fix CMake warningsGraham Bloice1-3/+3
Newer versions of CMake generate warnings about the use of @variable@ references, replace @CPACK_PACKAGE_NAME@ with ${CPACK_PACKAGE_NAME} Set the policy for CMP0026 to be old to squelch warnings about the use of target LOCATION Change-Id: I424083260c51875dde80f98a23d6528c31ff0aec Reviewed-on: https://code.wireshark.org/review/7977 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-05docsis: remove tvb_length callsEvan Huus8-10/+10
Change-Id: Ib35c6436876aa7f933dcec0a97a70ccbbc823905 Reviewed-on: https://code.wireshark.org/review/7913 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-03-01Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and ↵Michael Mann1-7/+4
SET_ADDRESS calls for the same address. Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116 Reviewed-on: https://code.wireshark.org/review/7437 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-02-10Remove unneeded includes from plugins folderMartin Mathieson1-1/+0
Change-Id: Ifdad0fb786a97a6f84a64d442fcca0c20116552f Reviewed-on: https://code.wireshark.org/review/7059 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-20CMake: Set an output directory for plugins.Gerald Combs1-40/+3
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-11Fix CMake generation and use of Windows .rc filesGraham Bloice2-2/+27
CMake now generates local copies of .rc files for all the Windows components and uses the files in the build of the components. The .rc.in files that include an icon were modified to allow the icon path to be set by CMake. The path is removed for nmake builds. Updated build architecture detection, required for wireshark.manifest.in Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8 Reviewed-on: https://code.wireshark.org/review/6482 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:05:04 +0000