aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-04-15Set the extcap working directory on Windows.Gerald Combs7-38/+48
On Windows, prepend the main program directory to %Path% when spawning extcap processes. This lets us place androiddump in extcap while allowing it to locate its DLLs. Change-Id: I406c47ce71323266d5f14fb596931398464e452d Reviewed-on: https://code.wireshark.org/review/8057 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: Gerald Combs <gerald@wireshark.org>
2015-04-15Replcae deprecated API tvb_length with tvb_reported_length or tvb_capturedAndersBroman17-93/+93
length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15Replcae deprecated API tvb_length with tvb_reported_length or tvb_capturedAndersBroman7-33/+33
length. Change-Id: Ia1235c49b28320b5651e284115639820f81cb747 Reviewed-on: https://code.wireshark.org/review/8074 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15ZigBee: fix IS_ANALOG_SUBTYPE macroJulien STAUB1-1/+1
Modify IS_ANALOG_SUBTYPE macro according to 07-5123-04 zigbee cluster library specification. It wasn't filtering out the 8-bit enums ans 16 bit enum (digital types). Bug: 11120 Change-Id: I74f1c0e6671b33fa69e5045cfc283ada3a39d380 Reviewed-on: https://code.wireshark.org/review/8069 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-14CMake: Fix an NSIS dependency.Gerald Combs1-1/+1
Change-Id: I514243727da1fed52c78a4cbd8c82c68bf724c8a Reviewed-on: https://code.wireshark.org/review/8070 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14CMake: Initial PortableApps targets.Gerald Combs7-17/+169
Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14Start moving win-setup to PowerShell.Gerald Combs5-20/+323
Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14openSAFETY: Replace deprecated APIRoland Knall1-3/+3
Replace deprecated API functions tvb_length and tvb_length_remaining Change-Id: Ibf4c7b12a1a6ea3b1a750dce7faf2f4933b4c470 Reviewed-on: https://code.wireshark.org/review/8063 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-14Bluetooth: OBEX: Update to PBAP 1.2, GOEP 2.1, CTN 1.0 and GPP 1.0Michal Labedzki1-193/+1174
Add a lot of fields. Change-Id: If12a30b1840c0dbe934bc6af264a068935912832 Reviewed-on: https://code.wireshark.org/review/8043 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Oops, have to actually comment out the definition, not just the declaration.Guy Harris1-0/+2
Change-Id: Iea588a07f4c559f4455d85d6bf99f9a3b631caed Reviewed-on: https://code.wireshark.org/review/8066 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14Cast away a (non-relevant) warning.Guy Harris1-1/+1
Change-Id: Iee5029dc685561491660a8f711e58a652893bc90 Reviewed-on: https://code.wireshark.org/review/8065 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14That made some *other* routines unused; "#if 0" them out.Guy Harris1-0/+6
Change-Id: I932765f724b6f38afafa8cba7bea6ee210c6b2e5 Reviewed-on: https://code.wireshark.org/review/8064 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14"#if 0" out some unused variables and functions.Guy Harris1-0/+42
This should be checked - why are they being generated by idl2wrs? Change-Id: I35956f95b3679fc06e2c63ddc1313733813e5f3f Reviewed-on: https://code.wireshark.org/review/8062 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14Get rid of extra variable.Guy Harris1-10/+4
That assigns all string members with a g_strdup-family function, making the assignment of the name similar to the other assignments. Change-Id: I5f2a4afbad5173b8428ba1bbe435f851e8cc1a19 Reviewed-on: https://code.wireshark.org/review/8061 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14Change deprecated API tvb_length -> tvb_reported_lengthAndersBroman17-57/+57
Change-Id: I14577dccaed5aa5ed85e94b6810a94b4c8b2e437 Reviewed-on: https://code.wireshark.org/review/8059 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-14GIOP: Reassembly of fragmentsgal2-6/+188
Support for the reassembly of GIOP Fragment message types. A new bool preference (giop.reassemble) is introduced to control reassembly and it is enabled by default. Change-Id: I10ca51f745710dca3b57a03cc89126f7b1dc06b4 Reviewed-on: https://code.wireshark.org/review/7966 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-04-14Geospatial and Imagery Access Service (GIAS) Dissectorgal9-0/+11039
A Corba (GIOP) based protocol for the exchange of Intelligence, Surveillance and Reconnaissance (ISR) products. Defined in STANAG 4559/AEDP-5 "NATO Standard ISR Library Interface (NSILI)" See http://www.nato.int/structur/ac/224/standard/4559/4559.htm for more information. The dissector is generated using idl2wrs using the gias.idl, with some manual corrections, as noted in README.gias. Patch Set 4: Initialise uninitialised variables and no longer mark them as unused. Change-Id: Ieae93a135b30078f2d34e66f8c7b2e476438224e Reviewed-on: https://code.wireshark.org/review/7965 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-04-14Bluetooth: SDP: Update to MAP 1.2 and PBAP 1.2Michal Labedzki1-14/+294
There are some new attributes comparing MAP 1.1 to 1.2 and PBAP 1.1 to 1.2. Change-Id: I4be2691e99d176c22676a00549aa550ea07e77e3 Reviewed-on: https://code.wireshark.org/review/8042 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Bluetooth: OBEX: Fix reassemble at transport layerMichal Labedzki1-54/+79
Transport layer is RFCOMM. OBEX packet may be fragmented over RFCOMM. If so then (Opcode + Final flag + ) Packet Length determines packet length, but whole OBEX packet will be framented over parts/packet that first packet has Packet Length and next packets are sequential parts of whole packet (no header, etc.) Reassemble on this level is simple concatenation of all packet up to Packet Length. Let threat packet shorted than 3 bytes as bad packet. There is still no reasssemble on OBEX level (aka Final flag), so content send over OBEX (vCards, files, XMLs) is still not reassembled. Change-Id: I11882eb07480b34d274a4ca6e504e609dcf982c0 Reviewed-on: https://code.wireshark.org/review/8041 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Bluetooth: OBEX: Add request/response trackingMichal Labedzki1-61/+78
Change-Id: I691d8a89c222208afb3b1bcd924a2331ea58af5b Reviewed-on: https://code.wireshark.org/review/8040 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Bluetooth: GATT/L2CAP: Add support for 6LoWPANMichal Labedzki1-3/+8
6LoWPAN is used by GATT level profile called IPSP. Change-Id: Iff2e1a8d531072d9bba03e7d84b56db59110cb35 Reviewed-on: https://code.wireshark.org/review/8045 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Bluetooth: HFP: Update to HFP 1.7Michal Labedzki1-4/+127
Update to latest Bluetooth specification: 1.7 (previously 1.6) Add +BIND and +BIEV commands, also update +BRSF to support new features. There is still some things to implement, but need more work to do it, like request-response tracking. Change-Id: I195380b9588f3a3e5b07628fbe9d5c66ed46fbfd Reviewed-on: https://code.wireshark.org/review/8046 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Just use g_strdup_printf() to create a g_mallocated formatted string.Guy Harris1-13/+5
And, as it's g_mallocated, we don't need to g_mallocate it again with g_strdup(). The same is true of strings allocated with g_strconcat(). Don't make an extra copy, and don't free up the original. Change-Id: Iea470a4424a811934f7fb8b0ba8dd110d337e420 Reviewed-on: https://code.wireshark.org/review/8058 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14UI: Implementing menus for pluginsRoland Knall9-1/+730
Plugins may utilize the tap interface to provide special tools or analysis options, not otherwise available in Wireshark, or perhaps not allowed to be distributed freely. Up until now, those tools either had to start automatically, or could not be started at all, or had to be started separately. It should be possible, that those tools may be started using a menu entry directly from Wireshark. This interface tries to achieve exactly that. This interface uses a clean interface, which can be implemented in any plugin or dissector. Documentation for this has been added to README.plugins. Separators are only supported for now in the Qt interface, but URLs can now be added as a simple item, and the UI will use the same methods used for other URL calls to open them. Change-Id: I170107dafb66f6badaa864d05a9091e5cbbf52c2 Reviewed-on: https://code.wireshark.org/review/7865 Reviewed-by: Roland Knall <rknall@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-04-13Fix zlib DLL copy.Gerald Combs1-3/+9
Switch to "if exist ... xcopy". Change-Id: I255fd3e719645b247024583590b748104c5e15b9 Reviewed-on: https://code.wireshark.org/review/8056 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-13More casts.Guy Harris1-3/+3
Change-Id: I0c8969bcb986350fa58f65d8e67394766b734286 Reviewed-on: https://code.wireshark.org/review/8055 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-13Add a major version number argument to --with-qt.Guy Harris2-29/+84
Without a major version number, it behaves as before, picking whatever version it finds, and preferring Qt 5 to Qt 4. With a major version number, it looks only for the version in question. Bug: 10793 Change-Id: Idf6c2c61e84bb87f7b601d8f09c33f31b67bf46d Reviewed-on: https://code.wireshark.org/review/8052 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>
2015-04-13Cast away some warnings.Guy Harris1-6/+6
offsetof() doesn't necessarily return an int-sized value; cast it to guint. Change-Id: Ie0072d62de0178f87bc3168e3f8f1a03d9ec69d5 Reviewed-on: https://code.wireshark.org/review/8053 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-13Add the OpenSUSE zlib1.dll when needed.Gerald Combs1-2/+5
The Visual Studio solution files created by CMake list "Debug" as the first configuration, which means that we end up with zlibd1.dll by default. Many of the OpenSUSE DLLs depend on zlib1.dll. Add the OBS version in that case. Change-Id: Ia98490f1a192802d1482e0749bbd2b550e916bc5 Reviewed-on: https://code.wireshark.org/review/8051 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-13Fix extcap interface capture with tsharkPascal Quantin1-2/+28
Extcap parameters must be saved when doing the interface number/name matching, otherwise extcap program is not launched and pipe is not created Change-Id: Iaa0c9ad145049ee6e7a285dfca904ceb0baf417f Reviewed-on: https://code.wireshark.org/review/8017 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>
2015-04-13dumpcap: fix opening of pipes on Windows broken since gbed29afPascal Quantin3-4/+20
Previous code was assuming that all local pipes were of extcap type. Let's explicitly check for extcap prefix now. Bug: 10803 Change-Id: If955e77a9ee2af11b553740269964c40273d5177 Reviewed-on: https://code.wireshark.org/review/8013 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>
2015-04-13Qt: Add option to copy all visible item or selected tree items in Packet ↵Michal Labedzki4-1/+65
Details pane The idea is allow to copy data from GUI by user, what is currently case only for tshark. The first option copy every item from Packet Details that are expanded (visibled). The second option do the same but start on currently selected item/tree. (let think about protocols like BT SDP where there is a lot of recursive subtrees) Change-Id: I19c925d21293ceb8af2167c7d2c1b1b36507124e Reviewed-on: https://code.wireshark.org/review/8047 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-13Support for new netscaler 3.5 trace format.anilkumar9116-11/+796
Change-Id: Ica74f3f9239a96486967cf248feb4313bc390734 Reviewed-on: https://code.wireshark.org/review/7751 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-04-13Add more "bitmask grouping" APIs.Michael Mann6-147/+260
Add proto_tree_add_bitmask_value, proto_tree_add_bitmask_value_with_flags and proto_tree_add_bitmask_list to aid in the removal of proto_tree_add_boolean "groupings" as well as "groups" of fields that use proto_tree_add_item with the same offset/len. This may be able to be optimized later, but the first step will be converting dissectors to use it. A sample conversion of each API is also included. Change-Id: I53febc7450ad632482f82615a7fa62174f8472c9 Reviewed-on: https://code.wireshark.org/review/8038 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-04-13GSM A: force display of the bits sequence corresponding to "Degrees of ↵Pascal Quantin1-1/+1
longitude" field It makes the display more consistent with other fields of Location Estimate IE Bug: 11114 Change-Id: Ib31c61a34f419cf97601a660f3b807454b1becd9 Reviewed-on: https://code.wireshark.org/review/8049 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-13Remove deprecated API tvb_lengtRemove deprecated API tvb_lengthAndersBroman6-12/+12
Change-Id: Iea7dd7d13ce1a2ee375a2c4a75f897ba2c936921 Reviewed-on: https://code.wireshark.org/review/8048 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-12Fix the path for androiddump.Guy Harris1-1/+1
The androiddump binary ends up in the top-level source directory, not the extcap subdirectory. Change-Id: Ia306b35211b885b817802a6a22ed9dbbe07f2532 Reviewed-on: https://code.wireshark.org/review/8037 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-12Windows: fix generation of PortableApps.com installerPascal Quantin3-1/+18
Change-Id: I249268ce21ddfbdc7f149609a950736b4fe2ae07 Reviewed-on: https://code.wireshark.org/review/8036 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>
2015-04-12androiddump: Disable automatic starting adbMichal Labedzki1-0/+13
It does not work as expected. Change-Id: Ibbfce9fdbb3e1aae747101a576fbe32c979b42c9 Reviewed-on: https://code.wireshark.org/review/8033 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-12androiddump: add more compatibility with MSVC connect APIPascal Quantin1-4/+5
Change-Id: I11d84d3904e11a085381b30cca7fc678c18797e6 Reviewed-on: https://code.wireshark.org/review/8034 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-12Windows: do not install androiddump by defaultPascal Quantin1-8/+8
It adds a delay on startup and is verbose on command line when Android SDK is not installed Change-Id: I165358ff14ef458712ebaa12bd3c7256f657e238 Reviewed-on: https://code.wireshark.org/review/8035 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-12Add missing androiddump stuffMichal Labedzki13-123/+536
Add missing androiddump stuff like: - release notes - documentation - Windows nmake support - running androiddump as a windows application instead of console on Windows - addition of androiddump to the Windows installer Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d Reviewed-on: https://code.wireshark.org/review/7981 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-12[Automatic update for 2015-04-12]Gerald Combs12-242/+518
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ide45514d6fd320962b642ed7c86bca959f2c58f7 Reviewed-on: https://code.wireshark.org/review/8029 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-12Only add flags to CFLAGS_FOR_BUILD if $CC and $CC_FOR_BUILD are the same.Guy Harris2-9/+25
Otherwise, just because a flag is appropriate for $CC, that doesn't necessarily mean it's appropriate for $CFLAGS_FOR_BUILD. (We don't use CFLAGS_FOR_BUILD for many things, so it's probably not worth making a lot of effort to throw all the warning flags into it if we're cross-compiling; we *do* throw them in for native compilation, which is what most developers use and test with, so that should be sufficient to let the warnings catch problems with the build tools we're building.) Change-Id: Iad9d611b4687e9e154f9871f741f3c8f3b307c88 Reviewed-on: https://code.wireshark.org/review/8026 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11Ignore androiddump - it's another build target.Guy Harris1-0/+1
Change-Id: If0d4ca167fba528726537a7b65f0fbdba5aaa59d Reviewed-on: https://code.wireshark.org/review/8024 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11Use HAVE_ARPA_INET_H to control whether to include <arpa/inet.h>.Guy Harris1-2/+4
That's how we do it elsewhere. Change-Id: Icd44d8bdec2425b58a4479cd60f08788c85c4d71 Reviewed-on: https://code.wireshark.org/review/8023 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11Add removal of zlib 1.2.8 folderPascal Quantin1-0/+1
Change-Id: I064cdfb46db49208b271806d7f697e3128e040a9 Reviewed-on: https://code.wireshark.org/review/8022 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-11More type cleanup to squelch warnings.Guy Harris1-3/+3
Make exported_pdu_headers_size a size_t to make it big enough. Make used_buffer_length a size_t as it doesn't go negative and gets compared with unsigned values. Cast length to size_t when comparing it with used_buffer_length - by that time, we've ensured that it's not negative. Change-Id: Ie192eee55914ebe548865d46575768964353ea2d Reviewed-on: https://code.wireshark.org/review/8021 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11androiddump: fix a typoPascal Quantin1-1/+1
Change-Id: I4adaace10aefb441e9aee76f9aba6101e805efa9 Reviewed-on: https://code.wireshark.org/review/8020 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-11Use G_GUINT64_CONSTANT() to make a guint64_t (or uint64_t) constant.Guy Harris1-2/+2
Don't assume "UL" is good enough; long is 32 bits on ILP32 platforms. Change-Id: If235e2e49afcbfff7d5289cafe24cf5cc01358e4 Reviewed-on: https://code.wireshark.org/review/8019 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 06:16:45 +0000