obnox/wireshark/wip.git
21 years ago"uint" is defined on all platforms; use "guint" instead.
guy [Sat, 22 Jun 2002 10:24:35 +0000 (10:24 +0000)]
"uint" is defined on all platforms; use "guint" instead.

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

21 years agoOn Windows, there's no "pipe_fd", so don't refer to it.
guy [Sat, 22 Jun 2002 10:21:00 +0000 (10:21 +0000)]
On Windows, there's no "pipe_fd", so don't refer to it.

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

21 years agoAdded some reply dissectors.
sahlberg [Sat, 22 Jun 2002 06:27:36 +0000 (06:27 +0000)]
Added some reply dissectors.

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

21 years agoGet rid of trailing newline in lines passed to "print_line()".
guy [Sat, 22 Jun 2002 01:52:27 +0000 (01:52 +0000)]
Get rid of trailing newline in lines passed to "print_line()".

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

21 years agoUse a common routine to print protocol tree nodes as text or PostScript,
guy [Sat, 22 Jun 2002 01:43:57 +0000 (01:43 +0000)]
Use a common routine to print protocol tree nodes as text or PostScript,
rather than having duplicate routines (the PostScript one was missing
some bug fixes in the text one).

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

21 years agoFrom Jaime Fournier: handle DCE RPC connectionless CANCEL PDUs with no
guy [Sat, 22 Jun 2002 01:30:54 +0000 (01:30 +0000)]
From Jaime Fournier: handle DCE RPC connectionless CANCEL PDUs with no
body.

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

21 years agoGet rid of separate "print_hex_data_text()" and "print_hex_data_ps()"
guy [Sat, 22 Jun 2002 01:24:23 +0000 (01:24 +0000)]
Get rid of separate "print_hex_data_text()" and "print_hex_data_ps()"
routines; instead, rename "print_hex_data_common()" to
"print_hex_data_buffer()" as it prints a buffer in hex and ASCII (or
EBCDIC), and have it take the print format as an argument.

Have it use "print_line()" to print lines, and fix "print_line()" so
that it prints a buffer *without* a newline at the end, printing the
newline itself.

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

21 years agoIn the hex dump, generate the offset at the beginning of each line in
guy [Sat, 22 Jun 2002 00:21:38 +0000 (00:21 +0000)]
In the hex dump, generate the offset at the beginning of each line in
common code, rather than in print-format-specific code, and have
"print_hex_data_common()" put out the blank line before the dump itself
rather than relying on the print-format-specific "start printing the hex
dump" code to do it.

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

21 years agoUse common code to print the hex dump as text and PostScript.
guy [Fri, 21 Jun 2002 23:52:47 +0000 (23:52 +0000)]
Use common code to print the hex dump as text and PostScript.

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

21 years agoMake the hex dump when printing PostScript look the same way it does
guy [Fri, 21 Jun 2002 23:04:30 +0000 (23:04 +0000)]
Make the hex dump when printing PostScript look the same way it does
when printing plain text.

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

21 years agoAdded my name at the top of the file
sahlberg [Fri, 21 Jun 2002 14:27:46 +0000 (14:27 +0000)]
Added my name at the top of the file

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

21 years agoAdded request dissection of functions NetrShareEnumSticky, NetrShareDelStart, NetrSha...
sahlberg [Fri, 21 Jun 2002 14:24:38 +0000 (14:24 +0000)]
Added request dissection of functions NetrShareEnumSticky, NetrShareDelStart, NetrShareDelCommit, NetrGetFileSecurity, NetrSetFileSecurity, NetrServerTransportAddEx and NetrServerSetServiceBits2

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

21 years agoAdded dissection of the requests to functions NetrRemoteTOD, NetrServerSetServiceBits...
sahlberg [Fri, 21 Jun 2002 12:41:37 +0000 (12:41 +0000)]
Added dissection of the requests to functions NetrRemoteTOD, NetrServerSetServiceBits, NetrPathType, NetrPathCanonicalize, NetrPathCompare, NetrNameValidate, NetrNameCanonicalize and NetrNameCompare

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

21 years agoAdded dissection of the requests to functions NetrServerDiskEnum, NetrServerStatistic...
sahlberg [Fri, 21 Jun 2002 10:58:48 +0000 (10:58 +0000)]
Added dissection of the requests to functions NetrServerDiskEnum, NetrServerStatisticsGet, NetrServerTransportAdd, NetrServerTransportEnum and NetrServerTransportDel

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

