This copying should be controlled by the MSVC_VARIANT setting in config.nmake instead (just like all the other alike settings).
svn path=/trunk/; revision=20286
"Apply the ugly attached patch to the installer"
... it's not that ugly at all - and installs (deletes) the manifest files if available
svn path=/trunk/; revision=20285
a) Packaging changes - including the latest GTK/GLIB/PANGO libaries
b) File associations - made when Wireshark is first run and removed when device is removed.
c) Install WinPcap - by running the installer if WinPcap is not installed. Uninstalled (if the U3 device installed it) when the device is removed. (This is an interim approach until the appropriate WinPcap U3 installation can be determined).
svn path=/trunk/; revision=19985
Here is a DTD for the MSCML protocol, draft-07. This implementation is not entirely up-to-date (draft-09 is out), but this is a good base to start from.
I updated the WIKI with info, snapshot and sample capture: http://wiki.wireshark.org/MSCML
svn path=/trunk/; revision=19901
Note from a mail on gtk dev list:
-rwxr-xr-x 1 tml Administ 224510 Oct 3 18:35 libpango-1.0-0.dll
-rwxr-xr-x 1 tml Administ 37952 Oct 3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x 1 tml Administ 58749 Oct 3 18:35 libpangowin32-1.0-0.dll
(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)
svn path=/trunk/; revision=19880
*) Assign a new UUID for version 0.99.5 (so different versions of Wireshark can be installed on one U3 device)
*) Include version number in U3 program name to allow user to differentiate versions
*) Catch up with packaging changes
svn path=/trunk/; revision=19790
The RDM protocol has been accepted as ANSI standard E1.20-2006. The following patch updates the decoder to that spec.
At the same time it is promoted to a build-in dissector.
svn path=/trunk/; revision=19596
wireshark was located in /usr/X11R6/bin while dumpcap
int /usr/bin. That way wireshark couldn't find dumpcap.
Install wireshark in the same path as dumpcap and tshark.
svn path=/trunk/; revision=18874
I hope this is the right place to send a patch for a new dissector
plugin. The telegram it dissects are for the communication between PLCs
(Programmable logic controller) from the company Saia Burgess Controls
Ltd. (http://www.start-controls.com, http://www.saia-burgess.com or
http://www.sbc-support.ch). The protocol is named Ether-S-Bus (the PLCs
are called PCD2, PCD3, PCD4).
svn path=/trunk/; revision=18526
new DTD files for the dtds folder. They are for:
- poc-settings (RFC 4354)
- presence (RFC 3863)
- watcherinfo (RFC 3858)
svn path=/trunk/; revision=18394
Change the name of the Windows package to "wireshark-setup-..." Other
Ethereal -> Wireshark updates.
We _really_ need a better Wireshark icon.
svn path=/trunk/; revision=18253
- nmake makefile for lua plugin added.
- declare variables at the beginning of a function.
- proto_reg_handoff_lua was removed, remove remaining calls, too.
- missing functions to libethereal.def added.
add lua plugin to installer, if available.
svn path=/trunk/; revision=17196
Ethereal 0.10.13 and trunk have a glitch in the NSIS Makefile.nmake. It still works with WinPcap_3_1_beta4.exe. The attached patch resolves this.
svn path=/trunk/; revision=16299
the lines of what's done for RADIUS. That keeps them together (and
separate from other files), and makes the layout of the top-level source
directory closer to the layout of the installation directory, so that if
you run Ethereal or Tethereal from the top-level directory on Windows
it'll pick up the Diameter dictionary files (if it supports loading
them), and can do so on UN*X if we support a mechanism to let it find
its control files in the directory in which the binary resides.
Use the diameter_DATA, dtds_DATA, and radius_DATA macros in the
EXTRA_DIST macro, so you only have to change the lists of Diameter, DTD,
and RADIUS files in one place if you add or remove a file.
svn path=/trunk/; revision=16050
use "ip.checksum_bad == 1" instead of simply "ip.checksum_bad" in the example colorfilter file, as the implementation of that filter string changed
install the global example files unconditionally by the win32 installer, to fix this problem and be compatible with the unix install process
svn path=/trunk/; revision=15535
stop NPF service and set it back to "On demand" if user deselected the corresponding checkbox
when upgrading from a previous Ethereal install, try to detect which choices of icons and alike was used last time, and set this as default (e.g. don't install desktop icon if I choose not to install last time)
minor text changes
svn path=/trunk/; revision=15055
- Installer now includes and installs WinPcap 3.0 (with detection)
- Install Sections are grouped now
- New Seperate page to select additional tasks like: icons, file extensions ...
- New Seperate page for WinPcap detection/installation
- Start WinPcap "NPF" service doesn't require a reboot
Uninstaller:
- New Uninstall sections page (uninstall, settings, plugins, WinPcap)
- If uninstallation selected, plugins will now be completely uninstalled (all versions, not only the current one)
- If selected, uninstallation of WinPcap
svn path=/trunk/; revision=15016
returned quite a list of files. Add them to MAINTAINERCLEANFILES.
Whitespace changes (replace multiple spaces by TABs, in a few cases this
needed to be done at the beginning of Makefile lines.
svn path=/trunk/; revision=14891
at least the colorfilters file needs some more "finetuning"
NSIS (Win32): install these files into the Ethereal Program dir, but don't overwrite existing ones
makefile.am: I've added the three files to EXTRA_DIST and pkgdata_DATA, which *seems* to be the right places
svn path=/trunk/; revision=14595
files. Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and
GENERATED_FILES macros in Makefile.common files, along the lines of what
wiretap/Makefile.common has.
Clean up "*~" files with "make clean" rather than only "make distclean"
in some additional places.
Add "maintainer-clean" rules to the Makefile.nmake files, paralelling
the ones in the automake-generated Makefile.in files, using the
GENERATED_FILES macros from Makefile.common files. In some cases, move
the cleanup of files from "make distclean" to "make maintainer-clean",
and in other cases, put in a comment indicating why we're not doing that
(because some files that are distributed in the source tarballs, namely
Flex output, were built with a UN*X Flex and won't compile on Windows,
so we get rid of them with "make distclean" so you can clean up stuff
that *has* to be re-generated for Windows).
Clean up some *CLEANFILES definitions - get rid of ones that no longer
apply as files were moved or that add to the definition a name that's
already there.
svn path=/trunk/; revision=13402
HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NPF\Start
With this key set to 1, the NPF service is started automatically at startup and then even users with restricted privilegies should be able to access Network Devices for capturing.
See also:
http://winpcap.polito.it/misc/faq.htm#Q-18
svn path=/trunk/; revision=13349
- enable Windows' ShellExecute command to call Ethereal without specifying
the installation path (a new key added in the registry)
- decode 2 more options in the OPSI plugin.
svn path=/trunk/; revision=12363
don't support GTK-Wimp for GTK+ 1.2[.x] (it requires 2.x);
install the NEWS file as "NEWS.txt";
optionally show it at the end of an installation.
svn path=/trunk/; revision=11841
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.
svn path=/trunk/; revision=11400
fix a bug in the case where both Ethereal with GTK1 and GTK2 are
attached;
disallow the "extension box" if Ethereal isn't selected.
svn path=/trunk/; revision=11266
- associate standard trace file extensions to ethereal *only*
if such extensions are not already known in the system;
- suppress the linking while Ethereal is uninstalling *only*
for extensions associated to Ethereal.
svn path=/trunk/; revision=11134
in "config.nmake", and use that in the NSIS script when generating the
NSIS installer, so it puts GTK+ and Pango in the appropriate
subdirectories. Also, when uninstalling, remove both of the sets of
subdirectories.
As per his suggestion, get rid of the "GTK1_VERSION" and "GTK2_VERSION"
macros, and just directly insert the values where those macros were used
- "GTK1_VERSION" wasn't used at all, and "GTK2_VERSION" was only used
immediately below where it was defined, and stuff elsewhere, such as in
the NSIS script, didn't use them and would break if you changed them
anyway.
svn path=/trunk/; revision=10976
I originally tried to make it disabled by default (using "Section /o"), but
this caused odd behavior in the installer.
svn path=/trunk/; revision=10884
add a config.nmake option to control whether to build
libethereal.dll or not;
remove "./wiretap" from PATH to prevent problems due to
wrongly-loaded files;
build dissector.lib with MSVC;
move "print.c" and "ps.c" to the dissector helpers, as "print.c"
imports variables from packet-frame.c and packet-data.c, which
are in libethereal;
move "g711.c" out of the dissector helpers, as they're used only
by Ethereal in a tap, not in Tethereal or in any dissector;
add a .def file for libethereal;
arrange to declare global variables exported from libethereal
with "__declspec(dllimport)" when building programs that import
those variables;
update the NSIS installer.
Make the "configure" script define ETH_VAR_IMPORT as "extern".
svn path=/trunk/; revision=10834
added new target "packaging" to root Makefile.nmake,
which will generate version 1 or 2 or both,
depending on config.nmake GTK?_DIR setting
svn path=/trunk/; revision=9866
From Anders Broman: patches to various makefiles and configure scripts
to build the V5UA dissector, and patches to make it compile.
From me: .cvsignore file, and NSIS patches.
svn path=/trunk/; revision=9311
This requires replacing libintl-1.dll from the libintl package (which
is no longer used) with intl.dll from intl.dll from the gettext package.
svn path=/trunk/; revision=9239
recurse into subdirectories doing "nmake -f Makefile.nmake distclean".
Have "nmake -f Makefile.nmake clean" not remove stuff that "make clean"
doesn't remove (such as Flex/Bison output and config.h files) - and have
"nmake -f Makefile.nmake distclean" remove stuff that "make distclean"
removes, including "tethereal-tap-register.c" and
"ethereal-tap-register.c".
svn path=/trunk/; revision=8672
a: display of the currently installed ethereal version in "add/remove software panel", e.g. "Ethereal 0.9.6" instead of "Ethereal" only.
b: added a link to the ethereal homepage "http://www.ethereal.com/" in Start->Programs->Ethereal
c: added a link to the ethereal program directory in Start->Programs->Ethereal
svn path=/trunk/; revision=6146
Generalize paths and get rid of sed-dependent ethereal.nsi.in.
Remove ethereal.nsi.in, and re-add ethereal.nsi with Ulf's changes.
Modify Makefile.nmake to use it.
Note: You'll have to add "COMMON_FILES_GNU" path to your config.nmake
that points to a directory with all of Ethereal's required DLLs.
Be obnixious and set "SetShellVarContext all" so that we install for
every user, like most standard Windows apps.
svn path=/trunk/; revision=6020
"make install"; even though the resulting files are huge it's probably better
to have the debugging symbols intact. Set file and directory permissions in
/usr/local to match those in /usr.
svn path=/trunk/; revision=6016
DOCSIS support, including support for "Ethernet" captures where
the raw frame is a DOCSIS frame rather than an Ethernet
frame (some Cisco cable-modem head-end gear can send out a
trace of all traffic on an Ethernet, but what it sends are
the raw bytes of DOCSIS frames, not Ethernet frames)
Get rid of second AUTHORS entry for Devin Heitmueller, merging its item
into the older entry.
Clean up the order of some lists of plugin items.
svn path=/trunk/; revision=5861
of the directory for Ethereal configuration files, not the configuration
file directory, as the Diameter dissector looks for them in the
subdirectory.
svn path=/trunk/; revision=5607
The original checkinstall assumed /usr/local as the GTK+ install
install directory even if an alternate directory directory was
specified when configure was run. checkinstall now checks for
GTK+ in the configured directory and punts (checks if gtk-config
is in the path) if it doesn't find GTK+ in the configured
location.
svn path=/trunk/; revision=4595
"--define", we now build the RPM and SRPM packages in packages/rpm.
As a result, one need not be root to build RPM-based packages.
Move the specfile to packaging/rpm/SPECS.
Update the INSTALL document to include the various packaging makefile
targets.
svn path=/trunk/; revision=4581
Additional Windows Makefile dependencies, so more stuff gets
built as needed.
Additional stuff cleaned up by "make clean" (well, "nmake -f
makefile.nmake clean", anyway)
Make PDB_FILE be "vc*.pdb", so it referes to the PDB files
either for VC++ 5.0 or VC++ 6.0.
svn path=/trunk/; revision=4481
Add some missing files in the "clean" targets.
Use pod2html rather than man2html to build HTML man pages.
Fix ethereal.nsi.in for recent versions of NSIS, and fix a typo.
svn path=/trunk/; revision=4475
they're not built and the executables already contain debugging
information, and update the README.win32 file appropriately and add
Text2Pcap and Mergecap to it.
svn path=/trunk/; revision=4425
Also mark those files as configuration files; "dictionary.xml" should
definitely be one, as it could be modified by the administrator if other
XML dictionary files are added to the list at the end, and the other
ones might be modified if there are any protocol changes.
svn path=/trunk/; revision=4389
fix a bogus batch mode inference rule of make, so that
"vc60.pdb" files are created in the proper directory;
delete ".pdb" files in a "nmake -f Makefile.nmake clean";
include the text2pcap and mergecap ".pdb" files in the Windows
binary distribution.
svn path=/trunk/; revision=4385
Update NSIS syntax for newest NSIS. That fix from David O'Shea.
Set config.nmake to get non-cygwin version of Python.exe; cygwin version
is fouling up on me and I'm not sure why.
svn path=/trunk/; revision=3705
We us $(VERSION), defined in the top-level config.nmake, to replace
@VERSION@ in various files. $(RC_VERSION) and $(WTAP_VERSION) are
similarly used.
svn path=/trunk/; revision=3258
package build targets. Move ethereal.spec(.in) to packaging/rpm.
The spec file is different from Henri's. We might want to switch to his
for the sake of consistency.
svn path=/trunk/; revision=2162
is installed in packaging/solaris.stage, and from there the package
is created. The checkinstall script depends on GTK+/Glib residing
in /usr/local.
svn path=/trunk/; revision=2151
Ulf Lamping