11 years agoOn Windows, if we're running anything but plain Visual C++ 6 (including
gerald [Mon, 11 Aug 2008 21:59:59 +0000 (21:59 +0000)]
On Windows, if we're running anything but plain Visual C++ 6 (including
VC6 plus a platform SDK), set INET6. Use that to figure out if we need
to define socklen_t for c-ares. This should fix bug 2797.

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

11 years agoFrom Darryl Champagne:
etxrab [Mon, 11 Aug 2008 20:14:04 +0000 (20:14 +0000)]
From   Darryl Champagne:
Add SyncML 1.2, and ActiveSync support to packet-wbxml.

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

11 years agoAdded some clean targets.
stig [Mon, 11 Aug 2008 19:45:02 +0000 (19:45 +0000)]
Added some clean targets.

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

11 years agoAdd a note about c-ares and MSVC6.
gerald [Mon, 11 Aug 2008 17:20:18 +0000 (17:20 +0000)]
Add a note about c-ares and MSVC6.

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

11 years agoFrom Roy Marples (bug 2781 and bug 2796):
stig [Mon, 11 Aug 2008 12:00:27 +0000 (12:00 +0000)]
From Roy Marples (bug 2781 and bug 2796):
Display FQDN binary encoded name as text
Ensure that get_dns_name does not cross packet sub boundry

From me:
Preserve the usage of bootp.fqdn.name as a display filter

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

11 years agoGet rid of a '<' in the description that causes docbook to bail out...
lego [Mon, 11 Aug 2008 07:32:17 +0000 (07:32 +0000)]
Get rid of a '<' in the description that causes docbook to bail out...

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

11 years agoThe forgotten file!
lego [Mon, 11 Aug 2008 02:01:09 +0000 (02:01 +0000)]
The forgotten file!

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

11 years agotry to avoid:
lego [Mon, 11 Aug 2008 01:55:27 +0000 (01:55 +0000)]
try to avoid:

funnel_stat.c:528: error: expected Ã¢â\82¬Ë\9c=ââ\82¬â\84¢, Ã¢â\82¬Ë\9c,ââ\82¬â\84¢, Ã¢â\82¬Ë\9c;ââ\82¬â\84¢, Ã¢â\82¬Ë\9casmââ\82¬â\84¢ or Ã¢â\82¬Ë\9c__attribute__ââ\82¬â\84¢ before Ã¢â\82¬Ë\9c*ââ\82¬â\84¢ token
funnel_stat.c:535: error: expected Ã¢â\82¬Ë\9c)ââ\82¬â\84¢ before Ã¢â\82¬Ë\9c*ââ\82¬â\84¢ token
funnel_stat.c:541: error: expected Ã¢â\82¬Ë\9c)ââ\82¬â\84¢ before Ã¢â\82¬Ë\9c*ââ\82¬â\84¢ token
funnel_stat.c:572: error: Ã¢â\82¬Ë\9cfunnel_new_progress_windowââ\82¬â\84¢ undeclared here (not in a function)

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

11 years agoAdd a slightly modified version of Paolo Abeni's funneled progress dialog (ref https...
lego [Mon, 11 Aug 2008 01:33:31 +0000 (01:33 +0000)]
Add a slightly modified version of Paolo Abeni's funneled progress dialog (ref https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2725) and its wslua interface.

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

11 years agoAlso check in $prefix for libsmi.
stig [Sun, 10 Aug 2008 15:37:39 +0000 (15:37 +0000)]
Also check in $prefix for libsmi.

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

11 years agoReplace build-depend of ADNS by c-ares
jake [Sun, 10 Aug 2008 08:05:59 +0000 (08:05 +0000)]
Replace build-depend of ADNS by c-ares

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

11 years agoFix an se_leak
lego [Sat, 9 Aug 2008 20:19:52 +0000 (20:19 +0000)]
Fix an se_leak

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

11 years agoFrom Brooss (bug 2373):
stig [Sat, 9 Aug 2008 18:36:22 +0000 (18:36 +0000)]
From Brooss (bug 2373):
Added TeamSpeak2 dissector

From me:
- Made all local functions static
- Renamed my_vals to conv_vals
- Call correct function to parse LOGINEND
- Fixed some obvious errors in typenames list
- Fixed some indentation

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

11 years agoFrom Shinsuke SUZUKI (bug 2789):
stig [Sat, 9 Aug 2008 16:24:39 +0000 (16:24 +0000)]
From Shinsuke SUZUKI (bug 2789):
Remove some non-ASCII characters.

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

11 years agoRemove an obsolete slash.
stig [Sat, 9 Aug 2008 16:17:19 +0000 (16:17 +0000)]
Remove an obsolete slash.

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

11 years agoFix a typo in a comment.
stig [Sat, 9 Aug 2008 16:16:52 +0000 (16:16 +0000)]
Fix a typo in a comment.

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

11 years agoIf using $prefix we add "$prefix/include" to the include search path
stig [Sat, 9 Aug 2008 16:16:28 +0000 (16:16 +0000)]
If using $prefix we add "$prefix/include" to the include search path
and "$prefix/lib" to the library search path.

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

11 years agoRemove the "Save column widths" option so we always save the widths.
stig [Sat, 9 Aug 2008 16:14:34 +0000 (16:14 +0000)]
Remove the "Save column widths" option so we always save the widths.

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

11 years agoCheck if the recent_common file exists instead of having a setting in
stig [Sat, 9 Aug 2008 16:12:41 +0000 (16:12 +0000)]
Check if the recent_common file exists instead of having a setting in
the recent file.

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

11 years agoFrom Alexey Neyman (Bug 2786):
sake [Sat, 9 Aug 2008 08:17:53 +0000 (08:17 +0000)]
From Alexey Neyman (Bug 2786):

Make "stop" button in the capture info dialog work

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

11 years agoReplace custom data presentation with native one.
jake [Fri, 8 Aug 2008 21:39:25 +0000 (21:39 +0000)]
Replace custom data presentation with native one.

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

11 years agoFix for bug 2778:
jake [Fri, 8 Aug 2008 21:22:33 +0000 (21:22 +0000)]
Fix for bug 2778:
Bye string is "null padded", not "null terminated". Change code to test for that fact.

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

11 years agoAF_ values are used in DLT_LOOP captures as well.
guy [Fri, 8 Aug 2008 21:11:44 +0000 (21:11 +0000)]
AF_ values are used in DLT_LOOP captures as well.

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

11 years agoAdd Linux AF_ values to epan/aftypes.h; IAX2 implicitly uses them.
guy [Fri, 8 Aug 2008 20:07:23 +0000 (20:07 +0000)]
Add Linux AF_ values to epan/aftypes.h; IAX2 implicitly uses them.

Have the IAX2 dissector include <epan/aftypes.h> and use the Linux AF_
values from it.  Point to the IAX2 I-D, and add some clarifying

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

11 years agoFix for bug 2780:
jake [Fri, 8 Aug 2008 19:57:50 +0000 (19:57 +0000)]
Fix for bug 2780:
Correct reverse direction payload save.

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

11 years agoFrom Kovarththanan Rajaratnam (Bug 2660):
sake [Fri, 8 Aug 2008 19:41:35 +0000 (19:41 +0000)]
From Kovarththanan Rajaratnam (Bug 2660):

Make display filter max recent entries a preference

(From me: fixed an off by one bug in saving to the recent file)

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

11 years agoAdd Winsock AF_ values to epan/aftypes.h; the DirectPlay and ActiveSync
guy [Fri, 8 Aug 2008 19:27:58 +0000 (19:27 +0000)]
Add Winsock AF_ values to epan/aftypes.h; the DirectPlay and ActiveSync
Desktop Pass-Through protocols use them.

Use those values in the dissectors for those protocols.

In the Desktop Pass-Through dissector, define the Winsock SOCK_ values
ourselves, and get the IP protocol values from <epan/ipproto.h>.  Don't
include now-unnecessary system headers in that dissector.

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

11 years agoDon't get AF_ values used in protocols from system header files -
guy [Fri, 8 Aug 2008 18:15:24 +0000 (18:15 +0000)]
Don't get AF_ values used in protocols from system header files -
they're not guaranteed to be the same in all OSes.  Define them

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

11 years agoWhen copying and renaming files, put quotes around the sources and
gerald [Fri, 8 Aug 2008 17:15:34 +0000 (17:15 +0000)]
When copying and renaming files, put quotes around the sources and

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

11 years agoInclude asn1/Makefile.inc.nmake and asn1/Makefile.preinc.nmake into the distribution...
kukosa [Fri, 8 Aug 2008 11:37:29 +0000 (11:37 +0000)]
Include asn1/Makefile.inc.nmake and asn1/Makefile.preinc.nmake into the distribution package

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

11 years agoAdd support for c-ares to the GNU toolchain.
gerald [Fri, 8 Aug 2008 00:04:38 +0000 (00:04 +0000)]
Add support for c-ares to the GNU toolchain.

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

11 years agoFrom Ryan Wamsley:
jake [Thu, 7 Aug 2008 22:38:19 +0000 (22:38 +0000)]
From Ryan Wamsley:
Add Ethernet Global Data (EGD) packet dissector.

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

11 years agoAdd support for the c-ares asynchronous DNS resolution library to the
gerald [Thu, 7 Aug 2008 21:41:48 +0000 (21:41 +0000)]
Add support for the c-ares asynchronous DNS resolution library to the
Windows build. Add support for async IPv6 lookups. Update the ADNS
code slightly.

This is not supported (yet) on the UNIX side.

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

11 years agoPut back the Intel URL for the IPMI specs.
guy [Thu, 7 Aug 2008 20:58:27 +0000 (20:58 +0000)]
Put back the Intel URL for the IPMI specs.

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

11 years agoActivate the IPMI changes
etxrab [Thu, 7 Aug 2008 19:33:40 +0000 (19:33 +0000)]
Activate the IPMI changes
From    Alexey Neyman.

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

11 years agoremove a degug printf
lego [Thu, 7 Aug 2008 16:40:56 +0000 (16:40 +0000)]
remove a degug printf

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

11 years agoRemove some obsolete comments related to GTK 1.
wmeier [Thu, 7 Aug 2008 12:31:43 +0000 (12:31 +0000)]
Remove some obsolete comments related to GTK 1.

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

11 years agoFrom Alexey Neyman :
etxrab [Wed, 6 Aug 2008 20:51:02 +0000 (20:51 +0000)]
From    Alexey Neyman :
(Note just checking in the new files not yet added to the build process on purpose
the changes to packet-ipmi.c is also not done yet - Anders).

Generic changes:

- IPMI session wrapper dissection has been separated from the dissection of
  IPMI itself. This will allow for possible dissection of captures directly
  from IPMB (as the IPMB messages lack the IPMI session wrapper).
IPMI changes:

- Implemented request-response matching for IPMI sessions. This makes easy
  serves two purposes: first, it allows for easy location of response to a
  certain request and vice versa. Second, it allows for dissection of
  responses where response format depends on the request data.

- IPMI dissector can now dissect much broader set of commands.

- Command-specific completion codes are now handled.

- The dissector is able to parse IPMI commands embedded into other IPMI
  commands (for now, only Send Message; Get Message and Forward Message
  can be implemented later). Such embedded commands also matched with
  responses to them.

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

11 years agoMerge files chronologically by default which:
morriss [Wed, 6 Aug 2008 14:11:46 +0000 (14:11 +0000)]
Merge files chronologically by default which:
- makes (much) more sense to me
- makes the GUI's default behavior the same as mergecap's

For whatever reason the default behavior was to append the new file
/if transport resolution was enabled/ (not sure what those two things have to
do with each other).

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

11 years agoHave the window being resizable
lego [Wed, 6 Aug 2008 12:03:16 +0000 (12:03 +0000)]
Have the window being resizable

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

11 years agoFrom Hakim Bellam:
etxrab [Wed, 6 Aug 2008 07:00:46 +0000 (07:00 +0000)]
From   Hakim Bellam:
-Added support for aggregate frames
-Added correct decoding for most fields

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

11 years agoFrom Kip McAtee:
etxrab [Wed, 6 Aug 2008 06:55:53 +0000 (06:55 +0000)]
From   Kip McAtee:
Added a mask to drop the high order byte of a short to isolate the protocol ID.
Also lowered the length restriction to support shorter packets for PPPoEoA.

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

11 years agoadd initial dnsserver dcerpc implementation
sahlberg [Wed, 6 Aug 2008 06:53:37 +0000 (06:53 +0000)]
add initial dnsserver dcerpc implementation

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

11 years agoFrom Gary Reynolds:
etxrab [Wed, 6 Aug 2008 06:53:04 +0000 (06:53 +0000)]
From   Gary Reynolds:
Extended the cldap desector to include all the current netlogon response data

Expanded the cldap netlogon ntver option to be a bit mask of the search flags

Updated the DS flags fields to include Windows 2008 options.

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

