obnox/wireshark/wip.git
18 years agoFrom Irene: Fix wrong display of SACKs.
tuexen [Tue, 9 May 2006 10:23:56 +0000 (10:23 +0000)]
From Irene: Fix wrong display of SACKs.

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

18 years agoMake top_tree static. This allows ethereal to be built on Mac OS X.
tuexen [Tue, 9 May 2006 10:20:28 +0000 (10:20 +0000)]
Make top_tree static. This allows ethereal to be built on Mac OS X.

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

18 years agoAdd the first layer of the bluetooth stack dissecting the hci h4 single byte
sahlberg [Tue, 9 May 2006 09:13:20 +0000 (09:13 +0000)]
Add the first layer of the bluetooth stack   dissecting the hci h4   single byte

refactyored from the affix patch by Christoph Scholz

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

18 years ago- support for multiple ASN.1 modules in one input file
kukosa [Tue, 9 May 2006 07:35:36 +0000 (07:35 +0000)]
- support for multiple ASN.1 modules in one input file
- support for multiple input files
- #.MODULE_IMPORT replaced with #.MODULE (#.MODULE_IMPORT is supported for backward compatibility)
- #.MODULE is used for just compiled modules too
- more debug outputs

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

18 years agoBasic Encoding Rules (BER) encoded file reading. Not really a packet trace format...
gal [Mon, 8 May 2006 19:56:36 +0000 (19:56 +0000)]
Basic Encoding Rules (BER) encoded file reading. Not really a packet trace format but still useful for dissecting arbitrary BER/DER ASN.1.

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

18 years agoLDAP attribute type dissector framework including support for "netlogon" attribute...
gal [Mon, 8 May 2006 17:52:42 +0000 (17:52 +0000)]
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes

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

18 years agoBetter split between dissectors and fixes for s4406 SEQ OF defined extensions
gal [Mon, 8 May 2006 17:46:58 +0000 (17:46 +0000)]
Better split between dissectors and fixes for s4406 SEQ OF defined extensions

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

18 years agoFT_STRING => FT_OID where applicable
gal [Mon, 8 May 2006 17:45:12 +0000 (17:45 +0000)]
FT_STRING => FT_OID where applicable

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

18 years agoFix bug 926 OID wrongly decoded.
etxrab [Mon, 8 May 2006 17:30:24 +0000 (17:30 +0000)]
Fix bug 926 OID wrongly decoded.

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

18 years agouse request/response tracking structure from NDMP and hang a scsi itlq nexus off...
sahlberg [Mon, 8 May 2006 09:20:34 +0000 (09:20 +0000)]
use request/response tracking structure from NDMP and hang a scsi itlq nexus off it   so that cdb/datain/dataout/response tracking for scsi forks also for the ndmp transport.

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

18 years agoadd tracking of request/response and responsetime to ndmp
sahlberg [Mon, 8 May 2006 08:21:36 +0000 (08:21 +0000)]
add tracking of request/response and responsetime to ndmp

we need this in order to be able to provide proper itlq structures to the scsi dissector   so that response data from scsi is dissected properly.

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

18 years agoFrom Bill Meier:
etxrab [Sun, 7 May 2006 18:39:47 +0000 (18:39 +0000)]
From Bill Meier:

Fix bug 833 (remove 'dead' code flagged by Coverity);
Update defines based upon current version of FreeTDS tds.h; Reformat defines for readability;

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

18 years agoFix an ASN1 error and use the IAANA registered ports.
etxrab [Sun, 7 May 2006 13:22:30 +0000 (13:22 +0000)]
Fix an ASN1 error and use the IAANA registered ports.

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

18 years agofix for coverity bug 156
sahlberg [Sat, 6 May 2006 22:00:23 +0000 (22:00 +0000)]
fix for coverity bug 156

it does not seem like it it is possible to trigger this bug   since the condition where st is dereferenced and null should be impossible to create.

