obnox/wireshark/wip.git
17 years agofix some entries with wrong spaces
lego [Thu, 4 Jan 2007 22:47:23 +0000 (22:47 +0000)]
fix some entries with wrong spaces

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20316 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agothe -lm flag might be needed to link lua
lego [Thu, 4 Jan 2007 22:45:43 +0000 (22:45 +0000)]
the -lm flag might be needed to link lua

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20315 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agothe widcards: Choose and All were inverted (again?)
lego [Thu, 4 Jan 2007 22:44:17 +0000 (22:44 +0000)]
the widcards: Choose and All were inverted (again?)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20314 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoadd the "Microsoft .Net Framework SDK Version 1.1" as a compiler option (this is...
ulfl [Thu, 4 Jan 2007 20:51:18 +0000 (20:51 +0000)]
add the "Microsoft .Net Framework SDK Version 1.1" as a compiler option (this is the one described in the corresponding Wiki page)

mark "Visual Studio 2005" (without Express) as EXPERIMENTAL too, seems to be working just like the Express Edition :-)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20313 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoOn Darwin, build shared libraries with -Wl,-single_module to the LDFLAGS
guy [Thu, 4 Jan 2007 20:47:43 +0000 (20:47 +0000)]
On Darwin, build shared libraries with -Wl,-single_module to the LDFLAGS
used with shared libraries, to fix some error that shows up in some
cases; some Apple documentation recommends it for most shared libraries.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20312 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoMake the recent INAP change in the template file as well.
etxrab [Thu, 4 Jan 2007 20:15:22 +0000 (20:15 +0000)]
Make the recent INAP change in the template file as well.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20311 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoRename pkgdata_DATA to dist_pkgdata_DATA, to make sure it's in the
guy [Thu, 4 Jan 2007 18:35:33 +0000 (18:35 +0000)]
Rename pkgdata_DATA to dist_pkgdata_DATA, to make sure it's in the
distribution.  That means we don't have to include it in EXTRA_DIST.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20310 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoMake Expires header value a numeric field
martinm [Thu, 4 Jan 2007 17:56:17 +0000 (17:56 +0000)]
Make Expires header value a numeric field

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20309 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoSerious source code cleanup.
jake [Thu, 4 Jan 2007 14:23:56 +0000 (14:23 +0000)]
Serious source code cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20308 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoBump date
jake [Thu, 4 Jan 2007 13:46:29 +0000 (13:46 +0000)]
Bump date

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20307 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoBump date and version number
jake [Thu, 4 Jan 2007 13:44:09 +0000 (13:44 +0000)]
Bump date and version number

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20306 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agofix compilation without GnuTLS
kukosa [Thu, 4 Jan 2007 13:26:45 +0000 (13:26 +0000)]
fix compilation without GnuTLS

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20305 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoCheck in trivial changes before generating a big diff...
martinm [Thu, 4 Jan 2007 13:25:25 +0000 (13:25 +0000)]
Check in trivial changes before generating a big diff...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20304 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoCall the handoff registration routine proto_reg_handoff_irsir() to avoid
guy [Thu, 4 Jan 2007 12:05:17 +0000 (12:05 +0000)]
Call the handoff registration routine proto_reg_handoff_irsir() to avoid
collisions with the WSP dissector's proto_reg_handoff_sir() - and don't
call it in the proto_register_irsir(); handoff registration routines are
supposed to be called after *all* registration routines are called.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20303 f5534014-38df-0310-8fa8-9805f1628bb7

17 years ago-Wl,-single_module breaks the configure script.
guy [Thu, 4 Jan 2007 11:55:05 +0000 (11:55 +0000)]
-Wl,-single_module breaks the configure script.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20302 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdd -Wl,-single_module to the linker flags in Darwin. The page at
guy [Thu, 4 Jan 2007 11:50:41 +0000 (11:50 +0000)]
Add -Wl,-single_module to the linker flags in Darwin.  The page at