11 years agoin nfs name to filehandle mappings
sahlberg [Wed, 6 Aug 2008 06:45:44 +0000 (06:45 +0000)]
in nfs name to filehandle mappings
when we check and ignore the two names "." and ".."
we must do so for both methods a caller can provide the name :
offset into a tvb, as well as a char* to a string.

also add ->full_name in the dissection to the replies  so that fh
both request and reply and not ->name

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

11 years agoMake the buttons of the UAT dialog usable again, and get rid of some gtk warnings.
lego [Wed, 6 Aug 2008 00:43:01 +0000 (00:43 +0000)]
Make the buttons of the UAT dialog usable again, and get rid of some gtk warnings.

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

11 years agoAdd a missing </para>.
gerald [Tue, 5 Aug 2008 23:08:16 +0000 (23:08 +0000)]
Add a missing </para>.

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

11 years agoFix some errors introduced when fixing Luis Ontanon's e-mail address.
guy [Tue, 5 Aug 2008 21:31:17 +0000 (21:31 +0000)]
Fix some errors introduced when fixing Luis Ontanon's e-mail address.

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

11 years agoluis.ontanon@gmail.com => luis@ontanon.org
lego [Tue, 5 Aug 2008 21:03:46 +0000 (21:03 +0000)]
luis.ontanon@gmail.com => luis@ontanon.org

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

11 years agoRemove obsolete "example_snmp_users_file"
lego [Tue, 5 Aug 2008 20:39:31 +0000 (20:39 +0000)]
Remove obsolete "example_snmp_users_file"

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

11 years ago(Temporary?) fix to get the Windows buildbot going again: remove constness from a...
morriss [Tue, 5 Aug 2008 20:38:22 +0000 (20:38 +0000)]
(Temporary?) fix to get the Windows buildbot going again: remove constness from a couple of variables.

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

11 years agoFromVincent Helfre:
etxrab [Tue, 5 Aug 2008 18:49:02 +0000 (18:49 +0000)]
FromVincent Helfre:
A patch for the PS handover XID parameters Information element, which uses the sndcp-xid dissector.

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

11 years agoDon't put (non-extern'd) prototypes for protect_thread_critical_region() and
morriss [Tue, 5 Aug 2008 17:33:14 +0000 (17:33 +0000)]
Don't put (non-extern'd) prototypes for protect_thread_critical_region() and
unprotect_thread_critical_region() in every module in gtk/: instead have those
modules include main.h (which has the properly extern'd prototype).

This should fix the link error on HP-UX described in

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

11 years agoSwitch the default MSVC_VARIANT from MSVC6 to MSVC2008.
gerald [Tue, 5 Aug 2008 17:02:30 +0000 (17:02 +0000)]
Switch the default MSVC_VARIANT from MSVC6 to MSVC2008.

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

11 years agoAdd --settag and --checktag arguments to win32-setup.sh, which respectively
gerald [Tue, 5 Aug 2008 17:00:34 +0000 (17:00 +0000)]
Add --settag and --checktag arguments to win32-setup.sh, which respectively
save and verify the current download tag. Add --settag and --checktag calls
to the process_libs target. (This should automatically notify everyone when
wireshark-win32-libs is updated, which I tend to forget to do.)

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

11 years agoThere's no need to have _DEPENDENCIES variables (which have only a very limited
morriss [Tue, 5 Aug 2008 14:51:34 +0000 (14:51 +0000)]
There's no need to have _DEPENDENCIES variables (which have only a very limited
subset of the real dependencies as specified in the _LDADD variables) for
Wireshark, tshark, and the rest of the programs: by specifying the
_DEPENDENCIES variable we just prevent automake from doing its job and
automatically figuring out the dependencies for us.

This should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2765

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

11 years agoFrom Daniel Krueger:
morriss [Tue, 5 Aug 2008 13:59:27 +0000 (13:59 +0000)]
From Daniel Krueger:

The attached patch fixes a bug in the dissection of the StatusResponse,
where device-specific error code is only 6 Bytes long instead of 8 Bytes.

Additionally, I changed the spelling (i.e. the case) of "Ethernet
POWERLINK" to the new preferred one of the EPSG.

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

11 years agoHave some UAT helper functions copying the passed buffer before
lego [Tue, 5 Aug 2008 11:16:24 +0000 (11:16 +0000)]
Have some UAT helper functions copying the passed buffer before
freeing the contained buffer ( The client might have passed the
contained buffer to avoid read-after-free )

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

11 years agoAdd a debug helper for EP memory corruption
lego [Tue, 5 Aug 2008 02:23:35 +0000 (02:23 +0000)]
Add a debug helper for EP memory corruption

if compiled in and the env var WIRESHARK_DEBUG_EP_CANARY is set:
will check for canary integrity at every call to EP_CHECK_CANARY()
if corruption is found it exits pronting the prior location and the location in which corruption was found.
Hopefully it stops running while the corruptor is still in the stack.

see EP_CHECK_CANARY() calls in packet.c as an example.

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

11 years agoKeep the OSX compiler happy: initialize a variable (altho not really req'd)
wmeier [Mon, 4 Aug 2008 23:58:03 +0000 (23:58 +0000)]
Keep the OSX compiler happy: initialize a variable (altho not really req'd)

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

11 years agoAnother temporary fix to prevent a build error
wmeier [Mon, 4 Aug 2008 23:50:11 +0000 (23:50 +0000)]
Another temporary fix to prevent a build error

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

11 years agoif it's se allocated it needs to be filled only once.
lego [Mon, 4 Aug 2008 23:25:07 +0000 (23:25 +0000)]
if it's se allocated it needs to be filled only once.

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

11 years agoFix an ep memory corruption due to passing ep blocks into a se allocated structure.
lego [Mon, 4 Aug 2008 23:15:54 +0000 (23:15 +0000)]
Fix an ep memory corruption due to passing ep blocks into a se allocated structure.

far away from UAT...

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

11 years agotemp fix (until the proper fix) to handle buildbot errs;
wmeier [Mon, 4 Aug 2008 23:15:51 +0000 (23:15 +0000)]
temp fix (until the proper fix) to handle buildbot errs;

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

11 years agoFrom Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.
gerald [Mon, 4 Aug 2008 23:05:32 +0000 (23:05 +0000)]
From Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.

From me:

Instead of adding adns_config.h, place it a custom adns package in
wireshark-win32-libs. Update tools/win32-setup.sh accordingly.

Split the MSVC2008EE variant into MSVC2008 and MSVC2008EE, similar to
MSVC2005 and MSVC2005EE. We have to worry about vcredist_x86.exe in
both cases.

Add Pascal to AUTHORS.

Update the Developer's Guide.

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

11 years agoFrom Alexey Neyman :
etxrab [Mon, 4 Aug 2008 20:41:43 +0000 (20:41 +0000)]
From Alexey Neyman :
This patch implements a function for dissecting bitfields with better control
over the resulting representation than the existing proto_tree_add_bitmask()
routine. This function will be used by reworked IPMI/ATCA dissector (bug 2048).

The function is described in README.developer. In short, the differences are as

- The new function does not require a hf_XXX field for the whole bitmask. When
the bitmask includes several unrelated fields, such hf_XXX field does not make

- The new function allows better control over the way the sub-item descriptions
are added to the top-level item. For example, proto_tree_add_bitmask() function
does not add non-enumerated integers, does not use true_false_string to display

- The new function allows to specify "fallback" text for the top-level item
which is used if no items were added to the top-level item.

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

11 years agoGive Vincent Helfre and Magnus Sörman credit.
etxrab [Mon, 4 Aug 2008 20:21:41 +0000 (20:21 +0000)]
Give Vincent Helfre and Magnus Sörman credit.

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

11 years agoFix packet-gsm_a_common.c:63: warning: assignment makes integer from pointer without...
etxrab [Mon, 4 Aug 2008 20:17:34 +0000 (20:17 +0000)]
Fix packet-gsm_a_common.c:63: warning: assignment makes integer from pointer without a cast.
Assuming the default shouldn't occure and fix a copy past error.

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

11 years agoFrom Neil Piercy:
etxrab [Mon, 4 Aug 2008 19:44:03 +0000 (19:44 +0000)]
From Neil Piercy:
All I've done in these is to split the 3 obviously distinct protocols (BSSMAP & RP) from the still-large (and wrongly-named) DTAP (really the whole of layer 3 - it includes RR and packet parts too).

So far I've only split in a "minimum change" manner - there is clearly some tidying and structure enhancement of how the common bits are used, removing the globals just added, and great scope for consistency of white space, improved naming etc. - but I thought it best to keep it very close to the original initially to establish the split.

With some changes to make it compile on Windows.

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

11 years agoDeclare next_tvb volatile. This prevents the warning:
martinm [Mon, 4 Aug 2008 16:36:16 +0000 (16:36 +0000)]
Declare next_tvb volatile.  This prevents the warning:

    packet-infiniband.c:806: warning: variable 'next_tvb' might be clobbered by `longjmp' or `vfork'

seen with gcc 3.4.6 (building for 32-bits on a pentium 4).

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

11 years agoFirst step to split the gsm_a dissector into several smaller ones ( done by Neil...
etxrab [Mon, 4 Aug 2008 16:11:17 +0000 (16:11 +0000)]
First step to split the gsm_a dissector into several smaller ones ( done by Neil Piercy)
rename the "old" one to gsm_a_common.

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

11 years agoPrint various uints with %u ...
wmeier [Mon, 4 Aug 2008 03:46:49 +0000 (03:46 +0000)]
Print various uints with %u ...

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

11 years agoFix 2 bugs:
wmeier [Mon, 4 Aug 2008 02:56:47 +0000 (02:56 +0000)]
Fix 2 bugs:
- Misplaced } resulted in incorrect program flow in switch statement;
- Invalid input caused "Dissector bug: infinite loop";

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

11 years agoFix buildbot error: "no newline at end of file"
wmeier [Mon, 4 Aug 2008 02:31:35 +0000 (02:31 +0000)]
Fix buildbot error: "no newline at end of file"

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

11 years agoAdjust various indentation/spacing; Do some minor reformatting
wmeier [Mon, 4 Aug 2008 02:27:20 +0000 (02:27 +0000)]
Adjust various indentation/spacing; Do some minor reformatting

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

11 years agoRevert previous checkin.
etxrab [Sun, 3 Aug 2008 16:11:23 +0000 (16:11 +0000)]
Revert previous checkin.

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

11 years agopacket-multipart.c:179: warning: unused parameter 'pinfo'
etxrab [Sun, 3 Aug 2008 15:44:26 +0000 (15:44 +0000)]
packet-multipart.c:179: warning: unused parameter 'pinfo'
packet-multipart.c:179: warning: unused parameter 'name'
( restore a bit of previous code)
Move inclusion of tvbuff.h to base64.c

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

11 years agoMove common code to base64.c
etxrab [Sun, 3 Aug 2008 14:27:22 +0000 (14:27 +0000)]
Move common code to base64.c

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

11 years agoDon't fetch data until you need it.
guy [Sat, 2 Aug 2008 21:59:33 +0000 (21:59 +0000)]
Don't fetch data until you need it.

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

11 years agoFix packet-netflow.c:2666: warning: 'pen' may be used uninitialized in this function
etxrab [Sat, 2 Aug 2008 16:13:40 +0000 (16:13 +0000)]
Fix packet-netflow.c:2666: warning: 'pen' may be used uninitialized in this function
and remove some C++ comments - some compilers don't allow them (at least not by default).

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

11 years agoFrom Hitoshi Irino:
etxrab [Sat, 2 Aug 2008 13:53:49 +0000 (13:53 +0000)]
From   Hitoshi Irino:
This patch
(1) fixes to decode IPFIX packets.
The revision 25601 warns and be not able to decodes IPFIX packets fully,
because the array "hf_register_info" does not have an entry
"hf_cflow_datarecord_length", and a length check for IPFIX packets is incorrect
in "dissect_netflow" function.
(2) is able to decode all Information Elements standardized by RFC 5102
(3) is able to decode IPFIX templates and data that contains PEN (Private
Enterprise Number) fields standardized by RFC 5101, and is able to decode
bi-directional flow standardized by RFC 5103.

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

11 years agoFrom Abhik Sarkar:
etxrab [Sat, 2 Aug 2008 13:47:31 +0000 (13:47 +0000)]
From   Abhik Sarkar:
Some buttons are always disabled in the "User DLTs Table" dialog.

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

11 years agoWIN32 ==> _WIN32
wmeier [Sat, 2 Aug 2008 12:20:38 +0000 (12:20 +0000)]
WIN32 ==>  _WIN32

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

11 years agoFrom metatech:
etxrab [Fri, 1 Aug 2008 18:17:23 +0000 (18:17 +0000)]
From metatech:
- In DRDA the data is of different "nature" : EBCDIC vs ASCII, so I think they
deserve different field names.

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

11 years agoReally start printing in 8 pnt Courier, not just state so in the template.
jake [Fri, 1 Aug 2008 17:36:09 +0000 (17:36 +0000)]
Really start printing in 8 pnt Courier, not just state so in the template.
Add Wireshark version info to the page header.

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

11 years agoSeveral improvements to the PostScript code:
jake [Fri, 1 Aug 2008 17:34:36 +0000 (17:34 +0000)]
Several improvements to the PostScript code:
- Remove old code and comments.
- Add 5 pnt between last lines baseline and lower horizontal line to avoid having the last line sitting right on top of the horizontal line
- Fix pagewidth expression (although outcome is the same)
- Add page decorations for single page print as well
- Add DSC end of file marker

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

11 years agoRemove a few warnings.
stig [Fri, 1 Aug 2008 16:49:12 +0000 (16:49 +0000)]
Remove a few warnings.

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

11 years agoRegenerated to use the new decode function for UTCTime.
stig [Fri, 1 Aug 2008 16:45:30 +0000 (16:45 +0000)]
Regenerated to use the new decode function for UTCTime.

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

11 years agoFrom Martin Peylo (bug 2507):
stig [Fri, 1 Aug 2008 16:44:06 +0000 (16:44 +0000)]
From Martin Peylo (bug 2507):
The attached patch enables asn2wrs.py and packet-ber.c to decode UTCTime
according to the definitions in X.680.

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

11 years agopacket-turnchannel.c:219: warning: passing argument 2 of 'register_dissector' from...
etxrab [Fri, 1 Aug 2008 15:45:29 +0000 (15:45 +0000)]
packet-turnchannel.c:219: warning: passing argument 2 of 'register_dissector' from incompatible pointer type

A dissector returning int should return the length consumed of the tvb and be
registered with new_register_dissector();

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

11 years agoFrom stéphane bryant:
etxrab [Fri, 1 Aug 2008 15:11:06 +0000 (15:11 +0000)]
From  stéphane bryant:
STUN, STUN2 and TURN dissection enhancements.

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

11 years agoboolean -> gboolean
stig [Fri, 1 Aug 2008 14:26:48 +0000 (14:26 +0000)]
boolean -> gboolean

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

11 years agofix packet-sndcp-xid.c:483: warning: unused parameter 'pinfo'
etxrab [Fri, 1 Aug 2008 12:42:38 +0000 (12:42 +0000)]
fix packet-sndcp-xid.c:483: warning: unused parameter 'pinfo'

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

11 years agoFrom Bill Meier:
etxrab [Fri, 1 Aug 2008 11:56:57 +0000 (11:56 +0000)]
From Bill Meier:
segmentation fault loading trace containing NCP packets.

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

11 years agoFix packet-gprs-llc.c:413: warning: format '%lu' expects type 'long unsigned int...
etxrab [Fri, 1 Aug 2008 11:25:23 +0000 (11:25 +0000)]
Fix packet-gprs-llc.c:413: warning: format '%lu' expects type 'long unsigned int', but argument 7 has type 'guint32' and the modified makfiloe.common missed in previous checkin.

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

11 years agoFrom Yaniv Kaul:
etxrab [Fri, 1 Aug 2008 11:20:50 +0000 (11:20 +0000)]
From   Yaniv Kaul:
( I edited the template files)
Failure to dissect long SASL wrapped LDAP response.

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

11 years agoFrom Vincent Helfre:
etxrab [Fri, 1 Aug 2008 11:08:21 +0000 (11:08 +0000)]
From   Vincent Helfre:
Implementation of a dissector for SNDCP XID parameters

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

11 years agoFrom Alexey Neyman:
etxrab [Fri, 1 Aug 2008 10:16:52 +0000 (10:16 +0000)]
From   Alexey Neyman:
Fix proto_tree_add_*_format_value() operation on bitfields.

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

11 years agoFrom Joe Eykholt:
jake [Fri, 1 Aug 2008 06:13:25 +0000 (06:13 +0000)]
From Joe Eykholt:
patch to fix misuse of format specifier %d for unsigned ints.

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

11 years agoUse guints for our tap array indices and use >= to make sure they wrap. This
gerald [Fri, 1 Aug 2008 00:22:36 +0000 (00:22 +0000)]
Use guints for our tap array indices and use >= to make sure they wrap. This
works around bug 2758 (which is apparently a compiler bug).

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