21 years agoWarning cleanup.
tpot [Fri, 21 Jun 2002 05:13:15 +0000 (05:13 +0000)]
Warning cleanup.

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

21 years agoPrettify subdissector names.
tpot [Fri, 21 Jun 2002 04:59:04 +0000 (04:59 +0000)]
Prettify subdissector names.

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

21 years agoReplace sub-dissector names with InterCaps names instead of the ugly
tpot [Fri, 21 Jun 2002 02:17:32 +0000 (02:17 +0000)]
Replace sub-dissector names with InterCaps names instead of the ugly
all caps version.

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

21 years agoFrom Michael Tuexen: fix SCTP port number for M2PA to be the
guy [Thu, 20 Jun 2002 20:58:07 +0000 (20:58 +0000)]
From Michael Tuexen: fix SCTP port number for M2PA to be the
IANA-assigned number rather than the M2UA number.

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

21 years agoFrom Mike Frisch: update the ACL and LOCK/LOCKT/LOCKU decoding
guy [Thu, 20 Jun 2002 20:55:49 +0000 (20:55 +0000)]
From Mike Frisch: update the ACL and LOCK/LOCKT/LOCKU decoding
for NFSv4.

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

21 years agoFrom Jeff Morriss:
guy [Thu, 20 Jun 2002 20:40:36 +0000 (20:40 +0000)]
From Jeff Morriss:

- Correct the "standard" preference to be "mtp3.standard"
  instead of "mtp3.mtp3_standard".
- Change ANSI decoding to use 8-bit SLS by default with an
  option for 5-bit.
- Put line breaks in a bunch of places to avoid going past 80
  chars.

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

21 years agoFrom Tom Uijldert:
guy [Thu, 20 Jun 2002 20:17:40 +0000 (20:17 +0000)]
From Tom Uijldert:

- Remove compiler warnings
- Support operation '0'

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

21 years agoAdded dissection of SERVER_INFO union and rewrote functions NetrServerGetInfo and...
sahlberg [Thu, 20 Jun 2002 12:34:51 +0000 (12:34 +0000)]
Added dissection of SERVER_INFO union and rewrote functions NetrServerGetInfo and added NetrServerSetInfo.

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

21 years agoSome infolevels for SERVER_INFO_UNION
sahlberg [Thu, 20 Jun 2002 10:25:24 +0000 (10:25 +0000)]
Some infolevels for SERVER_INFO_UNION

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

21 years agoFrom Didier Gautheron: assorted small fixes, more AFP calls, and DSI/ASP
guy [Thu, 20 Jun 2002 00:44:33 +0000 (00:44 +0000)]
From Didier Gautheron: assorted small fixes, more AFP calls, and DSI/ASP
error code in the Info column.

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

21 years agoAdded MS Window printing to ethereal.
jfoster [Wed, 19 Jun 2002 20:44:05 +0000 (20:44 +0000)]
Added MS Window printing to ethereal.

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

21 years agoClarify a comment, for the benefit of those not familiar with RFCspeak.
guy [Wed, 19 Jun 2002 20:21:26 +0000 (20:21 +0000)]
Clarify a comment, for the benefit of those not familiar with RFCspeak.

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

21 years agoPut the status of the broadcast flag into the summary line for the flags
guy [Wed, 19 Jun 2002 19:50:34 +0000 (19:50 +0000)]
Put the status of the broadcast flag into the summary line for the flags
field.

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

