Commit Graph

555 Commits

Author SHA1 Message Date
Anders Broman 25a7d62b92 BSSGP - Translate MCC and make MCC MNC etc vissible filters
GSMMAP - Small bugfix

svn path=/trunk/; revision=17132
2006-01-31 05:46:36 +00:00
Anders Broman c6527de2aa Fix a typo.
svn path=/trunk/; revision=17131
2006-01-31 05:42:55 +00:00
Anders Broman 65530eb912 Add the abillity to translate MCC.
svn path=/trunk/; revision=17105
2006-01-26 06:54:52 +00:00
Anders Broman 1c5874e2e3 Dissect CellGlobalIdOrServiceAreaIdOrLAI and RAIdentity
svn path=/trunk/; revision=17075
2006-01-22 21:16:33 +00:00
Anders Broman fded8deafc RANAP - Dissect ProtocolExtensionField IE:s
GSM A - Service Request; Mobile identity element is LV type

svn path=/trunk/; revision=17069
2006-01-21 19:12:52 +00:00
Anders Broman f194c9eddb Dissect:
- PDPcontext
 - GSN-Address
 - QoS

svn path=/trunk/; revision=17063
2006-01-20 19:41:31 +00:00
Anders Broman ae3e48d228 Dissect:
- PDPcontext
 - GSN-Address
 - QoS

svn path=/trunk/; revision=17062
2006-01-20 19:39:38 +00:00
Anders Broman d5ee40fd86 Dissect:
- PDPcontext
- GSN-Address
- QoS

svn path=/trunk/; revision=17061
2006-01-20 19:34:53 +00:00
Anders Broman 9d6de675a4 ext_qos_subscribed was not correctly decoded in Camel and GSM MAP
Change to use proto_add_item in packet-gsm_a.c for some octets and export value strings.

svn path=/trunk/; revision=17055
2006-01-19 18:20:14 +00:00
Gerald Combs f816511ea9 In packet-cops.c use proto_item_append_text() instead of creating a
separate buffer.  Fixes the current Buildbot failure.

Don't let the sprint_realloc_* functions reallocate ep_allocated memory.
Add comments warning against this in the future.

In emem.c, make sure we don't use an extra 100k every stinkin' time
someone wants to allocate memory when debugging is enabled.

Fixup whitespace.

svn path=/trunk/; revision=17051
2006-01-18 20:02:19 +00:00
Anders Broman 4ecd261cfb Change some OPCODE decodes from respons to Invoke (bug fix), let gsm_a decode som IE:s.
svn path=/trunk/; revision=17050
2006-01-17 21:52:30 +00:00
Anders Broman c5e0d27e84 From Alejandro Vaquero:
patch to add t38 setup info for h245 packets.

- Me add /y to makefiles.

svn path=/trunk/; revision=17036
2006-01-16 06:05:25 +00:00
Anders Broman d9b0082c91 Backup changes.
svn path=/trunk/; revision=17035
2006-01-15 22:10:56 +00:00
Gerald Combs 62a3709da3 Reset h245_pi using CLEANUP_PUSH/CLEANUP_CALL_AND_POP so that we don't leave
ep_alloc()ated memory lying around.  Fixes bug 667.

Fixup whitespace.

svn path=/trunk/; revision=17022
2006-01-12 21:53:02 +00:00
Anders Broman e3e5ea61c2 Backup the latest edits
svn path=/trunk/; revision=17021
2006-01-12 19:27:56 +00:00
Gerald Combs faef737b31 Before we begin dissection, NULLify some global variables that might
contain ep_alloc()ed data from a previous dissection.  Correctly fixes
bug 651 (the previous fix was incorrect).

svn path=/trunk/; revision=17015
2006-01-12 02:06:34 +00:00
Gerald Combs 12331f9cb4 Make sure last_dn is big enough, and set it to NULL when we're
finished with it.  This should fix the current menagerie failure
in Buildbot.

Fix up whitespace.

svn path=/trunk/; revision=16995
2006-01-10 23:28:16 +00:00
Anders Broman c0d17b8845 Use col_set_fence(), not to owerwrite colinfo if more than one Camel pdu is in one TCAP message.
svn path=/trunk/; revision=16980
2006-01-09 21:12:22 +00:00
Anders Broman baa9b5c93b Add dissection of more IE:s
svn path=/trunk/; revision=16977
2006-01-07 13:07:04 +00:00
Anders Broman 44784a9fe4 From Olivier Jacques,
Here is a patch that:
- Replaces the arrow labels by the beginning of the COLINFO column if available (usually containing message names/types).
- Change the comment area to be "protocol: colinfo_content"
From Anders
Added ID tag