Still   handle this impossible situation better if the guarantee that st can not be null here is changed in the future.

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

18 years agofrom Chris Audley
sahlberg [Sat, 6 May 2006 21:52:47 +0000 (21:52 +0000)]
from Chris Audley

fix for bug 909

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

18 years agosome minor fixes to the Preferences tooltip texts
ulfl [Sat, 6 May 2006 12:57:54 +0000 (12:57 +0000)]
some minor fixes to the Preferences tooltip texts

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

18 years agoupdate the itl structure so that it sets the cmdset field to the current command...
sahlberg [Fri, 5 May 2006 22:01:45 +0000 (22:01 +0000)]
update the itl structure so that it sets the cmdset field to the current command set even for the case where we have not detected it by seeing the inquiry response.
Make teh msb of the cmdset variable indicate whether we detected the commandset from the trace or whether we used the default value from preferences.

indicate in the dissection of the packet whether the command set is "known" or whether we are using the default one.

make scsi srt stats work even for when we are using the "default" dommandset. Previously scsi srt would ignore all pdus for itl sessions where the "default" command set was used.

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

18 years agoadd two missing DCOM Dispatch error codes
ulfl [Fri, 5 May 2006 19:32:49 +0000 (19:32 +0000)]
add two missing DCOM Dispatch error codes

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

18 years agofix dissection of IDispatch Invoke dissection, if rgdispidNamedArgs array isn't NULL
ulfl [Fri, 5 May 2006 19:31:23 +0000 (19:31 +0000)]
fix dissection of IDispatch Invoke dissection, if rgdispidNamedArgs array isn't NULL

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

18 years agofix VARIANT BOOL meaning
ulfl [Fri, 5 May 2006 19:29:50 +0000 (19:29 +0000)]
fix VARIANT BOOL meaning

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

18 years agofix spelling: PROFInet -> PROFINET
ulfl [Thu, 4 May 2006 19:48:33 +0000 (19:48 +0000)]
fix spelling: PROFInet -> PROFINET

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

18 years agoFrom LEGO fix "Dissector bug, Protocol H248"
etxrab [Thu, 4 May 2006 18:25:43 +0000 (18:25 +0000)]
From LEGO fix "Dissector bug, Protocol H248"

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

18 years agoFrom Menno Andriesse
jake [Thu, 4 May 2006 16:50:52 +0000 (16:50 +0000)]
From Menno Andriesse
By popular request (sort of...) here is a patch for the S5066 dissector to enable TCP port preference.

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

18 years agoFrom Greg Morris:
etxrab [Thu, 4 May 2006 15:36:41 +0000 (15:36 +0000)]
From Greg Morris:
In summary these patches do the following:
1. GTK+ 2.x builds will now use Tree View to display the expert items, expanded items are the individual packet numbers.
2. GTK+ 1.x builds will continue to use the older clist functionality
3. Implements the equivilant of expert info (actually calls expert_dlg.c)

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

18 years agoFrom: Thomas Boehne
jake [Thu, 4 May 2006 15:04:05 +0000 (15:04 +0000)]
From: Thomas Boehne
But since most PLCs now offer to run the protocol directly on TCP, I attached a little patch.

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

18 years agoforce the AssertionValue type to be displayed as a STRING instead of as hex BYTES.
sahlberg [Thu, 4 May 2006 10:19:32 +0000 (10:19 +0000)]
force the AssertionValue type to be displayed as a STRING instead of as hex BYTES.

Most of the time  AssertionValue will contain an ascii string   so make it always display as a string to make the display "correct" most of the time insterad of being "wrong" most of the time.

There are situations when AssertionValue contains binary data though  and in those cases the display will be "wrong" (but not more wrong than the old dissector anyway)