http://developer.apple.com/releasenotes/DeveloperTools/RN-dyld/index.html

says

The static linker ld(1) supports building dylibs as either
-multi_module or -single_module.  Conceptually, a multi-module
dylib is like a group of smaller dylibs - one per source file.
The extra meta-data in a multi-module dylib allowed (pre-10.4)
dyld to delay binding and running initializers on the individual
modules.  In Mac OS X 10.4 dyld ignores all multi-module
meta-data and completely binds and runs all initializers the
same as if it were built single-module.  In general, building
dylibs -single_module is preferred.  The one case where
multi-module is still useful is it allows internal functions of
a dylib to be interposable.  For instance, libSystem.dylib is
built multi_module so that malloc() can be overridden and all
uses of malloc in libSystem (e.g.  strdup) would be redirected
to use the overridden version.

and we don't need the interposability for our dylibs, and Andreas Fink
indicates that it's necessary for the packaged Wireshark builds he's
doing.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20301 f5534014-38df-0310-8fa8-9805f1628bb7

17 years ago- new ssl_set_master_secret() which can set master secret (and optionally other param...
kukosa [Thu, 4 Jan 2007 09:20:18 +0000 (09:20 +0000)]
- new ssl_set_master_secret() which can set master secret (and optionally other parameters) into SSL dissector from external source, e.g. private 'trace protocol' dissector
- call 'data' subdissector for decrypted data in real dissector is not found

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20300 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdd dissection of SystemCapabilities.
etxrab [Thu, 4 Jan 2007 07:51:26 +0000 (07:51 +0000)]
Add dissection of SystemCapabilities.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20299 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoadd wiretap manifest file to packaging
ulfl [Wed, 3 Jan 2007 23:12:37 +0000 (23:12 +0000)]
add wiretap manifest file to packaging

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20298 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoanother attempt to fix the "Program Files" setting. Unfortunately, using the environm...
ulfl [Wed, 3 Jan 2007 22:09:15 +0000 (22:09 +0000)]
another attempt to fix the "Program Files" setting. Unfortunately, using the environment setting doesn't seem to work ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20297 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoSome cleanup of the source.
jake [Wed, 3 Jan 2007 20:17:17 +0000 (20:17 +0000)]
Some cleanup of the source.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20296 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFrom Peter Vestman:
etxrab [Wed, 3 Jan 2007 19:25:28 +0000 (19:25 +0000)]
From Peter Vestman:
The number of rfci's in rate control messages is read in the wrong place.
We have created a patch for this, in the patch we have also added CRC checks
for header and payload.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20295 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFix a typo.
gerald [Wed, 3 Jan 2007 18:10:13 +0000 (18:10 +0000)]
Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20294 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdd call to the Teleservice dissector add a bunch of missing Return signals and
etxrab [Wed, 3 Jan 2007 07:55:40 +0000 (07:55 +0000)]
Add call to the Teleservice dissector add a bunch of missing Return signals and
fix up some cut and paste errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20293 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agohmmm, maybe he don't like mixing slashes and backslashes ...
ulfl [Wed, 3 Jan 2007 06:41:17 +0000 (06:41 +0000)]
hmmm, maybe he don't like mixing slashes and backslashes ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20292 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoclean should also remove generated plugin.c and manifest files
ulfl [Wed, 3 Jan 2007 06:06:53 +0000 (06:06 +0000)]
clean should also remove generated plugin.c and manifest files

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20291 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoremove the PDB_FILE setting from config.nmake - there's no real need for this info
ulfl [Wed, 3 Jan 2007 05:41:11 +0000 (05:41 +0000)]
remove the PDB_FILE setting from config.nmake - there's no real need for this info

add some missing files to the clean targets

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20290 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agofix epan\crypt\crypt-md5.obj
ulfl [Wed, 3 Jan 2007 05:08:20 +0000 (05:08 +0000)]
fix epan\crypt\crypt-md5.obj

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20289 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoInstead of hard coding "C:/program files", use the corresponding environment variable...
ulfl [Wed, 3 Jan 2007 04:28:28 +0000 (04:28 +0000)]
Instead of hard coding "C:/program files", use the corresponding environment variable %ProgramFiles% (hopefully this is available on all supported platforms). This makes it possible to use the same unchanged setting even for internationalised Windows versions (e.g. in the german version this is: "C:\Programme")

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20288 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoan attempt to fix the distcheck
ulfl [Wed, 3 Jan 2007 04:18:55 +0000 (04:18 +0000)]
an attempt to fix the distcheck

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20287 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agofix packaging (for now): copy the manifest files with the /nonfatal switch, so they...
ulfl [Wed, 3 Jan 2007 04:15:18 +0000 (04:15 +0000)]
fix packaging (for now): copy the manifest files with the /nonfatal switch, so they only issue a warning if none existing (e.g. MSVC6).

This copying should be controlled by the MSVC_VARIANT setting in config.nmake instead (just like all the other alike settings).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20286 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agofrom Laurent Rabret:
ulfl [Wed, 3 Jan 2007 03:46:48 +0000 (03:46 +0000)]
from Laurent Rabret:
"Apply the ugly attached patch to the installer"

... it's not that ugly at all - and installs (deletes) the manifest files if available

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20285 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agodelete GTK 2.10 files and dirs while uninstalling
ulfl [Wed, 3 Jan 2007 03:42:33 +0000 (03:42 +0000)]
delete GTK 2.10 files and dirs while uninstalling

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20284 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agomove the MSVC "block" towards the top of the file
ulfl [Wed, 3 Jan 2007 02:53:30 +0000 (02:53 +0000)]
move the MSVC "block" towards the top of the file
don't use GNUTLS and ZLIB when compiling with MSVC != Version 6 - it currently doesn't work

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20283 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agofrom Laurent Rabret:
ulfl [Wed, 3 Jan 2007 02:50:22 +0000 (02:50 +0000)]
from Laurent Rabret:
I posted a patch about 1.5 years ago for the formerly Ethereal to successfully compiled with Visual > 6. I have always successfully used this patched Ethereal/Wireshark compiled with VS 2003 and have just checked when compiled with Visual C++ 2005 Express

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20282 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agofix windows build
ulfl [Wed, 3 Jan 2007 00:23:22 +0000 (00:23 +0000)]
fix windows build

maybe the definitions from Makefile.common should better be used - the current Makefile.nmake looks a bit strange compared to others ;-)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20281 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoif exist, the install targets should copy pdb and manifest files along with the exe...
ulfl [Wed, 3 Jan 2007 00:10:57 +0000 (00:10 +0000)]
if exist, the install targets should copy pdb and manifest files along with the exe and dll ones

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20280 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoRemove empty files (which should have been removed with r20231).
gerald [Wed, 3 Jan 2007 00:07:07 +0000 (00:07 +0000)]
Remove empty files (which should have been removed with r20231).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20279 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agofollowing the Microsoft installer guidelines: as default, an installer should not...
ulfl [Tue, 2 Jan 2007 23:55:47 +0000 (23:55 +0000)]
following the Microsoft installer guidelines: as default, an installer should not put an icon on the desktop

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20278 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoMove epan/crypt-md5.[ch] to epan/crypt. Remove
gerald [Tue, 2 Jan 2007 22:49:57 +0000 (22:49 +0000)]
Move epan/crypt-md5.[ch] to epan/crypt.  Remove
epan/crypt/airpdcap_md5.[ch].  Fix up whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20277 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agodefine SecMIBs only if NET_SNMP_DIR is defined - to prevent a NSIS warning
ulfl [Tue, 2 Jan 2007 22:19:48 +0000 (22:19 +0000)]
define SecMIBs only if NET_SNMP_DIR is defined - to prevent a NSIS warning

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20276 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoUpdate supported Win32 versions and NSIS version.
jake [Tue, 2 Jan 2007 20:53:04 +0000 (20:53 +0000)]
Update supported Win32 versions and NSIS version.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20275 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFrom Gisle Vanem:
gerald [Tue, 2 Jan 2007 19:56:59 +0000 (19:56 +0000)]
From Gisle Vanem:

Here are some patches needed to build using HAVE_AIRPCAP
on MingW:

* airpcap.h needs 'WEP_KEY_MAX_SIZE' from <epan/crypt/wep-wpadefs.h>.

* airpcap_loader.h needs <epan/crypt/airpdcap_user.h> and definition of
 'decryption_key_t'.

* epan/crypt/airpdcap_interop.h defines 'ntohs()' before <winsock2.h>
 gets included. Thus creating a parse error later on.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20274 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdd a good/bad tree to the FCS item.
sfisher [Tue, 2 Jan 2007 19:55:55 +0000 (19:55 +0000)]
Add a good/bad tree to the FCS item.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20273 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoOops: wireshark.com --> wireshark.org
wmeier [Tue, 2 Jan 2007 17:19:25 +0000 (17:19 +0000)]
Oops:   wireshark.com --> wireshark.org
Also: 1 additional Ethereal --> Wireshark

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20272 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoDissect details of RAck header, and change RSeq to a numerical field.
martinm [Tue, 2 Jan 2007 17:06:00 +0000 (17:06 +0000)]
Dissect details of RAck header, and change RSeq to a numerical field.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20271 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoMore ethereal --> wireshark
wmeier [Tue, 2 Jan 2007 14:11:35 +0000 (14:11 +0000)]
More ethereal --> wireshark

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20270 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAlign build target names.
jake [Tue, 2 Jan 2007 13:46:06 +0000 (13:46 +0000)]
Align build target names.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20269 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoMore Ethereal -> Wireshark renaming.
jake [Tue, 2 Jan 2007 13:36:45 +0000 (13:36 +0000)]
More Ethereal -> Wireshark renaming.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20268 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoMore Ethereal -> Wireshark renaming
jake [Tue, 2 Jan 2007 13:34:05 +0000 (13:34 +0000)]
More Ethereal -> Wireshark renaming

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20267 f5534014-38df-0310-8fa8-9805f1628bb7