Camel
Use col_set_str to remove TCAP info in col_info
 


svn path=/trunk/; revision=16975
2006-01-07 11:10:50 +00:00
Gerald Combs 20b00dd581 Don't dereference a null pointer. Fixes bug 651. Update the release notes
accordingly.

svn path=/trunk/; revision=16967
2006-01-06 20:03:52 +00:00
Jörg Mayer f9a57f08d1 Bill Meier:
Spelling fixes.

svn path=/trunk/; revision=16956
2006-01-05 13:01:08 +00:00
Anders Broman 9d3228610a Further asn1 code updates and IE decoding.
svn path=/trunk/; revision=16932
2006-01-03 15:13:26 +00:00
Guy Harris 35743cded8 Fix a typo.
svn path=/trunk/; revision=16931
2006-01-02 10:52:50 +00:00
Anders Broman 40ce443b6a Updates to the ASN1 code and decode some IE:s
svn path=/trunk/; revision=16915
2005-12-28 21:32:41 +00:00
Luis Ontanon be94b45514 - Decode some more annex C fields
- Keep track of terminations (link wildcarded ones to real ones)
- Keep termination info and link aal2 terminations to alcap legs


svn path=/trunk/; revision=16914
2005-12-28 19:46:57 +00:00
Ronnie Sahlberg 2975ff835b microsoft does not use a confounder for spnego when using DNS/TSIG
they use an additional confounder everywhere else  (as it seems)   but not for DNS/TSIG


svn path=/trunk/; revision=16894
2005-12-25 11:43:47 +00:00
Anders Broman 17716d3716 Add ASN1 code from some more 3GPP2 dockuments.
svn path=/trunk/; revision=16867
2005-12-20 18:26:28 +00:00
Anders Broman fadf4746d1 Add dissection of RNSAP, not complete yet.
svn path=/trunk/; revision=16864
2005-12-20 07:22:33 +00:00
Anders Broman fb6610f77d Fix some asn1 errors and insert the new code to call TCAP.
svn path=/trunk/; revision=16862
2005-12-19 19:39:42 +00:00
Anders Broman f9d87c5800 Get rid of some GCC warnings about unused code.
svn path=/trunk/; revision=16861
2005-12-19 19:36:32 +00:00
Anders Broman a010425f35 Add dissection of Error parameters hopfully geting rid of some GCC warnings.
svn path=/trunk/; revision=16860
2005-12-19 19:34:52 +00:00
Jörg Mayer b06bd208d0 warning: function declaration isn't a prototype
svn path=/trunk/; revision=16852
2005-12-18 23:18:06 +00:00
Anders Broman a9f59bb0d2 Work in progress ANSI MAP dissector.
svn path=/trunk/; revision=16846
2005-12-18 18:17:29 +00:00
Guy Harris 004eb8b1c1 If we're going to use a handle for the data handle, we need to get a
handle for that dissector.  This fixes bug 637.

svn path=/trunk/; revision=16842
2005-12-18 11:19:25 +00:00
Guy Harris 384f0fb6bb Update tcap.cnf to generate the current packet-tcap.c
svn path=/trunk/; revision=16841
2005-12-18 11:08:38 +00:00
Guy Harris 9851c0aa87 Get rid of an unused variable.
svn path=/trunk/; revision=16840
2005-12-18 10:59:45 +00:00
Guy Harris df02403f08 Get rid of an unused variable.
svn path=/trunk/; revision=16838
2005-12-18 10:51:41 +00:00
Guy Harris bcd1cacaa7 Get rid of an unused variable.
Fix a typo in svn:keywords.

svn path=/trunk/; revision=16837
2005-12-18 10:42:29 +00:00
Luis Ontanon bc84ba5de6 Have tcap subdissectors registering using functions provided by tcap and tcap manage ssn registration.
In packet-sccp.c avoid not having a binding.