What someone really should do (someone interested in ldap that is) to make it more correct would be to implement a dissector for AssertionValue in the template file and having the dissector check if any of the bytes of the octet string has a value <32   and if so display it in hex as   0x.....
It all bytes have values >=32   then it shoudlk display it as a string "...
instead.

Someone interested in ldap may spend time on this refinement.

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

18 years agofrom Guenther Deschner
sahlberg [Thu, 4 May 2006 08:54:58 +0000 (08:54 +0000)]
from Guenther Deschner

Two more Kerberos error codes where it has been witnessed that the payload contains a PA-DATA structure with the magic salt containing an nt status code

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

18 years agocol_append_str() instead of col_set_str() by mistake.
etxrab [Wed, 3 May 2006 19:32:27 +0000 (19:32 +0000)]
col_append_str() instead of col_set_str() by mistake.

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

18 years agoUse the asn2eth generated snmp dissector.
etxrab [Wed, 3 May 2006 19:09:03 +0000 (19:09 +0000)]
Use the asn2eth generated snmp dissector.

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

18 years agoAdd dissection of country code if number is in international format and Number plan...
etxrab [Wed, 3 May 2006 18:57:32 +0000 (18:57 +0000)]
Add dissection of country code if number is in international format and Number plan is E164.

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

18 years agoFix Bug 916 PurgeMS decoding error in GSM MAP.
etxrab [Wed, 3 May 2006 18:49:37 +0000 (18:49 +0000)]
Fix Bug 916  PurgeMS decoding error in GSM MAP.
Get rid of som unused ASN1 code and some asn2eth warnings.

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

18 years agodo some template magic to make ethereal dissect CLDAP RPC again.
sahlberg [Wed, 3 May 2006 10:59:15 +0000 (10:59 +0000)]
do some template magic to make ethereal dissect CLDAP RPC again.

i dont think it is the optimal way to solve this but it is better than nothing for the time being.

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

18 years agoAnything linked with @PCAP_LIBS@ needs, on at least some platforms
guy [Wed, 3 May 2006 08:48:52 +0000 (08:48 +0000)]
Anything linked with @PCAP_LIBS@ needs, on at least some platforms
(e.g., Solaris 2 and later), to be linked with @SOCKET_LIBS@ and
@NSL_LIBS@ as well.

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

18 years agoFrom Paolo Abeni:
etxrab [Wed, 3 May 2006 05:29:04 +0000 (05:29 +0000)]
From Paolo Abeni:
authesserre samuel <sauthess@gmail.com> kindly pointed out an issue with session renegotiation in the current ssl decryption code.

Encrypted handshake message are decrypted, but the dissector try to interpret the encrypted code. Renegotiation messages are therefore ignored. The attached pcap trace and key can be used to trigger the issue.

The attached patch fix the problem storing the decrypted version of encrypted handshake message and dissecting it when available. The patch also fix bad issue with des cipher (alike the issue fixed in my previous post)

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

18 years agoFrom Andrei Emeltchenko:
etxrab [Wed, 3 May 2006 05:07:04 +0000 (05:07 +0000)]
From Andrei Emeltchenko:
I attached patch to add preferences in SDP for RTP stream detection. By default SDP decodes RTP stream but now I can disable it.

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

18 years agoFix Bug 913 DateAndTime dissection error in CAMEL CallInfoReportArg
etxrab [Tue, 2 May 2006 20:26:49 +0000 (20:26 +0000)]
Fix Bug 913  DateAndTime dissection error in CAMEL CallInfoReportArg

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

18 years agoDo the ESP payload decoding, and pass it to the subdissector, regardless
guy [Tue, 2 May 2006 19:58:19 +0000 (19:58 +0000)]
Do the ESP payload decoding, and pass it to the subdissector, regardless
of whether we're building a protocol tree or not - you have to call
subdissectors in either case.

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

18 years agoMakefiles for OMA UserPlane Location Protocol packet dissection..
etxrab [Tue, 2 May 2006 19:48:03 +0000 (19:48 +0000)]
Makefiles for OMA UserPlane Location Protocol packet dissection..

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

