obnox/wireshark/wip.git
14 years agoPack widgets into boxes better to make window stretch properly.
martinm [Tue, 16 Feb 2010 10:23:47 +0000 (10:23 +0000)]
Pack widgets into boxes better to make window stretch properly.

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

14 years agoAt least part of the problem is that Bash's test command appears not to
guy [Tue, 16 Feb 2010 01:08:07 +0000 (01:08 +0000)]
At least part of the problem is that Bash's test command appears not to
do short-circuit evaluation, so you can't do

if [ {test 1} -a {test that's not safe if test1 is false} ]
then
...
fi

so don't do that.

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

14 years agoClose quote.
guy [Tue, 16 Feb 2010 00:41:06 +0000 (00:41 +0000)]
Close quote.

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

14 years agoMore debug crap.
guy [Tue, 16 Feb 2010 00:00:50 +0000 (00:00 +0000)]
More debug crap.

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

14 years agoMore debugging - stripping out the newlines didn't suffice.
guy [Mon, 15 Feb 2010 23:47:05 +0000 (23:47 +0000)]
More debugging - stripping out the newlines didn't suffice.

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

14 years agoCorrect GTK+ package for Win64.
guy [Mon, 15 Feb 2010 23:46:39 +0000 (23:46 +0000)]
Correct GTK+ package for Win64.

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

14 years agoThe problem was that if you do, for example:
guy [Mon, 15 Feb 2010 23:26:43 +0000 (23:26 +0000)]
The problem was that if you do, for example:

foo=`echo`

$foo won't be empty, it'll include the newline at the end of the output
of "echo".  The same applies for any other command; strip newlines from
the output of regtool to avoid that problem.

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

14 years agoEh? It looks blank, but "-n" should catch that. Hopefully we have "od"
guy [Mon, 15 Feb 2010 23:05:04 +0000 (23:05 +0000)]
Eh?  It looks blank, but "-n" should catch that.  Hopefully we have "od"
and that'll let us see the raw bytes.

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

14 years agoAdd a debugging printout. (What I found in the Intertubes seems to
guy [Mon, 15 Feb 2010 22:48:51 +0000 (22:48 +0000)]
Add a debugging printout.  (What I found in the Intertubes seems to
indicate that ProxyEnabled is an integral value; if it's not a null
string, and if it's not an integral value, what is it?)

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

14 years agoProtect against $proxy_enabled being empty.
guy [Mon, 15 Feb 2010 22:31:21 +0000 (22:31 +0000)]
Protect against $proxy_enabled being empty.

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

14 years agoTry to fix the win64 build.
etxrab [Mon, 15 Feb 2010 22:24:40 +0000 (22:24 +0000)]
Try to fix the win64 build.

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

14 years agoAdd a missing port from 1.2
etxrab [Mon, 15 Feb 2010 22:18:42 +0000 (22:18 +0000)]
Add a missing port from 1.2

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

14 years agoEnable/disable filtering controls depending on channel selection.
martinm [Mon, 15 Feb 2010 22:12:41 +0000 (22:12 +0000)]
Enable/disable filtering controls depending on channel selection.

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

14 years agoUse the latest GTK bundle (2.18.7)
etxrab [Mon, 15 Feb 2010 20:57:50 +0000 (20:57 +0000)]
Use the latest GTK bundle (2.18.7)

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

14 years agoCheck for GLib 2.14 and gmodule support no matter what.
gerald [Mon, 15 Feb 2010 05:08:17 +0000 (05:08 +0000)]
Check for GLib 2.14 and gmodule support no matter what.

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

14 years agoTry to restore ue/channel selections during/after retapping.
martinm [Sun, 14 Feb 2010 23:30:00 +0000 (23:30 +0000)]
Try to restore ue/channel selections during/after retapping.

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

14 years ago[Automatic manuf and enterprise-numbers update for 2010-02-14]
gerald [Sun, 14 Feb 2010 16:02:55 +0000 (16:02 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-02-14]

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

14 years agoFrom Yaniv Kaul: minor changes + smallest additions
wmeier [Sat, 13 Feb 2010 16:42:01 +0000 (16:42 +0000)]
From Yaniv Kaul: minor changes + smallest additions
  See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4339#c5

From Me:
 - Use VNC_... as the initial part of various enum identifiers to
   ensure that they are unique since they are part of the global namespace;
 - Fix some indentatiom;

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

14 years agoFix some indentation.
wmeier [Sat, 13 Feb 2010 16:28:32 +0000 (16:28 +0000)]
Fix some indentation.

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

14 years agoFrom Mike Sager: NFS: parse RECLAIM_COMPLETE op
wmeier [Sat, 13 Feb 2010 16:25:30 +0000 (16:25 +0000)]
From Mike Sager:  NFS: parse RECLAIM_COMPLETE op
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4469

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

14 years agoDon't use PCRE if we have GRegex.
gerald [Sat, 13 Feb 2010 00:07:42 +0000 (00:07 +0000)]
Don't use PCRE if we have GRegex.

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

14 years agoFrom Owen Kirby:
jake [Fri, 12 Feb 2010 22:10:53 +0000 (22:10 +0000)]
From Owen Kirby:
This patch fixes a bug in the 6LoWPAN dissectors that corrupts addresses when
multicast address compression is used. Testing this fix also uncovered a bug in
the computation of the length of the extension headers. And some typos.

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

14 years agoShow the substrings of AUTN and AUTS. Expert info warnings
dimeg [Fri, 12 Feb 2010 21:57:07 +0000 (21:57 +0000)]
Show the substrings of AUTN and AUTS. Expert info warnings
when their lengths is not the expected one.

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

14 years agoFix for Bug 4480:
dimeg [Fri, 12 Feb 2010 20:52:54 +0000 (20:52 +0000)]
Fix for Bug 4480:
Octet containing first digit of IMEI(SV) highlighted
when IMEI(SV) selected

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

14 years ago'lint' the XML source even when building individual documents.
jake [Fri, 12 Feb 2010 07:54:14 +0000 (07:54 +0000)]
'lint' the XML source even when building individual documents.

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

14 years agoHmmm, suffix rules don't have dependencies, only prerequisites.
morriss [Thu, 11 Feb 2010 17:25:40 +0000 (17:25 +0000)]
Hmmm, suffix rules don't have dependencies, only prerequisites.

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

14 years ago1.3.3 -> 1.3.4.
gerald [Thu, 11 Feb 2010 16:38:42 +0000 (16:38 +0000)]
1.3.3 -> 1.3.4.

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

14 years agoUse suffix rules to simplify the man page generation
morriss [Thu, 11 Feb 2010 15:58:56 +0000 (15:58 +0000)]
Use suffix rules to simplify the man page generation

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

14 years agoWe don't want to deliver the (generated) Makefile. Since Makefile.common is always...
morriss [Thu, 11 Feb 2010 01:14:24 +0000 (01:14 +0000)]
We don't want to deliver the (generated) Makefile.  Since Makefile.common is always a dependency, add references to it only once (in Makefile.common).  Should it be a dependency?

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

14 years agoFix the GNU build.
gerald [Thu, 11 Feb 2010 00:28:18 +0000 (00:28 +0000)]
Fix the GNU build.

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

14 years agoMake the build dependencies more consistent between platforms. Try to
gerald [Wed, 10 Feb 2010 23:34:46 +0000 (23:34 +0000)]
Make the build dependencies more consistent between platforms. Try to
fix the Windows build (without breaking the GNU toolchain build).

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

14 years agoBuild 1.3.3.
gerald [Wed, 10 Feb 2010 22:53:43 +0000 (22:53 +0000)]
Build 1.3.3.

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

14 years agoCreate FT_BYTES fields for the RAND, AUTN, SRES, XRES
dimeg [Wed, 10 Feb 2010 22:34:34 +0000 (22:34 +0000)]
Create FT_BYTES fields for the RAND, AUTN, SRES, XRES
and AUTS octet strings in DTAP

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

14 years agoUse automake to build things in docbook/ .
morriss [Wed, 10 Feb 2010 22:12:22 +0000 (22:12 +0000)]
Use automake to build things in docbook/ .
This at least gets the docbook source distributed, as requested in:

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3871

Still to do:
1) get out-of-source-tree builds working
2) automatically check that everything is distributed with distcheck
   (requires (1) but it may also require building the docbook
   directory as part of "make all")
3) (optional) use automake rules to actually build the stuff (currently
   Makefile.am is basically some automake stuff wrapped around standard
   Makefile rules. Could this done better?)

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

14 years agoAdd an item for the "ignore" feature.
gerald [Wed, 10 Feb 2010 19:57:21 +0000 (19:57 +0000)]
Add an item for the "ignore" feature.

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

14 years agoDie if we can't open the input or output files
morriss [Wed, 10 Feb 2010 17:59:34 +0000 (17:59 +0000)]
Die if we can't open the input or output files

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

14 years agoAdd SVN Id tag
morriss [Wed, 10 Feb 2010 16:08:16 +0000 (16:08 +0000)]
Add SVN Id tag

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

14 years agoNo need for cvse_reserved as a variable; getting rid of it squelches a
guy [Wed, 10 Feb 2010 08:20:55 +0000 (08:20 +0000)]
No need for cvse_reserved as a variable; getting rid of it squelches a
compiler warning.

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

14 years agoDefine VENDOR_VERIZON in sminmpec.h
etxrab [Wed, 10 Feb 2010 07:21:51 +0000 (07:21 +0000)]
Define VENDOR_VERIZON in sminmpec.h

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

14 years agoFrom yi ren:
etxrab [Wed, 10 Feb 2010 06:59:26 +0000 (06:59 +0000)]
From yi ren:
CVSE fields for MIP protocol is not correctly decoded.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4477
From me:
- Fixed hf blurbs.
- FT_BYTES, BASE_NONE
- Updated value_strings from IANA registery.

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

14 years agoMake the kludge work for xmllint too.
jake [Tue, 9 Feb 2010 21:47:04 +0000 (21:47 +0000)]
Make the kludge work for xmllint too.

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

14 years agoDrop support for Windows 2000 in 1.3 and later.
gerald [Tue, 9 Feb 2010 19:13:57 +0000 (19:13 +0000)]
Drop support for Windows 2000 in 1.3 and later.

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

14 years agoFix some memory leaks; Fix some indentation.
wmeier [Tue, 9 Feb 2010 17:48:41 +0000 (17:48 +0000)]
Fix some memory leaks; Fix some indentation.
This is a re-submission of SVN #31838 this time
properly using g_list_free() instead of g_free().

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

14 years agoRevert SVN #31838; It's NG.
wmeier [Tue, 9 Feb 2010 14:43:30 +0000 (14:43 +0000)]
Revert SVN #31838; It's NG.

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

14 years agoDon't trust the length field in a V5 sample to be valid.
guy [Tue, 9 Feb 2010 10:17:53 +0000 (10:17 +0000)]
Don't trust the length field in a V5 sample to be valid.

This appears to fix bug 4473.

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

14 years agoDo all the missing dissectors the same way.
guy [Tue, 9 Feb 2010 09:52:10 +0000 (09:52 +0000)]
Do all the missing dissectors the same way.

Oh, and there's no dissector registered as "atm" - and, if there were,
it probably wouldn't be able to handle AAL5 packets by themselves, as
you'd probably have to supply pseudo-header information (where does the
VPI/VCI come from, for example?).

This fixes bug 4471.

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

14 years agoRead the packet into private areas (private pseudo-header and packet
guy [Tue, 9 Feb 2010 09:15:08 +0000 (09:15 +0000)]
Read the packet into private areas (private pseudo-header and packet
data), rather than overwriting the information in the cinfo structure.
This at least appears to fix bug 4056.

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

14 years agoFrom Owen Kirby:
jake [Tue, 9 Feb 2010 08:40:40 +0000 (08:40 +0000)]
From Owen Kirby:
This patch fixes a bug in the 6LoWPAN dissector where link-local addresses
created from an EUI-64 address do not correctly invert the universal/local bit
as recommended by section 4 of RFC2464.

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

14 years agothese two guys are actually range-strings and not value-string
sahlberg [Tue, 9 Feb 2010 07:42:38 +0000 (07:42 +0000)]
these two guys are actually range-strings and not value-string
so it is surprising we didnt catche these before.

gcc complains about strict alignment on these

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

14 years agoInitialize sub_cfg_attr_type_tree.
etxrab [Tue, 9 Feb 2010 06:52:49 +0000 (06:52 +0000)]
Initialize sub_cfg_attr_type_tree.

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

14 years agoFrom Alexis La Goutte:
etxrab [Tue, 9 Feb 2010 06:15:49 +0000 (06:15 +0000)]
From Alexis La Goutte:
ISAKMP Enhancements.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2905

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

14 years agoAnother BASE_NONE.
etxrab [Tue, 9 Feb 2010 05:55:39 +0000 (05:55 +0000)]
Another BASE_NONE.

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

14 years agoFix some memory leaks; Fix some indentation.
wmeier [Mon, 8 Feb 2010 23:45:10 +0000 (23:45 +0000)]
Fix some memory leaks; Fix some indentation.

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

14 years agoTerminate a value_string, and get rid of a non-ASCII character.
guy [Mon, 8 Feb 2010 22:40:27 +0000 (22:40 +0000)]
Terminate a value_string, and get rid of a non-ASCII character.

(No ligatures, please.)

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

14 years agoflag two unusued arguments with _U_ to prevent a compiler warning
sahlberg [Mon, 8 Feb 2010 22:35:49 +0000 (22:35 +0000)]
flag two unusued arguments with _U_ to prevent a compiler warning

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

14 years agoMake example output pagebreak in PDF.
jake [Mon, 8 Feb 2010 22:11:05 +0000 (22:11 +0000)]
Make example output pagebreak in PDF.

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

14 years agoRightsize graphics by modifying their DPI.
jake [Mon, 8 Feb 2010 22:09:51 +0000 (22:09 +0000)]
Rightsize graphics by modifying their DPI.

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

14 years agoFix field base.
etxrab [Mon, 8 Feb 2010 21:15:54 +0000 (21:15 +0000)]
Fix field base.

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

14 years agoFrom Yi Yu:
etxrab [Mon, 8 Feb 2010 21:01:21 +0000 (21:01 +0000)]
From Yi Yu:
Enhanced sFlow dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3543

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

14 years ago(Minor) Fix code so port pref change actually deletes the previous dissector port...
wmeier [Mon, 8 Feb 2010 19:30:32 +0000 (19:30 +0000)]
(Minor) Fix code so port pref change actually deletes the previous dissector port registration

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

14 years ago(Trivial): remove an incorrect _U_ in a few cases.
wmeier [Mon, 8 Feb 2010 18:54:31 +0000 (18:54 +0000)]
(Trivial): remove an incorrect _U_ in a few cases.

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

14 years ago(Trivial changes):
wmeier [Mon, 8 Feb 2010 18:32:20 +0000 (18:32 +0000)]
(Trivial changes):
  #include <stdio.h> not req'd;
  localize two variables;
  remove two unneeded forward reference declarations.

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

14 years agoAdd preference that allows RLC PDUs embedded inside MAC info to be seen nicely in...
martinm [Mon, 8 Feb 2010 15:01:08 +0000 (15:01 +0000)]
Add preference that allows RLC PDUs embedded inside MAC info to be seen nicely in the info column

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

14 years agotry autogenerate lsa in preparation for updates to the lsa idl file
sahlberg [Mon, 8 Feb 2010 01:48:33 +0000 (01:48 +0000)]
try autogenerate lsa in preparation for updates to the lsa idl file

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

14 years agoadd a macro to handle types that are 2 bytes in ndr and 4 bytes in
sahlberg [Mon, 8 Feb 2010 00:48:45 +0000 (00:48 +0000)]
add a macro to handle types that are 2 bytes in ndr and 4 bytes in
ndr64, i.e. enums.

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

14 years agoFlag the arguments as _U_ so that we dont fail the build with "unusued
sahlberg [Mon, 8 Feb 2010 00:14:40 +0000 (00:14 +0000)]
Flag the arguments as _U_ so that we dont fail the build with "unusued
parameter" warnings if we build without libgcrypt

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

14 years agoFix and rework some code a bit:
wmeier [Sun, 7 Feb 2010 23:51:56 +0000 (23:51 +0000)]
Fix and rework some code a bit:
-No prefs so prefs calback not req'd;
-Remove (seemingly) not needed dissector registration on UDP port 0;
-Rework dissect_applemidi_heur() and related so that once dissect_applemidi_heur()
  determines that a pair of UDP addr/ports are being used for the AppleMIDI protocol,
  dissect_apple_midi() will always be called directly for UDP packets with that pair
  (rather than dissect_applemidi_heur() always be called for every packet).

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

14 years agoMore uninitialized-variable warning squelching.
guy [Sun, 7 Feb 2010 20:45:49 +0000 (20:45 +0000)]
More uninitialized-variable warning squelching.

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

14 years agoInitialize a subtree.
stig [Sun, 7 Feb 2010 20:12:48 +0000 (20:12 +0000)]
Initialize a subtree.

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

14 years agoTry to pacify the buildbot.
etxrab [Sun, 7 Feb 2010 20:08:00 +0000 (20:08 +0000)]
Try to pacify the buildbot.

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

14 years agoFrom Owen Kirby:
etxrab [Sun, 7 Feb 2010 19:39:31 +0000 (19:39 +0000)]
From Owen Kirby:
Packet decryption for IEEE 802.15.4.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457

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

14 years ago[Automatic manuf and enterprise-numbers update for 2010-02-07]
gerald [Sun, 7 Feb 2010 16:03:28 +0000 (16:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-02-07]

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

14 years agoFixed warning: format not a string literal and no format arguments.
stig [Sun, 7 Feb 2010 15:38:42 +0000 (15:38 +0000)]
Fixed warning: format not a string literal and no format arguments.

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

14 years agoAdded packet-applemidi.c.
stig [Sun, 7 Feb 2010 15:37:03 +0000 (15:37 +0000)]
Added packet-applemidi.c.

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

14 years agoFrom Tobias Erichsen:
etxrab [Sun, 7 Feb 2010 14:30:11 +0000 (14:30 +0000)]
From Tobias Erichsen:
AppleMIDI - dissector for lightweight session protocol used in Apple network MIDI.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4455

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

14 years agoFrom Stephen Donnelly:
etxrab [Sun, 7 Feb 2010 13:37:51 +0000 (13:37 +0000)]
From Stephen Donnelly:
AAL2 preference.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4465

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

14 years agoFrom Alex Lindberg via bug 4463:
stig [Sun, 7 Feb 2010 11:01:13 +0000 (11:01 +0000)]
From Alex Lindberg via bug 4463:
Added se_tree_lookup32_array_le to emem.[ch].  This function is similar to
se_tree_lookup32_le already defined.

Updated README.binarytrees to reflect this added function and corrected minor
spelling issues.

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

14 years agoForgot that etype_vals is DATA.
stig [Sun, 7 Feb 2010 10:41:06 +0000 (10:41 +0000)]
Forgot that etype_vals is DATA.

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

14 years agoExport etype_vals from libwireshark.
stig [Sun, 7 Feb 2010 10:29:41 +0000 (10:29 +0000)]
Export etype_vals from libwireshark.
Moved some elements alphabetical.

This fixes request in bug 4468.

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

14 years agoRenamed some reassembled data texts.
stig [Sat, 6 Feb 2010 18:20:21 +0000 (18:20 +0000)]
Renamed some reassembled data texts.
Removed some check_col().

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

14 years agoWhitespace change
jmayer [Sat, 6 Feb 2010 10:17:52 +0000 (10:17 +0000)]
Whitespace change

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

14 years agoFrom Chris Maynard:
jake [Fri, 5 Feb 2010 22:39:14 +0000 (22:39 +0000)]
From Chris Maynard:
Take into account PIM protocol specifics with regards to TTL when colorizing packets.

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

14 years agoHarden "Process Information" presentation functions.
jake [Fri, 5 Feb 2010 22:08:29 +0000 (22:08 +0000)]
Harden "Process Information" presentation functions.

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

14 years agoFrom Alex Burlyga:
jake [Fri, 5 Feb 2010 22:02:55 +0000 (22:02 +0000)]
From Alex Burlyga:
Currently parsing of the Exchange_Id is technically correct but hard to read.
This patch updates display inline with data structures specified in RFC 5661.

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

14 years agoFrom Mike Sager:
jake [Fri, 5 Feb 2010 21:37:21 +0000 (21:37 +0000)]
From Mike Sager:
Dynamically register callback dissector based on the NFSv4.0 SETCLIENTID args
(the equivalent of what had already been done for NFSv4.1 CREATE_SESSION).

Fix CB_LAYOUTRECALL dissecting: the recall type wasn't getting parsed, so some
of the layout recall info wasn't being displayed.

Parse CB_SEQUENCE's referring call lists.

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

14 years agoExit normally when we trap a signal so that things like Buildbot don't
gerald [Fri, 5 Feb 2010 21:35:59 +0000 (21:35 +0000)]
Exit normally when we trap a signal so that things like Buildbot don't
generate unnecessary errors when we cancel a fuzz test.

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

14 years agoFix the MNC decoding when Global Title is built
dimeg [Fri, 5 Feb 2010 20:54:13 +0000 (20:54 +0000)]
Fix the MNC decoding when Global Title is built
according to E.212

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

14 years agoAdd missing graphics file.
jake [Fri, 5 Feb 2010 17:24:28 +0000 (17:24 +0000)]
Add missing graphics file.

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

14 years agoTry to pacify the buildbot.
etxrab [Fri, 5 Feb 2010 06:46:32 +0000 (06:46 +0000)]
Try to pacify the buildbot.

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

14 years agoFrom Joshua Zhao:
etxrab [Fri, 5 Feb 2010 05:54:56 +0000 (05:54 +0000)]
From Joshua Zhao:
Add vendor extension support for 802.11 radiotap header.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4283
Slightly modified.

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

14 years agoFrom Chris Maynard: "Wrong download link to vcredist_x86.exe"
wmeier [Fri, 5 Feb 2010 03:37:46 +0000 (03:37 +0000)]
From Chris Maynard:  "Wrong download link to vcredist_x86.exe"
(from me): Change a few additional cases of "2008EE" to "2008EE SP1"
  and indicate that 2008EE SP1 is recommended (rather than 2005EE).

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

14 years agoI think you meant "pinfo->pseudo_header->atm.flags & ATM_AAL2_NOPHDR"
guy [Fri, 5 Feb 2010 01:06:27 +0000 (01:06 +0000)]
I think you meant "pinfo->pseudo_header->atm.flags & ATM_AAL2_NOPHDR"
(test whether ATM_AAL2_NOPHDR is set in atm.flags), not
"pinfo->pseudo_header->atm.flags | ATM_AAL2_NOPHDR" (which is always
true if ATM_AAL2_NOPHDR is nonzero, which it is).

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

14 years agoFrom: Stefan Metzmacher <metze@samba.org>
sahlberg [Thu, 4 Feb 2010 23:17:17 +0000 (23:17 +0000)]
From: Stefan Metzmacher <metze@samba.org>
Subject: [PATCH 4/7] packet-winsrepl.c: handle the strange alignment after
names

metze

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

14 years agoFrom: Stefan Metzmacher <metze@samba.org>
sahlberg [Thu, 4 Feb 2010 23:16:08 +0000 (23:16 +0000)]
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 27 Aug 2009 10:51:34 +0200
Subject: [PATCH 3/7] packet-spnego: fix decryption of DCERPC packets in
decrypt_gssapi_krb_cfx_wrap()

There the checksum and the encrypted data are no 2 different buffers
and we need to combine them before we try to rotate and decrypt them.

metze

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

14 years agoFrom Metze
sahlberg [Thu, 4 Feb 2010 23:14:21 +0000 (23:14 +0000)]
From Metze

Subject: [PATCH 2/7] packet-smb2.c: fix handling of compounded
SMB2 PDUs

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

14 years agoFrom: Stefan Metzmacher <metze@samba.org>
sahlberg [Thu, 4 Feb 2010 23:13:05 +0000 (23:13 +0000)]
From: Stefan Metzmacher <metze@samba.org>

fix crash bug in dcerpc nt

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

14 years agoInitialize a variable to squash a compiler warning.
sahlberg [Thu, 4 Feb 2010 22:17:40 +0000 (22:17 +0000)]
Initialize a variable to squash a compiler warning.

GCC mistakes opcode that it might be uninitialized.
This is not true, but GCC can not detect that it will never be
used unititialized.

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

14 years agoFrom Holger Pfrommer:
dimeg [Thu, 4 Feb 2010 21:14:53 +0000 (21:14 +0000)]
From Holger Pfrommer:
Updated text in packet-hilscher.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4462

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

14 years agoAdd commo-channel stats.
martinm [Thu, 4 Feb 2010 17:15:15 +0000 (17:15 +0000)]
Add commo-channel stats.

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

14 years agoAdd UEId to MAC tap struct and stats window.
martinm [Thu, 4 Feb 2010 16:30:43 +0000 (16:30 +0000)]
Add UEId to MAC tap struct and stats window.

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