17 years ago"an wireshark" -> "a wireshark".
martinm [Tue, 2 Jan 2007 13:25:36 +0000 (13:25 +0000)]
"an wireshark" -> "a wireshark".
Presumably "an ethereal" was search replaced...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20266 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agomake MSVC6 the default for MSVC_VARIANT, not MSVC2005
ulfl [Tue, 2 Jan 2007 13:05:04 +0000 (13:05 +0000)]
make MSVC6 the default for MSVC_VARIANT, not MSVC2005

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20265 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFix for bug 1279 (Negative values for RTCP round trip delay
martinm [Tue, 2 Jan 2007 11:46:30 +0000 (11:46 +0000)]
Fix for bug 1279 (Negative values for RTCP round trip delay
cannot be stored in guint32).
- Makes the threshold preference value an absolute value.
- There is now a separate expert info item for -ve roundtrips

N.B. There is still a problem with filtering -ve values on this
FT_INT32 field, i.e. rtcp.roundtrip-delay < 0 never matches with
frames that it should (even if rtcp.roundtrip-delay == -3 can
be used to match specific frames...).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20264 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdding all enterprise numbers for 2006.
jake [Tue, 2 Jan 2007 10:13:38 +0000 (10:13 +0000)]
Adding all enterprise numbers for 2006.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20263 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoEhtereal[sic] -> Wireshark. :-)
guy [Tue, 2 Jan 2007 09:20:27 +0000 (09:20 +0000)]
Ehtereal[sic] -> Wireshark. :-)

Give a little more detail in the comment in the H.248 dissector about
"MEGACO" vs. "H.248".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20262 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdd a WIRESHARK_RUN_FROM_BUILD_DIRECTORY environment variable on UN*X;
guy [Tue, 2 Jan 2007 06:49:40 +0000 (06:49 +0000)]
Add a WIRESHARK_RUN_FROM_BUILD_DIRECTORY environment variable on UN*X;
if set, and if the program isn't running with additional privileges,
it'll treat the directory in which the program is found as the data
directory.

If, on Windows, the version-number subdirectory of {data
directory}\plugins doesn't exist (which is assumed to mean that the
program is being run from the build directory), or if, on UN*X,
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set, the plugin directory is the
"plugins" subdirectory of the data directory, and all subdirectories of
that directory are scanned for plugins, as the "plugins" subdirectory of
the build directory contains subdirectories for the plugins; this means
that if we're running from the build directory, we'll find the plugins
we built in the build tree.

When generating the wireshark-filter man page, run tshark with
WIRESHARK_RUN_FROM_BUILD_DIRECTORY set, so it uses the plugins from the
build to generate the list of filters.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20261 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoUse G_DIR_SEPARATOR_S as the path separator.
guy [Tue, 2 Jan 2007 06:39:22 +0000 (06:39 +0000)]
Use G_DIR_SEPARATOR_S as the path separator.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20260 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoMSVC2006 defines sockaddr_storage, so we shouldn't define this on our own for MSVC2006
ulfl [Tue, 2 Jan 2007 01:52:47 +0000 (01:52 +0000)]
MSVC2006 defines sockaddr_storage, so we shouldn't define this on our own for MSVC2006

this might be depending on the Platform SDK and not on MSVC version - I don't really know

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20259 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agofirst MSVC 2005 changes:
ulfl [Tue, 2 Jan 2007 01:19:40 +0000 (01:19 +0000)]
first MSVC 2005 changes:
- add some lines to set the desired MSVC_VARIANT
- set some defines (to prevent tons of "deprecated" warnings)
- set some linker flags (currently don't know if these are the right ones - still experimenting)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20258 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoUse TransactionId to match ansi map responses to requests and fix
etxrab [Mon, 1 Jan 2007 22:03:01 +0000 (22:03 +0000)]
Use TransactionId to match ansi map responses to requests and fix
some bugs in the asn2wrs generated ansi map dissector.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20257 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFix a compiler warning. Surround an MSVC-specific #pragma with an
gerald [Mon, 1 Jan 2007 20:07:23 +0000 (20:07 +0000)]
Fix a compiler warning.  Surround an MSVC-specific #pragma with an
#ifdef, and add a link to a -dev mailing list thread pointing out that
it may not be necessary.  Fixup whitespace and comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20256 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFix "dumpcap -w -" to use binmode on stdout if Windows;
wmeier [Mon, 1 Jan 2007 17:04:38 +0000 (17:04 +0000)]
Fix "dumpcap -w -" to use binmode on stdout if Windows;
(The related tests in suite-capture.sh should now work correctly).
(Also: Print error message if attempting to use ring-buffers
   with a named pipe).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20255 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFrom Pierre Juhen: patch to correct the bug 1220
wmeier [Mon, 1 Jan 2007 16:58:03 +0000 (16:58 +0000)]
From Pierre Juhen: patch to correct the bug 1220

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20254 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFrom Mark C. Brown:
jake [Mon, 1 Jan 2007 14:48:18 +0000 (14:48 +0000)]
From Mark C. Brown:
HP-UX 11.31 will add a new nettl trace subsystem, NS_LS_TELNET (ID=267).
NS_LS_TELNET is just raw telnet data.  There is no layer 2/3/4 headers, so
there's just the HP-UX nettl record header followed directly by the TCP payload
for a telnet connection.  Thus the need for a new wiretap encapsulation type...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20253 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFrom Mark C. Brown:
jake [Mon, 1 Jan 2007 14:43:15 +0000 (14:43 +0000)]
From Mark C. Brown:
Fix some nettl encap types and size checks

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20252 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agobreak out dfcode from the capture file structure and declare it locally where it...
sahlberg [Mon, 1 Jan 2007 10:23:37 +0000 (10:23 +0000)]
break out dfcode from the capture file structure and declare it locally where it is needed.
allocate and release the dfcode program as needed instead of having it hang around in the capture file structure.

this will ensure that dfcode will not have longer than se scope lifetime in case we need that property of it later

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20251 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFrom Paul Erkkila:
jake [Sun, 31 Dec 2006 00:00:06 +0000 (00:00 +0000)]
From Paul Erkkila:
parse NAPTR records in dns dissector (rfc 3403)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20250 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoThe stuff we were doing with {programname}_DEPENDENCIES macros was to
guy [Sat, 30 Dec 2006 04:40:59 +0000 (04:40 +0000)]
The stuff we were doing with {programname}_DEPENDENCIES macros was to
work around a deficiency in older versions of automake; we now require
automake 1.6, which doesn't have that deficiency, so we get rid of that
stuff and simplify things.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20249 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoBring all the {programname}_* macros together into one section.
guy [Sat, 30 Dec 2006 01:15:05 +0000 (01:15 +0000)]
Bring all the {programname}_* macros together into one section.

Split bin_PROGRAMS and man1_MANS into multiple lines, and put them in
the same order as the corresponding {programname}_* macro sections.

Get rid of the separate {programname}_DEPENDENCIES macros in cases where
they can be constructed from the corresponding {programname}_LDADD
macro, and explain why they're different in cases where they can't be.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20248 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFix for bug #1132:
sfisher [Sat, 30 Dec 2006 01:06:46 +0000 (01:06 +0000)]
Fix for bug #1132:

Stop displaying the application data (in this case, HTML) in the tree and
and "Decrypted SSL data" tab twice since each already includes both of the
application data record layers combined.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20247 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agosince all callers to fvalue_set for FT_STRING[Z] use already_copied==FALSE we now...
sahlberg [Sat, 30 Dec 2006 00:57:46 +0000 (00:57 +0000)]
since all callers to fvalue_set for FT_STRING[Z] use already_copied==FALSE we now assert that this is the case in ftype-string.c and no longer have a conditional whetehr to create a local copy or not.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20246 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoproto_tree_set_string() no longer needs an already_allocated parameter since it is...
sahlberg [Sat, 30 Dec 2006 00:41:41 +0000 (00:41 +0000)]
proto_tree_set_string() no longer needs an already_allocated parameter since it is now always FALSE.

This should mean that all fvalue_set() for FT_STRING[Z] are always with already_copied==FALSE

(funny that we never saw someone trying to g_free("[ Null ]") which might have happened before)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20245 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agomake the FT_STRINGZ case in proto_tree_new_item() use ep allocated memory
sahlberg [Sat, 30 Dec 2006 00:36:29 +0000 (00:36 +0000)]
make the FT_STRINGZ case in proto_tree_new_item() use ep allocated memory

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20244 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agomake proto_tree_set_string_tvb use ep allocated memory and thus push the memory alloc...
sahlberg [Sat, 30 Dec 2006 00:27:33 +0000 (00:27 +0000)]
make proto_tree_set_string_tvb use ep allocated memory and thus push the memory allocation/free for this field down into ftype-string.c

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20243 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoRegularize the setting of variables for various executable targets.
guy [Sat, 30 Dec 2006 00:14:25 +0000 (00:14 +0000)]
Regularize the setting of variables for various executable targets.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20242 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoWhen building for Darwin, link with -search_paths_first, so that
guy [Sat, 30 Dec 2006 00:13:00 +0000 (00:13 +0000)]
When building for Darwin, link with -search_paths_first, so that
--with-pcap=/usr/local will, if there's only a static libpcap in
/usr/local/lib, link with that rather than the system's dynamic version.

Move the check for Cygwin that adds -no-undefined to LDFLAGS to the
section checking for linker flags to add.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20241 f5534014-38df-0310-8fa8-9805f1628bb7

17 years ago use ep allocated memory for the string in proto_item_append_string and let ftype...
sahlberg [Fri, 29 Dec 2006 23:05:55 +0000 (23:05 +0000)]
 use ep allocated memory for the string in proto_item_append_string and let ftype-string.c handle the allocation/freeing of storage by setting already_copied to FALSE

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20240 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agouse an ep allocated temporary string when creating the string for a FT_STRING value...
sahlberg [Fri, 29 Dec 2006 22:55:13 +0000 (22:55 +0000)]
use an ep allocated temporary string when creating the string for a FT_STRING value and call fvalue_set with already_copied==FALSE   so the string gets allocated in ftype-string.c instead

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20239 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoSet svn:ignore appropriately.
guy [Fri, 29 Dec 2006 22:54:43 +0000 (22:54 +0000)]
Set svn:ignore appropriately.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20238 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoMake the crypt library the same way other sublibraries of libwireshark
guy [Fri, 29 Dec 2006 22:53:44 +0000 (22:53 +0000)]
Make the crypt library the same way other sublibraries of libwireshark
are made, so that if libwireshark is shared, the crypt library is built
appropriately.  (This squelches a build warning, at least in OS X, that
linking a shared library with a static library is non-portable; it
should also arrange that the crypt library is built as
position-independent code if necessary.)

DISTCLEANFILES subsumes CLEANFILES, so it doesn't need to list files
already in CLEANFILES.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20237 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdd some parentheses, as the suggestion of Mr. GCC.
guy [Fri, 29 Dec 2006 22:48:52 +0000 (22:48 +0000)]
Add some parentheses, as the suggestion of Mr. GCC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20236 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoGive dissect_cmd_Get_Channel_Auth_Capabilities() a return type (it
guy [Fri, 29 Dec 2006 22:48:09 +0000 (22:48 +0000)]
Give dissect_cmd_Get_Channel_Auth_Capabilities() a return type (it
returns nothing, so it should be void), and make it static like the
other functions.

Make the ipmi_cmd_array[] table static - and const, while we're at it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20235 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFix for bug #1278:
sfisher [Fri, 29 Dec 2006 22:22:54 +0000 (22:22 +0000)]
Fix for bug #1278:

"When analysing a trace with 802.11 packages (made by airpcap) and selecting
Statistics->Conversation List->WLAN all wlan conversations are listed. When
after this selecting Apply as filter->Selected->A<->B a display filter is
created as

eth.addr==<A>  && eth.addr==<B>

when if should be

wlan.addr==<A>  && wlan.addr==<B>"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20234 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agogtk1 does not provide g_ascii_isxdigit so provide it through strutil.h instead
sahlberg [Fri, 29 Dec 2006 21:57:19 +0000 (21:57 +0000)]
gtk1 does not provide g_ascii_isxdigit   so provide it through strutil.h instead

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20233 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdd clean targets to wslua. Fix the config.nmake include in crypt.
gerald [Thu, 28 Dec 2006 17:28:29 +0000 (17:28 +0000)]
Add clean targets to wslua.  Fix the config.nmake include in crypt.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20232 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoMove the contents of airpdcap to epan/crypt. Try to fix the current
gerald [Thu, 28 Dec 2006 17:22:12 +0000 (17:22 +0000)]
Move the contents of airpdcap to epan/crypt.  Try to fix the current
distcheck failure.  Move the nmake build targets for airpdcap from
epan/dissectors to epan.  This will probably break the Windows build.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20231 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agodebug improvements
kukosa [Thu, 28 Dec 2006 12:30:53 +0000 (12:30 +0000)]
debug improvements

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20230 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoHack so test.sh will work with bash 3.1.6 or greater
wmeier [Thu, 28 Dec 2006 03:17:28 +0000 (03:17 +0000)]
Hack so test.sh will work with bash 3.1.6 or greater
which requires 'igncr' to be able to process files in
'dos format' (\r\n line endings)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20229 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdd missing files.
gerald [Wed, 27 Dec 2006 23:19:45 +0000 (23:19 +0000)]
Add missing files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20228 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoPrepare to move the airpdcap code to epan/crypt (SVN won't let me actually
gerald [Wed, 27 Dec 2006 23:05:55 +0000 (23:05 +0000)]
Prepare to move the airpdcap code to epan/crypt (SVN won't let me actually
move the files until these changes are checked in).  Add an AC_DEFINE
for airpdcap (which will be removed once the changes have settled).
Update the airpdcap code to compile on non-Windows systems.  Fix up
comments and whitespace to conform more closely to the rest of the
code base.  Verified to compile under Windows and OS X.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20227 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoUse the correct function to translate to hex.
etxrab [Wed, 27 Dec 2006 22:24:22 +0000 (22:24 +0000)]
Use the correct function to translate to hex.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20226 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoUse portaudio v19.
etxrab [Wed, 27 Dec 2006 22:21:46 +0000 (22:21 +0000)]
Use portaudio v19.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20225 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoAdding moduleinfo.nmake to the distribution
jake [Wed, 27 Dec 2006 12:21:30 +0000 (12:21 +0000)]
Adding moduleinfo.nmake to the distribution

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20224 f5534014-38df-0310-8fa8-9805f1628bb7

17 years ago+ browser_open_url()
lego [Wed, 27 Dec 2006 01:46:42 +0000 (01:46 +0000)]
+ browser_open_url()
+ browser_open_data_file()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20223 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoFrom Sebastien Tandel: fix places where a signed character was being
guy [Tue, 26 Dec 2006 22:56:35 +0000 (22:56 +0000)]
From Sebastien Tandel: fix places where a signed character was being
passed to ctype.h macros.

Make some routines in packet-exec.c not used outside that file static,
and fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20222 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoUh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake;
wmeier [Tue, 26 Dec 2006 22:40:49 +0000 (22:40 +0000)]
Uh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake;
I violated Murphy's nth law: thou shalt test fixes in an
'out of the box' configuration *not* in one's customized configuration.
:(

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20221 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agoIf p2p_dir isn't set (no message direction is configured) or no association is found...
morriss [Tue, 26 Dec 2006 22:27:46 +0000 (22:27 +0000)]
If p2p_dir isn't set (no message direction is configured) or no association is found, try to find a subdissector on both the called and calling SSNs instead of just trying the called SSN.  Also clean up some indenting and fix the capitalization when showing what dissector the TCAP SSN is linked to.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20220 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agothe default python version used changed from cygwin to native Win32 version
ulfl [Tue, 26 Dec 2006 22:01:09 +0000 (22:01 +0000)]
the default python version used changed from cygwin to native Win32 version

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20219 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agocygwins python doesn't work on a lot of machines, make the native python the default...
ulfl [Tue, 26 Dec 2006 20:20:52 +0000 (20:20 +0000)]
cygwins python doesn't work on a lot of machines, make the native python the default (until we know what the cause of the problems are)

set VERSION_EXTRA back to empty - I guess this was checked in by mistake

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20218 f5534014-38df-0310-8fa8-9805f1628bb7

17 years agofix unused warnings
ulfl [Tue, 26 Dec 2006 20:04:54 +0000 (20:04 +0000)]
fix unused warnings

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20217 f5534014-38df-0310-8fa8-9805f1628bb7