Age | Commit message (Collapse) | Author | Files | Lines |
|
necessary for the switch to GTK 2.6 (at least on WIN32).
to do this, I've added file_util.h to wiretap (would file_compat.h be a better name?), and provide compat_macros like eth_open() instead of open(). While at it, move other file related things there, like #include <io.h>, definition of O_BINARY and alike, so it's all in one place.
deleted related things from config.h.win32
As of these massive changes, I'm almost certain that this will break the Unix build. I'll keep an eye on the buildbot so hopefully everything is working again soon.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16403 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15811 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
sprintf -> g_snprintf
snprintf -> g_snprintf
vsnprintf -> g_vsnprintf
strdup -> g_strdup
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15412 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
http://cvs.fedora.redhat.com/viewcvs/rpms/ethereal/FC-4/:
In the LPD dissector, make lpd_client_code a value_string so that we
don't segfault. Do the same for lpd_server_code, although it's not
strictly necessary.
Check to see if htmlview is installed, and use it as our HTML viewer.
The Fedora RPM has other patches, but I'm not sure if they should
be applied.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15143 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
add optional pcap_next_ex() which is currently unused
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14412 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
key list. In the Nettle code, clear the key list and re-read the key
file when the key file preference changes.
Remove a redundant define in config.h.win32.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12471 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
Whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12304 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
than using the plugin address table.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12139 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
Also add support for pcap_datalink_name_to_val(), and arrange that we
properly define HAVE_PCAP_DATALINK_NAME_TO_VAL and
HAVE_PCAP_DATALINK_VAL_TO_NAME for MSVC++ builds.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12073 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
64-bit integer; use "g_ascii_strtoull()", and, in the configure script,
check whether it's available in GLib (it's not in GLib 1.2[.x]) and, if
not, supply the GLib 2.4.5 version of the routine.
For G_MAXUINT32 and G_MAXUINT64, put a "U" at the end of the constant to
explicitly flag it as unsigned.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11889 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
64-bit ints *present in MSVC++ 6*, Microsoft!), so we can't use it. Use
"g_ascii_strtoull()", instead - it's present in GLib 2.x, and we require
GLib 2.x on Win32. (It's not present in 1.2[.x], and we don't require
2.x for UN*X, so we don't just use it everywhere.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11824 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
"strtol", as "_strtoui64".
Make the comment match what the UN*X configure script puts in.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11799 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
integers.
Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array
values, to the protocol tree, and add routines to add specified 64-bit
integer values to the protocol tree.
Use those routines in the RSVP dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11796 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11400 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11191 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
use to format 64-bit integers.
Fix the RSVP dissector to use that rather than hardcoding "%ll" in.
Remove the "only if G_HAVE_GINT64 is defined" bit from the discussion of
64-bit integers - we're too dependent on having them to support
compilers that don't have a 64-bit integral data type. Do, however,
note that neither "long" nor "long long" are acceptable, and also note
that you shouldn't assume "%ll" does the trick for printing them.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11182 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10834 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
Fix a missing ZLIB_CFLAGS in epan/Makefile.nmake.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10807 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9185 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
controlling whether ZLIB_DIR is defined or not in config.nmake.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8911 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
set in the config.nmake file.
Configure whether we have pcap_findalldevs() based on whether
WINPCAP_VERSION is 2.3 (if so, we don't) or 3.0 or 3.1 (if so, we do).
WinPcap 3.0 has the new libpcap declarations of "pcap_lookupnet()" and
"pcap_open_live()" in which the first argument is a "const char *"
rather than a "char *"; declare the functions and pointers to them
appropriately based on the version of WinPcap.
If we don't have pcap_findalldevs(), don't declare a pointer to it, as
we don't have a declaration of pcap_if_t.
We also need to refer to "pcap_freealldevs()", so make a pointer for it.
"symbols[]" is a const array; make the pointer to elements in it a const
pointer.
Fix some typoes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8660 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
GNU ADNS or not - set it based on whether ADNS_DIR is defined by
"config.nmake", and make "config.h.win32" files that specify whether we
have GNU ADNS dependent on "config.nmake".
Note in "config.nmake" that:
if you have GNU ADNS, ADNS_DIR should be defined as the
directory in which the ADNS .lib file resides;
if you don't have GNU ADNS, ADNS_DIR shouldn't be defined.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7860 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
found at
http://adns.jgaa.com/
and
http://www.ethereal.com/distribution/win32/development/
The modifications to the root-level config.h.win32 and Makefile.nmake
may not be neccessary.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7769 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
rather than UCD SNMP on Windows, and define HAVE_SOME_SNMP as per Wes
Hardaker's changes to handle both Net-SNMP and UCD SNMP.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6484 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
In gtk/main.c and tethereal.c set MIBDIRS to <get_program_path()>\snmp\mibs
so that we can drop the MIB files there, instead of the default c:\usr\...
path.
Add NET_SNMP_DIR to config.nmake and modify Makefile.nmake to adjust
CFLAGs, ethereal_LIBS and tethereal_LIBS accordingly.
Define HAVE_UCD_SNMP in config.h.win32.
I tested this by creating c:\program files\ethereal\snmp\mibs and
dropping in the MIB files that come with Net-SNMP. Ethereal resolved
system.sysDescr.0 to "iso.3.6.1.2.1.1.1.0" under Windows. Under Linux
it resolved to "SNMPv2-MIB::sysDescr.0".
Ethereal.nsi still needs to be updated.
A compiled version of the Net-SNMP library can be found at
http://www.ethereal.com/distribution/win32/development/
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6385 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
it's defined in the Wiretap config.h.win32.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6243 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
<packet32.h> includes <winsock2.h>; we include that rather than
<winsock.h>, to avoid errors due to conflicting declarations in
<winsock.h> and <winsock2.h>.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5742 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
Make the directory option to "--with-ucdsnmp" optional. Handle
"--with-ucdsnmp" similar to the way "--with-pcap" is handled.
Get rid of unnecessary #defines in "packet-cops.c".
Get rid of no-longer-necessary include of "dlfcn.h" in "packet-snmp.c".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4930 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
whether it's present.
This puts HAVE_ICONV_H in the "config.h" file, so put in an entry for it
in "config.h.win32" - an entry that doesn't define it - and get rid of
the check for WIN32 in "xmlstub.h".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4124 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
directory in which global data files are stored. If an installed binary
is being run, that's the correct directory for them; if a build-tree
binary is being run, the "manuf" file will be there, and you can put
other data files there as well, if necessary.
Do the same with plugins, except that, if there's no
"plugins\\{version}" subdirectory of that directory, fall back on the
default installation directory, so you at least have a place where you
can put plugins for use by build-tree binaries. (Should we, instead,
have the Windows build procedure create a subdirectory of the "plugins"
source directory, with the plugin version number as its name, and copy
the plugins there, so you'd use the build-tree plugin binaries?)
Move "test_for_directory()" out of "util.c" and into
"epan/filesystem.c", with the other file system access portability
wrappers and convenience routines. Fix "util.h" not to declare it - or
other routines moved to "epan/filesystem.c" a while ago.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3858 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
"standard" plugin directory, and, instead of getting PLUGIN_DIR (the
*real* installation directory) from the configure script, as can be done
in UNIX, attempt to get it by getting the full pathname of the currently
running program and assuming it's in the installation directory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3850 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
"--with-pcap", it adds the "include" subdirectory of that directory to
the list of directories to search for include files, rather than adding
the directory itself.
Check whether libpcap defines "pcap_version", and define
HAVE_PCAP_VERSION if it does. Use "pcap_version" iff HAVE_PCAP_VERSION
is defined, rather than special-casing MacOS X.
Don't #define a string for the WinPcap version; just leave
HAVE_PCAP_VERSION undefined on Windows, as WinPcap 2.2beta is out, so we
can no longer assume that the Windows version of Ethereal is using
WinPcap 2.1.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3792 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
declare our version of it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3502 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
whether there's a "dlfcn.h" header file; that lets us support plugins on
HP-UX.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3390 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
for Win32, and show a slightly more informative (i.e., geared to the
user) help message when trying to capture without having WinPcap installed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3261 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
We us $(VERSION), defined in the top-level config.nmake, to replace
@VERSION@ in various files. $(RC_VERSION) and $(WTAP_VERSION) are
similarly used.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3258 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
Fix build for splitting build dir from src dir.
Note the use of updated GTK+ release for Win32 binaries.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3107 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2882 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2705 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
in order to check whether to use ANSI C features such as "const".
GCC defines it as 1 even if extensions that render the implementation
non-conformant are enabled; Sun's C compiler (and, I think, other
AT&T-derived C compilers) define it as 0 if extensions that render
the implementation non-conformant are enabled; Microsoft Visual C++
6.0 doesn't define it at all if extensions that render the implementation
non-conformant are enabled.
We define it as 0 in "config.h.win32", so that those generated files will use
those features (and thus not get type warnings when compiled with
MSVC++).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2698 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2682 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2540 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
Mention IGRP dissector in NEWS.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2539 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
"config.h", and update it to include stuff added to "config.h" and
remove stuff removed from "config.h".
Give libethereal a "config.h.win32" and make its "Makefile.nmake" file
copy it to "config.h".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2504 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2432 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2196 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
it in "util.c", so we have to define HAVE_SYS_STAT_H in Win32.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2192 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
<arpa/inet.h>, but is, in some fashion, declared differently from the
way we declare it in "inet_v6defs.h", but "inet_ntop()" isn't defined,
so we include "inet_v6defs.h" in "inet_pton.c", which causes
"inet_pton.c" not to compile as we get a collision between the two
declarations.
Move the declaration of "inet_aton()" to "inet_aton.h", define
"NEED_INET_ATON_H" iff we didn't find "inet_aton()" in the system
libraries, and include "inet_aton.h" in the callers of "inet_aton()" iff
"NEED_INET_ATON_H" is defined, so that it doesn't get declared by us if
"inet_aton()" is defined by a system library (which hopefully means it's
declared in <arpa/inet.h> instead).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2137 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
#define strcasecmp stricmp
for prefs.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2118 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
In gtk/Makefile.nmake, add progress_dlg.obj
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2108 f5534014-38df-0310-8fa8-9805f1628bb7
|