summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-10-08Only set err_info on an error, and use g_strdup_printf().Guy Harris1-6/+16
If the goal is to look like a libwiretap routine, we only need to set *err_info on an error, and we should set it to a g_mallocated string (or NULL). Handle WTAP_ERR_UNSUPPORTED while we're at it - we never return it, but we never return WTAP_ERR_UNSUPPORTED_ENCAP, either, but we handle it. Change-Id: I9d93c43278d22f0fa77ec1cf7f29b476c8dd0dd0 Reviewed-on: https://code.wireshark.org/review/4565 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08No need to set *err_info if there's no error.Guy Harris1-2/+0
Change-Id: I98ae9ec50e079d48b6247bb208528b7c5ad16027 Reviewed-on: https://code.wireshark.org/review/4564 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08Robopatch and remove #MISSING comments.Guy Harris2-4/+3
Change-Id: I611882a8b268046665488381be64aca89cdf3194 Reviewed-on: https://code.wireshark.org/review/4563 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08Use WTAP_ERR_BAD_FILE for malformed compressed data in DOS Sniffer files.Guy Harris3-29/+23
Get rid of WTAP_ERR_UNC_TRUNCATED and WTAP_ERR_UNC_BAD_OFFSET, and lump them under WTAP_ERR_BAD_FILE, with an error string; they're just another form of "this file isn't a valid file of the type in question". Change-Id: I0e9ac7c2ee66c8d789234a301c1dc2173aef1312 Reviewed-on: https://code.wireshark.org/review/4562 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08Make sure we don't dereference a null pointer.Gerald Combs2-8/+23
Change-Id: I033c60cdc5b78f4db31903277c659661e0dc5123 Reviewed-on: https://code.wireshark.org/review/4561 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08Fix a comment.Guy Harris1-1/+1
Change-Id: I0ebaa1b99bc9c7e51be10f3f8825280782f26190 Reviewed-on: https://code.wireshark.org/review/4560 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08ANSI 683: Removed unused assignments.Stig Bjørlykke1-19/+0
Change-Id: I952ce5329f69fa947e39b020a70a06f2bbf8a014 Reviewed-on: https://code.wireshark.org/review/4558 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08"long" does not necessary mean "64-bit". Use G_GINT64_MODIFIER.Guy Harris1-1/+1
Change-Id: I2521bf368ea30ac691af50c760a63b81efedeeae Reviewed-on: https://code.wireshark.org/review/4559 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08Try to speed up ping-dependent capture tests.Gerald Combs1-9/+14
Ping four times a second for ~60 seconds. Save the subprocess PID so that we can kill it when we're done with each test instead of waiting for it to finish. Change-Id: I64f889c700e8a6fa1bc1c3916ef045341ef59cc6 Reviewed-on: https://code.wireshark.org/review/4557 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08Set err_info to null for errors that don't have an informaton string.Guy Harris2-2/+3
Change-Id: Ibbcf3496ebfb20c53b953db84b2ddb69083dcb86 Reviewed-on: https://code.wireshark.org/review/4556 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08Remove redundant and erroneous debug log message.Tomasz Moń1-2/+0
Change-Id: I91d6131b3b4b7ef670f0d188ebd6da3947c49bdc Reviewed-on: https://code.wireshark.org/review/4548 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-08DCERPC (DRSUAPI) Fix typo found on idl fileAlexis La Goutte2-9/+1
Change-Id: I79ad05122ae48de671c9c919bab6b3e8d94a50de Reviewed-on: https://code.wireshark.org/review/4554 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08SIP Enhance dissecion of PATHJohan Wahl1-1/+51
Change-Id: I0508a886fb664f36b51464a9dfd6936092e197f8 Reviewed-on: https://code.wireshark.org/review/4543 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-08elmi: Fix bug in message type codingAnish Bhatt1-1/+1
Bug: 10531 Change-Id: Ide6237afb71c79243347dedd1c744b3e97ff612e Reviewed-on: https://code.wireshark.org/review/4542 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-08[tools] Add missing GPL license to generate-bacnet-vendors.pyAnish Bhatt1-0/+18
Change-Id: I15336a5f759fea6b1fb4f6c5a05807d797a7f5aa Reviewed-on: https://code.wireshark.org/review/4544 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08Qt capture interfaces dialogue string tweaksEvan Huus1-2/+2
To clarify that capturing always uses a file, the checkbox only controls whether that file is temporary or persisted. Change-Id: I939e1fdf488f53245166612193c60a366f63a18b Reviewed-on: https://code.wireshark.org/review/4537 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08Remove #pragma warning (MSVC) for PIDL generate dissectorAlexis La Goutte19-129/+3
Change-Id: I1e4c7944a2cd877f5c707703dcff44fe9f955a2c Reviewed-on: https://code.wireshark.org/review/4479 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08Fix extcap boolean flag handling.Tomasz Moń1-3/+17
Change-Id: I4c6b32805d4138ef0912fbf1b129a5e97776ab9c Reviewed-on: https://code.wireshark.org/review/4535 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-08DCERPC DFS: Remove from Dirty PIDL listAlexis La Goutte2-3/+3
Change-Id: I87bd196d1c4ba14d9af6d174754b37d2b4d772c8 Reviewed-on: https://code.wireshark.org/review/4527 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>
2014-10-08[bacnet] update vendors list, fix whitespace issues, all generated via scriptAnish Bhatt1-23/+24
Change-Id: Ieb4b169dfcf5e89b7b2a2cb90b6572a3d973d744 Reviewed-on: https://code.wireshark.org/review/4519 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-08Add support for LISP over TCP control messagesLorand Jakab4-0/+418
draft-kouvelas-lisp-rloc-membership-00 specifies 9 new LISP control message types using TCP transport instead of UDP (which is used by all existing messages). These new messages are related to each other and are used to exchange RLOC membership information between a tunnel router and a map server. Bug: 10494 Change-Id: I129f0d6344693092bd5d0efb06b025e89fd26bf2 Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/4253 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-07Provide an error message for WTAP_ERR_CANT_WRITE.Guy Harris1-1/+1
Change-Id: Iffc762ba60ac523148310ea2a432d4953bc64a94 Reviewed-on: https://code.wireshark.org/review/4541 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07No need for WTAP_ERR_CANT_READ.Guy Harris30-147/+61
Unlike the standard I/O routines, the code we introduced that supports fast random seeking on gzipped files will always supply some specific error code for read errors, so we don't need WTAP_ERR_CANT_READ. Add WTAP_ERR_CANT_WRITE for writing, as we're still using the standard I/O routines for that. Set errno to WTAP_ERR_CANT_WRITE before calling fwrite() in wtap_dump_file_write(), so that it's used if fwrite() fails without setting errno. Change-Id: I6bf066a6838284a532737aa65fd0c9bb3639ad63 Reviewed-on: https://code.wireshark.org/review/4540 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07Replace another file_read() call with wtap_read_bytes().Guy Harris1-8/+4
Change-Id: I7b5e82c3a2fc4b4c16bf466508546558c584c150 Reviewed-on: https://code.wireshark.org/review/4539 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07Close some memory leaks for bad K12 RF5 files.Guy Harris1-0/+13
Change-Id: Ic4272a5637463fdb4d23f80d81341a0e6ea33de3 Reviewed-on: https://code.wireshark.org/review/4538 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07[tools] add script to automatically generate bacnet vendorsAnish Bhatt1-0/+36
Requires beautifulsoup4 for parsing, translitcodec for converting accents/diaeresis etc to regular text Change-Id: I4d400f15916ee3ab07fa14b09fca12beac2010f3 Reviewed-on: https://code.wireshark.org/review/4518 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07ANSI683: Fix mobile country code baseEvan Huus1-1/+1
Fixes error: Field 'Mobile country code (MCC_T)' (ansi_683.mcc_t) is an integral value (FT_UINT16) but is being displayed as BASE_NONE Change-Id: I2d87075b0c982bcaf0e855653d49eb891e83b70d Reviewed-on: https://code.wireshark.org/review/4536 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07GSM (bssmap): Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-2/+0
by Clang Change-Id: I9fadd0edc26e5525cfdd15fc62062f19fef16d10 Reviewed-on: https://code.wireshark.org/review/4526 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07Overhaul the filterability of packet-ansi_683.cMichael Mann5-2307/+1068
It's (ab)use of proto_tree_add_text was "hidden" behind a single FT_NONE hf item, that effectively had the same behavior of proto_tree_add_text, but wouldn't show up in checkAPIs.pl. Replaced the (over 200+) proto_tree_add_none_format calls with proto_tree_add_text and then ran convert_proto_tree_add_text.pl on the dissector. That started the cleanup, and I did more while in the neighborhood. Change-Id: I89e09cf23e8998bcc9197f9a4043e1fc2850fc8c Reviewed-on: https://code.wireshark.org/review/4521 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-07[iSCSI] Fix incorrect heuristic.Anish Bhatt1-3/+5
The only valid check for Expected Data Transfer Length is : R and W MUST NOT both be 0 when the Expected Data Transfer Length and/or Bidirectional Read Expected Data Transfer Length are not 0 Bug #10469 Change-Id: I5503a5ad524c4e237b143696fc8eda895bcb9172 Reviewed-on: https://code.wireshark.org/review/4514 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-07asn2wrs: Added support for #.SYNTAX_NEWStig Bjørlykke1-4/+12
This allows syntaxes to be registered as "new" dissectors. Change-Id: Ibb76688d9d3cbf47222610956aa627fa374bcbce Reviewed-on: https://code.wireshark.org/review/4524 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07ASN1: Added support for using #.REGISTER_NEWStig Bjørlykke5-50/+92
This will register BER PDU-dissectors as "new". Return number of bytes dissected from dissector_try_* functions. Return number of bytes dissected in DissectorTable:try() This will make it possible to get dissected length when using dissector_try_*() and dissected ASN.1 length in Lua when using DissectorTable:try() (as we already have for Dissector:call). Change-Id: Iee17a68dc214fa0fb50b25fc927026ad7c1cbce4 Reviewed-on: https://code.wireshark.org/review/4531 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07Add proper decoding for type field in OBEX headersMichał Orynicz1-1/+12
Change type field type from byte sequence to string. Change-Id: I3e2ac6fbb5ce7187ba1183d63236e9a2bcd824ee Reviewed-on: https://code.wireshark.org/review/4417 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-07Make the code a bit more like the pre-new-APIs code.Guy Harris8-108/+50
Change-Id: I40282d8825936d24480c9b77e2e7d9374b1de6b5 Reviewed-on: https://code.wireshark.org/review/4534 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-071.99.0 → 1.99.1.Gerald Combs5-9/+9
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6 Reviewed-on: https://code.wireshark.org/review/4532 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07Revert "ASN1: Added support for using #.REGISTER_NEW"Gerald Combs5-92/+50
This temporarily reverts commit acc09c2aa248d892ee6b894b43c79cb060131b11. Change-Id: I7a55c8c2da3f65e914b90648ee92c84efd57f1a0 Reviewed-on: https://code.wireshark.org/review/4525 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-12 00:37:42 +0000