21 years agoFrom Joerg Mayer:
guy [Wed, 19 Jun 2002 19:39:38 +0000 (19:39 +0000)]
From Joerg Mayer:
- dissect the flags field properly (some tool
  sent a wrong bc-flag (0x0100 instead of 0x8000) and
  the only way to see this was in the hexdump.
- The existence of the bootp.vendor field is optional.
  Iff it's there and the magic is not the dhcp one,
  this field is exactly 64 bytes long.

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

21 years agoFrom Joerg Mayer: fix a typo in a comment.
guy [Wed, 19 Jun 2002 19:21:15 +0000 (19:21 +0000)]
From Joerg Mayer: fix a typo in a comment.

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

21 years agoFix to WEP decoding, from Solomon Peachy.
guy [Wed, 19 Jun 2002 17:57:23 +0000 (17:57 +0000)]
Fix to WEP decoding, from Solomon Peachy.

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

21 years agoAdded dissection of the request packets for the functions NetrShareSetInfo, NetrShare...
sahlberg [Wed, 19 Jun 2002 10:22:55 +0000 (10:22 +0000)]
Added dissection of the request packets for the functions NetrShareSetInfo, NetrShareDel, NetrShareDelSticky and NetrShareCheck

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

21 years agoDon't hand off the stub body of a Fault PDU to the subdissector for the
guy [Wed, 19 Jun 2002 10:06:02 +0000 (10:06 +0000)]
Don't hand off the stub body of a Fault PDU to the subdissector for the
protocol.

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

21 years agoAdded/Rewrote dissection of NetrShareEnum NetrShareGetInfo
sahlberg [Wed, 19 Jun 2002 09:59:42 +0000 (09:59 +0000)]
Added/Rewrote dissection of NetrShareEnum NetrShareGetInfo

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

21 years agoFix some bugs in the dissection of WEP-encrypted frames.
guy [Wed, 19 Jun 2002 09:18:45 +0000 (09:18 +0000)]
Fix some bugs in the dissection of WEP-encrypted frames.

Put the WEP header tree under the top-level 802.11 tree, rather than
putting it at the top level itself.

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

21 years agoDissect the bodies of some additional PDU types.
guy [Wed, 19 Jun 2002 08:34:38 +0000 (08:34 +0000)]
Dissect the bodies of some additional PDU types.

Show presentation context negotiation results and rejection reasons, PDU
rejection reasons, and rejection status codes symbolically.  Show the
presentation context negotiation rejection reason only if there was a
rejection, and, if so, show it in the Info column as well as the
protocol tree.

Show more fields in the Info column.

Show the packet type in decimal in the protocol tree - it's shown as
decimal in the Info column and the values are shown as decimal in the
DCE RPC 1.1 spec.

Show the sequence number for connectionless PDUs as decimal in the
protcool tree - it's snown as decimal in the Info column, and the call
ID for connection-oriented PDUs is shown as decimal in the protocol
tree.

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

21 years agoPut in an additional portability note about "bzero()"/"bcopy()"/"bcmp()"
guy [Tue, 18 Jun 2002 20:25:12 +0000 (20:25 +0000)]
Put in an additional portability note about "bzero()"/"bcopy()"/"bcmp()"
vs. "memset()"/"memcpy()"/"memmove()"/"memcmp()".

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

21 years agoFrom Solomon Peachy: do WEP decryption before reassembly.
guy [Tue, 18 Jun 2002 20:17:17 +0000 (20:17 +0000)]
From Solomon Peachy: do WEP decryption before reassembly.

Use "memset()" rather than "bzero()", as "memset()" is the official ANSI
C routine (and you get an error when compiling with MSVC++ if you use
"bzero()").

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

21 years agoAdded dissection of the request to NetrShareAdd
sahlberg [Tue, 18 Jun 2002 13:18:30 +0000 (13:18 +0000)]
Added dissection of the request to NetrShareAdd

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

21 years agoAdded dissection of the request packets for NetrSessionEnum and NetrSessionDel functions.
sahlberg [Tue, 18 Jun 2002 10:19:47 +0000 (10:19 +0000)]
Added dissection of the request packets for NetrSessionEnum and NetrSessionDel functions.

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

21 years agoFrom Solomon Peachy: WEP cleanups, WEP decryption support and other
guy [Tue, 18 Jun 2002 08:38:19 +0000 (08:38 +0000)]
From Solomon Peachy: WEP cleanups, WEP decryption support and other
mangling of the 802.11 dissector, and optional processing of an FCS at
the end of the frame.

When dissecting the frame-type-dependent part of the header, dissect all
management frames (including ones with an invalid subtype) the same, and
dissect all data frames (including ones with an invalid subtype) the
same.

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

21 years agoThere's no more need for separate request and response reassembly hash
guy [Tue, 18 Jun 2002 06:11:42 +0000 (06:11 +0000)]
There's no more need for separate request and response reassembly hash
tables for connectionless PDUs than for connection-oriented PDUs; just
have one connectionless PDU reassembly hash table.

Get rid of unnecessary tests of "dcerpc_reassemble" - the code to handle
requests and responses was

if (!dcerpc_reassemble || packet not fragmented || frame is short)
don't reassemble;
else if (dcerpc_reassemble)
reassemble

but if we go into the "else" clause we know that all three conditions in
the "if" are false, including "!dcerpc_reassemble", so we know
"dcerpc_reassemble" is true.

Set "pinfo->fragmented" based on whether the PDU being dissected is an
unreassembled first fragment or not.

Put a "Fragment data" item into the protocol tree for all fragments.

Properly maintain the offset when dissecting the header of a
connectionless PDU, even if we aren't building a protocol tree.

"fd_head->datalen" is bogus for sequence-number-based reassembly; use
"fd_head->len" instead.

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

21 years agoThe offset of the authentication information in a connectionless PDU is
guy [Tue, 18 Jun 2002 05:06:44 +0000 (05:06 +0000)]
The offset of the authentication information in a connectionless PDU is
the fragment length *plus the offset of the beginning of the fragment
data*, not just the fragment length.

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

21 years agoAdded dissectors for the request packets of functions NetrConnectionEnum, NetrFileEnu...
sahlberg [Mon, 17 Jun 2002 13:04:14 +0000 (13:04 +0000)]
Added dissectors for the request packets of functions NetrConnectionEnum, NetrFileEnum, NetrFileGetInfo and NetrFileClose

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

21 years agoAdded dissection of the requests to functions NetrCharDevQGetInfo, NetrCharDevQSetInf...
sahlberg [Mon, 17 Jun 2002 10:39:41 +0000 (10:39 +0000)]
Added dissection of the requests to functions NetrCharDevQGetInfo, NetrCharDevQSetInfo, NetrCharDevQPurge and NetrCharDevQPurgeSelf

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

21 years agoAdded true_false_string for job status codes.
tpot [Mon, 17 Jun 2002 06:45:42 +0000 (06:45 +0000)]
Added true_false_string for job status codes.

Fixed bug in printer notify subtree item display.

The flags field in rfnpcnex is a change id not a flags value.

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

21 years agoAdded value_string for printer status values.
tpot [Mon, 17 Jun 2002 03:21:15 +0000 (03:21 +0000)]
Added value_string for printer status values.

Added true_false_string for printer attributes.

Display notify type and notify field name in subtree item when
dissecting notify options or notify data.

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

21 years agoDon't check for a short frame until we care whether the frame is short;
guy [Mon, 17 Jun 2002 01:12:13 +0000 (01:12 +0000)]
Don't check for a short frame until we care whether the frame is short;
that lets us get rid of a variable.

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

21 years agoAdd support for reassembly of fragmented connectionless PDUs.
guy [Mon, 17 Jun 2002 01:11:00 +0000 (01:11 +0000)]
Add support for reassembly of fragmented connectionless PDUs.

Don't try to add a fragment to a reassembly operation if we don't have
all of the stub data (because the frame is short, or because it's part
of a packet fragmented at a layer below RPC and not reassembled).

Put an entry into the protocol tree for the fragment data of the last
fragment.

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

21 years agoAdd #defines for the bits in the flag fields, and a macro to test
guy [Mon, 17 Jun 2002 00:04:49 +0000 (00:04 +0000)]
Add #defines for the bits in the flag fields, and a macro to test
whether a connection-oriented PDU is fragmented or not.

Clean up the handling of fragmented connection-oriented PDUs (the code
to handle fragmented PDUs can assume that it is not the case that both
PFC_FIRST_FRAG and PFC_LAST_FRAG are set, as that's an unfragmented
PDU).  Put an entry into the protocol tree for the fragment data in
fragmented PDUs.

For fragmented connectionless PDUs, don't hand the payload of any
fragment other than the first fragment to the subdissector.

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

21 years agoReturn an error for an invalid class instead of dumping core.
gerald [Sun, 16 Jun 2002 17:08:43 +0000 (17:08 +0000)]
Return an error for an invalid class instead of dumping core.

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

21 years agoForgot again to remove test changes. Must update my testscripts so I dont need this...
sahlberg [Sun, 16 Jun 2002 14:43:17 +0000 (14:43 +0000)]
Forgot again to remove test changes. Must update my testscripts so I dont need this change anymore.

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

21 years agoAdded dissectors for the requests for functions NetrCharDevGetInfo, NetrCharDevContro...
sahlberg [Sun, 16 Jun 2002 14:29:15 +0000 (14:29 +0000)]
Added dissectors for the requests for functions NetrCharDevGetInfo, NetrCharDevControl, NetrCharDevQEnum.

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

21 years agoALIGN_TO_4_BYTES cleanup
sahlberg [Sun, 16 Jun 2002 13:50:51 +0000 (13:50 +0000)]
ALIGN_TO_4_BYTES cleanup

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

21 years agoWe must make sure that the ALIGN_TO_4_BYTES macro does not change the offset
sahlberg [Sun, 16 Jun 2002 13:47:39 +0000 (13:47 +0000)]
We must make sure that the ALIGN_TO_4_BYTES macro does not change the offset
when we do the conformance run.

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

21 years agoForgot to remove one change only used for local testing from last checkin
sahlberg [Sun, 16 Jun 2002 11:55:46 +0000 (11:55 +0000)]
Forgot to remove one change only used for local testing from last checkin

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

21 years agoAdded dissection of the request for NetrCharDevEnum function.
sahlberg [Sun, 16 Jun 2002 11:46:18 +0000 (11:46 +0000)]
Added dissection of the request for NetrCharDevEnum function.

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

21 years agoChanged one function name that was a duplicate.
sahlberg [Sun, 16 Jun 2002 01:52:26 +0000 (01:52 +0000)]
Changed one function name that was a duplicate.

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

21 years agoHandle the "bool" members the same way we handled the members for
guy [Sun, 16 Jun 2002 00:58:38 +0000 (00:58 +0000)]
Handle the "bool" members the same way we handled the members for
enumerated values - "boolp" for pointers, "boolval" for values.

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

21 years agoFrom Chris Waters: don't use "bool" as a variable name or structure
guy [Sun, 16 Jun 2002 00:53:20 +0000 (00:53 +0000)]
From Chris Waters: don't use "bool" as a variable name or structure
member, as it's a C++ keyword.

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

21 years agoFix "display_unicode_string()" to get the length of the Unicode string,
guy [Sun, 16 Jun 2002 00:39:30 +0000 (00:39 +0000)]
Fix "display_unicode_string()" to get the length of the Unicode string,
allocate a buffer big enough to hold the ASCIIfied version of that
string, and then ASCIIfy the Unicode string into that buffer, rather
than ASCIIfying into a fixed-length buffer.

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

21 years agoThe enumerated types given in the WTLS spec have values given in
guy [Sat, 15 Jun 2002 23:27:15 +0000 (23:27 +0000)]
The enumerated types given in the WTLS spec have values given in
decimal, not hex; use decimal in the value_string tables for them, and
display them in decimal, not hex.

Clean up the names of the certificate types.

Add a routine to add text identifiers, use that routine rather than
doing similar things in several places in the code, and don't have that
routine extract the string contents into a buffer and add it with
"proto_tree_add_string()" - we can just use "proto_tree_add_item()",
which is simpler *and* removes worries about buffer overflows.

Use #defines rather than raw numerical values for identifier types in
switch-statement case clauses.

Fix a typo ("Unknow" -> "Unknown").

FT_NONE and FT_STRING fields can't have a base, so make them BASE_NONE.

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

21 years agoCharacter set values are in hex in the WSP spec; always display them in
guy [Sat, 15 Jun 2002 23:23:31 +0000 (23:23 +0000)]
Character set values are in hex in the WSP spec; always display them in
hex.

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

21 years agoFixed bug in MAPI
sahlberg [Sat, 15 Jun 2002 22:24:31 +0000 (22:24 +0000)]
Fixed bug in MAPI
If we had unreassebled DCERPC PDUs but had
decryption of MAPI enabled we would try to read too much data from the
tvbuff and ethereal would later dump core.

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

21 years agoPut bounds checking into the code in "get_dns_name()" to handle RFC 2673
guy [Sat, 15 Jun 2002 20:38:34 +0000 (20:38 +0000)]
Put bounds checking into the code in "get_dns_name()" to handle RFC 2673
extended labels.

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

21 years agoAdded all missing function names.
sahlberg [Sat, 15 Jun 2002 10:24:25 +0000 (10:24 +0000)]
Added all missing function names.
Changed all existing function names to match MS naming of these functions.

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

21 years agoFrom Graeme Hewson: fix capture-from-pipe not to block when reading from
guy [Thu, 13 Jun 2002 21:23:02 +0000 (21:23 +0000)]
From Graeme Hewson: fix capture-from-pipe not to block when reading from
the pipe, and clean up various other things.

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

21 years agoFix some compiler warnings.
guy [Thu, 13 Jun 2002 21:20:24 +0000 (21:20 +0000)]
Fix some compiler warnings.

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

21 years agoMove the entries to map between platform-dependent libpcap link-layer
guy [Thu, 13 Jun 2002 11:03:23 +0000 (11:03 +0000)]
Move the entries to map between platform-dependent libpcap link-layer
types and Wiretap encapsulations after the entries to map between
platform-independent libpcap link-layer types and those Wiretap
encapsulations, so that, when writing a libpcap-format file, we choose
the platform-independent link-layer types.

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

21 years agoAdd /I$(PCAP_DIR)/include to the list of directories in which to look
guy [Thu, 13 Jun 2002 10:39:29 +0000 (10:39 +0000)]
Add /I$(PCAP_DIR)/include to the list of directories in which to look
for header files, so that we find "pcap.h".

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

21 years agoFrom Bill Fumerola: recognize "Option negotiated failed" error in TFTP.
guy [Thu, 13 Jun 2002 08:48:44 +0000 (08:48 +0000)]
From Bill Fumerola: recognize "Option negotiated failed" error in TFTP.

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

21 years agoFrom Peter Hawkins: make the maximum length argument to
guy [Thu, 13 Jun 2002 07:36:52 +0000 (07:36 +0000)]
From Peter Hawkins: make the maximum length argument to
"tvb_get_nstringz0()" no larger than the space in "str" (not counting
the space for the trailing '\0').

Make "str" big enough to hold a maximum-length serial number string (the
length is 1 byte, hence the maximum length is 256 bytes plus 1 byte of
terminating '\0').

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

21 years agoFrom Peter Hawkins: fix the maximum length argument to "tvb_memcpy()".
guy [Thu, 13 Jun 2002 07:32:34 +0000 (07:32 +0000)]
From Peter Hawkins: fix the maximum length argument to "tvb_memcpy()".

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

21 years agoFrom Steve Housley: support for the IEEE 802.3ad Link Aggregation
guy [Thu, 13 Jun 2002 07:18:49 +0000 (07:18 +0000)]
From Steve Housley: support for the IEEE 802.3ad Link Aggregation
Control Protocol.

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

21 years agoExport the new wtap_process_pcap_packet routine.
guy [Thu, 13 Jun 2002 06:50:41 +0000 (06:50 +0000)]
Export the new wtap_process_pcap_packet routine.

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

21 years agoFrom Loic Tortay: fix a crash when dissecting AFS authentication
guy [Thu, 13 Jun 2002 06:43:46 +0000 (06:43 +0000)]
From Loic Tortay: fix a crash when dissecting AFS authentication
requests - the data part of the AFS authentication request
(hf_afs_kauth_data) is displayed as a string whilst declared as a binary
array in "packet-afs-register-info.h".

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

21 years agoAdd #define HAVE_PCAP_H 1 to config.h.win32.
gram [Mon, 10 Jun 2002 15:45:30 +0000 (15:45 +0000)]
Add   #define HAVE_PCAP_H  1  to config.h.win32.
In libpcap.c, move wtap_pcap_encap_to_wtap_encap before libpcap_open
so that if HAVE_PCAP_H is not true, the file will still compile.

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

21 years agoMake various text buffers all the same size, so that, for example, we
guy [Sun, 9 Jun 2002 21:25:47 +0000 (21:25 +0000)]
Make various text buffers all the same size, so that, for example, we
don't overflow the token buffer if presented with a maximum-sized
command.

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

21 years agoAdd in names for NDS verbs, from a list found by a Web search that found
guy [Sun, 9 Jun 2002 01:36:43 +0000 (01:36 +0000)]
Add in names for NDS verbs, from a list found by a Web search that found
the source to an "ipxdump" utility from the Linux ncpfs package.

The NetworkAddress field in a 23/26 GetInternetAddress reply appears
to be big-endian; we assume it's big-endian in all messages.

The NetworkSocket field in that reply also appears to be big-endian;
it was already set up to be big-endian in other messages.

Put in comments noting other things seen in captures.

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

21 years agoFrom John Wells: Fix the default offset adjustment in dissect_mip_extentions.
gerald [Sun, 9 Jun 2002 01:03:19 +0000 (01:03 +0000)]
From John Wells: Fix the default offset adjustment in dissect_mip_extentions.

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

21 years agoWhen looking for dissectors for the source and destination port numbers
guy [Sat, 8 Jun 2002 21:54:52 +0000 (21:54 +0000)]
When looking for dissectors for the source and destination port numbers
in TCP, UDP, and SCTP, try the lower port number first, and then the
higher port number; this means that, for packets where a dissector is
registered for *both* port numbers:

1) we pick the same dissector for traffic going in both directions;