svn path=/trunk/; revision=16834
2005-12-17 16:55:45 +00:00
Anders Broman 6f23144e46 From Jaap Keuter:
- Editcap 
Mikko Tiihonen filed bug 379 including a patch for editcap. This wasn't picked up so far. I've ported the patch to svn 16820 and included a documentation patch.

-packet-ieee80211.c
Radek Vokal of RedHat filed a bug found by Vladimir Kondratiev of Intel in the 802.11 dissector. Radek provided a sample capture and Vladimir a oneliner patch. I've ported the patch to svn 16820 and tested it against the provided capture. Works well.


-From Kan Sasaki
A patch for packet-ospf.c is attached:
 - Fix the handling of the DN-bit of options field.
 - Add a new function dissect_ospf_bitfield() to dissect a bitfield
   such as options, flags. The following functions are merged by
   using this function.
     - dissect_ospf_lls_extended_options()
     - dissect_ospf_dbd()


     - dissect_ospf_options()
     - dissect_ospf_v3_prefix_options()
 - dissect the flags and prefix-options bitfield.

- lldp Bugfix Bug 596  LLDP TIA Network Policy Decode is not correct 

- Camel make it possible to dissect based on OID.

svn path=/trunk/; revision=16822
2005-12-16 16:37:03 +00:00
Anders Broman 8d05164bec Get rid of duplicted dissector tables for MTP3 Service indicator and SCCP ssn:s
svn path=/trunk/; revision=16815
2005-12-16 07:05:50 +00:00
Anders Broman 483ec5bd05 From Graeme Lunt:
* DOP - This has now been successfully tested and so is now enabled by default and workaround code removed. 
Also now uses the correct EXPORTs from the other modules/dissectors.

* X509SAT - Most of the selected attributes are now supported in addition to the DirectoryString syntax attributes. This includes restoring the correct DirectoryString syntax and also providing the basic syntaxes (e.g. OBJECT IDENTIFIER, PrintableString). The latter requires a sed line in the Makefile which I assume should be OK? Not all the SAT can be defined in x509sat - so some have been included in x509if and x509af - though x509sat.cnf contains the master list and references the other dissectors where appropriate.

(I still prefer a syntax registration approach but I don't think that is going to be agreed in the short term.)

* X509IF - a mechanism to register some formating, based upon the hf_index, that is used in the cnf file.

* A couple of fixes identified by Stig.

svn path=/trunk/; revision=16814
2005-12-16 06:47:22 +00:00
Anders Broman ef6bc891fa Fix Bug 628 Bugzilla 2.18.3
CAMEL - Connect decoding error 
- Calledparty number included first two octets

svn path=/trunk/; revision=16804
2005-12-14 21:46:56 +00:00
Anders Broman f3c3b8f577 Add makefiles
svn path=/trunk/; revision=16800
2005-12-14 21:04:42 +00:00
Anders Broman 404b556084 From Grame Lunt:
Attached is a patch that updates - 

* DOP - This has now been successfully tested and so is now enabled by default and workaround code removed. 
Also now uses the correct EXPORTs from the other modules/dissectors.

* X509SAT - Most of the selected attributes are now supported in addition to the DirectoryString syntax attributes. This includes restoring the correct DirectoryString syntax and also providing the basic syntaxes (e.g. OBJECT IDENTIFIER, PrintableString). The latter requires a sed line in the Makefile which I assume should be OK? Not all the SAT can be defined in x509sat - so some have been included in x509if and x509af - though x509sat.cnf contains the master list and references the other dissectors where appropriate.

(I still prefer a syntax registration approach but I don't think that is going to be agreed in the short term.)

* X509IF - a mechanism to register some formating, based upon the hf_index, that is used in the cnf file.

* A couple of fixes identified by Stig.

Note the patc for dop did not apply don't regenerate dissectors yet.

svn path=/trunk/; revision=16799
2005-12-14 21:02:56 +00:00
Luis Ontanon 3728b83d2b Avoid the default sccp.ssn range to overwrite sccp.ssns of other dissectors.
svn path=/trunk/; revision=16782
2005-12-13 22:04:02 +00:00
Gerald Combs 6b376c9c0e asn2eth.py:
Catch a TypeError that gets thrown if we don't use any conversion
specifiers during string formatting.

H.248:

Don't dereference a null pointer.  Fixes bug 626.

svn path=/trunk/; revision=16773
2005-12-13 03:48:26 +00:00
Jörg Mayer 50d94b2f95 Add missing propset ...
svn path=/trunk/; revision=16749
2005-12-09 16:46:24 +00:00
Guy Harris b45d2efe6d Regenerate with the latest asn2eth, to get FT_OID used, and to add #line.
svn path=/trunk/; revision=16736
2005-12-08 23:29:21 +00:00
Guy Harris 344b59b6b3 Squelch a const vs. non-const pointer warning.
svn path=/trunk/; revision=16731
2005-12-08 09:05:23 +00:00
Anders Broman fa92d58b40 From Grame Lunt:
updated X.500 dissectors to include DOP support.

The "dop" dissector is the renamed "x501" dissector consequently the asn/x501 directory should be removed. The patch includes the changes to epan/dissectors/Makefile.common to reflect this.

As the DOP dissection is not fully tested, I have disabled it by default for now (like DSP) but it can be enabled by the user.


svn path=/trunk/; revision=16726
2005-12-07 23:20:11 +00:00
Luis Ontanon 55d5c5cc66 Avoid dereferencing pointers to the message, context and transaction object if they have not been created.
svn path=/trunk/; revision=16725
2005-12-07 21:08:51 +00:00
Guy Harris 76bcc9bd3f Squelch some compiler const vs. non-const warnings.
svn path=/trunk/; revision=16710
2005-12-06 22:59:30 +00:00
Luis Ontanon 94110893b7 It crashed when keep_persistent_data == FALSE
svn path=/trunk/; revision=16705
2005-12-06 19:47:22 +00:00
Luis Ontanon d6c5410b18 - Fix few issues with context analysis
- Add used terminations tree to the context analysis tree

Regenerate Dissector


svn path=/trunk/; revision=16703
2005-12-06 18:52:17 +00:00
Anders Broman 1426dbb8fb Dissect Cause and use %(DEFAULT_BODY)s use import for IMSI.
svn path=/trunk/; revision=16701
2005-12-06 17:53:28 +00:00
Anders Broman f27bf13022 From Grame Lunt:
a patch for the X.411, X420 and CMS dissectors to implement the remaining heading extensions and bodyparts.

This includes GeneralText BP, forwarded content BP (forwarded p22 and forwarded p772), PKCS#7 BP, and "business class" messaging extensions.

The X.411 extensions using the SIGNATURE macro have also been implemented. There is also a fix for a bug in the dissection of integer 22 content type.

Graeme

svn path=/trunk/; revision=16689
2005-12-05 23:00:03 +00:00
Luis Ontanon 906eb93fd7 Analysis starts to work
svn path=/trunk/; revision=16678
2005-12-05 01:46:07 +00:00
Anders Broman 223506c537 Work in progress an asn2eth generated snmp dissector.
svn path=/trunk/; revision=16674
2005-12-04 21:45:38 +00:00
Luis Ontanon e622f903f9 Rewrite of the analisys and summary code.
Analysis code is still  not working so it is disabled.


svn path=/trunk/; revision=16658
2005-12-03 11:43:19 +00:00
Ronnie Sahlberg 7efbafb6e5 from Stig B:
I have made a small change in packet-x411-template.c to make the X.
411 message heading in CDT look like in COTP.




svn path=/trunk/; revision=16657
2005-12-02 22:01:00 +00:00
Ronnie Sahlberg 30a69454db add work in progress asn2eth generated ldap dissector from AndersB's email of
Nov 15

it is checked in but not copied to epan/dissectors so that those interested can work on it until it gets ready to replace the old one.



svn path=/trunk/; revision=16649
2005-12-02 10:41:46 +00:00
Anders Broman 72b18dfd81 Fix a typo
svn path=/trunk/; revision=16630
2005-12-01 06:18:30 +00:00
Anders Broman 6ea74af3d1 Connec all op types to the asn1 code. Use #.PDU to get hf fields auto generated.
svn path=/trunk/; revision=16629
2005-11-30 20:14:18 +00:00
Anders Broman f082fe8ecf ISUP - Export functions used by INAP and Camel
Gsmmap - Export asn1 structs used by Camel
Camel - Use functions from GSMMAp and ISUP
INAP - Rewrite of the asn1 code to correspond more to CS1 data types
          Let ISUP and Q931 dissect apropriate stuff.

svn path=/trunk/; revision=16624
2005-11-29 17:23:50 +00:00
Jörg Mayer 2edee79378 Porperties: replace executable by eol-style and keywords
svn path=/trunk/; revision=16603
2005-11-26 10:05:14 +00:00
Guy Harris 3784eec708 Get rid of unused global variables.
svn path=/trunk/; revision=16601
2005-11-26 03:09:40 +00:00
Anders Broman b8d097b28b Update the Camel asn1 spec to 3GPP TS 29.078 version 6.4.0 and export needed stuff from gsmmap
svn path=/trunk/; revision=16587
2005-11-25 20:18:36 +00:00
Anders Broman 59a7f595b4 From Stig Bjørlykke
Added a new dissector for CDT (CompressedDataType) as
 defined in STANAG 4406 Annex E.  This dissector is used in P_Mul to  
 decode encapsulated X.411 content.  I have added a function in the  
 X.411 dissector to decode a MTS APDU without having a ROS

 Changes in this patch:
 * Added CDT dissector
 * Use CDT dissector in P_Mul
 * Added function to decode MTS APDU in the X.411 dissector

svn path=/trunk/; revision=16565
2005-11-23 07:29:45 +00:00
Anders Broman 704e126253 Add cdt
svn path=/trunk/; revision=16564
2005-11-23 07:24:18 +00:00
Jörg Mayer eff40f65db Trivial warning fixes
svn path=/trunk/; revision=16561
2005-11-22 12:51:14 +00:00
Guy Harris a30e519736 When registering a context ID and OID, set the OID to NULL if we don't
have an OID to register.

If our table of context identifiers and OIDs is to keep that association
on a per-conversation basis, it should use conversations, not
address/port, as we aren't necessarily running over TCP or UDP.

svn path=/trunk/; revision=16554
2005-11-20 04:34:58 +00:00
Ronnie Sahlberg 2d8fb070ca if the packet is mangled the oid string might be NULL.
dont try to register a NULL oid



svn path=/trunk/; revision=16553
2005-11-20 02:48:26 +00:00
Guy Harris e2c9bcf703 The SHA-1 routines now take const pointers; don't cast away constness.
tvb_get_ptr() returns a "const guint8 *"; don't bother casting its
return value to "const guint8 *".

"cms_verify_msg_digest()" can be passed a const pointer for "alg"; make
its argument a "const char *".

svn path=/trunk/; revision=16534
2005-11-17 11:50:36 +00:00
Guy Harris 148d700e01 Get rid of some char * vs. const char * warnings, and declare a function
with no arguments as such.

svn path=/trunk/; revision=16532
2005-11-17 11:16:37 +00:00
Guy Harris 7586ab64db Squelch some const vs. non-const warnings.
svn path=/trunk/; revision=16525
2005-11-17 05:02:30 +00:00
Guy Harris 0c8be0fab6 Include <epan/emem.h> to declare ep_alloc().
svn path=/trunk/; revision=16524
2005-11-17 04:54:25 +00:00
Guy Harris 393ac45d83 "dissect_ber_object_identifier_str" expects a "const char **" as its
last argument; make it so.

svn path=/trunk/; revision=16523
2005-11-17 04:47:41 +00:00
Ronnie Sahlberg d71982fbbb add the rest of Graeme Lunts patch
svn path=/trunk/; revision=16520
2005-11-16 23:17:21 +00:00
Ronnie Sahlberg 3487cd6d59 from Graeme Lunt
4 new asn based protocols
X501
DISP
DAP
DSP



svn path=/trunk/; revision=16518
2005-11-16 22:53:33 +00:00
Ronnie Sahlberg 898dc49980 add a simple g_strlcat define in strutil for gtk==1 where this symbol does not exist
svn path=/trunk/; revision=16511
2005-11-16 09:27:43 +00:00
Anders Broman c33182b898 From Graeme Lunt:
Here are a number of small patches for asn1 based dissectors:

acse:
  release request/response column information (many X.400/X.500 unbinds are
empty)
  "standardised" PNAME to "ISO 8650-1 OSI Association Control Service"
  fix for crash when using EXTERNAL dissector

rtse:
  column information when attempting a resume

x509if:
  generation of LDAP-style DNs from RDNSequences 
  new function x509if_get_last_dn() to get the last DN generated.

x509af:
  DSS parameters
  certificate extension naming
  subject naming of certificate

x509sat:
  Guide syntax (as SET now supported)
  PDU exports.
  
cms:
  verification of message digest attribute (SHA-1 and MD5)
  
ess:
  enumerated/restrictive/permissive/informative security categories

x411:
  generation of string encoding of X.400 addresses, trace information and message identifiers.

s4406:
  separate types for primary and copy precedence to allow better filtering (e.g. primary precedence = flash)
  priority-level-qualifier


svn path=/trunk/; revision=16508
2005-11-16 07:13:12 +00:00
Tomas Kukosa 97584210fb improvements in value constraint support
- NO_BOUND is defined instead of usage -1
- negative bound is handled properly for INTEGER

svn path=/trunk/; revision=16505
2005-11-14 13:05:17 +00:00
Ronnie Sahlberg f4e55c1155 move the include of emem.h a bit further down
so it does know what size_t is when emem is included.

i needed this change to get it to compile on my box


svn path=/trunk/; revision=16504
2005-11-14 13:02:23 +00:00
Tomas Kukosa 3b770d5c7c - dissect_ber_object_identifier() returns value as tvb
- new dissect_ber_object_identifier_str() function
 - BER dissectors adapted and regenerated

svn path=/trunk/; revision=16501
2005-11-14 10:02:31 +00:00
Anders Broman 42ed3aede8 Fix the lenght calculation.
svn path=/trunk/; revision=16499
2005-11-13 18:09:44 +00:00
Luis Ontanon ff20ed3e10 Some cleanup,
- Improve expert info
- Remove the debug tree (one warning unused function, will go)
- Make Sure Pending messages have a cmdmsg (and so a colinfo label)


svn path=/trunk/; revision=16383
2005-11-02 23:01:15 +00:00
Luis Ontanon b10fcd969a - terminate a value_string
- wildcard field subdissector


svn path=/trunk/; revision=16378
2005-11-02 19:46:47 +00:00
Anders Broman 6eb18470f8 From Tim
A small patch for camel and inap, where the linkedid doesn't get dissected correctly in camel or inap
and some tidy up in the camel asn.1 which now compiles with no warnings.

also fix the copy_file target (/y)

svn path=/trunk/; revision=16376
2005-11-02 07:51:55 +00:00
Luis Ontanon c5ff846c22 - add a counter for pending messages
- do not use a value string for context ids
- remove the plugin registration as it is not supposedd to be a plugin


svn path=/trunk/; revision=16375
2005-11-01 21:09:28 +00:00
Luis Ontanon f100a33216 - Embryonic Transaction & Context tracing
svn path=/trunk/; revision=16372
2005-11-01 16:28:13 +00:00
Ronnie Sahlberg deaf5edaaf register 1.2.840.113533.7.66.13 as passwordbasedmac from CRMF
svn path=/trunk/; revision=16344
2005-10-27 11:54:55 +00:00
Ronnie Sahlberg 6d964caa1e updates to CMP
implement the glue to dissect CMP oer TCP


svn path=/trunk/; revision=16323
2005-10-26 20:17:40 +00:00
Anders Broman 159963a270 Add the rest of the IE:s
svn path=/trunk/; revision=16322
2005-10-26 19:52:00 +00:00
Anders Broman 85cd6d8dc7 Set correct offset fore some signals, use dummy funtion to get hf fields auto generated.
svn path=/trunk/; revision=16319
2005-10-26 18:52:46 +00:00
Anders Broman 78ed339b3d Tags should be implicit.
svn path=/trunk/; revision=16316
2005-10-25 20:30:43 +00:00
Anders Broman c8d3cd483b As there are more Procedure codes the hueristics need to be updated.
svn path=/trunk/; revision=16315
2005-10-25 20:29:50 +00:00
Guy Harris 859ccfa6cb Check in re-generated version from Graeme Lunt's fix to asn2eth.
svn path=/trunk/; revision=16313
2005-10-25 19:39:50 +00:00
Guy Harris 7e874fc9dd Don't declare "dissect_rtse_EXTERNAL()" in "packet-rtse.c" - let it get
it from "packet-rtse.h" (which, at least on some platforms, doesn't
declare it as static, so GCC 4.0, at least, fails because the static and
non-static declarations collide).

svn path=/trunk/; revision=16312
2005-10-25 19:37:38 +00:00