aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-10-12Add editor modelines; Adjust whitespace as needed.Bill Meier54-1282/+1978
Change-Id: I4da7b335d905dbca10bbce03aa88e1cdeeb1f8ad Reviewed-on: https://code.wireshark.org/review/4626 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-12DCERPC: Remove DIRTY_PIDL_DISSECTOR_SRCAlexis La Goutte3-16/+4
Now mapi and drsuapi build without warning ! Change-Id: Iae19af2fd06fd998a13696ba2adf6cd12d311f58 Reviewed-on: https://code.wireshark.org/review/4619 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>
2014-10-12PIDL (DCERPC misc): enhance dissectorAlexis La Goutte4-159/+17
* Fix -Wunused-function (Set NOEMIT winreg_Data and remove unused function) * Remove dissector DCERPC misc from DIRTY list Change-Id: If59b14f8db33354a2d5248e8bc256cadee3ea4bf Reviewed-on: https://code.wireshark.org/review/4345 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12ISUP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+0
Change-Id: I17163b18348919d19d3d336ccf9c1310d473a05d Reviewed-on: https://code.wireshark.org/review/4624 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12LMP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: Ie651e8a7d0309330504a77664bb2eac75c00d968 Reviewed-on: https://code.wireshark.org/review/4623 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12Add back get_uinteger for boolean_type.Stig Bjørlykke1-1/+1
This was removed in ed0b19b94bf07056b5e0cfe64d4d05c3ebae801a Change-Id: I548ca955eda6e0b6991a0f6731cbbb3bf82e0e2b Reviewed-on: https://code.wireshark.org/review/4620 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-12[Automatic manuf, services and enterprise-numbers update for 2014-10-12]Gerald Combs4-17/+212
Change-Id: Icc98f156e55bc8523490bb8a8d712ca80076649e Reviewed-on: https://code.wireshark.org/review/4615 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-12E-LMI: add what seems to be a missing break (Coverity CID 1245648)Pascal Quantin1-0/+1
Change-Id: I6b35ea96fba142bdabf17d3fc3f9db23dc390d31 Reviewed-on: https://code.wireshark.org/review/4613 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-12Make boolean bitmask type 64-bit wideDaniel Mack12-62/+109
There are protocols out there that have 64-bit wide bit mask fields, so make the internal representation and bitfield decoders 64-bit aware. For this, the ws_ctz() fallback and bits_count_ones() have to be tweaked slightly. Change-Id: I19237b954a69c9e6c55864f281993c1e8731a233 Reviewed-on: https://code.wireshark.org/review/4158 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: Michael Mann <mmann78@netscape.net>
2014-10-12Add support for NTTIME_hyper and NTTIME_1secMatthieu Patou5-9/+39
It's hyper with 8 bytes alignment it can have 1/100000 sec resolution or 1sec resolution Bug: 10541 Change-Id: Iecc4c6d1bd1695a4c02db72e1617134254810cd9 Reviewed-on: https://code.wireshark.org/review/4606 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-11Use the wtap_read_bytes{_or_eof}() routines.Guy Harris1-77/+57
Change-Id: I4f707bc714b2643d0f6c568f3367e712ee635d8e Reviewed-on: https://code.wireshark.org/review/4612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-11Use variable name 'len' when handling length.Stig Bjørlykke1-17/+17
Change-Id: Icb1d81316d1ead3455c68ad55e52b8120b7dccf9 Reviewed-on: https://code.wireshark.org/review/4609 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-11Use the count-of-records fields to figure out how many records to read.Guy Harris1-98/+134
Fetch the count of records from one of the locations where it appears to be, and, currently, require that it be equal to the count at the other location where it appears to be; if they ever differ, we'll need the file in order to reverse-engineer some more. Fix the way we *write* .rf5 files - it turns out that we were 1) not writing the full file size; 2) not writing the packet count in the right location. Detect files written by the old code, and get the packet count from the right location for those files. Change-Id: I7ce83afbc9dbbd300c81c96ef8f7785a0aeefa7a Reviewed-on: https://code.wireshark.org/review/4608 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-11Add dissection of MIDL_NDRHEADERBLOB used in drsuapi and some other protocolsMatthieu Patou2-0/+66
Bug: 10540 Change-Id: If4a8603a7cb62894cc46094056dd5313039884b2 Reviewed-on: https://code.wireshark.org/review/4604 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-11CMake: Don't add Custom.make to the bundle.Gerald Combs1-0/+1
Change-Id: I08f2701e4450f34aa9d840cc5f507e9348e115bd Reviewed-on: https://code.wireshark.org/review/4605 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10Dissection of sid28 needs null check.Michael Mann1-2/+2
Bug: 10542 Change-Id: I8fcfbbd96833af2c57754a4c8f96cf702972e22a Reviewed-on: https://code.wireshark.org/review/4603 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10Update READMEs to reflect recent CMake environment changes.Gerald Combs3-18/+33
Change-Id: Idbf879f20448eea0b69e793271439dec877832e9 Reviewed-on: https://code.wireshark.org/review/4602 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10Use names more like the other names in open_info.Guy Harris1-62/+91
For open_info, use names based on the names in other lists. Also, in comments, indicate what the three count 'em three tables are used for, and clean up the type/subtype table. Change-Id: I7a763119e790d5970f87dff05284f465eebfb7e7 Reviewed-on: https://code.wireshark.org/review/4599 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10DNP3 Protocol Bugfix / Enhancementcbontje1-14/+17
- Fix for Single-bit Objects offset-pointer - Enhancement for Obj 12 Var 2 (Pattern Control Block) and Var 3 (Pattern Mask) Decoding Bug: 10558 Change-Id: I8d3f6cee4acbab09d0b93dab6b868cddd842b682 Reviewed-on: https://code.wireshark.org/review/4597 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10[ELMI] Add missing information elements, add support for sub-information ↵Anish Bhatt1-2/+307
elements. Bug 10532 Updated with Bandwidth Profile support Change-Id: I0f31eb6c78a5e34bcb1c286a9a10730b3b63481c Reviewed-on: https://code.wireshark.org/review/4571 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>
2014-10-10Remove (almost all) proto_tree_add_text calls in ISUP dissector.Michael Mann6-476/+522
Change-Id: I57a01eacaa02e45c23bb4827ae982c897fb308ee Reviewed-on: https://code.wireshark.org/review/4592 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-10NCP: switch to wmem memory and ensure that all fields are initializedPascal Quantin1-7/+7
Change-Id: Ia17e189baed05d8020654e6702a51f51bd384f26 Reviewed-on: https://code.wireshark.org/review/4589 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10Version 3 has only absolute timestamps; don't set nsg_creltime.Guy Harris1-5/+7
Version 3's time stamps are all absolute, so we can directly use the value in the file; we don't need to keep track of the time in the private data structure, and some compilers issue warnings due to setting it and then not using the value to which we set it. Change some names and indentation to match other file versions while we're at it. Change-Id: I97698d933b87a8ad58d9e88ceedd75004797df69 Reviewed-on: https://code.wireshark.org/review/4596 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10GSM MAP: fix detection of SMS direction when application context version is < 3Pascal Quantin3-18/+16
Bug: 10547 Change-Id: I4708fd9977e635c66ef1350ce5098520e4c2ce1e Reviewed-on: https://code.wireshark.org/review/4579 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10CMake: Bundle the "share" directory files and directories.Gerald Combs1-29/+75
Work around a CMake bug using file globbing. Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f Reviewed-on: https://code.wireshark.org/review/4595 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10Add editor modelines; Adjust whitespace as needed.Bill Meier43-516/+1064
Change-Id: I3dc57f4c2ca57585103e3b71503ac4c332903e50 Reviewed-on: https://code.wireshark.org/review/4594 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-10GTPv2: Presence-Reporting-Area-Elements-List do full dissection of ECGIAndersBroman1-47/+72
and TAI. Change-Id: I95d9ebf1d6f4eabe30b557fdc937d56006f8b123 Reviewed-on: https://code.wireshark.org/review/4593 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-10wtap_file_read_till_separator() can return values other than 1 on success.Guy Harris1-1/+1
It returns the length of the string it read, so only treat 0 and -1 as errors. (0 either means "EOF" or "string is zero length", but this is only in the code that reads numbers, and a number needs at least 1 digit, so both EOF and "zero-length string" mean "this isn't a valid Peek tagged file".) Change-Id: Ib83eb2f1e53d912a2138be01480e2b464cf936db Reviewed-on: https://code.wireshark.org/review/4591 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10Fix some more int-to-enum conversion complaint.Guy Harris1-4/+10
While we're at it, log a message if a Lua file format module lacks a read or a seek-read routine, rather than completely silently ignoring that module if it claims a file. Change-Id: I9778f7835922439e2d3708614689280ef7b61d33 Reviewed-on: https://code.wireshark.org/review/4590 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10CMake: Bundle our libraries.Gerald Combs3-1/+18
Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa Reviewed-on: https://code.wireshark.org/review/4588 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10Add back a value_string conversion lost in g58cc452.Gerald Combs1-1/+1
I don't have a capture to check but this appears to be correct. Change-Id: I93405d1e3ec4aac3761d06e257db3ec2e32b2fc2 Reviewed-on: https://code.wireshark.org/review/4587 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10Oops, missed one.Guy Harris1-1/+1
Change-Id: I0847846d50d6979f0f50a00438a834c7c7c2acc0 Reviewed-on: https://code.wireshark.org/review/4586 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10Don't treat int return values as valid wtap_open_return_val values.Guy Harris1-8/+10
They happen to be, at least now, but that's not valid in C++, and it's probably unwise in any case. Change-Id: Ifd49920cfaa376e5e7788329ee83db3956a7cdff Reviewed-on: https://code.wireshark.org/review/4585 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10Cast size_t to to gulong as the length argument to g_snprintf().Guy Harris1-3/+3
Sadly, the GTK+ folks decided not to use size_t for the size argument, so it doesn't do the right thing on LLP64 platforms such as Windows. Change-Id: I2aa9096215c488b48f1cf68d2a285a48abb6f07f Reviewed-on: https://code.wireshark.org/review/4584 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10Fix declared types of open routines.Guy Harris48-49/+49
Change-Id: Ifa38dfec31ec5b03f00d6e077902184a9ae2ee0e Reviewed-on: https://code.wireshark.org/review/4583 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-09CMake: Bundle our plugins.Gerald Combs14-42/+168
plugins/*/CMakeLists.txt has a lot of repitition. We might want to create a module or include file to simplify things. Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852 Reviewed-on: https://code.wireshark.org/review/4582 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09Use an enum for the open-routine return value, as per Evan Huus's suggestion.Guy Harris52-529/+521
Clean up some things we ran across while making those changes. Change-Id: Ic0d8943d36e6e120d7af0a6148fad98015d1e83e Reviewed-on: https://code.wireshark.org/review/4581 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-09Kerberos: fix decryption of DCERPC with Kerberos encryptionPascal Quantin2-15/+17
Bug: 10538 Change-Id: I4e6feaf218da7f977f6c63d8bc204635f387672c Reviewed-on: https://code.wireshark.org/review/4566 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09Kerberos: remove debug logs when loading a keytabPascal Quantin2-13/+3
Bug: 10543 Change-Id: I9ea20cd4d046cc072c21fd3f87f6d6be40b08b27 Reviewed-on: https://code.wireshark.org/review/4567 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09GTPv2: fix an infinite loopPascal Quantin1-1/+1
Bug: 10548 Change-Id: I916e15cecf0ec9dc607362b902709567d69243df Reviewed-on: https://code.wireshark.org/review/4578 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09CMake: Build an application bundle (Wireshark.app) on OS X.Gerald Combs3-39/+85
Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09Eliminate proto_tree_add_text from packet-lmp.cMichael Mann1-301/+251
Also "refactored" a few fields into proto_tree_add_bitmask calls. Change-Id: I3a222b38e1992943d6ee4bd300026bc28c5bbb78 Reviewed-on: https://code.wireshark.org/review/4575 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-09Add Dissection of MA packets over UDPSean O. Stalley1-3/+14
Change-Id: Ic6e1cbb623f3e84b73ce7e4608f291baadc77bf6 Reviewed-on: https://code.wireshark.org/review/4576 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09Eliminate proto_tree_add_text from packet-nbns.cMichael Mann3-238/+261
Some other cleanup while in the neighborhood. Not sure the all the proto_tree_add_expert calls are needed after each field (having implicit bounds error thrown should be sufficient), but left them in there. Change-Id: I3ca75ec9f51ccbed6b6ca792789daa8e7cebf34a Reviewed-on: https://code.wireshark.org/review/4574 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-09[BACnet][trivial] change strings as per Bug 9640Anish Bhatt1-2/+2
Change-Id: I542b5a96bcff6c779359b80ddce513524852272c Reviewed-on: https://code.wireshark.org/review/4572 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-09Lua: Improved TreeItem:add documentation.Stig Bjørlykke1-9/+13
The protofield is optional and can not be replaced with 'nil' as with the other fields for this function. Change-Id: I2b1dd7f290264394b400cea2110b65b657c71456 Reviewed-on: https://code.wireshark.org/review/4549 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-09Make the OPEN_INFO_ values members of an enum.Guy Harris1-8/+6
Change-Id: I93dbd14f81492764bf5854ee40eebcd1e04f3e01 Reviewed-on: https://code.wireshark.org/review/4570 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08Be less lazy about disabling a Visual C++ warning.Gerald Combs1-0/+4
As Graham pointed out, "#pragma warning(disable..." affects the rest of the file. Add a push+pop so that we only operate on the line in question. Ideally we'd be able to use "suppress" but an "#endif" prevents that. Change-Id: Ia01d6c245879f1c845dc68c18caea2cbceb273ef Reviewed-on: https://code.wireshark.org/review/4569 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08Use WTAP_ERR_DECOMPRESS for decompression errors.Guy Harris1-4/+4
Distringuish "the compression data has a problem" from "the capture file (not compressed, or after decompression) data has a problem", with WTAP_ERR_DECOMPRESS used for the former (whether it's the gzipping decoded by our gunzip code or the Sniffer compression) and WTAP_ERR_BAD_FILE used for the latter. Change-Id: I8e6bff7edb480deba00c52a9e5afff607492e085 Reviewed-on: https://code.wireshark.org/review/4568 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08Fix --extcap-dlts call in extcap_example.py.Tomasz Moń1-1/+1
There is regular expression that extracts only the number from --extcap-interface argument and only that number (as string) is being passed to extcap_dlts(). Change-Id: I5159f9405a766c1edff792213b2aef72b9a29ba4 Reviewed-on: https://code.wireshark.org/review/4550 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 13:46:04 +0000