2) we prefer the port number that's more likely to be the right
   one (as that prefers well-known ports to reserved ports);

although there is, of course, no guarantee that any such strategy will
always pick the right port number.

Ignore port numbers of 0, as some dissectors use a port number of 0 to
disable the port, and as RFC 768 says that the source port in UDP
datagrams is optional and is 0 if not used.

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

21 years agoTweak some of the "levels" arguments to properly decorate the protocol
guy [Sat, 8 Jun 2002 10:58:46 +0000 (10:58 +0000)]
Tweak some of the "levels" arguments to properly decorate the protocol
tree with share names.

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

21 years agoUpdates to netshareenumall to correctly decode reply packets
sahlberg [Fri, 7 Jun 2002 23:05:12 +0000 (23:05 +0000)]
Updates to netshareenumall to correctly decode reply packets

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

21 years agoFrom Martin Gignac: fix the handling of From: headers to properly
guy [Fri, 7 Jun 2002 22:50:49 +0000 (22:50 +0000)]
From Martin Gignac: fix the handling of From: headers to properly
interpret and show Value-Length fields bigger than a single byte.
allows the dissector to properly interpret and show
From: headers with a Value-Length field bigger than a single byte.

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

21 years agoAdd a Wiretap routine to process packets captured via libpcap, possibly
guy [Fri, 7 Jun 2002 21:11:24 +0000 (21:11 +0000)]
Add a Wiretap routine to process packets captured via libpcap, possibly
extracting a pseudo-header, for the use of SunATM captures.

Add support for SunATM capture.

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

21 years agoFix the decode of NCP 8701.
gram [Fri, 7 Jun 2002 15:33:37 +0000 (15:33 +0000)]
Fix the decode of NCP 8701.

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

21 years agoDon't call "tvb_strsize(tvb, offset)" if we know there's nothing *at*
guy [Fri, 7 Jun 2002 11:37:05 +0000 (11:37 +0000)]
Don't call "tvb_strsize(tvb, offset)" if we know there's nothing *at*
"offset".

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

21 years agoUse "tvb_memcpy()" rather than "strncpy()" with a "tvb_get_ptr()"
guy [Fri, 7 Jun 2002 11:27:54 +0000 (11:27 +0000)]
Use "tvb_memcpy()" rather than "strncpy()" with a "tvb_get_ptr()"
argument to copy a counted string, and use "tvb_strsize()" rather tan
"strlen()" with a "tvb_get_ptr()" argument to get the length of a
null-terminated string, so that we throw an exception if we go past the
end of the tvbuff, rather than processing bytes past the end.

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

21 years agoJust have "pcap_dispatch()" cons up a "strut pcap_pkthdr" and call
guy [Fri, 7 Jun 2002 11:12:43 +0000 (11:12 +0000)]
Just have "pcap_dispatch()" cons up a "strut pcap_pkthdr" and call
"capture_pcap_cb()", so it duplicates even less of the latter routine.

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

21 years agoHave a common routine for doing the packet counter stuff, rather than
guy [Fri, 7 Jun 2002 10:54:03 +0000 (10:54 +0000)]
Have a common routine for doing the packet counter stuff, rather than
having two different versions, both broken in different ways.

Bump the count of total packets in the capture-from-pipe routine.

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

21 years agoPass the captured length, not the full length, to the "capture_"
guy [Fri, 7 Jun 2002 10:36:57 +0000 (10:36 +0000)]
Pass the captured length, not the full length, to the "capture_"
routines.

Call the 802.11 and Cisco HDLC capture routines for those packet types.

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

21 years agoPut the stuff to add the "Illegal {fragment,segment}" item to the Info
guy [Fri, 7 Jun 2002 10:17:21 +0000 (10:17 +0000)]
Put the stuff to add the "Illegal {fragment,segment}" item to the Info
column, and to return TRUE or FALSE, depending on whether there were any
reassembly errors, in a common routine.

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

21 years agoAdd "show_fragment_seq_tree()", which is like "show_fragment_tree()",
guy [Fri, 7 Jun 2002 10:11:41 +0000 (10:11 +0000)]
Add "show_fragment_seq_tree()", which is like "show_fragment_tree()",
but for stuff reassembled with "fragment_add_seq()" or
"fragment_add_seq_check()".

Add a "fragment tag" string to the "fragment_items", so that packets
with fragmentation errors can be properly flagged as having "Illegal
fragments" or "Illegal segments" depending on the term used with the
protocol in question.

Make all the dissectors that can use "show_fragment_tree()" or
"show_fragment_seq_tree()", and don't already use them, do so.

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

21 years agoAdd a new error for attempts to open a pipe or FIFO for random access.
guy [Fri, 7 Jun 2002 07:47:58 +0000 (07:47 +0000)]
Add a new error for attempts to open a pipe or FIFO for random access.

Have "wtap_open_offline()", if asked to open a FIFO, return that error
if it was asked to open the file for random access.

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

21 years agoGraeme Hewson noted that zlib has a bug wherein "gzseek()" doesn't set
guy [Fri, 7 Jun 2002 07:27:35 +0000 (07:27 +0000)]
Graeme Hewson noted that zlib has a bug wherein "gzseek()" doesn't set
the internal z_err value for the stream if an "fseek()" call it makes
fails, so that if "gzerror()" is subsequently called, it returns Z_OK
rather than an error.

To work around this, we pass "file_seek()" an "int *err", and have the
with-zlib version of "file_seek()" check, if "gzseek()" fails, whether
the return value of "file_error()" is 0 and, if so, have it return
"errno" instead.

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

21 years agoFixed another bug in RRPCN.
tpot [Fri, 7 Jun 2002 06:10:53 +0000 (06:10 +0000)]
Fixed another bug in RRPCN.

Some more updates for printer notification data types as I figure out
how it all hangs together.

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

21 years agoBSD/OS Frame Relay packets just begin with the Frame Relay header, so
guy [Fri, 7 Jun 2002 04:48:36 +0000 (04:48 +0000)]
BSD/OS Frame Relay packets just begin with the Frame Relay header, so
they are, in fact, WTAP_ENCAP_FRELAY.  Support 11 as WTAP_ENCAP_FRELAY
if DLT_FR is defined and is equal to 11, and support 107 as
WTAP_ENCAP_FRELAY unconditionally.

Get rid of a comment indicating that 105 isn't used - it's been
supported as DLT_IEEE802_11 for a while.

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

21 years agoA printer port name is a notification string, not a two word value.
tpot [Fri, 7 Jun 2002 03:42:02 +0000 (03:42 +0000)]
A printer port name is a notification string, not a two word value.

A RFNPCNEX request contains a NOTIFY_OPTIONS_ARRAY_CTR instead of a
NOTIFY_OPTIONS_ARRAY.

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

21 years agoKeep an invalid packet length from overflowing a data buffer.
gerald [Thu, 6 Jun 2002 22:42:27 +0000 (22:42 +0000)]
Keep an invalid packet length from overflowing a data buffer.

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

21 years agoFrom Michael Tuexen: remove the old workaround for "select()"s not
guy [Thu, 6 Jun 2002 19:03:39 +0000 (19:03 +0000)]
From Michael Tuexen: remove the old workaround for "select()"s not
working on MacOS X.

It appears that the underlying problem with the timeout was that we
weren't treating MacOS X as a BSD, and the "select()" we were doing
presumably wasn't working as it doesn't work on BPF devices on many
BSDs; the workaround no longer appears to be necessary, with Michael's
fix to treat MacOS X as BSD.

(Presumably a select timeout with "tv_usec" set to 1000*1000
microseconds was treated as an error, or otherwise treated in such a way
that it didn't block waiting for the BPF device to say it could be
read.)

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

21 years agoUse "phtons()", not "htons()", just as we use "pntohs()" rather than
guy [Thu, 6 Jun 2002 18:58:12 +0000 (18:58 +0000)]
Use "phtons()", not "htons()", just as we use "pntohs()" rather than
"ntohs()".

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