aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-06-24Add quotes around MAKEDIR.Ben Burwell1-1/+1
Bug: 7870 Change-Id: I6cea057c4953f5ecc0a146a24570d089e79f8352 Reviewed-on: https://code.wireshark.org/review/2620 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24Correct indentation in make-dissector-regРоман Донченко1-86/+86
The indented portions are inside an if. Change-Id: I3343a7aa7e777466ec9f40e8a02a8218bef62017 Reviewed-on: https://code.wireshark.org/review/2622 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24Ensure proto_item from subtree is initializedMichael Mann1-0/+4
bug:10223 Change-Id: I40ed92bcf436723ad3927a93181f7c732cf4690f Reviewed-on: https://code.wireshark.org/review/2623 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24MBIM: add an option to force SMS PDU decoding format if ↵Pascal Quantin1-4/+26
MBIM_DEVICE_CAPS_INFO message was not captured Change-Id: Iff78a00b463a7a33e1705c76ea49618af532f3aa Reviewed-on: https://code.wireshark.org/review/2621 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-24Fix OS X CMake build.Guy Harris3-0/+30
I have ***NO*** idea why this makes a difference, but, without this change, APPLE_CORE_FOUNDATION_LIBRARY is apparently *not* set correctly for wsutil/CMakeLists.txt, and, with this change, it is. I guess there's something magic involved here with "global" CMake variables or something crazy such as that. Change-Id: I7a0046b9c249568cd666720838104f48e854e203 Reviewed-on: https://code.wireshark.org/review/2612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24proto_tree_add_uint() takes a value, not an encoding, as an argument.Guy Harris1-1/+1
Change-Id: Ie2c0523e32b54cd13506501d98215934a8d1304e Reviewed-on: https://code.wireshark.org/review/2611 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Another capchild.lib -> libcapchild.lib.Guy Harris1-1/+1
Change-Id: I4c7750f05c831f12d0d34e2edf0d982d501d90d8 Reviewed-on: https://code.wireshark.org/review/2610 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Another file to generate in the configure script.Guy Harris1-0/+1
Change-Id: I6dafc9ab9fafd465cb2ad83e5e56e4d22b36d41b Reviewed-on: https://code.wireshark.org/review/2609 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Create capchild/doxygen.cfgJoerg Mayer1-0/+1
Change-Id: I215a9d9849c752f9e8e3216c0f6479d1ba1cfafd Reviewed-on: https://code.wireshark.org/review/2608 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24usb iso urbs on linux can't possibly contain a setup packetMartin Kaiser1-68/+55
see mon_bin_event() in the linux kernel where the setup_flag is set only for control urbs clean up various things related to this assertion: remove type_2 parameter show the iso descriptors in any case calculate the end offset correctly, the end offset is the byte after the iso data Change-Id: Iebfbe6443c224a958a1697563aa8fb853d7aa8c2 Reviewed-on: https://code.wireshark.org/review/2541 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-24Remove unneeded include <sys/stat.h>Joerg Mayer2-4/+0
Change-Id: I3be8f29d2b4fba2cb1d7ee2f29bdb27e42dd40a5 Reviewed-on: https://code.wireshark.org/review/2607 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24Add libcapchild, remove the files that are now in it.Guy Harris1-4/+2
Change-Id: I79c16bbea47e507859c904e4142fc06fa6bfc127 Reviewed-on: https://code.wireshark.org/review/2606 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Get rid of trailing blanks.Guy Harris1-18/+18
Change-Id: Idee9c273a74d37f1e754fcada0a06dcd67f306c3 Reviewed-on: https://code.wireshark.org/review/2605 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Remove unneeded sys/types.hJoerg Mayer3-17/+6
Change-Id: I03cd66cb9a2d01ea40308b338955756d08a36516 Reviewed-on: https://code.wireshark.org/review/2604 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24capture_ifinfo.c and capture_sync.c are now in libcapchild.Guy Harris1-2/+0
Change-Id: I8203a3a1a77f231c4286fd32fcc6372a2ac9db48 Reviewed-on: https://code.wireshark.org/review/2603 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Restore correct tree assignment.Michael Mann1-1/+1
Change-Id: Id06bd486114a80fb899f8dc148d48928e99e775e Reviewed-on: https://code.wireshark.org/review/2602 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24Add a doxygen.cfg.in file for the capture child library.Guy Harris1-0/+81
Change-Id: I79c83c8583b86e1d05b7f486078a0e0a4ca5dbdd Reviewed-on: https://code.wireshark.org/review/2599 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24dos2unix is now in Utils, not Base.Guy Harris1-2/+2
Change-Id: Ib430582270a2b788843785fd5aa7148ebe0f8871 Reviewed-on: https://code.wireshark.org/review/2597 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Fix name of library.Guy Harris1-1/+1
Change-Id: I463637a6218a86ed6dbd95019f33d8b999bcaaf2 Reviewed-on: https://code.wireshark.org/review/2596 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Fix some more capchild includes.Guy Harris2-2/+2
Change-Id: I6d6cd79ee9e630fe81eb6deca9691249b44bdaf4 Reviewed-on: https://code.wireshark.org/review/2595 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24For capchild headers, include <capchild/XXX.h>.Guy Harris16-23/+23
Change-Id: I780c69ee637dcd9846756a2e2d6a35baf02d826d Reviewed-on: https://code.wireshark.org/review/2594 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Include ZLIB_CFLAGS so we file zlib.h.Guy Harris1-1/+2
Change-Id: I9026f99397b1dfbc550af550d0c71597b3c87950 Reviewed-on: https://code.wireshark.org/review/2592 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Move the routines to talk to dumpcap into a static libcapchild.Guy Harris15-20/+295
This pulls some stuff out of the top-level directory, and means we don't have to build them once for every program using them. Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5 Reviewed-on: https://code.wireshark.org/review/2591 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23ssl: fix ClientKeyExchange, fix TLSv1.2 SKE for DHPeter Wu4-1393/+570
Since DTLS and TLS do not differ in handling ClientKeyExchange and ServerKeyExchange, its dissection got moved to ssl-utils. The code is based on the SSL dissector, with header field names adjusted to the DTLS ones (those got capitalized). Besides a version difference (for signatures), the header field and function names, the DTLS and SSL code are equal (this is verified). This patch refactors the dissectors for DHE_RSA and ECDHE to make use of a common function to dissect the signed_params field. All offset tracking is also removed in favor of exception handling by the proto_tree_add_item function. Occurrences of proto_tree_add_uint are also replaced by proto_tree_add_item for simplicity. After those changes, the SKE dissector for DH key exchanges is updated to handle the mandatory signature field in TLSv1.2, using the newly added function. (bug 9208) Another bug occurred after the length check removal, pre-TLS and OpenSSL's old DTLS implemenation do not include a vector length in the CKE. This is now also fixed. (bug 10222) Other minor changes: comments added/corrected, renamed keyex_dh -> keyex_dhe (includes DHE_RSA and DHE_DSS). Bug: 9208 Bug: 10222 Change-Id: I76e835d56a65c91facce46840d79c1c48ce8d5dd Reviewed-on: https://code.wireshark.org/review/2542 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23Remove some unneeded includesJoerg Mayer1-8/+0
Change-Id: I4327ead0451244daa0d876ae3a770cbbf80760c8 Reviewed-on: https://code.wireshark.org/review/2590 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Don't report the run-time version of pcap if we weren't built with pcap.Guy Harris1-0/+2
Change-Id: Ib879290b72938cc999e00b6e044f917161ba5801 Reviewed-on: https://code.wireshark.org/review/2589 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Have individual programs get libpcap and libz version info.Guy Harris7-28/+86
That way, the code that constructs the runtime version string doesn't itself have to call libpcap and libz, and could be usable in programs that don't call them. While we're at it, add "with" to the run-time version information for GnuTLS and libgcrypt, to match the compile-time version information, and add the version information from libwireshark to TShark. Change-Id: I3726a027d032270b032292da9314c1cec535dcd2 Reviewed-on: https://code.wireshark.org/review/2587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Initialize whole buffer in GPRS Mobility and Session Management dissectorPascal Quantin1-1/+1
Bug: 10216 Change-Id: I572a7a6ce0f816063f02397b667dd46c990cf73e Reviewed-on: https://code.wireshark.org/review/2583 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-23[WIP] qt: Add support for Polish languageMichal Labedzki9-0/+944
Change-Id: Ib63937e741b737f171a9b383a9cbabb55dfdd8ef Reviewed-on: https://code.wireshark.org/review/2553 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Point the user at http://www.cygwin.com/install.html for downloads.Guy Harris1-3/+4
That page gives a bit more information. Change-Id: Id0c708ede50aa9e6c6583f6957c355a630fa7e7e Reviewed-on: https://code.wireshark.org/review/2578 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Replace AF_ values by COMMON_AF_ values.Joerg Mayer1-16/+5
Remove no longer needed system includes Change-Id: Id9ffffaa7da5185041db63fa7611d348a1cc4b68 Reviewed-on: https://code.wireshark.org/review/2577 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Add all AF_ types for Windows that are in WinSock.h or WinSock2.hJoerg Mayer1-1/+27
Change-Id: Ia45f4aaea75d8cb08bb9016f9147f47db4434b06 Reviewed-on: https://code.wireshark.org/review/2576 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Revert "Optimize sip_is_known_sip_header()"Evan Huus6-788/+294
This reverts commit c9a5fbeb1da9b5566ac9ac36bfdcdee6172ef5c8. Change-Id: Ic2e5d531f719ed1107ef7bb1de12175d4601fd6d Reviewed-on: https://code.wireshark.org/review/2574 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23Revert "Cheat and try to fix the generated file manually."Evan Huus1-25/+5
This reverts commit 9079e3ad1d32c594309a52ccef5936d11a93a55d. Change-Id: I0430408e139ff8de068c970d02e36122552614fe Reviewed-on: https://code.wireshark.org/review/2575 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23Cheat and try to fix the generated file manually.AndersBroman1-5/+25
Change-Id: Iabf1821aa0ef676ac4d1d7f2983460b2e671a98a Reviewed-on: https://code.wireshark.org/review/2573 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23Optimize sip_is_known_sip_header()Jakub Zawadzki6-294/+788
Profling SIP shows that gperf generated hashing code, is 3 times faster than using GHashTable & g_str_hash/_equal() This result in about 1% improve of whole dissection (sip traffic with filter). Change-Id: Id6bf64bacd872e2d1c30a1b6356db444b25ba326 Reviewed-on: https://code.wireshark.org/review/2116 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23Fix a typo.AndersBroman1-1/+1
Change-Id: I6874a6f4a340c2b8e82d1ca5333cbeb31ff27f2d Reviewed-on: https://code.wireshark.org/review/2570 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23Add col_append_lstr(), speedup column generation for TCP.Jakub Zawadzki3-5/+63
When dissecting with columns TCP dissector spends around 1/4 time in col_append_fstr(), add col_append_lstr() and do formatting by ourselves. Change-Id: If90bc26242761884b4991e8db0db62c8f9e32690 Reviewed-on: https://code.wireshark.org/review/2527 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-22Get rid of set-but-not-used variable.Guy Harris1-2/+1
Change-Id: Ic0f2c79b4bd9fc737bf33ef64512f4142d74de6b Reviewed-on: https://code.wireshark.org/review/2568 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Get rid of some unused variables.Guy Harris5-7/+2
Change-Id: I2a806af639e5f0519ba93b0048ec7a4624fa33fc Reviewed-on: https://code.wireshark.org/review/2567 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Make dissect_lltd() a new-style dissector and register it as such.Guy Harris1-14/+14
Presumably that was the intent. Change-Id: Icf8529a23a9a36e7f12e446d67f3867771b221d8 Reviewed-on: https://code.wireshark.org/review/2566 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22convert to proto_tree_add_subtree[_format] for ASN.1 dissectorsMichael Mann57-954/+644
Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22LLTD dissectorMichael Mann3-0/+993
bug: 6071 Change-Id: If7b544a762df10ffc13aeaf8886cf74a1757c37c Reviewed-on: https://code.wireshark.org/review/2512 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22convert to proto_tree_add_subtree[_format]Michael Mann34-956/+604
Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df Reviewed-on: https://code.wireshark.org/review/2560 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22Initialize whole buffer in GTP dissectorEvan Huus1-1/+1
Bug:10216 Change-Id: Ib7de616d50937eb43b16daa4067ee0de9edc8ec7 Reviewed-on: https://code.wireshark.org/review/2562 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22Fix leak in nbap init functionEvan Huus2-4/+4
Change-Id: I9a70d4da936ad5fd847fc1ba0b29b7220030b977 Reviewed-on: https://code.wireshark.org/review/2558 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22Fix a leak in the SCTP dissectorEvan Huus1-29/+44
use wmem instead of glib Change-Id: I326d2dd71b13ae45b4434c86fdacf9f3cec6c069 Reviewed-on: https://code.wireshark.org/review/2557 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22Replace C++-style comments with "#if 0"/"#endif".Guy Harris1-2/+6
checkapi complains about C++-style comments, as some C compilers (IBM XLC, for one) reject them by default, and gcc -pedantic might do so as well. Change-Id: I1719da03d2fed0fe97574e200dd79434b3d760cd Reviewed-on: https://code.wireshark.org/review/2556 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Point to the Cygwin mirrors page.Guy Harris1-6/+12
If you choose to install from the Intertubes, you probably want to choose a nearby mirror site, rather than downloading from halfway across the world; the list of download sites in setup*.exe's UI gives no indication of where the mirror sites are, so you could end up picking one to which you have a slow Internet path. Tell the user about the list of mirror sites on the Cygwin Web site, as that list *does* give geographical locations. Change-Id: Idf035d288885ee45db7b3627af969e64270487a1 Reviewed-on: https://code.wireshark.org/review/2555 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-2264-bit Cygwin's dependencies for Bison are wrong; it doesn't require m4.Guy Harris1-0/+7
Change-Id: Id6a6c0a7c09ed1d9eb1e1d522930e3f94e7b20d6 Reviewed-on: https://code.wireshark.org/review/2554 Reviewed-by: Guy Harris <guy@alum.mit.edu>