18 years agoAdd OMA UserPlane Location Protocol packet dissector
etxrab [Tue, 2 May 2006 19:44:12 +0000 (19:44 +0000)]
Add OMA UserPlane Location Protocol packet dissector

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

18 years agoHandle UTCTime for PER.
etxrab [Tue, 2 May 2006 19:08:28 +0000 (19:08 +0000)]
Handle UTCTime for PER.

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

18 years agoMSVC is picky about assignments in declarations.
etxrab [Tue, 2 May 2006 19:07:38 +0000 (19:07 +0000)]
MSVC is picky about assignments in declarations.

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

18 years agoIt looks like g_fopen() in the version of GLib that we ship with Windows
gerald [Tue, 2 May 2006 18:21:42 +0000 (18:21 +0000)]
It looks like g_fopen() in the version of GLib that we ship with Windows
sets errno to 0 when we can't open a file.  This resurrected the annoying
"C:\Program Files\Ethereal\asn1/default.tt" error in the ASN.1 plugin,
since we depended on errno being set to ENOENT.  Move some logic around
to account for this.

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

18 years agoNot all compilers support unnamed struct/union fields within
guy [Tue, 2 May 2006 18:02:08 +0000 (18:02 +0000)]
Not all compilers support unnamed struct/union fields within
structs/unions (GCC supports it "for compatibility with other
compilers"; presumably that's not for compatibility with the version of
Sun C that rejected it - was that a PCCism?).

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

18 years agoAdd infrastructure for display filter functions.
gram [Tue, 2 May 2006 14:26:17 +0000 (14:26 +0000)]
Add infrastructure for display filter functions.
Add upper() and lower() display filter functions for string fields.

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

18 years agoimplement decryption of and dissection of
sahlberg [Tue, 2 May 2006 08:42:19 +0000 (08:42 +0000)]
implement decryption of and dissection of
EncKrbCredPart

Packet 18 in sample capture kerberos-Delegation.zip on the wiki contains this structure.

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

18 years agoAdd newlines to the ends of the files.
guy [Tue, 2 May 2006 07:56:21 +0000 (07:56 +0000)]
Add newlines to the ends of the files.

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

18 years agoPreparations to restore CLDAP dissection, no need to regenerate the dissector yet.
etxrab [Tue, 2 May 2006 05:35:55 +0000 (05:35 +0000)]
Preparations to restore CLDAP dissection, no need to regenerate the dissector yet.

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

18 years agoBump the version number to 1.1. Clean up the release notes.
gerald [Mon, 1 May 2006 19:21:00 +0000 (19:21 +0000)]
Bump the version number to 1.1.  Clean up the release notes.

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

18 years agoInclude <epan/strutil.h> to define g_ascii_isprint() on systems with
guy [Mon, 1 May 2006 17:43:29 +0000 (17:43 +0000)]
Include <epan/strutil.h> to define g_ascii_isprint() on systems with
GLib 1.2[.x].

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

18 years agoAdd a Makefile to generate the dissectors from UN*X.
guy [Mon, 1 May 2006 17:42:01 +0000 (17:42 +0000)]
Add a Makefile to generate the dissectors from UN*X.

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

18 years agoFix for bug 887. Use the right function to set the window position.
jake [Mon, 1 May 2006 10:59:06 +0000 (10:59 +0000)]
Fix for bug 887. Use the right function to set the window position.

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

18 years agoOperation request/result correlation and timing.
gal [Mon, 1 May 2006 10:17:59 +0000 (10:17 +0000)]
Operation request/result correlation and timing.

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

18 years agoUse the asn2eth generated ldap dissector.
etxrab [Mon, 1 May 2006 10:04:10 +0000 (10:04 +0000)]
Use the asn2eth generated ldap dissector.

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

