Commit Graph

417 Commits

Author SHA1 Message Date
Ronnie Sahlberg 076d4710ec more updates of x509if
svn path=/trunk/; revision=12433
2004-10-29 11:39:58 +00:00
Ronnie Sahlberg deae759020 new generated version of x509if
svn path=/trunk/; revision=12432
2004-10-29 11:11:11 +00:00
Guy Harris 62612c70aa From Yaniv Kaul: dissect authentication data as NTLMSSP only if it
starts with "NTLMSSP", otherwise dissect it as GSS-API.

svn path=/trunk/; revision=12430
2004-10-29 08:01:11 +00:00
Guy Harris 1e6a5d408c As Sam Leffler notes, the radiotap header isn't BSD-only, it's also used
by his madwifi Atheros driver on Linux; rename
WTAP_ENCAP_IEEE_802_11_WLAN_BSD to WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP,
and change its text name from "ieee-802-11-bsd" to
"ieee-802-11-radiotap".

svn path=/trunk/; revision=12429
2004-10-29 02:40:01 +00:00
Gerald Combs 24f30a8850 Add support for pkauthdata and pkdhkeydata OIDs.
svn path=/trunk/; revision=12426
2004-10-28 22:06:55 +00:00
Ronnie Sahlberg bef8e01fcd fix small bug that gets offset confused for CHOICE { } OPTIONAL if there were no arms that matched
svn path=/trunk/; revision=12425
2004-10-28 11:35:43 +00:00
Guy Harris ea673ada7a The offset to the first IFD in a TIFF file is 4 bytes long, not 2 bytes
long.

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.

svn path=/trunk/; revision=12424
2004-10-28 07:50:07 +00:00
Guy Harris 21e7c6bc78 "dissect_MAP_Dialogue()" returns no value; declare its return value as
"void".

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.

svn path=/trunk/; revision=12419
2004-10-27 21:16:18 +00:00
Anders Broman 9315137a65 Add a MapDialouge dissector ( can be tested with the file gsm-ss-01.snoop )
svn path=/trunk/; revision=12416
2004-10-27 20:17:38 +00:00
Anders Broman 784fece9c0 Improve OID dissection and make it possible to call an "OID" Dissector for Dialougedata parameter.
svn path=/trunk/; revision=12413
2004-10-27 20:04:56 +00:00
Anders Broman 0510221c29 Make it possible to register a string for an OID in the hash table.
svn path=/trunk/; revision=12412
2004-10-27 19:59:44 +00:00
Guy Harris 948d61bae1 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
"dissect_per_octet_string()".

svn path=/trunk/; revision=12406
2004-10-27 10:02:45 +00:00
Guy Harris 816267f2c1 Don't have two variables, in different scopes in the same routine, have
the same name.

Fix up alignment.

svn path=/trunk/; revision=12400
2004-10-27 02:52:40 +00:00
Guy Harris 685bbf7b35 Encapsulate into a macro the idiom
if(offset&0x07){
		offset=(offset&0xfffffff8)+8;
	}

for byte-aligning a bit offset.

svn path=/trunk/; revision=12399
2004-10-27 02:34:30 +00:00
Guy Harris e8727b5615 Fix the file name in the initial comment.
svn path=/trunk/; revision=12397
2004-10-26 18:41:25 +00:00
Gerald Combs 7053cbed3b Rename the "boolean" enum to "val_boolean" lest the Microsoft compiler let
its displeasure be known.

svn path=/trunk/; revision=12396
2004-10-26 16:08:16 +00:00
Ronnie Sahlberg ec0752c135 new cms dissector based on updated and cleaned up conformance and template file.
use the nice #.REGISTER directive instead of doing it by hand.


svn path=/trunk/; revision=12393
2004-10-26 13:53:30 +00:00
Guy Harris 4011ff29b7 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
"proto_item_append_text()".

svn path=/trunk/; revision=12391
2004-10-26 07:00:23 +00:00
Guy Harris 671cd939ae Make yes_no work in "dissect_netware_ip_suboption()" the way it works
elsewhere, and replace "struct o63_opt_info" with "struct opt_info".

svn path=/trunk/; revision=12390
2004-10-25 23:25:59 +00:00
Guy Harris 32539c3e28 "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.

svn path=/trunk/; revision=12389
2004-10-25 09:31:13 +00:00
Guy Harris ec3230d492 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
ipv4_list.

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.

