Change-Id: Icaca74f7d5038b4e2e232fb499933219b322e02d
Reviewed-on: https://code.wireshark.org/review/9159
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
It will avoid losing precision in case of export from a nseclibpcap input file.
As Wireshark is probably the only tool able to read this link type, we do not need to bother with compatibility.
Change-Id: Iea5b5c88b02ff4799c255f795be2469a091161fe
Reviewed-on: https://code.wireshark.org/review/9171
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
The payload dissection now only includes the remaining bytes,
even if the actual number of payload bytes should be bigger.
An expert Info is added, to inform the user, that the trace was
truncated, but the payload is still given to a sub-dissector,
as it may contain valid information
Change-Id: Iefef78e7c7aed7f87e40875f345ff5debf364f3a
Reviewed-on: https://code.wireshark.org/review/9124
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
For out-of-tree builds you have to pass the location of your build to our tools
like the fuzz script, valgrind script etc. Modify them so that the value can be
set in the environment rather than requiring a shell script flag.
Set the environment variable in the vagrant provision step, so that the scripts
Just Work (TM) in the VM.
Change-Id: If8ce6b278176085ba6dd994137b82fc989b80124
Reviewed-on: https://code.wireshark.org/review/9168
Reviewed-by: Evan Huus <eapache@gmail.com>
Reformat build and install instructions at the end a bit.
Change-Id: I0f6be9e4b58f3987615abcec6521f59ba33b3b0a
Reviewed-on: https://code.wireshark.org/review/9166
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
statements to c++ files. The standard method to mark function parameters
as unused in cpp is to just leave out the variable name.
Change-Id: I4f07ad9f494ad16388eadb67e93ea7b26ae70eb5
Reviewed-on: https://code.wireshark.org/review/9152
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
The nsis_uninstall target appears to create a temporary file
uninstaller_installer.exe that is renamed to uninstall.exe
The above rename upsets the portableapps_app_dir target that is
copying files from the CMake run dir into the portable apps dir.
The change adds a dependency on nsis_uninstall to the portableapps_package
target in an attempt to sequence the copy operation.
Change-Id: I9feb55599eff000f983c23ce29c89fbd3be0a6ac
Reviewed-on: https://code.wireshark.org/review/9153
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
if we're not capturing to multiple files
Change-Id: I18d36ef8e7e3525b2bd8d94f2b2349cefa3ecb52
Reviewed-on: https://code.wireshark.org/review/9161
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Just for completeness' sake.
Change-Id: I1ed609431c8bc62a79ebbf837fa2fc62f627a002
Reviewed-on: https://code.wireshark.org/review/9157
Reviewed-by: Guy Harris <guy@alum.mit.edu>
In ByteViewTab::clear, make sure we stay hidden or visible as
appropriate.
Bug: 11313
Change-Id: I12fa5169e840dbc4d27b6525fe6be72e13acce5d
Reviewed-on: https://code.wireshark.org/review/9155
Reviewed-by: Gerald Combs <gerald@wireshark.org>
abort the dissection in this case
Change-Id: Ic65f7535422d1c0a6e395a15fbc4a8ae550c0976
Reviewed-on: https://code.wireshark.org/review/9144
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Put WIRESHARK_RUN_FROM_BUILD_DIRECTORY in the shell profile so that wireshark
knows it's running from a build directory (which it otherwise sometimes doesn't
for out-of-tree cmake). This fixes lua and other things in the vagrant build.
Change-Id: I69775612d0f9161ce9b30c32122aee52a1106cbc
Reviewed-on: https://code.wireshark.org/review/9148
Reviewed-by: Evan Huus <eapache@gmail.com>
Have a field that holds the PHY type but nothing else. Have
a union with structures holding PHY-type-specific information, as a
bunch of attributes are PHY-specific.
If we have a channel and band, but don't have the frequency, attempt to
calculate the frequency, and add that to the radio information if we
succeed. If we have the frequency, but don't have the channel, attempt
to calculate the channel, and add that to the radio information if we
succeed.
Handle FHSS information, 11a "half/quarter-clocked" and turbo
information, 11g normal vs. Super G, additional 11n and 11ac
information, and the "short preamble" flag for 11b and 11g.
Add a PHY type for 11 legacy DSSS and detect it if possible.
Clean up the AVS dissector - make all fields wlancap. fields (if you
want generic fields, use the wlan_radio. fields).
Set more fields when writing out Commview Wi-Fi files.
Change-Id: I691ac59f5e9e1a23779b56a65124049914b72e69
Reviewed-on: https://code.wireshark.org/review/9146
Reviewed-by: Guy Harris <guy@alum.mit.edu>
don't THROW() an exception
Change-Id: Ie0ddd8caf1963ab0ab7e8bb47a275ce887e19d60
Reviewed-on: https://code.wireshark.org/review/9145
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Server Core editions of Windows don't have shell.application. As a result
CopyHere and its unzip capabilities aren't guaranteed to be available.
Plus, CopyHere is just plain slow.
Remove the CopyHere code. Search for 7z and 7za in various places and
download the standalone 7za if needed.
Bug: 11151
Change-Id: Ie719effbdcee3141764183bf3535ec9bd1c3e97a
Reviewed-on: https://code.wireshark.org/review/8226
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Missed a bunch of them in g131f8f0.
Change-Id: I5b1df810a31c26c3ab3cd778f8774519283217c8
Reviewed-on: https://code.wireshark.org/review/9143
Reviewed-by: Evan Huus <eapache@gmail.com>
Add a dependency on the lemon binary and lempar.c files because the
output depends on these tools. This is already done for autotools and
nmake.
In addition, clean up the generated .h and .out files.
Change-Id: Ic1fa2c23949abf05e976a67d226c90293b2ce834
Reviewed-on: https://code.wireshark.org/review/9139
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Change-Id: I5f9315b144333be789f8555f4128371994d4245b
Reviewed-on: https://code.wireshark.org/review/9141
Reviewed-by: Michael Mann <mmann78@netscape.net>
BTSNOOP format is supported by libwiretap and this dissector add
ability to open the same file in second mode:
1. Wireshark aka Protocol Viewer (default)
2. Fileshark aka File Viewer
Mode 2 also has feature to dissect protocols contained by this file,
try "Protocol Preferences -> Dissect next layer".
Change-Id: I99f0df5b55d31bf5a7d6e9269bfc054c09022b51
Reviewed-on: https://code.wireshark.org/review/17
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Rather than forcing everything to live in guint32. We still use guints for now
via the G_POINTER_TO_UINT and vice-versa, but this paves the way in future for
custom comparison functions which will make e.g. string trees far more
efficient for long strings.
Change-Id: Ibb15400f74761ae295948507df8d2e022f2ebb05
Reviewed-on: https://code.wireshark.org/review/9138
Reviewed-by: Evan Huus <eapache@gmail.com>
The OSX 10.5 build doesn't seem to like it.
Change-Id: I7471639f649dbf89ba77d78f77faebbeefcf4ed3
Reviewed-on: https://code.wireshark.org/review/9134
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Evan Huus <eapache@gmail.com>
Built-in string prefs have to be dynamic, but get overwritten by the
registration routine, so we have to save and then free them after-the-fact.
Change-Id: Ib418b14296391dd198a8b49b0c99c5f697d8050f
Reviewed-on: https://code.wireshark.org/review/9132
Reviewed-by: Evan Huus <eapache@gmail.com>
this should prevent Visual Studio from picking up generated include
files which may be lying around in the source tree (as leftovers from
previous in-tree builds)
Change-Id: I2406c31bc0638eb13ed4b539ddc607512051033d
Reviewed-on: https://code.wireshark.org/review/9130
Reviewed-by: Anders Broman <a.broman58@gmail.com>
this should make Visual Studio pick up the generated include files
from the build directory instead of the source directory (which may
contain lefovers from an in-tree build)
Change-Id: Ie3de4cdd85a2865e203118a42ab10f443372f03b
Reviewed-on: https://code.wireshark.org/review/9129
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
If we can't read the dictionary containing all our definitions, free necessary
memory before returning.
Change-Id: I814962d920852b9a82acb3bb2e7bc41addd835f7
Reviewed-on: https://code.wireshark.org/review/9131
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: I87f6f9f40e1c33148de43b53a8881d51416f5d2c
Reviewed-on: https://code.wireshark.org/review/7898
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Rename ext_menubar to a more appropriate plugin_if.
External menus can be implemented by plugins to present
additional menus for deep-packet analysis. One side-effect
of such menus being implemented as plugins is, that they
are being executed in different threads and therefore can
only use limited access to the main GUI. Also, there is
no safe cross-gui (GTK and Qt) way for many features.
This patch implements a first functionality, by which a
plugin implemented using ext_menubar can apply a display
filter to the main view.
For now the implementation supports filtering, as well as
saving a preference.
Change-Id: Iffe4caa954bbeb8ce356352de4dae348a50efba9
Reviewed-on: https://code.wireshark.org/review/8773
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
if we haven't captured any packets yet, don't display a warning about
unsaved changes
make sure that we're not running into a scenario where
MainWindow::testCaptureFileClose() tries to close the capture file at
the same time as the pipe handler who sees an eof on the pipe
cf_has_unsaved_data() should return false if we have a temporary file
that contains no packets
Change-Id: I18d75bd658b85d45dd3313d49e2cd654c6300de5
Reviewed-on: https://code.wireshark.org/review/9109
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The first thing I generally do when I open a graph is to maximize it.
Having a maximize button makes that a lot easier. Call QDialog(NULL,
Qt::Window) similar to g80342e4.
Call QDialog(NULL) in the about box.
Change-Id: I4f229ab579d0912cb03ba8f8d0300d933d0ba914
Reviewed-on: https://code.wireshark.org/review/7072
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
atof is locale-dependent. In locales such as Swedish, German and Dutch,
the dot is a thousand separator, resulting in wrong conversions for
floats.
While at it, make the mate dissector also be independent of locale.
Blacklist atof in checkAPIs. Lemon is still using strtod, but that is
not our problem for now.
Bug: 11297
Bug: 8964
Change-Id: I6fe3e45eb1d6d95d41aa4f3af1f81a6204a60c63
Reviewed-on: https://code.wireshark.org/review/9116
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Change-Id: Ie471a67a978aeb54727d03f93b98e3e422441a58
Reviewed-on: https://code.wireshark.org/review/9119
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
- add license headers to the scripts
- don't mount `.` into the VM manually, vagrant already puts it in /vagrant/
for us, just use that.
- build with -j3, slightly more efficient even with two cores
Change-Id: I43580ade7ae2635696072b39e4f18a401a030a85
Reviewed-on: https://code.wireshark.org/review/9127
Reviewed-by: Evan Huus <eapache@gmail.com>
Coming after Jasper talk #Sharkfest15 about TCP stuff
Change-Id: I2b01bc6dfe24e28454101da59720d2c74603b88f
Reviewed-on: https://code.wireshark.org/review/9120
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser