obnox/wireshark/wip.git
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

17 years agouse prefix to prevent redefinition warning from wingdi.h
ulfl [Tue, 26 Dec 2006 20:00:45 +0000 (20:00 +0000)]
use prefix to prevent redefinition warning from wingdi.h

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

17 years agoconvert line endings (using dos2unix) of the win32_setup.sh file before using it
ulfl [Tue, 26 Dec 2006 12:40:37 +0000 (12:40 +0000)]
convert line endings (using dos2unix) of the win32_setup.sh file before using it

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

17 years agoFrom Sebastien Tandel:
jake [Tue, 26 Dec 2006 09:13:05 +0000 (09:13 +0000)]
From Sebastien Tandel:
Here is a patch for the management of the bad/good checksum for ISIS (like TCP/UDP/IP).
support added for:
- booleans hf_isis_lsp_checksum_good, hf_isis_lsp_checksum_bad in the tree,
- information in the info column if bad checksum,
- expert info for bad checksum,

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

17 years agoFix indentation.
guy [Mon, 25 Dec 2006 21:34:11 +0000 (21:34 +0000)]
Fix indentation.

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

17 years agoFrom Sake Blok:
sfisher [Mon, 25 Dec 2006 04:01:22 +0000 (04:01 +0000)]
From Sake Blok:

The attached patch changes the way the ssl-session-id is displayed.
Currently it is not shown, only the length is shown like this:

   Session ID Length: 32
   Session ID (32 bytes)

To me, it is not useful to repeat the length and omit the ID itself.
With this patch the ssl-session-id is shown like this:

   Session ID Length: 32
   Session ID: A4B2FB0EE6D8F58DEFF68E38B1E5B4C25F1869D4BC86A96E...

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

17 years agodissect_roofnet_link() returns no value and nothing expects it to;
guy [Sun, 24 Dec 2006 20:40:19 +0000 (20:40 +0000)]
dissect_roofnet_link() returns no value and nothing expects it to;
declare it to return void, not int.

Get rid of an unused variable.

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

17 years agoReverse commit 20209, breaking the build across the board.
jake [Sun, 24 Dec 2006 16:12:04 +0000 (16:12 +0000)]
Reverse commit 20209, breaking the build across the board.

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

17 years agomake the PCRE ftype use ep allocated memory instead of g_malloced memory
sahlberg [Sat, 23 Dec 2006 21:17:32 +0000 (21:17 +0000)]
make the PCRE ftype use ep allocated memory instead of g_malloced memory

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

17 years agoget rid of an unused variable.
lego [Sat, 23 Dec 2006 03:53:13 +0000 (03:53 +0000)]
get rid of an unused variable.

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

17 years agoHave -X options defined before epan_init() gets called.
lego [Sat, 23 Dec 2006 03:52:38 +0000 (03:52 +0000)]
Have -X options defined before epan_init() gets called.

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

17 years ago- Fix an error in the tap listener callback
lego [Sat, 23 Dec 2006 03:45:46 +0000 (03:45 +0000)]
- Fix an error in the tap listener callback
- add some comments to console.lua

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

17 years agomake ipv4 ftype use cheap ep_ memory isntead of slightly less cheap g_ memory
sahlberg [Sat, 23 Dec 2006 00:10:49 +0000 (00:10 +0000)]
make ipv4 ftype use cheap ep_ memory isntead of slightly less cheap g_ memory
for the temporary storage while parsing

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

17 years agoUpdate to GNUTLS 1.6.0.
gerald [Sat, 23 Dec 2006 00:06:16 +0000 (00:06 +0000)]
Update to GNUTLS 1.6.0.

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

17 years agoReport inaccurate PPPoE Session payload length when detected to aid in the
sfisher [Fri, 22 Dec 2006 22:15:38 +0000 (22:15 +0000)]
Report inaccurate PPPoE Session payload length when detected to aid in the
troubleshooting of malformed packets.

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

17 years ago@ -> [AT]
gerald [Fri, 22 Dec 2006 21:01:23 +0000 (21:01 +0000)]
@ -> [AT]

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

17 years agoMake fix for bug 771 compatible with GTK1
jake [Fri, 22 Dec 2006 20:09:09 +0000 (20:09 +0000)]
Make fix for bug 771 compatible with GTK1

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

17 years agoOK: I think I've fixed most of the problems in
wmeier [Fri, 22 Dec 2006 18:16:22 +0000 (18:16 +0000)]
OK: I think I've fixed most of the problems in
    suite-capture.sh which were causing some
    of tests to fail;
    The stdout tests still tend to fail:
    some issue with flushing the stdout pipe ??

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

17 years agoTake out UCD-SNMP message since we no longer use it
morriss [Fri, 22 Dec 2006 17:23:45 +0000 (17:23 +0000)]
Take out UCD-SNMP message since we no longer use it

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

17 years agoFix for bug 1272.
jake [Fri, 22 Dec 2006 14:48:51 +0000 (14:48 +0000)]
Fix for bug 1272.
Check length remaining before aligning.

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

17 years agoUse interface '1' for the capture tests;
wmeier [Fri, 22 Dec 2006 13:00:40 +0000 (13:00 +0000)]
Use interface '1' for the capture tests;
Add additional error output in case any other problems

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

17 years agoFix for bug 1195.
jake [Fri, 22 Dec 2006 12:53:49 +0000 (12:53 +0000)]
Fix for bug 1195.
Add preference svn_client to indicate you want to use 'svn info' i.s.o. ugly directory hack.
version.conf format more relaxed.

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

17 years agohmm
sahlberg [Fri, 22 Dec 2006 09:01:12 +0000 (09:01 +0000)]
hmm

best to revert this for a while.

revert all changes from previous patch.

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

17 years agochange some slab allocated memory into ep/emem allocated structures instead.
sahlberg [Fri, 22 Dec 2006 08:35:43 +0000 (08:35 +0000)]
change some slab allocated memory into ep/emem allocated structures instead.

this primarily removes code and simplifies (==eliminates) the need to track the data that is allocated and should potentially be slightly faster than a slab allocator.
however these functions are called A LOT so there might be a performance hit when using emem with full debugging canary values and all the bells and whistles activated.

this change also makes any future attempt to parallellize dissection of frames easier if we just make the ep allocator allocate from a threads specific ep pool.
(something we would have to do anyway to make ep allocations multithreaded)

this works in all my tests so far but needs more test coverage.

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

17 years agofix a typo.
lego [Fri, 22 Dec 2006 05:54:12 +0000 (05:54 +0000)]
fix a typo.

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

17 years ago- Fix the name of the disable_lua variable.
lego [Fri, 22 Dec 2006 05:48:57 +0000 (05:48 +0000)]
- Fix the name of the disable_lua variable.
== improve documentation
   make-doc.pl ( make doc ) generates an almost complete reference manual.

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

17 years agoAdd additional output to try to find out why the "capture 10
wmeier [Fri, 22 Dec 2006 04:46:26 +0000 (04:46 +0000)]
Add additional output to try to find out why the "capture 10
packets" test fails during the run-tests step of the
buildbot windows build ...

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

17 years agouse 'rm -rf' so no error if directory already deleted (by 'clean_setup')
wmeier [Fri, 22 Dec 2006 00:38:53 +0000 (00:38 +0000)]
use 'rm -rf' so no error if directory already deleted (by 'clean_setup')

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

17 years agoFrom Alfred Alinazar:
jake [Thu, 21 Dec 2006 22:24:33 +0000 (22:24 +0000)]
From Alfred Alinazar:
The patch is to dissect unknown information element when an Avaya PBX
use codeset = 6 to send display.

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

17 years agoUpdate to use gtk 2.10.6 and friends.
etxrab [Thu, 21 Dec 2006 22:15:34 +0000 (22:15 +0000)]
Update to use gtk 2.10.6 and friends.

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

17 years agoFrom Taisuke SASAKI:
jake [Thu, 21 Dec 2006 22:13:30 +0000 (22:13 +0000)]
From Taisuke SASAKI:
I found a misdecoding in dissect_sflow_extended_switch() in epan/dissector/packet-sflow.c and fixed it.

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

17 years agoFrom Florent Drouin:
jake [Thu, 21 Dec 2006 22:01:09 +0000 (22:01 +0000)]
From Florent Drouin:
Here is a patch for Bug 771.
It solves the problem of datalink header selection, when the interface has more than one.

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

17 years agoSteve Sommars wanted his work e-mail address removed and his home
guy [Thu, 21 Dec 2006 21:09:39 +0000 (21:09 +0000)]
Steve Sommars wanted his work e-mail address removed and his home
address's entry removed.

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

17 years agoAdd a generated field for how many data bytes are accepted by subdissector
martinm [Thu, 21 Dec 2006 18:00:07 +0000 (18:00 +0000)]
Add a generated field for how many data bytes are accepted by subdissector

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

17 years agoTBCP changes:
martinm [Thu, 21 Dec 2006 17:05:42 +0000 (17:05 +0000)]
TBCP changes:
- Fix 'ignored' flag that wasn't wide enough to take result
- Use FP_UINT_STRING in a couple of places

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

17 years agoFrom Motonori Shindo:
sfisher [Thu, 21 Dec 2006 06:41:11 +0000 (06:41 +0000)]
From Motonori Shindo:

As per NetFlow V9 protocol, Template ID is guaranteed to be unique per
Observation Domain (identified by Source ID) and the Exporter
(identified by the source IP address of NetFlow PDU).

The former code was ignoring these information for simplicity, but
noticing such a necessity.

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

17 years agoSet svn:ignore
jmayer [Wed, 20 Dec 2006 21:41:19 +0000 (21:41 +0000)]
Set svn:ignore

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

17 years agoUpdated to describe the current state of plugin development.
jake [Wed, 20 Dec 2006 16:24:19 +0000 (16:24 +0000)]
Updated to describe the current state of plugin development.

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

17 years agoEnhance tcp reassembly of the flavor "reassemble one more segment" work properly
sahlberg [Wed, 20 Dec 2006 11:57:31 +0000 (11:57 +0000)]
Enhance tcp reassembly of the flavor "reassemble one more segment" work properly
for the quite unusual case when we need to do this multiple times in a row for the same PDU.

This fixes the issue reported by Xiaoguang Liu on the mailinglist
where wireshark did not manage to properly reassemble a big HTTP header spanning several (more than two) tcp segments.

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

17 years agoBump micro version number, like in moduleinfo.h
jake [Wed, 20 Dec 2006 10:07:20 +0000 (10:07 +0000)]
Bump micro version number, like in moduleinfo.h

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

17 years agoraise plugin version, as I've done some small but important changes
ulfl [Tue, 19 Dec 2006 22:44:35 +0000 (22:44 +0000)]
raise plugin version, as I've done some small but important changes

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

17 years agoSet the right properties on the files.
jake [Tue, 19 Dec 2006 22:30:38 +0000 (22:30 +0000)]
Set the right properties on the files.

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