svn path=/trunk/; revision=12388
2004-10-25 08:56:39 +00:00
Guy Harris b140c74433 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
options.

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

svn path=/trunk/; revision=12387
2004-10-25 08:33:39 +00:00
Guy Harris a7b17234c3 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.

svn path=/trunk/; revision=12386
2004-10-25 08:17:11 +00:00
Guy Harris e08ef66cfe 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.

svn path=/trunk/; revision=12385
2004-10-24 22:53:06 +00:00
Guy Harris 7b1b2d0b1a Don't display the FQDN in the FQDN option if the length of the FQDN is
zero.

Clean up some field names and descriptions.

svn path=/trunk/; revision=12384
2004-10-24 10:30:03 +00:00
Guy Harris b248485905 Fix the length used for the name in the FQDN option.
svn path=/trunk/; revision=12383
2004-10-24 10:18:16 +00:00
Ronnie Sahlberg 97a6dc74e7 make SEQUENCE OF and CHOICE handle indefinite length encodings
svn path=/trunk/; revision=12382
2004-10-24 03:51:27 +00:00
Guy Harris f6881b345f From Yaniv Kaul: name some more interface calls.
svn path=/trunk/; revision=12381
2004-10-24 01:29:03 +00:00
Guy Harris cbbdf75b4d Remove the include of <epan/prefs.h> from files that don't call any
preference routines.

svn path=/trunk/; revision=12380
2004-10-23 09:20:39 +00:00
Guy Harris 02c9bf57f4 Put the name, as well as the value, of the family and subfamily fields
into the protocol tree item that contains them.

svn path=/trunk/; revision=12379
2004-10-23 08:37:21 +00:00
Guy Harris 7e0170ffbf From Josh Bailey: fix the fetch of the IPDC payload length, it's only 10
bits long.

svn path=/trunk/; revision=12378
2004-10-22 18:03:21 +00:00
Guy Harris bd23f6f1a8 From Alejandro Vaquero: start T.38 conversations for SDP sessions.
"T38" -> "T.38" in the T.38 dissector.

svn path=/trunk/; revision=12374
2004-10-22 06:19:00 +00:00
Guy Harris 1a4033c65e From Francisco Alcoba: declare the tap data as static, so it's still
there when the tap is called (which happens after dissection is
complete).

svn path=/trunk/; revision=12373
2004-10-22 06:05:03 +00:00
Guy Harris 21a7962e28 Include "Makefile.common" in the list of files to put into the
distribution.

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
example).

svn path=/trunk/; revision=12371
2004-10-22 02:05:53 +00:00
Guy Harris a87394e71e 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
port.

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
port.

svn path=/trunk/; revision=12362
2004-10-20 23:38:31 +00:00
Anders Broman ff755ba49c From Jacques, Olivier: - Fixing enums recognition when an XML dictionary is used (was OK with fixed dictionaries)
svn path=/trunk/; revision=12350
2004-10-19 19:29:08 +00:00
Guy Harris 8995a7ab6b Squelch a compiler warning.
svn path=/trunk/; revision=12343
2004-10-18 17:21:31 +00:00
Guy Harris 915fe77f75 From Laurent Constantin: fix a (presumed) cut-and-pasteo.
svn path=/trunk/; revision=12342
2004-10-18 17:17:38 +00:00
Gerald Combs d7d9c6be54 From Olivier Jacques: Add #defines to disable XML validation.
svn path=/trunk/; revision=12340
2004-10-18 14:58:32 +00:00
Gerald Combs d6a2182535 Fix some include problems and compiler warnings pointed out by Thomas Anders.
svn path=/trunk/; revision=12339
2004-10-18 14:37:43 +00:00
Gerald Combs 7e6c4fec40 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) 

svn path=/trunk/; revision=12338
2004-10-18 14:24:25 +00:00
Gerald Combs fa01ccd18c One more item from CableLabs: Add conversation support to the Kerberos
UDP dissector.

svn path=/trunk/; revision=12337
2004-10-18 13:58:20 +00:00
Guy Harris ee26f8b9bb From Alejandro Vaquero: in the RTP analysis code, don't analyze packets
that have an RTP version other than 2.

svn path=/trunk/; revision=12332
2004-10-17 22:14:47 +00:00
Anders Broman 8df4148db6 Update some SIP headers from http://www.iana.org/assignments/sip-parameters.
svn path=/trunk/; revision=12331
2004-10-17 21:57:04 +00:00
Guy Harris 5dbaf6c29e From Rene Pilz: make DTAP be dissected for a GPRS LLC SAPI of 1.
svn path=/trunk/; revision=12330
2004-10-17 11:10:08 +00:00
Guy Harris 8566564c59 From Rene Pilz: add a preference to ignore the cipher bit, in case
captures have unciphered data with the cipher bit set.

svn path=/trunk/; revision=12329
2004-10-17 11:04:28 +00:00
Guy Harris 236123a94b 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

svn path=/trunk/; revision=12325
2004-10-17 02:36:32 +00:00
Guy Harris 6d53294988 "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
changed.

svn path=/trunk/; revision=12321
2004-10-17 00:48:37 +00:00
Guy Harris 727ad67453 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.

svn path=/trunk/; revision=12320
2004-10-16 23:32:24 +00:00
Ronnie Sahlberg de1bcd5d88 make the SEQUENCE dissection helper understand and handle Indefinite Length
svn path=/trunk/; revision=12319
2004-10-16 12:53:09 +00:00
Guy Harris 64394fdef2 Fix a typo.
svn path=/trunk/; revision=12312
2004-10-16 07:39:37 +00:00
Guy Harris cde0733be8 Clena up a few things.
Squelch a compiler warning.

svn path=/trunk/; revision=12311
2004-10-16 05:59:24 +00:00
Jörg Mayer 429ede32f8 Add support for draft-ietf-dhc-fqdn-option-07.txt
svn path=/trunk/; revision=12309
2004-10-16 02:04:08 +00:00
Jörg Mayer db564c5096 Change Client Identifier display a bit to better handle non-hw identifiers of length 7
svn path=/trunk/; revision=12308
2004-10-16 00:19:07 +00:00
Gerald Combs 536cfec083 Fix a cut-and-paste error.
svn path=/trunk/; revision=12306
2004-10-15 19:02:47 +00:00
Gerald Combs fee16ab377 Add support for decoding DES3/CBC/MD5 keys. Make it disabled by default.
Whitespace cleanup.

svn path=/trunk/; revision=12304
2004-10-15 15:36:12 +00:00
Guy Harris c2d2988e4f Don't declare functions inside functions - not all C compilers support
that.

svn path=/trunk/; revision=12301
2004-10-15 05:54:33 +00:00
Guy Harris abd16b297f From Jeff Morriss: PREF_RANGE preference type, for ranges of integers.
svn path=/trunk/; revision=12300
2004-10-14 23:45:09 +00:00
Ronnie Sahlberg 29da6658b6 add support in packet-kerberos to use MIT Kerberos API to parse keytabs and decrypt blobs
if HAVE_KERBEROS and HAVE_MIT_KERBEROS are both defined in config.h


Now we need someone to hack up the required automake magic to detect MIT Kerberos and massage the makefiles accordingly.



svn path=/trunk/; revision=12296
2004-10-14 09:51:54 +00:00
Guy Harris 063b6fc3f5 Use "tvb_format_stringzpad()" rather than "tvb_format_text()", as per
RFC 2132, which says

	Options containing NVT ASCII data SHOULD NOT include a trailing
	NULL; however, the receiver of such options MUST be prepared to
	      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	delete trailing nulls if they exist.
	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

svn path=/trunk/; revision=12295
2004-10-14 08:02:58 +00:00
Guy Harris ab5a687178 Get rid of C++ comments.
Add more COPS client type values from the IANA cops-parameters page.

Get rid of per-dissection static variables - pass them as parameters.

Make functions not used outside packet-cops.c static.

svn path=/trunk/; revision=12294
2004-10-14 07:42:31 +00:00
Guy Harris c1a86b40a1 Add the application ID for credit control, as per
draft-ietf-aaa-diameter-cc-06.

Indicate where the Diameter application IDs for 3GPP stuff came from.

Update URLs for various Diameter drafts.

svn path=/trunk/; revision=12293
2004-10-14 03:29:35 +00:00
Michael Tüxen c2903542a5 Make sure that the IPv4 and IPv6 address parameters are always processed to support tabbing.
svn path=/trunk/; revision=12291
2004-10-13 08:41:32 +00:00
Ronnie Sahlberg 9ccd4e5025 get rid of some compiler warnings for cms
svn path=/trunk/; revision=12290
2004-10-13 00:21:00 +00:00
Ronnie Sahlberg b32eb2981c get rid of some compiler warnings for X509AF
svn path=/trunk/; revision=12289
2004-10-13 00:16:42 +00:00
Ronnie Sahlberg 1cfa62377a final massaging to get rid of the last remaining compiler warnings for megaco
svn path=/trunk/; revision=12288
2004-10-13 00:08:44 +00:00
Ronnie Sahlberg 850f13fbff get rid of some more compiler warnings
svn path=/trunk/; revision=12287
2004-10-12 23:56:41 +00:00
Ronnie Sahlberg d951c9dce6 massage the h248 files so that it compiles with asn2eth without warnings
svn path=/trunk/; revision=12286
2004-10-12 23:40:51 +00:00
Guy Harris 94873c0d94 From Ronnie Sahlberg: set a variable before we test it.
svn path=/trunk/; revision=12281
2004-10-12 17:51:13 +00:00
Guy Harris 22a80dae75 Re-generate with latest asn2eth.
svn path=/trunk/; revision=12280
2004-10-12 17:40:31 +00:00
Guy Harris 988faafe34 Check in a regenerated file we missed.
svn path=/trunk/; revision=12276
2004-10-12 08:09:07 +00:00
Anders Broman 26c1da067e Pretyfy EventName and SignalName
svn path=/trunk/; revision=12271
2004-10-12 05:00:37 +00:00
Guy Harris 45d05ca95e Re-generate a number of ASN.1-based dissectors with the most recent
version of asn2eth.

svn path=/trunk/; revision=12267
2004-10-11 18:36:51 +00:00
Guy Harris 518f7926b7 Constify more pointer arguments.
svn path=/trunk/; revision=12265
2004-10-11 18:34:54 +00:00
Ronnie Sahlberg fd6e2f7099 From Martin M, update h2250 so that some things that are supposed to be strings are printed as strings and not as hex data.
svn path=/trunk/; revision=12263
2004-10-11 12:04:35 +00:00
Ronnie Sahlberg 97a1230136 dissect_per_restricted_character_string() was almost completely broken when it came to PrintableString.
I am amazed it worked at all and noone complained.

It is little less broken now and handles some of the PrintableStrings  properly.



svn path=/trunk/; revision=12262
2004-10-11 12:00:08 +00:00
Ronnie Sahlberg 7c00b3a9d3 small fix for TCP ACK RTT, the measurements for the time it took to ack some data.
Only display this value if we really have some data to ACK
which is not always the case.

This fixes a problem recently reported to the list



svn path=/trunk/; revision=12259
2004-10-11 08:12:34 +00:00
Guy Harris c6bd115a94 From Mark C. Brown: add HP's OUI.
Update Gerald's e-mail address.

svn path=/trunk/; revision=12256
2004-10-11 07:15:08 +00:00
Guy Harris c01a523dc4 Make "per_choice_t" and "per_sequence_t" structures "const" structures.
svn path=/trunk/; revision=12255
2004-10-11 06:51:19 +00:00
Guy Harris 4998eb51ee Make the "per_choice_t" and "per_sequence_t" pointer arguments pointers
to const.

svn path=/trunk/; revision=12253
2004-10-11 06:38:12 +00:00
Guy Harris 3acb84d24a Make the "asn_namedbit *" argument to "dissect_ber_bitstring()" a
"const" pointer.

svn path=/trunk/; revision=12247
2004-10-08 21:14:33 +00:00
Guy Harris c5c8453097 "dissect_ber_sequence()" doesn't modify the "ber_sequence" structure
passed to it; make that argument a const pointer.

svn path=/trunk/; revision=12244
2004-10-08 20:24:23 +00:00
Gerald Combs 0d1e6348c2 Remove an unused variable.
svn path=/trunk/; revision=12242
2004-10-08 17:24:18 +00:00
Guy Harris 4d07a3a63f From Carlos Pignataro: decode more TLVs and subTLVs and make some small
fixes.

Include "packet-ldp.h" in "packet-ldp.c" (if we'd been doing that, the
mismatch between "packet-ldp.h"'s declaration of "fec_vc_types_vals[]"
and "packet-ldp.c"'s definition of it would have been caught earlier).

svn path=/trunk/; revision=12241
2004-10-08 17:01:43 +00:00
Guy Harris 8ceddc4a1d "dissect_sigcomp()" returns 0 or the packet length, so it has to be
registered with "new_register_dissector()".

svn path=/trunk/; revision=12239
2004-10-08 16:42:27 +00:00
Guy Harris 50cae903ed Force 4294967295 to be unsigned, to squelch a compiler warning.
svn path=/trunk/; revision=12238
2004-10-08 16:40:36 +00:00
Anders Broman 1bac620377 Add sigcomp Universal Decompressor Virtual Machine (UDVM) and state handler, for decompression of
sigcomp messages. Currently states are or not saved so only messages with bytecode can be decompressed.

svn path=/trunk/; revision=12237
2004-10-08 15:55:06 +00:00
Anders Broman 249ebcbfc1 From: "Jacques, Olivier :
- Added new RFC 3588 header format support (vendor-Id is replaced by
application-Id) and command code has its own separated name space. The
Draft v16 behaviour is maintained (through Preferences menu).
- Added 3GPP IMS Cx/Dx interface decoding (new imscxdx.xml)
- Fixed some issues in dictionary.xml
- Refreshed Diameter applications in embedded AVPs (that do not rely on
XML dictionary)

svn path=/trunk/; revision=12235
2004-10-08 09:35:56 +00:00
Gerald Combs 628bde2034 Add support for the PacketCable Multimedia Specification (PKT-SP-MM-
I02-040930).  The code had to be integrated with the existing D-QoS code,
and has not been extensively tested.  Add ports for PacketCable D-QoS
(2126) and Multimedia (3918).  Code contributed by CableLabs.


svn path=/trunk/; revision=12232
2004-10-07 19:22:54 +00:00
Anders Broman d680ab149c Get rid of h248-package-bcp, as it is no longer needed.
svn path=/trunk/; revision=12229
2004-10-07 09:28:28 +00:00
Anders Broman f7a201530c Added dissection of some packages Property ID:s
svn path=/trunk/; revision=12228
2004-10-07 09:25:21 +00:00
Anders Broman 17190c4cd0 Export some value strings and a function, some minor bug fixes.
svn path=/trunk/; revision=12226
2004-10-07 09:04:51 +00:00
Guy Harris 8b8e67ccbe "tvb_reported_length_remaining()" returns a "gint", so assign its return
value to a "gint".

svn path=/trunk/; revision=12223
2004-10-06 17:37:47 +00:00
Ulf Lamping 871ada80d8 remove MSVC compiler warning
svn path=/trunk/; revision=12221
2004-10-06 17:08:25 +00:00
Ulf Lamping 9fd6789da8 bring MSVC generation back to live, as elipses in macros are not alowed. May need some more rework.
svn path=/trunk/; revision=12220
2004-10-06 17:06:12 +00:00
Guy Harris 69e4cb6a93 We now do reassembly.
Use "tvb_reported_length_remaining()", not "tvb_length_remaining()", to
find out how much encapsulated data there is, so we properly handle
short frames (reporting how much was really there, not how much was
captured).

svn path=/trunk/; revision=12219
2004-10-06 10:14:56 +00:00
Guy Harris 1e47d6557f Add support for reassembly.
The reason why you need to turn on "Try heuristic sub-dissector first"
is that the traffic might be port 10000 traffic, and the NDMP dissector
gets that but doesn't properly reject it if it doesn't look like NDMP -
that's been fixed.

svn path=/trunk/; revision=12217
2004-10-06 10:01:36 +00:00
Guy Harris 776280fa0d Properly reject packets that don't look like NDMP packets.
svn path=/trunk/; revision=12216
2004-10-06 09:59:50 +00:00
Guy Harris fdd1b1dba5 From Francesco Fondelli: ICE protocol support.
svn path=/trunk/; revision=12215
2004-10-06 09:03:42 +00:00
Guy Harris 96fb567289 Use "tvb_format_text()" for string items, so non-printable characters
don't get stuck into protocol tree item representations (and so that
they can be more easily found if, as, and when we get around to handling
different character encodings).

Clean up white space.

Get rid of another sprintf() on top of a string constant.

svn path=/trunk/; revision=12211
2004-10-05 23:22:36 +00:00