14 years agoThe common merge code merely needs to offer the abstraction of routines
guy [Fri, 29 Oct 2004 00:36:52 +0000 (00:36 +0000)]
The common merge code merely needs to offer the abstraction of routines
that return the next packet from a set of {chronologically sorted,
sequential-by-file} packets; it doesn't need to have a loop over all
those packets, or any code to write packets.

Supply those abstractions, change the code that merges packets to do its
own writing, and have the Ethereal version manage a progress bar and
have the mergecap version print packet numbers in verbose mode, as the
common merge code used to do.

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

14 years agoAdd support for pkauthdata and pkdhkeydata OIDs.
gerald [Thu, 28 Oct 2004 22:06:55 +0000 (22:06 +0000)]
Add support for pkauthdata and pkdhkeydata OIDs.

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

14 years agofix small bug that gets offset confused for CHOICE { } OPTIONAL if there were no...
sahlberg [Thu, 28 Oct 2004 11:35:43 +0000 (11:35 +0000)]
fix small bug that gets offset confused for CHOICE { } OPTIONAL if there were no arms that matched

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

14 years agoThe offset to the first IFD in a TIFF file is 4 bytes long, not 2 bytes
guy [Thu, 28 Oct 2004 07:50:07 +0000 (07:50 +0000)]
The offset to the first IFD in a TIFF file is 4 bytes long, not 2 bytes

The offset is relative to the first byte of the TIFF structure, which is
after the "Exif\0" *and* the extra byte after "Exif\0".

Loop over all IFDs.

Sanity check the offset to the first IFD and the offset in each IFD to
the next IFD.

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

14 years agoMake "merge_files()" and "merge_append_files()" return a tri-state
guy [Thu, 28 Oct 2004 01:52:05 +0000 (01:52 +0000)]
Make "merge_files()" and "merge_append_files()" return a tri-state
indication - success, read failure, write failure - and have their
callers handle read failures by looking for the file that got the read
failure and reporting the failure in question.

Free up the err_info string returned by "wtap_read()" after using it.

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

14 years agoRemove all the verbose-mode code from merge.c, and put most of it in
guy [Thu, 28 Oct 2004 01:06:11 +0000 (01:06 +0000)]
Remove all the verbose-mode code from merge.c, and put most of it in
mergecap.c (get rid of the verbose printing of information for each

Have "merge_append_files()" return FALSE only on a write error, as
"merge_files()" does.

Sort the routines in "merge.c" in the order from "merge.h".

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

14 years agoGet rid of merge_n_files() - it's only called in one place now, and
guy [Wed, 27 Oct 2004 23:45:10 +0000 (23:45 +0000)]
Get rid of merge_n_files() - it's only called in one place now, and
absorbing its logic into "cf_merge_files()" simplifies things a bit.

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

14 years agoChange some of the merge.c APIs to return more information on failure,
guy [Wed, 27 Oct 2004 23:28:37 +0000 (23:28 +0000)]
Change some of the merge.c APIs to return more information on failure,
and use that information to provide better error messages.

Have "merge_open_outfile()" do all the work of filling in the
merge_out_file_t structure, with the values to use passed as arguments.
Get rid of some structure members that used to be used solely to pass
information to "merge_open_outfile()".

Add a "cf_merge_files()" routine to do the merging and reporting of errors.

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

14 years ago"dissect_MAP_Dialogue()" returns no value; declare its return value as
guy [Wed, 27 Oct 2004 21:16:18 +0000 (21:16 +0000)]
"dissect_MAP_Dialogue()" returns no value; declare its return value as

Fix a typo in the MAP Dialogue dissector template .h file.

Re-generate the MAP Dialogue dissector files and set svn:keywords to Id
and svn:eol-style to native for them.

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

14 years agoTurn off execute permission on .asn files.
guy [Wed, 27 Oct 2004 20:36:20 +0000 (20:36 +0000)]
Turn off execute permission on .asn files.

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

14 years agoFix a typo in the name of the directory for the MAP dialogue ASN.1
guy [Wed, 27 Oct 2004 20:34:21 +0000 (20:34 +0000)]
Fix a typo in the name of the directory for the MAP dialogue ASN.1

Set svn:eol-style to native for those files, and get rid of trailing

Set svn:keywords to Id for those files.

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

14 years agoAdd a MapDialouge dissector ( can be tested with the file gsm-ss-01.snoop )
etxrab [Wed, 27 Oct 2004 20:17:38 +0000 (20:17 +0000)]
Add a MapDialouge dissector ( can be tested with the file gsm-ss-01.snoop )

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

14 years agoAdd a MAPdialouge dissector
etxrab [Wed, 27 Oct 2004 20:08:44 +0000 (20:08 +0000)]
Add a MAPdialouge dissector

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

14 years agoAdd a MAPdialouge dissector
etxrab [Wed, 27 Oct 2004 20:06:45 +0000 (20:06 +0000)]
Add a MAPdialouge dissector

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

14 years agoImprove OID dissection and make it possible to call an "OID" Dissector for Dialougeda...
etxrab [Wed, 27 Oct 2004 20:04:56 +0000 (20:04 +0000)]
Improve OID dissection and make it possible to call an "OID" Dissector for Dialougedata parameter.

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

14 years agoMake it possible to register a string for an OID in the hash table.
etxrab [Wed, 27 Oct 2004 19:59:44 +0000 (19:59 +0000)]
Make it possible to register a string for an OID in the hash table.

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

14 years agoFix indentation.
guy [Wed, 27 Oct 2004 19:36:48 +0000 (19:36 +0000)]
Fix indentation.

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

14 years agoCheck whether any input files were specified, and print an error for
guy [Wed, 27 Oct 2004 19:36:22 +0000 (19:36 +0000)]
Check whether any input files were specified, and print an error for
that - otherwise, you get a "No valid input files" message, which
perhaps doesn't make it clear enough that the problem is that there were
no input files, period.

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

14 years agoAdd unix2dos.pl to the list of files to be distributed.
guy [Wed, 27 Oct 2004 19:26:01 +0000 (19:26 +0000)]
Add unix2dos.pl to the list of files to be distributed.

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

14 years agotwo more dia diagrams about Ethereals capture engine and updated the first one
ulfl [Wed, 27 Oct 2004 19:12:51 +0000 (19:12 +0000)]
two more dia diagrams about Ethereals capture engine and updated the first one

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

14 years agoa dia diagram about Ethereal development (hopefully later some more)
ulfl [Wed, 27 Oct 2004 17:20:25 +0000 (17:20 +0000)]
a dia diagram about Ethereal development (hopefully later some more)

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

14 years agoCheck to make sure we don't give a protocol tree item a negative length.
guy [Wed, 27 Oct 2004 10:02:45 +0000 (10:02 +0000)]
Check to make sure we don't give a protocol tree item a negative length.

Clean up indentation.

If we dissect an octet string and then re-dissect it as a particular
type of data, don't use the end offset from the re-dissection as the
offset of the end of the octet string - just use the result of

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

14 years agofix doxygen generation
ulfl [Wed, 27 Oct 2004 04:46:17 +0000 (04:46 +0000)]
fix doxygen generation

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

14 years agofix doxygen tags
ulfl [Wed, 27 Oct 2004 04:45:00 +0000 (04:45 +0000)]
fix doxygen tags

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

14 years agofix doxygen generation
ulfl [Wed, 27 Oct 2004 04:03:31 +0000 (04:03 +0000)]
fix doxygen generation

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

14 years agofix doxygen generation
ulfl [Wed, 27 Oct 2004 03:59:02 +0000 (03:59 +0000)]
fix doxygen generation

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

14 years agofix doxygen tags
ulfl [Wed, 27 Oct 2004 03:57:57 +0000 (03:57 +0000)]
fix doxygen tags

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

14 years agoDon't have two variables, in different scopes in the same routine, have
guy [Wed, 27 Oct 2004 02:52:40 +0000 (02:52 +0000)]
Don't have two variables, in different scopes in the same routine, have
the same name.

Fix up alignment.

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

14 years agoEncapsulate into a macro the idiom
guy [Wed, 27 Oct 2004 02:34:30 +0000 (02:34 +0000)]
Encapsulate into a macro the idiom


for byte-aligning a bit offset.

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

14 years agoDocument the personal capture and display filters list in the FILES
guy [Tue, 26 Oct 2004 23:30:33 +0000 (23:30 +0000)]
Document the personal capture and display filters list in the FILES
section, as is done for other files.  Just refer to those files in the
section for the "Save" button for the capture and display filter dialog

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

14 years agoFix the file name in the initial comment.
guy [Tue, 26 Oct 2004 18:41:25 +0000 (18:41 +0000)]
Fix the file name in the initial comment.

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

14 years agoRename the "boolean" enum to "val_boolean" lest the Microsoft compiler let
gerald [Tue, 26 Oct 2004 16:08:16 +0000 (16:08 +0000)]
Rename the "boolean" enum to "val_boolean" lest the Microsoft compiler let
its displeasure be known.

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

14 years agomake the dissector use the nice #.REGISTER directive
sahlberg [Tue, 26 Oct 2004 14:02:02 +0000 (14:02 +0000)]
make the dissector use the nice #.REGISTER directive

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

14 years ago use the nice #.REGISTER directive instead of handcoding it in teh template
sahlberg [Tue, 26 Oct 2004 13:54:09 +0000 (13:54 +0000)]
 use the nice #.REGISTER directive instead of handcoding it in teh template

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

14 years agonew cms dissector based on updated and cleaned up conformance and template file.
sahlberg [Tue, 26 Oct 2004 13:53:30 +0000 (13:53 +0000)]
new cms dissector based on updated and cleaned up conformance and template file.

use the nice #.REGISTER directive instead of doing it by hand.

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

14 years agoUse the much better #.REGISTER directive instead of the #.PDU directive
sahlberg [Tue, 26 Oct 2004 13:04:09 +0000 (13:04 +0000)]
Use the much better #.REGISTER directive instead of the #.PDU directive

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

14 years agoAdd a "data" item to the opt_info structure, containing a "const void
guy [Tue, 26 Oct 2004 07:00:23 +0000 (07:00 +0000)]
Add a "data" item to the opt_info structure, containing a "const void
*".  For val_u_byte, if non-null, it points to a "value_string" table to
be used to interpret the value.  Replace "toggle" and "yes_no" with
"boolean, and have the "data" pointer point to a "struct
true_false_string" to be used to interpret the value.

The NetBIOS-over-TCP/IP Node Type option can now be a regular val_u_byte
value, with the appropriate value_string table.

Construct the item for DHCP options by initializing it without the value
and appending the value to the item's string with

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

14 years agoMake yes_no work in "dissect_netware_ip_suboption()" the way it works
guy [Mon, 25 Oct 2004 23:25:59 +0000 (23:25 +0000)]
Make yes_no work in "dissect_netware_ip_suboption()" the way it works
elsewhere, and replace "struct o63_opt_info" with "struct opt_info".

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

14 years ago"struct o43pxeclient_opt_info" and "struct o43cablelabs_opt_info" look
guy [Mon, 25 Oct 2004 09:31:13 +0000 (09:31 +0000)]
"struct o43pxeclient_opt_info" and "struct o43cablelabs_opt_info" look
just like "struct opt_info", except for the name of the "enum
field_type" field; use "opt_info" instead of them.  Rename the
equivalent field in "struct o63_opt_info", as well, with an eye towards
changing "struct opt_info" to be able to replace "struct o63_opt_info"
as well.

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

14 years agoRemove val_s_long as it's unimplemented and unused - put it back if it's
guy [Mon, 25 Oct 2004 08:56:39 +0000 (08:56 +0000)]
Remove val_s_long as it's unimplemented and unused - put it back if it's
ever necessary.

Make some options, that have only one IPv4 address, use ipv4 rather than

Add val_u_short_list, and have val_u_short accept one and only one
16-bit integer.  Give options the appropriate type.

Shuffle the types a bit in the enum, and shuffle the cases for types
around to match the order in the enum.

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

14 years agoRename "ipv4" to "ipv4_list", as it's used for lists of IPv4 addresses,
guy [Mon, 25 Oct 2004 08:33:39 +0000 (08:33 +0000)]
Rename "ipv4" to "ipv4_list", as it's used for lists of IPv4 addresses,
and add a separate "ipv4"; use that in the dissector for Netware IP

Add a "presence" option type, for options with no value whose presence
is significant; use that in the dissector for Netware IP options.

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

14 years agoPass to the the routines that dissect suboption lists the offset of the
guy [Mon, 25 Oct 2004 08:17:11 +0000 (08:17 +0000)]
Pass to the the routines that dissect suboption lists the offset of the
end of the option, and have them do bounds checking.  Also, in some
places, check the suboption length.

In "dissect_netware_ip_suboption()", process the suboption length
(which, according to RFC 2242, is present in all suboptions), and use
val_u_byte rather than val_u_short for 1-byte options.

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

14 years agoRestructure the DHCP option parsing a bit, to make it a bit clearer -
guy [Sun, 24 Oct 2004 22:53:06 +0000 (22:53 +0000)]
Restructure the DHCP option parsing a bit, to make it a bit clearer -
and fix some bugs that this made a bit more obvious.  Add checks of the
option length.

Clean up white space.

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

14 years agoDon't display the FQDN in the FQDN option if the length of the FQDN is
guy [Sun, 24 Oct 2004 10:30:03 +0000 (10:30 +0000)]
Don't display the FQDN in the FQDN option if the length of the FQDN is

Clean up some field names and descriptions.

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

14 years agoFix the length used for the name in the FQDN option.
guy [Sun, 24 Oct 2004 10:18:16 +0000 (10:18 +0000)]
Fix the length used for the name in the FQDN option.

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

14 years agomake SEQUENCE OF and CHOICE handle indefinite length encodings
sahlberg [Sun, 24 Oct 2004 03:51:27 +0000 (03:51 +0000)]
make SEQUENCE OF and CHOICE handle indefinite length encodings

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

14 years agoFrom Yaniv Kaul: name some more interface calls.
guy [Sun, 24 Oct 2004 01:29:03 +0000 (01:29 +0000)]
From Yaniv Kaul: name some more interface calls.

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

14 years agoRemove the include of <epan/prefs.h> from files that don't call any
guy [Sat, 23 Oct 2004 09:20:39 +0000 (09:20 +0000)]
Remove the include of <epan/prefs.h> from files that don't call any
preference routines.

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

14 years agoPut the name, as well as the value, of the family and subfamily fields
guy [Sat, 23 Oct 2004 08:37:21 +0000 (08:37 +0000)]
Put the name, as well as the value, of the family and subfamily fields
into the protocol tree item that contains them.

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

14 years agoFrom Josh Bailey: fix the fetch of the IPDC payload length, it's only 10
guy [Fri, 22 Oct 2004 18:03:21 +0000 (18:03 +0000)]
From Josh Bailey: fix the fetch of the IPDC payload length, it's only 10
bits long.

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

14 years agoAdd an item for DNS IPSECKEY RR support for David Fort.
guy [Fri, 22 Oct 2004 17:40:58 +0000 (17:40 +0000)]
Add an item for DNS IPSECKEY RR support for David Fort.

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

14 years agoadd a section about "Windows folders"
ulfl [Fri, 22 Oct 2004 08:33:50 +0000 (08:33 +0000)]
add a section about "Windows folders"

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

14 years agoChange some code that affects g_resolv_flags to set a flag if the check
guy [Fri, 22 Oct 2004 07:07:08 +0000 (07:07 +0000)]
Change some code that affects g_resolv_flags to set a flag if the check
box for the flag is active and clear it if it's inactive, rather than
clearing all but RESOLV_CONCURRENT and then setting flags if the check
box is active - or, in one case, not clearing any flags due to a typo
and then setting them, so they never get cleared.  This matches what's
done with theresolution flags in some other places.

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

14 years agoFrom Alejandro Vaquero: start T.38 conversations for SDP sessions.
guy [Fri, 22 Oct 2004 06:19:00 +0000 (06:19 +0000)]
From Alejandro Vaquero: start T.38 conversations for SDP sessions.

"T38" -> "T.38" in the T.38 dissector.

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

14 years agoFrom Francisco Alcoba: declare the tap data as static, so it's still
guy [Fri, 22 Oct 2004 06:05:03 +0000 (06:05 +0000)]
From Francisco Alcoba: declare the tap data as static, so it's still
there when the tap is called (which happens after dissection is

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

14 years agoFor the .pod->.html rules, find the ".pod" files in $(srcdir),
guy [Fri, 22 Oct 2004 02:09:35 +0000 (02:09 +0000)]
For the .pod->.html rules, find the ".pod" files in $(srcdir),
just as we do for the .pod->.[1-9] rules.

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

14 years agoInclude "Makefile.common" in the list of files to put into the
guy [Fri, 22 Oct 2004 02:05:53 +0000 (02:05 +0000)]
Include "Makefile.common" in the list of files to put into the

Don't use ":=" - not all versions of make necessarily support it, and,
even for those that do, it doesn't mean the same thing in all versions
(it means something different in Solaris make than in GNU make, for

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

14 years agocleanup "Packet Reassembling" section
ulfl [Thu, 21 Oct 2004 21:43:37 +0000 (21:43 +0000)]
cleanup "Packet Reassembling" section

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

14 years agoremoved the protocols list completely, as I don't want to update it to the current...
ulfl [Thu, 21 Oct 2004 21:09:28 +0000 (21:09 +0000)]
removed the protocols list completely, as I don't want to update it to the current Ethereal features all the time and we also have a really good online version of that list available.

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

14 years agoadd info about temporary capture files and a section about "Windows NT/2000/XP roamin...
ulfl [Thu, 21 Oct 2004 20:22:21 +0000 (20:22 +0000)]
add info about temporary capture files and a section about "Windows NT/2000/XP roaming profiles"

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

14 years agoThe top-level window's list of capture filter expressions might not yet
guy [Thu, 21 Oct 2004 19:12:22 +0000 (19:12 +0000)]
The top-level window's list of capture filter expressions might not yet
exist if no filters have been remembered; don't set the popdown string
list for the filter combo box if the list is empty.

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

14 years agoFrom Laurent Rabret:
gerald [Thu, 21 Oct 2004 02:06:37 +0000 (02:06 +0000)]
From Laurent Rabret:

- enable Windows' ShellExecute command to call Ethereal without specifying
  the installation path (a new key added in the registry)
- decode 2 more options in the OPSI plugin.

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

14 years agoAt least some versions of the OS X NFS client (and possibly some if not
guy [Wed, 20 Oct 2004 23:38:31 +0000 (23:38 +0000)]
At least some versions of the OS X NFS client (and possibly some if not
all other BSD NFS clients) retransmit on different ports from the port
on which the original request was set, so have the RPC "conversation"
for connectionless protocols use only the source address and destination

Use NO_ADDR_B and NO_PORT_B when looking up the conversation in those
cases, and use NO_ADDR2 and NO_PORT2 when creating the conversation in
those cases, to make it clearer that we're only using one address and

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

14 years agoPull in versions from the 0.10.7 branch.
gerald [Wed, 20 Oct 2004 19:14:51 +0000 (19:14 +0000)]
Pull in versions from the 0.10.7 branch.

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

14 years agorenamed capinfo to capinfos, as the former name capinfo was already used in a program...
ulfl [Wed, 20 Oct 2004 18:50:58 +0000 (18:50 +0000)]
renamed capinfo to capinfos, as the former name capinfo was already used in a program called tcprelay, so that might confuse packaging managers and users. Hopefully I got all the places need to be changed.

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

14 years agoFrom Tomas Kukosa: export bytes_to_str_punct().
guy [Wed, 20 Oct 2004 07:15:07 +0000 (07:15 +0000)]
From Tomas Kukosa: export bytes_to_str_punct().

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

14 years agoadd a small section about "GTK resources on the web"
ulfl [Wed, 20 Oct 2004 07:10:01 +0000 (07:10 +0000)]
add a small section about "GTK resources on the web"

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

14 years agoUpdate the man page to indicate that "-q", when capturing without "-w",
guy [Wed, 20 Oct 2004 00:06:48 +0000 (00:06 +0000)]
Update the man page to indicate that "-q", when capturing without "-w",
suppresses the printing of packet information.

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

14 years agoIf we're not printing packet information, don't print the preamble or
guy [Tue, 19 Oct 2004 22:43:52 +0000 (22:43 +0000)]
If we're not printing packet information, don't print the preamble or
finale for that information, either.

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

14 years agoFrom Mark C. Brown:
guy [Tue, 19 Oct 2004 22:28:27 +0000 (22:28 +0000)]
From Mark C. Brown:

fix FDDI to use correct bit swapped encap;

tweak file open code to guess at file encap so merge works

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

14 years agoFrom Jacques, Olivier: - Fixing enums recognition when an XML dictionary is used...
etxrab [Tue, 19 Oct 2004 19:29:08 +0000 (19:29 +0000)]
From  Jacques, Olivier: - Fixing enums recognition when an XML dictionary is used (was OK with fixed dictionaries)

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

14 years agoadding a chapter about capturing, currently only containing the mail from Guy Harris...
ulfl [Tue, 19 Oct 2004 18:32:27 +0000 (18:32 +0000)]
adding a chapter about capturing, currently only containing the mail from Guy Harris about adding new capture types

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

14 years agofixup whitespace
ulfl [Tue, 19 Oct 2004 18:30:44 +0000 (18:30 +0000)]
fixup whitespace

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

14 years agoAdd AUTHORS-SHORT-FORMAT to the list of files to ignore.
guy [Tue, 19 Oct 2004 07:15:03 +0000 (07:15 +0000)]
Add AUTHORS-SHORT-FORMAT to the list of files to ignore.

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

14 years agoFrom Tomas Kukosa: add range preference functions.
guy [Tue, 19 Oct 2004 07:09:32 +0000 (07:09 +0000)]
From Tomas Kukosa: add range preference functions.

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

14 years agoSquelch a compiler warning.
guy [Mon, 18 Oct 2004 17:21:31 +0000 (17:21 +0000)]
Squelch a compiler warning.

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

14 years agoFrom Laurent Constantin: fix a (presumed) cut-and-pasteo.
guy [Mon, 18 Oct 2004 17:17:38 +0000 (17:17 +0000)]
From Laurent Constantin: fix a (presumed) cut-and-pasteo.

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

14 years agoFrom Olivier Jacques: Add #defines to disable XML validation.
gerald [Mon, 18 Oct 2004 14:58:32 +0000 (14:58 +0000)]
From Olivier Jacques:  Add #defines to disable XML validation.

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

14 years agoFix some include problems and compiler warnings pointed out by Thomas Anders.
gerald [Mon, 18 Oct 2004 14:37:43 +0000 (14:37 +0000)]
Fix some include problems and compiler warnings pointed out by Thomas Anders.

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

14 years agoFrom Thomas Anders:
gerald [Mon, 18 Oct 2004 14:24:25 +0000 (14:24 +0000)]
From Thomas Anders:

- change DHCP option 122 dissection to use official RFC 3495/3594 wording
  (if bootp.pkt.ccc.protocol_version preference setting is 2 or 3)
- update CableLabs specification references
- some minor cleanup (option 43 also)

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

14 years agoOne more item from CableLabs: Add conversation support to the Kerberos
gerald [Mon, 18 Oct 2004 13:58:20 +0000 (13:58 +0000)]
One more item from CableLabs:  Add conversation support to the Kerberos
UDP dissector.

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

14 years agoAdd a rule to make ../AUTHORS-SHORT-FORMAT, as it won't necessarily have
guy [Mon, 18 Oct 2004 09:53:06 +0000 (09:53 +0000)]
Add a rule to make ../AUTHORS-SHORT-FORMAT, as it won't necessarily have
been made by the time this Makefile is used.

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

14 years agoDon't blow up if the proto,colinfo tap is used but the columns aren't
guy [Mon, 18 Oct 2004 01:18:44 +0000 (01:18 +0000)]
Don't blow up if the proto,colinfo tap is used but the columns aren't
being printed.

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

14 years agoFrom Graeme Hewson: make AUTHORS-SHORT not include formatting codes,
guy [Sun, 17 Oct 2004 23:03:11 +0000 (23:03 +0000)]
From Graeme Hewson: make AUTHORS-SHORT not include formatting codes,
with AUTHORS-SHORT-FORMAT containing the formatting codes.

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

14 years agoFrom Graeme Hewson: re-wrap some of the lines so that they fit into the
guy [Sun, 17 Oct 2004 22:18:14 +0000 (22:18 +0000)]
From Graeme Hewson: re-wrap some of the lines so that they fit into the
About dialog and ethereal.1 without wrapping.

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

14 years agoFrom Alejandro Vaquero: in the RTP analysis code, don't analyze packets
guy [Sun, 17 Oct 2004 22:14:47 +0000 (22:14 +0000)]
From Alejandro Vaquero: in the RTP analysis code, don't analyze packets
that have an RTP version other than 2.

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

14 years agoUpdate some SIP headers from http://www.iana.org/assignments/sip-parameters.
etxrab [Sun, 17 Oct 2004 21:57:04 +0000 (21:57 +0000)]
Update some SIP headers from iana.org/assignments/sip-parameters.

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

14 years agoFrom Rene Pilz: make DTAP be dissected for a GPRS LLC SAPI of 1.
guy [Sun, 17 Oct 2004 11:10:08 +0000 (11:10 +0000)]
From Rene Pilz: make DTAP be dissected for a GPRS LLC SAPI of 1.

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

14 years agoFrom Rene Pilz: add a preference to ignore the cipher bit, in case
guy [Sun, 17 Oct 2004 11:04:28 +0000 (11:04 +0000)]
From Rene Pilz: add a preference to ignore the cipher bit, in case
captures have unciphered data with the cipher bit set.

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

14 years agofile_hdr.network is one byte long, so don't use htoles() on values it's
guy [Sun, 17 Oct 2004 06:20:43 +0000 (06:20 +0000)]
file_hdr.network is one byte long, so don't use htoles() on values it's
set to - that causes it to be set to zero.

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

14 years agoWhen merging, default to the current file format as the output format.
guy [Sun, 17 Oct 2004 03:11:31 +0000 (03:11 +0000)]
When merging, default to the current file format as the output format.

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

14 years agoFrom Mark C. Brown: allow the file type for the merge operation to be
guy [Sun, 17 Oct 2004 02:53:26 +0000 (02:53 +0000)]
From Mark C. Brown: allow the file type for the merge operation to be
specified in the GUI.

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

14 years agoFrom Thomas Anders: DHCP option 6 enhancements:
guy [Sun, 17 Oct 2004 02:36:32 +0000 (02:36 +0000)]
From Thomas Anders: DHCP option 6 enhancements:

- add full support for upcoming PacketCable 1.5
- fix bug regarding MTA/CM Device Capabilities Length
- PacketCable MTA: fix bug regarding RSVP and UGS-AD options
- make presentation more compact (similar to other TLV data dissectors)
- change some descriptions and variables to (hopefully) make more sense
  to DOCSIS/PacketCable users

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

14 years agoUpdate to reflect changes to the range API.
guy [Sun, 17 Oct 2004 01:38:51 +0000 (01:38 +0000)]
Update to reflect changes to the range API.

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

14 years agoHave "range_convert_range()" dynamically allocate a string large enough
guy [Sun, 17 Oct 2004 01:31:36 +0000 (01:31 +0000)]
Have "range_convert_range()" dynamically allocate a string large enough
to hold the representation of the range, rather than imposing a
fixed-size limit on the string.

Check for overflow in "strtoul()" - and use "strtoul()" rather than
"strtol()" for range members.

Clean up indentation.

Get rid of an unnecessary include in <epan/range.h>.

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

14 years ago"ssn_range" needs to be a copy of "global_ssn_range", so that it's not
guy [Sun, 17 Oct 2004 00:51:50 +0000 (00:51 +0000)]
"ssn_range" needs to be a copy of "global_ssn_range", so that it's not
freed if "global_ssn_range" is changed because the preference was

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

14 years ago"ssn_range" needs to be a copy of "global_ssn_range", so that it's not
guy [Sun, 17 Oct 2004 00:48:37 +0000 (00:48 +0000)]
"ssn_range" needs to be a copy of "global_ssn_range", so that it's not
freed if "global_ssn_range" is changed because the preference was

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

14 years agoRemove the fixed maximum number of subranges in a range_t; dynamically
guy [Sat, 16 Oct 2004 23:32:24 +0000 (23:32 +0000)]
Remove the fixed maximum number of subranges in a range_t; dynamically
allocate them to be large enough.

Add checks that the numbers in the range fit in a guint32.

Check the validity of a range before saving or printing, and report
errors in an alert box.

Clean up white space.

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

14 years agomake the SEQUENCE dissection helper understand and handle Indefinite Length
sahlberg [Sat, 16 Oct 2004 12:53:09 +0000 (12:53 +0000)]
make the SEQUENCE  dissection helper understand and handle Indefinite Length

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

14 years agoFirst support for Unix-to-DOS line termination translation by means of a small
obiot [Sat, 16 Oct 2004 11:46:17 +0000 (11:46 +0000)]
First support for Unix-to-DOS line termination translation by means of a small
perl script (unix2dos.pl). The NEWS file is now properly displayed on the
Notepad.exe text editor on a Windows box.

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