18 years agoPreference to disable BER length sanity check (needed for asn2eth LDAP dissector).
gal [Mon, 1 May 2006 09:26:40 +0000 (09:26 +0000)]
Preference to disable BER length sanity check (needed for asn2eth LDAP dissector).

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

18 years agoMS KDC sends a PA_DATA with a magic salt containing an nt status code also for ERR_BA...
sahlberg [Mon, 1 May 2006 08:48:33 +0000 (08:48 +0000)]
MS KDC sends a PA_DATA with a magic salt containing an nt status code also for ERR_BADOPTION which can be seen in the constrained-delegation.zip   capture on the wiki sample captures page.

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

18 years agoIt's g_strdup_printf(), not g_sprintf_alloc().
guy [Mon, 1 May 2006 08:09:39 +0000 (08:09 +0000)]
It's g_strdup_printf(), not g_sprintf_alloc().

Declare "error", and properly terminate a string.

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

18 years agocoverity 155
sahlberg [Mon, 1 May 2006 07:43:47 +0000 (07:43 +0000)]
coverity 155

coverity showed this as a null dereference which was a false positive.
sp can never be null here.

there is a bug however since with this invalid test  the memory release functions will never be called and we thus had a memory leak here.

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

18 years agoremove a test for NULL we dont need since itlq can not be null here and thus we
sahlberg [Mon, 1 May 2006 07:32:09 +0000 (07:32 +0000)]
remove a test for NULL we dont need since itlq can not be null here and thus we
dont need to test for it.

this unnecessary test for itlq==NULL was shown by coverity issue 151

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

18 years agoHandle the case where we *can't* determine the pathname in which to find
guy [Mon, 1 May 2006 06:51:14 +0000 (06:51 +0000)]
Handle the case where we *can't* determine the pathname in which to find
programs, by reporting it with a dialog box that at least attempts to
indicate what the problem is, and by giving up early on running dumpcap.

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

18 years agoHave "pdu_store_sequencenumber_of_next_pdu()" return the newly-allocated
guy [Mon, 1 May 2006 02:32:16 +0000 (02:32 +0000)]
Have "pdu_store_sequencenumber_of_next_pdu()" return the newly-allocated
"struct tcp_multisegment_pdu"; that lets it be used in one case where
the code in it was duplicated.

Make "desegment_tcp()" loop rather than recursing - not all compilers
will necessarily recognize the tail recursion.

Catch heuristic dissectors that reject a packet but also request
(whether deliberately or accidentally) that more data be added.

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

18 years agoUDP and SCTP aren't byte-stream protocols, so they don't offer TCP-style
guy [Mon, 1 May 2006 02:28:01 +0000 (02:28 +0000)]
UDP and SCTP aren't byte-stream protocols, so they don't offer TCP-style
reassembly.  UDP has no notion of reassembly - that's done at the IP
layer - and SCTP has its own notions of reassembly which it currently
doesn't provide.  As such, TCP-style reassembly isn't possible for
JXTA-over-UDP or JXTA-over-SCTP.

As for TCP, a heuristic dissector for a TCP-based protocol can't request
more data if it's rejecting a packet; make it not do so.  That should
fix the recent buildbot crash, although there are still some reassembly
problems with that capture (c05-http-reply-r1.pcap.gz in the menagerie
and on the SampleCaptures page of the Wiki) that aren't fixed yet.

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

18 years agoOperational Attributes and Syntaxes
gal [Sun, 30 Apr 2006 12:53:26 +0000 (12:53 +0000)]
Operational Attributes and Syntaxes

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

18 years agoFix for bug 881. Adding processing of error packet when server greeting is expected.
jake [Sun, 30 Apr 2006 10:33:36 +0000 (10:33 +0000)]
Fix for bug 881. Adding processing of error packet when server greeting is expected.

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

18 years agotcp reassembly updates
sahlberg [Sun, 30 Apr 2006 10:27:55 +0000 (10:27 +0000)]
tcp reassembly updates

use tcp_multisegment_pdu and se_tree_lookup32_le()   to track pdu boundaries for tcp reassembly just as this structure is used for the same purpose when reassembly is not enabled.

get rid of a hashtable and two memchunks we no longer need
tcp_segment_table    tcp_segment_key_chunk and   tcp_segment_address_chunk

This makes tcp reassembly work for out-of-order segments   as well as when reassembly completes in one segment and when the tail of the segment contains the head of the next pdu  which we did not handle before.

tcp reassembly should be much better and efficient now    modulo introduced regressions.

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

18 years agoGet rid of extra semicolon - GCC warns that ISO C doesn't allow it.
guy [Sun, 30 Apr 2006 09:25:34 +0000 (09:25 +0000)]
Get rid of extra semicolon - GCC warns that ISO C doesn't allow it.

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

18 years agoConstify some stuff, to eliminate compiler warnings and to make a table
guy [Sun, 30 Apr 2006 09:14:42 +0000 (09:14 +0000)]
Constify some stuff, to eliminate compiler warnings and to make a table
that isn't written const.

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

18 years agoNo C++/C99 comments, please (GCC warns about them in the Solaris
guy [Sun, 30 Apr 2006 08:59:26 +0000 (08:59 +0000)]
No C++/C99 comments, please (GCC warns about them in the Solaris
buildbot build, even though the code is #if 0'ed out).

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

18 years agoRequest/result matching, port preference and display tweaks
gal [Sun, 30 Apr 2006 07:23:42 +0000 (07:23 +0000)]
Request/result matching, port preference and display tweaks

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

18 years agoAdd "file_dlg.h" to declare "set_last_open_dir()".
guy [Sun, 30 Apr 2006 06:57:01 +0000 (06:57 +0000)]
Add "file_dlg.h" to declare "set_last_open_dir()".

Try leaving "dlg_utils.h" out.

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

18 years agoInclude <errno.h> to get errnos.
guy [Sun, 30 Apr 2006 06:54:25 +0000 (06:54 +0000)]
Include <errno.h> to get errnos.

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

18 years agoSee whether <stdio.h> will get EISDIR defined.
guy [Sun, 30 Apr 2006 03:22:39 +0000 (03:22 +0000)]
See whether <stdio.h> will get EISDIR defined.

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

18 years agoWe use stuff from dlg_utils.h.
guy [Sun, 30 Apr 2006 03:19:59 +0000 (03:19 +0000)]
We use stuff from dlg_utils.h.

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

18 years agoWe need <gdk/gdkkeysyms.h> to define GDK_VoidSymbol.
guy [Sun, 30 Apr 2006 03:19:11 +0000 (03:19 +0000)]
We need <gdk/gdkkeysyms.h> to define GDK_VoidSymbol.

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

18 years agoMove the file selection dialog routines to file_dlg.c, and give it a
guy [Sun, 30 Apr 2006 01:47:58 +0000 (01:47 +0000)]
Move the file selection dialog routines to file_dlg.c, and give it a
header file.

#if 0 out some includes; if none of the builds have a problem with
that, I'll remove them.

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

18 years agoFix the idempotent-include #define.
guy [Sat, 29 Apr 2006 23:18:47 +0000 (23:18 +0000)]
Fix the idempotent-include #define.

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

18 years agoMost of the stuff in file_dlg.c is specific to capture files, so rename
guy [Sat, 29 Apr 2006 23:03:57 +0000 (23:03 +0000)]
Most of the stuff in file_dlg.c is specific to capture files, so rename
it to capture_file_dlg.c, and rename its header file.  We might want to
move the generic file dialog stuff to a file_dlg.c file (it's currently
in dlg_utils.c), and move the non-capture-file dialog stuff in
capture_file_dlg.c to another file.

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

18 years agoAdd some simple sanity checking of BVLC packets, so if you're unlucky
guy [Sat, 29 Apr 2006 18:54:54 +0000 (18:54 +0000)]
Add some simple sanity checking of BVLC packets, so if you're unlucky
enough to have a non-BVLC packet from or to port 47808, we're likely to
reject it and let another dissector try it.  Fixes bug 855 (in which an
MS Messenger packet was unlucky enough to have come from that port).

Add value_string tables to some fields, and just use
proto_tree_add_uint() to add them to the protocol tree, rather than
generating our own text for them.

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

18 years agoHave the ring buffer routines take a pointer to a "bytes written" count
guy [Sat, 29 Apr 2006 17:54:46 +0000 (17:54 +0000)]
Have the ring buffer routines take a pointer to a "bytes written" count
as an argument, rather than keeping the count to themselves, so the
count kept by the capturing program can be updated correctly - including
getting reset when files are switched.  Fixes bug 895.

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

18 years agoClean up indentation; use 2-space indentation throughout.
guy [Sat, 29 Apr 2006 17:31:20 +0000 (17:31 +0000)]
Clean up indentation; use 2-space indentation throughout.

Save the media encoding name in the transport_info_t structure rather
than in a global variable.  Allocate it with tvb_get_ephemeral_string()
so it's released after the packet is completely processed.  Do *NOT*
assume it's necessarily non-null in decode_sdp_fmtp(), as the code flow
doesn't guarantee that to be true.

proto_tree_add_string() now suffices for adding a particular SDP item -
strings are now displayed "safely", with escaping of non-printable
characters done.

Update a comment (we no longer have the Big Transfer Vector to allow
plugins to call dissector functions in Windows, we have those functions
in a DLL).

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

18 years agochrisaudley@yahoo.com:
jmayer [Sat, 29 Apr 2006 15:25:44 +0000 (15:25 +0000)]
chrisaudley@yahoo.com:

Patch to fix:
[Bug 904] FIX protocol dissector missing some message types

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

18 years agoA dissector called from tcp_dissect_pdus() has to return void. (If you
guy [Sat, 29 Apr 2006 09:30:09 +0000 (09:30 +0000)]
A dissector called from tcp_dissect_pdus() has to return void.  (If you
want to have a dissector capable of rejecting packets, you need to
reject the packet before you call tcp_dissect_pdus() - once you're doing
reassembly, etc., it's too late to reject the packet.)

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

18 years agoCheck Payload type before dissecting fmtp parameters.
etxrab [Fri, 28 Apr 2006 21:42:18 +0000 (21:42 +0000)]
Check Payload type before dissecting fmtp parameters.

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

18 years agoFix bug 896 by using tcp_dissect_pdus() .
etxrab [Fri, 28 Apr 2006 21:41:13 +0000 (21:41 +0000)]
Fix bug 896 by using tcp_dissect_pdus() .

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

18 years agoFetch a combobox control handle before we try to use it. Add some needed
gerald [Fri, 28 Apr 2006 18:43:33 +0000 (18:43 +0000)]
Fetch a combobox control handle before we try to use it.  Add some needed
_T macros.  Remove some extraneous comments.

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

18 years agoFix logic used to test protection under Windows OT. Only initialize
gerald [Fri, 28 Apr 2006 16:40:39 +0000 (16:40 +0000)]
Fix logic used to test protection under Windows OT.  Only initialize
our page size and OS version information once.

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

18 years ago tcp analysis updates to prepare for later tcp reassembly updates
sahlberg [Fri, 28 Apr 2006 09:44:02 +0000 (09:44 +0000)]
 tcp analysis updates   to prepare for later tcp reassembly updates

now that we have se_tree_lookup32_le   we can do the tracking of pdu boundaries much more efficiently.

track pdu boundaries by a new  tcp_multisegment_pdu  structure that is indexed by sequence numbers and let this structure replace the older tcp_next_pdu structure.

with se_tree_lookup32_le  we no longer need to track segment by segment and can get rid of the two hash tables
tcp_pdu_tracking_table
tcp_pdu_skipping_table
Neither do we need the tree   tcp_pdu_time_table anymore so that one is gone as well.

remove various other functions that are no longer needed due to removing the structure and the tables/tree

this part of the code shoul;d be much more readable now   and also a bit faster

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

18 years ago- fix Bug 890
kukosa [Fri, 28 Apr 2006 06:47:51 +0000 (06:47 +0000)]
- fix Bug 890
- remove c2asn() which did not work exactly

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

18 years agoDon't change rflags for any properties other than
guy [Fri, 28 Apr 2006 06:29:19 +0000 (06:29 +0000)]
Don't change rflags for any properties other than
IEEE80211_RADIOTAP_FLAGS.

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

18 years agoadd some higher packet length values
ulfl [Thu, 27 Apr 2006 22:13:29 +0000 (22:13 +0000)]
add some higher packet length values

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

18 years agoThis was completely broken, as the "length" variable actually reflected
guy [Thu, 27 Apr 2006 19:58:32 +0000 (19:58 +0000)]
This was completely broken, as the "length" variable actually reflected
the amount of data left in the radiotap header after the fields we've
processed so far, not the total length of the header, so it couldn't be
used to skip past the radiotap header and get a tvbuff of the packet
data.  Fix that.

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

18 years agoFrom Diego Petteno and Daniel Black: add more libraries to the list of
guy [Thu, 27 Apr 2006 19:12:50 +0000 (19:12 +0000)]
From Diego Petteno and Daniel Black: add more libraries to the list of
libraries with which we link libethereal, fixing the reopened bug 878.

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

18 years agoAdd an extra null pointer check. Fixes Coverity CID 154.
gerald [Thu, 27 Apr 2006 18:46:05 +0000 (18:46 +0000)]
Add an extra null pointer check.  Fixes Coverity CID 154.

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

18 years agoProperly grow our buffers for utf_8to16().
gerald [Thu, 27 Apr 2006 14:58:46 +0000 (14:58 +0000)]
Properly grow our buffers for utf_8to16().

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

18 years agoFrom Martin Mathieson:
etxrab [Thu, 27 Apr 2006 05:02:57 +0000 (05:02 +0000)]
From Martin Mathieson:

Fix typo in menu item name

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

18 years agoFrom Mark C. Brown:
jake [Wed, 26 Apr 2006 22:53:00 +0000 (22:53 +0000)]
From Mark C. Brown:
The code was incorrectly bounds checking AndXOffset.  AndXOffset is only
relevant when AndXCommand is not 0xFF.  This patch corrects erroneous
"Malformed packet" exceptions.

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

18 years agoProperly set our export file name before we try to use it. Fixes bug 894.
gerald [Wed, 26 Apr 2006 21:15:51 +0000 (21:15 +0000)]
Properly set our export file name before we try to use it.  Fixes bug 894.

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

18 years agoIf we're running under Windows 95/98/Me, don't abort if we can't protect
gerald [Wed, 26 Apr 2006 21:06:52 +0000 (21:06 +0000)]
If we're running under Windows 95/98/Me, don't abort if we can't protect
our guard pages.

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

18 years agoAdd dissection of MPEG4 fmtp parameter.
etxrab [Wed, 26 Apr 2006 20:16:57 +0000 (20:16 +0000)]
Add dissection of MPEG4 fmtp parameter.

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

18 years agominor enhancements
ulfl [Wed, 26 Apr 2006 20:13:33 +0000 (20:13 +0000)]
minor enhancements

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

18 years agoCheck for NULL return value from wtap_dump_open().
gram [Wed, 26 Apr 2006 17:31:56 +0000 (17:31 +0000)]
Check for NULL return value from wtap_dump_open().
Fixes coverity bug 159.

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